Added the functionnality to be able to reparent items

src/main/java/de/catma/repository/git/GitProjectHandler.java

@@ -196,6 +196,24 @@ public String createOrUpdateTag(String tagsetId, TagDefinition tagDefinition, St
 		}
 	}
 
+	public String moveTagAndUpdateAnnotations(TagsetDefinition tsdFrom, TagsetDefinition tsdTo, TagDefinition tdFrom, TagDefinition tdTo, Multimap<String, TagInstance> tagInstancesByCollectionId, String commitMsg) throws IOException {
+		try (LocalGitRepositoryManager localGitRepoManager = localGitRepositoryManager) {
+			localGitRepoManager.open(projectReference.getNamespace(), projectReference.getProjectId());
+			GitTagsetHandler gitTagsetHandler = new GitTagsetHandler(
+					localGitRepoManager,
+					projectPath,
+					remoteGitServerManager.getUsername(),
+					remoteGitServerManager.getEmail()
+			);
+			String projectRevision = gitTagsetHandler.moveTagDefinition(tdFrom, tdTo, commitMsg);
+
+			localGitRepoManager.push(jGitCredentialsManager);
+
+			return projectRevision;
+		}
+	}
+
+
 	public String removeTagAndAnnotations(TagDefinition tagDefinition, Multimap<String, TagInstance> tagInstancesByCollectionId) throws IOException {
 		try (LocalGitRepositoryManager localGitRepoManager = localGitRepositoryManager) {
 			localGitRepoManager.open(projectReference.getNamespace(), projectReference.getProjectId());

src/main/java/de/catma/repository/git/GitTagsetHandler.java

@@ -171,6 +171,77 @@ public ContentInfoSet getContentInfoSet(String tagsetId) throws IOException {
 
 		return contentInfoSet;
 	}
+
+	/**
+	 * Moves a tag definition between one or multiple tagsets identified by <code>tagsetId</code>.
+	 *
+	 * @param tdFrom {@link TagDefinition} source
+	 * @param tdTo {@link TagDefinition} destination
+	 * @param commitMsg commit message
+	 * @return the new project revision hash
+	 * @throws IOException if an error occurs during the move of the tag definition
+	 */
+	public String moveTagDefinition(
+			TagDefinition tdFrom,
+			TagDefinition tdTo,
+			String commitMsg
+	) throws IOException {
+		String pdj = "/propertydefs.json";
+		String common =	String.format("%s/%s/", this.projectDirectory.getAbsolutePath(), GitProjectHandler.TAGSETS_DIRECTORY_NAME);
+		String fromTagsetDir = String.format("%s/%s/", common, tdFrom.getTagsetDefinitionUuid());
+		String toTagsetDir = String.format("%s/%s/", common, tdTo.getTagsetDefinitionUuid());
+
+		/* This work like it seems: all the folders having subdirectories have a folder
+		at the root of the tagset folder containing the subitems. This mean that the
+		hiearchy isn't stored as it is in the UI. */
+		String fromPath = fromTagsetDir +
+			(StringUtils.isEmpty(tdFrom.getParentUuid()) ? "" : (tdFrom.getParentUuid() + "/"))
+			+ tdFrom.getUuid();
+		String toPath = toTagsetDir +
+			(StringUtils.isEmpty(tdTo.getParentUuid()) ? "" : (tdTo.getParentUuid() + "/"))
+			+ tdTo.getUuid();
+		File from = Paths.get(fromPath).toFile();
+		File to = Paths.get(toPath).toFile();
+		if ((StringUtils.isEmpty(tdFrom.getParentUuid()) && StringUtils.isEmpty(tdTo.getParentUuid())) ||
+			(!StringUtils.isEmpty(tdFrom.getParentUuid()) && !StringUtils.isEmpty(tdTo.getParentUuid()))) {
+			/* if we move from an item in a tree somewhere to an item in a tree somewhere else, or if we
+				move a parent around in the root of the hierarchy, its fine, we just move the folder
+                                around */
+			FileUtils.moveDirectory(from, to);
+			this.localGitRepositoryManager.remove(Paths.get(fromPath + pdj).toFile());
+			this.localGitRepositoryManager.remove(from);
+		}
+		if (StringUtils.isEmpty(tdFrom.getParentUuid()) && !StringUtils.isEmpty(tdTo.getParentUuid())) {
+			/* if we moved from the root to an object lower in the hierarchy, we need to bring the children back down 
+			(if it has any) */
+			/* There shouldn't be a subdir with the name of the current tag UUID in its parent folder */
+			to.mkdirs();
+			FileUtils.moveFile(Paths.get(fromPath+pdj).toFile(), Paths.get(toPath+pdj).toFile());
+			/* That leaves the children in the root of the tagset under the directory with the name of
+                        their parent, which is what we wanted anyways */
+			this.localGitRepositoryManager.remove(Paths.get(fromPath + pdj).toFile());
+		}
+		if (StringUtils.isEmpty(tdTo.getParentUuid()) && !StringUtils.isEmpty(tdFrom.getParentUuid())) {
+			/* If we moved back to the root, our children are already in a directory called with our UUID at the root,
+			we need to not squish them, so we only move the propertydefs there */
+			FileUtils.moveFile(Paths.get(fromPath+pdj).toFile(), Paths.get(toPath+pdj).toFile());
+			this.localGitRepositoryManager.remove(Paths.get(fromPath + pdj).toFile());
+		}
+
+		GitTagDefinition gitTagDefinition = new GitTagDefinition(tdTo);
+		String serializedGitTagDefinition =
+				new SerializationHelper<GitTagDefinition>().serialize(gitTagDefinition);
+
+		String projectRevision = this.localGitRepositoryManager.addAndCommit(
+			Paths.get(toPath + pdj).toFile(),
+			serializedGitTagDefinition.getBytes(StandardCharsets.UTF_8),
+			commitMsg,
+			this.username,
+			this.email);
+		System.out.println("Deletion test commit:" + projectRevision);
+		return projectRevision;
+	}
+
 
 	/**
 	 * Creates a tag definition within the tagset identified by <code>tagsetId</code>.
@@ -187,6 +258,9 @@ public String createOrUpdateTagDefinition(
 			String commitMsg
 	) throws IOException {
 
+		/* This work like it seems: all the folders having subdirectories have a folder
+		at the root of the tagset folder containing the subitems. This mean that the
+		hiearchy isn't stored as it is in the UI. */
 		String targetPropertyDefinitionsFileRelativePath =
 			(StringUtils.isEmpty(tagDefinition.getParentUuid()) ? "" : (tagDefinition.getParentUuid() + "/"))
 			+ tagDefinition.getUuid()

src/main/java/de/catma/repository/git/GraphWorktreeProject.java

@@ -409,6 +409,30 @@ else if (evt.getNewValue() == null) { // TagDefinition was deleted
 		};
 		tagManager.addPropertyChangeListener(TagManagerEvent.tagDefinitionChanged, tagDefinitionChangedListener);
 
+		PropertyChangeListener tagDefinitionMovedListener = new PropertyChangeListener() {
+			public void propertyChange(final PropertyChangeEvent evt) {
+				if (!tagManagerListenersEnabled) {
+					return;
+				}
+
+				try {
+					@SuppressWarnings("unchecked")
+					final Pair<TagsetDefinition, TagDefinition> newVal = (Pair<TagsetDefinition, TagDefinition>) evt.getNewValue();
+					final Pair<TagsetDefinition, TagDefinition> oldVal = (Pair<TagsetDefinition, TagDefinition>) evt.getOldValue();
+					moveTagDefinition((TagsetDefinition)(oldVal.getFirst()), (TagsetDefinition)(newVal.getFirst()), (TagDefinition)(oldVal.getSecond()), (TagDefinition)(newVal.getSecond()));
+				}
+				catch (Exception e) {
+					propertyChangeSupport.firePropertyChange(
+							ProjectEvent.exceptionOccurred.name(),
+							null,
+							e
+					);
+				}
+			}
+		};
+
+		tagManager.addPropertyChangeListener(TagManagerEvent.tagDefinitionMoved, tagDefinitionMovedListener);
+
 		PropertyChangeListener userDefinedPropertyChangedListener = new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent evt) {
 				if (!tagManagerListenersEnabled) {
@@ -652,26 +676,27 @@ private void removeTagsetDefinition(TagsetDefinition tagsetDefinition) throws Ex
 		graphProjectHandler.updateProjectRevision(oldRootRevisionHash, rootRevisionHash);
 	}
 
-	private void addTagDefinition(TagDefinition tagDefinition, TagsetDefinition tagsetDefinition) throws Exception {
+	private void updateTagDefinition(TagDefinition tagDefinition, TagsetDefinition tagsetDefinition) throws Exception {
 		if (isReadOnly()) {
 			throw new IllegalStateException(
 					String.format(
-							"Project \"%1$s\" is in read-only mode! Cannot add tag \"%2$s\" to tagset \"%3$s\".",
+							"Project \"%1$s\" is in read-only mode! Cannot update tag \"%2$s\" with ID %3$s in tagset \"%4$s\".",
 							projectReference.getName(),
 							tagDefinition.getName(),
+							tagDefinition.getUuid(),
 							tagsetDefinition.getName()
 					)
 			);
 		}
 
 		String oldRootRevisionHash = rootRevisionHash;
 
-		// create tag in repo and commit
+		// update tag in repo and commit
 		rootRevisionHash = gitProjectHandler.createOrUpdateTag(
 				tagsetDefinition.getUuid(),
 				tagDefinition,
 				String.format(
-						"Added tag \"%1$s\" with ID %2$s to tagset \"%3$s\" with ID %4$s",
+						"Updated tag \"%1$s\" with ID %2$s in tagset \"%3$s\" with ID %4$s",
 						tagDefinition.getName(),
 						tagDefinition.getUuid(),
 						tagsetDefinition.getName(),
@@ -683,27 +708,25 @@ private void addTagDefinition(TagDefinition tagDefinition, TagsetDefinition tags
 		graphProjectHandler.updateProjectRevision(oldRootRevisionHash, rootRevisionHash);
 	}
 
-	private void updateTagDefinition(TagDefinition tagDefinition, TagsetDefinition tagsetDefinition) throws Exception {
+	private void addTagDefinition(TagDefinition tagDefinition, TagsetDefinition tagsetDefinition) throws Exception {
 		if (isReadOnly()) {
 			throw new IllegalStateException(
 					String.format(
-							"Project \"%1$s\" is in read-only mode! Cannot update tag \"%2$s\" with ID %3$s in tagset \"%4$s\".",
+							"Project \"%1$s\" is in read-only mode! Cannot add tag \"%2$s\" to tagset \"%3$s\".",
 							projectReference.getName(),
 							tagDefinition.getName(),
-							tagDefinition.getUuid(),
 							tagsetDefinition.getName()
 					)
 			);
 		}
-
 		String oldRootRevisionHash = rootRevisionHash;
 
-		// update tag in repo and commit
+		// create tag in repo and commit
 		rootRevisionHash = gitProjectHandler.createOrUpdateTag(
 				tagsetDefinition.getUuid(),
 				tagDefinition,
 				String.format(
-						"Updated tag \"%1$s\" with ID %2$s in tagset \"%3$s\" with ID %4$s",
+						"Added tag \"%1$s\" with ID %2$s to tagset \"%3$s\" with ID %4$s",
 						tagDefinition.getName(),
 						tagDefinition.getUuid(),
 						tagsetDefinition.getName(),
@@ -715,6 +738,44 @@ private void updateTagDefinition(TagDefinition tagDefinition, TagsetDefinition t
 		graphProjectHandler.updateProjectRevision(oldRootRevisionHash, rootRevisionHash);
 	}
 
+	private void moveTagDefinition(TagsetDefinition tsdFrom, TagsetDefinition tsdTo, TagDefinition tdFrom, TagDefinition tdTo) throws Exception {
+		if (isReadOnly()) {
+			throw new IllegalStateException(
+					String.format(
+							"Project \"%1$s\" is in read-only mode! Cannot move tag \"%2$s\" with ID %3$s from tagset \"%4$s\".",
+							projectReference.getName(),
+							tdTo.getName(),
+							tdTo.getUuid(),
+							tsdTo.getName()
+					)
+			);
+		}
+
+		String oldRootRevisionHash = rootRevisionHash;
+
+		Multimap<String, TagReference> tagReferencesByCollectionId = graphProjectHandler.getTagReferencesByCollectionId(tdFrom);
+		Multimap<String, TagInstance> tagInstancesByCollectionId = Multimaps.transformValues(
+				tagReferencesByCollectionId, TagReference::getTagInstance
+		);
+
+		// update tag in repo and commit
+		rootRevisionHash = gitProjectHandler.moveTagAndUpdateAnnotations(
+				tsdFrom, tsdTo, tdFrom, tdTo,
+				tagInstancesByCollectionId,
+				String.format(
+						"Moved tag \"%1$s\" with ID %2$s from tagset \"%3$s\" with ID %4$s to tagset \"%5$s\" with id %6$s",
+						tdTo.getName(),
+						tdTo.getUuid(),
+						tsdFrom.getName(),
+						tsdFrom.getUuid(),
+						tsdTo.getName(),
+						tsdTo.getUuid()
+				)
+		);
+		// update revision hash on GraphProjectHandler
+		graphProjectHandler.updateProjectRevision(oldRootRevisionHash, rootRevisionHash);
+	}
+
 	private void removeTagDefinition(TagDefinition tagDefinition, TagsetDefinition tagsetDefinition) throws Exception {
 		if (isReadOnly()) {
 			throw new IllegalStateException(

src/main/java/de/catma/tag/TagManager.java

@@ -25,6 +25,7 @@
 import java.util.logging.Logger;
 
 import de.catma.document.source.ContentInfoSet;
+import de.catma.project.Project;
 import de.catma.util.Pair;
 
 /**
@@ -102,6 +103,13 @@ public enum TagManagerEvent {
 		 * <li>{@link PropertyChangeEvent#getOldValue()} = the {@link ContentInfoSet old bibliographical data }</li>
 		 */
 		tagLibraryChanged, 
+		/**
+		 * <p>{@link TagDescription} moved:
+		 * <li>{@link PropertyChangeEvent#getNewValue()} = the new tagset and location</li>
+		 * <li>{@link PropertyChangeEvent#getOldValue()} = the old tagset and location</li>
+		 * </p><br />
+		 */
+		tagDefinitionMoved,
 		;
 	}
 
@@ -210,14 +218,23 @@ public void updateTagDefinition(TagDefinition tag, TagDefinition updatedTag) {
 					pd.getUuid()).setPossibleValueList(pd.getPossibleValueList());
 			}
 		}
-
 		tag.setName(updatedTag.getName());
 		tag.setColor(updatedTag.getColor());
-
-		this.propertyChangeSupport.firePropertyChange(
+		if (tag.getParentUuid() != updatedTag.getParentUuid()) {
+			tagset.reParent(tag, updatedTag.getParentUuid());
+
+			this.propertyChangeSupport.firePropertyChange(
+				TagManagerEvent.tagDefinitionMoved.name(),
+				new Pair<TagsetDefinition, TagDefinition>(tagLibrary.getTagsetDefinition(tag.getTagsetDefinitionUuid()), tag),
+				new Pair<TagsetDefinition, TagDefinition>(tagset, updatedTag));
+			tag.setParentUuid(updatedTag.getParentUuid());
+		} else {
+			this.propertyChangeSupport.firePropertyChange(
 				TagManagerEvent.tagDefinitionChanged.name(),
 				tagset,
 				tag);
+		}
+
 	}
 
 	public void removeUserDefinedPropertyDefinition(

src/main/java/de/catma/tag/TagsetDefinition.java

@@ -25,6 +25,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Logger;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -45,6 +46,7 @@ public class TagsetDefinition implements Iterable<TagDefinition> {
 	private String forkedFromCommitURL;
 	private String responsibleUser;
 
+	private Logger logger = Logger.getLogger(this.getClass().getName());
 	private Map<String,TagDefinition> tagDefinitions;
 	private Map<String,Set<String>> tagDefinitionChildren;
 	private Set<String> deletedDefinitions;
@@ -224,6 +226,30 @@ Set<String> getChildIDs(TagDefinition tagDefinition) {
 		return Collections.unmodifiableSet(childIDs);	
 	}
 
+	public void reParent(TagDefinition item, String parent) {
+		if (!tagDefinitions.containsKey(item.getUuid())) {
+			logger.warning("Can't reparent: there is no such TagDefinition in this tagset");
+			return;
+		}
+		if (item.getParentUuid() == parent) {
+			logger.warning("Parent hasn't moved, not changing anything");
+			return;
+		}
+		if (!tagDefinitionChildren.containsKey(item.getParentUuid())) {
+			logger.warning("The item parent doesn't seem to have any children");
+			return;
+		}
+		if (!tagDefinitionChildren.get(item.getParentUuid()).contains(item.getUuid())) {
+			logger.warning("The item parent doesn't contain itself");
+			return;
+		}
+		if (!tagDefinitionChildren.containsKey(parent)) {
+			tagDefinitionChildren.put(parent, new HashSet<String>());
+		}
+		tagDefinitionChildren.get(parent).add(item.getUuid());
+		tagDefinitionChildren.get(item.getParentUuid()).remove(item.getUuid());
+	}
+
 	public void remove(TagDefinition tagDefinition) {
 		for (TagDefinition child : getChildren(tagDefinition)) {
 			remove(child);