SuccessChanges

Summary

  1. * Added collision marker icon to main tree. * Refactored collision marker icon handling in file-tree (=> asynchronous, non-blocking!). * Started wizard for resolving collsions.
Revision 431 by Marco Nguitragool-Schulze:
* Added collision marker icon to main tree.
* Refactored collision marker icon handling in file-tree (=> asynchronous, non-blocking!).
* Started wizard for resolving collsions.
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.java
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionData.java
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxgraph
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.fxml
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/CollisionPane.java
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collision/messages.properties
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.java
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java