Changes

Summary

Implemented everything needed to mark collisions as resolved in the UI.

Revision 433 by Marco Nguitragool-Schulze: Implemented everything needed to mark collisions as resolved in the UI.
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.java
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionFilter.java
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/PlainHistoCryptoRepoFileFilter.java
	/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/SsLocalRepoMetaData.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/FileTreeItem.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/FileTreePane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionDtoSet.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoryPaneContainer.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoryPaneSupport.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/collision-resolved_16x16.png
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/collision-resolved_24x24.png
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.fxgraph
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.fxml
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.fxgraph
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.fxml
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/collision-resolved_24x24.png
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/ServerRepoDirectoryMainTreeItem.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/ServerRepoMainTreeItem.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/CollisionDtoWithPlainHistoCryptoRepoFileDto.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionData.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionWizard.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionData.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxgraph
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxml
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionWizardPage.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.fxgraph
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.fxml
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingWizardPage.java
	/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/messages.properties
	/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_16x16.png
	/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_16x16.xcf
	/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_24x24.png
	/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_24x24.xcf
	/trunk/org.subshare/org.subshare.gui/src/main/resources/ok_24x24.png
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.java
	/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFileDao.java