SuccessChanges

Summary

  1. * Refactored Collision[Dto] and introduced the encrypted counter-part CollisionPrivate[Dto]. * Made it possible to not only [un]resolve a collision, but also to set a (secret) comment.
Revision 435 by Marco Nguitragool-Schulze:
* Refactored Collision[Dto] and introduced the encrypted counter-part CollisionPrivate[Dto].
* Made it possible to not only [un]resolve a collision, but also to set a (secret) comment.
The file was modified/trunk/org.subshare/build.gradle
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.java
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.core/src/main/java/org/subshare/core/dto/CollisionPrivateDto.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/PlainHistoCryptoRepoFileDto.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CloudStoreJaxbContextProviderImpl.java
The file was added/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/jaxb/CollisionPrivateDtoIo.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/histo/HistoExporterImpl.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionFilter.java
The file was added/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionPrivateFilter.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/PlainHistoCryptoRepoFileFilter.java
The file was modified/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/SsLocalRepoMetaData.java
The file was removed/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionDtoSet.java
The file was added/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionPrivateDtoSet.java
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/histo/HistoCryptoRepoFileTreeItem.java
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.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.gui/src/main/java/org/subshare/gui/resolvecollision/CollisionDtoWithPlainHistoCryptoRepoFileDto.java
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionWizard.java
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionData.java
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxgraph
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxml
The file was modified/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeContext.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeNode.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionDtoConverter.java
The file was added/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/CollisionPrivateDtoConverter.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CloudStorePersistenceCapableClassesProviderImpl.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.java
The file was added/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivate.java
The file was added/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionPrivateDao.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoFrameDao.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PlainHistoCryptoRepoFile.java
The file was modified/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsRemoteRepositoryDao.java