Started by upstream project "org.subshare" build number 107107org.subsharejob/org.subshare/false7562168737org.subshare.www #832016-06-09_19-25-53false83SUCCESS1465493153000https://www.codewizards.co:443/jenkins/view/org.subshare/job/org.subshare.www/83//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.javahttps://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze43314654907754102016-06-09T16:46:15.410850ZImplemented everything needed to mark collisions as resolved in the UI.edit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.javaedit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/dto/CollisionDto.javaedit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/CollisionFilter.javaedit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/PlainHistoCryptoRepoFileFilter.javaedit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/repo/local/SsLocalRepoMetaData.javadelete/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/collisionedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/FileTreeItem.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/FileTreePane.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/CollisionDtoSet.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/filetree/repoaware/RepoAwareFileTreePane.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoryPaneContainer.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/HistoryPaneSupport.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/collision-resolved_16x16.pngadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/histo/collision-resolved_24x24.pngedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.fxgraphedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.fxmledit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/LocalRepoPane.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.fxgraphedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.fxmledit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/LocalRepoDirectoryPane.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/localrepo/directory/collision-resolved_24x24.pngedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/LocalRepoDirectoryMainTreeItem.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/ServerRepoDirectoryMainTreeItem.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/maintree/ServerRepoMainTreeItem.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollisionadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/CollisionDtoWithPlainHistoCryptoRepoFileDto.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionData.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/ResolveCollisionWizard.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collisionedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionData.javaedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxgraphedit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.fxmledit/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionPane.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/collision/CollisionWizardPage.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loadingadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.fxgraphadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.fxmladd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingPane.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/LoadingWizardPage.javaadd/trunk/org.subshare/org.subshare.gui/src/main/java/org/subshare/gui/resolvecollision/loading/messages.propertiesedit/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_16x16.pngedit/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_16x16.xcfadd/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_24x24.pngadd/trunk/org.subshare/org.subshare.gui/src/main/resources/collision-resolved_24x24.xcfadd/trunk/org.subshare/org.subshare.gui/src/main/resources/ok_24x24.pngedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Collision.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CollisionDao.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFileDao.java433Marco Nguitragool-Schulzesvnhttps://www.codewizards.co/svn/subshare/trunk/org.subshare433https://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze3.0.4