From 4b9662c96beb77deb187287bc77630e919d82240 Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Wed, 3 Jul 2024 17:05:37 +0200 Subject: [PATCH] Revert "LM Reviews" This reverts commit da21fdb520465b464f605b77d0635cc05db58576. --- .../org.eclipse.emf.cdo-feature/feature.xml | 2 +- features/org.eclipse.emf.cdo-feature/pom.xml | 2 +- .../feature.xml | 2 +- .../.project | 42 - .../org.eclipse.core.resources.prefs | 2 - .../org.eclipse.ltk.core.refactoring.prefs | 3 - .../org.eclipse.mylyn.tasks.ui.prefs | 4 - .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 - .../build.properties | 14 - .../feature.properties | 8 - .../feature.xml | 53 -- .../pom.xml | 31 - .../feature.xml | 9 +- .../org.eclipse.emf.cdo.sdk-feature/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 72 +- plugins/org.eclipse.emf.cdo.common/pom.xml | 2 +- .../emf/cdo/common/branch/CDOBranchRef.java | 17 - .../common/commit/CDOCommitHistoryImpl.java | 42 +- .../META-INF/MANIFEST.MF | 2 +- .../lm/internal/client/LMNamingStrategy.java | 7 +- .../lm/internal/client/SystemDescriptor.java | 23 +- .../META-INF/MANIFEST.MF | 4 +- plugins/org.eclipse.emf.cdo.lm.edit/pom.xml | 2 +- .../cdo/lm/provider/ChangeItemProvider.java | 43 +- .../META-INF/MANIFEST.MF | 8 +- .../icons/full/OLD/Comment1.png | Bin 413 -> 0 bytes .../icons/full/OLD/Comment7.gif | Bin 324 -> 0 bytes .../icons/full/OLD/DeliveryReview - Kopie.gif | Bin 184 -> 0 bytes .../icons/full/OLD/DropReview - Kopie.gif | Bin 135 -> 0 bytes .../OLD/JSF_SELECTMANYCHECKBOX1 - Kopie.gif | Bin 352 -> 0 bytes .../full/OLD/JSF_SELECTMANYCHECKBOX1.gif | Bin 352 -> 0 bytes .../icons/full/OLD/Review.gif | Bin 218 -> 0 bytes .../icons/full/OLD/_drop_ovr.gif | Bin 212 -> 0 bytes .../icons/full/OLD/_review_ovr.gif | Bin 143 -> 0 bytes .../icons/full/OLD/chat.gif | Bin 306 -> 0 bytes .../icons/full/OLD/insert-comment.ico | Bin 1150 -> 0 bytes .../icons/full/OLD/review.png | Bin 366 -> 0 bytes .../icons/full/OLD/template_obj.gif | Bin 353 -> 0 bytes .../icons/full/obj16/Comment.gif | Bin 325 -> 129 bytes .../icons/full/obj16/DeliveryReview.gif | Bin 341 -> 129 bytes .../icons/full/obj16/DropReview.gif | Bin 242 -> 129 bytes .../icons/full/obj16/Heading.gif | Bin 326 -> 0 bytes .../icons/full/obj16/ReleaseReview.gif | Bin 242 -> 0 bytes .../icons/full/obj16/ReviewTemplate.gif | Bin 218 -> 129 bytes .../icons/full/ovr16/Resolved.gif | Bin 121 -> 0 bytes .../icons/full/ovr16/Unresolved.gif | Bin 63 -> 0 bytes .../plugin.properties | 69 +- .../pom.xml | 2 +- .../reviews/provider/CommentItemProvider.java | 64 +- .../provider/CommentableItemProvider.java | 118 +-- .../provider/DeliveryReviewItemProvider.java | 109 +-- .../provider/DropReviewItemProvider.java | 63 +- .../reviews/provider/HeadingItemProvider.java | 126 --- .../reviews/provider/ReviewItemProvider.java | 115 +-- .../provider/ReviewTemplateItemProvider.java | 32 +- .../ReviewsItemProviderAdapterFactory.java | 29 - .../.classpath | 11 - .../.project | 58 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 441 --------- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 141 --- .../org.eclipse.ltk.core.refactoring.prefs | 3 - .../org.eclipse.mylyn.tasks.ui.prefs | 4 - .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 - .../.settings/org.eclipse.pde.api.tools.prefs | 95 -- .../.settings/org.eclipse.pde.prefs | 35 - .../META-INF/MANIFEST.MF | 16 - .../about.html | 28 - .../build.properties | 24 - .../plugin.properties | 13 - .../plugin.xml | 33 - .../pom.xml | 31 - .../cdo/lm/reviews/server/ReviewManager.java | 383 -------- .../reviews/server/ReviewsAppExtension.java | 142 --- .../server/ServerReviewStatemachine.java | 75 -- .../lm/reviews/server/internal/bundle/OM.java | 44 - .../.classpath | 7 - .../.project | 58 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 441 --------- .../.settings/org.eclipse.jdt.launching.prefs | 3 - .../.settings/org.eclipse.jdt.ui.prefs | 141 --- .../org.eclipse.ltk.core.refactoring.prefs | 3 - .../org.eclipse.mylyn.tasks.ui.prefs | 4 - .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 - .../.settings/org.eclipse.pde.api.tools.prefs | 95 -- .../.settings/org.eclipse.pde.prefs | 35 - .../META-INF/MANIFEST.MF | 30 - .../about.html | 28 - .../build.properties | 25 - .../icons/Abandon.png | Bin 676 -> 0 bytes .../icons/Delete.gif | Bin 351 -> 0 bytes .../icons/MergeFromSource.gif | Bin 534 -> 0 bytes .../icons/RebaseToTarget.png | Bin 525 -> 0 bytes .../icons/Resolve.gif | Bin 87 -> 0 bytes .../icons/Restore.png | Bin 593 -> 0 bytes .../icons/Submit.png | Bin 612 -> 0 bytes .../icons/Unresolve.gif | Bin 190 -> 0 bytes .../icons/wizban/AbandonReview.png | Bin 10075 -> 0 bytes .../icons/wizban/DeleteReview.gif | Bin 3230 -> 0 bytes .../icons/wizban/MergeFromSource.gif | Bin 2668 -> 0 bytes .../icons/wizban/NewComment.png | Bin 9843 -> 0 bytes .../icons/wizban/RebaseToTarget.png | Bin 9650 -> 0 bytes .../icons/wizban/RestoreReview.png | Bin 9562 -> 0 bytes .../icons/wizban/SubmitReview.png | Bin 10081 -> 0 bytes .../plugin.properties | 11 - .../plugin.xml | 23 - .../org.eclipse.emf.cdo.lm.reviews.ui/pom.xml | 31 - .../reviews/ui/ClientReviewStatemachine.java | 122 --- .../cdo/lm/reviews/ui/ReviewsMenuFiller.java | 188 ---- .../ui/actions/AbandonReviewAction.java | 56 -- .../ui/actions/AbstractReviewAction.java | 71 -- .../ui/actions/DeleteReviewAction.java | 55 -- .../ui/actions/MergeFromSourceAction.java | 66 -- .../reviews/ui/actions/NewCommentAction.java | 126 --- .../ui/actions/NewDeliveryReviewAction.java | 204 ----- .../ui/actions/NewDropReviewAction.java | 184 ---- .../ui/actions/RebaseToTargetAction.java | 124 --- .../ui/actions/ResolveCommentAction.java | 62 -- .../ui/actions/RestoreReviewAction.java | 55 -- .../ui/actions/SubmitReviewAction.java | 222 ----- .../ui/actions/UnresolveCommentAction.java | 62 -- .../emf/cdo/lm/reviews/ui/bundle/OM.java | 65 -- .../.settings/.api_filters | 85 -- .../META-INF/MANIFEST.MF | 9 +- .../model/Reviews.aird | 617 ++++--------- .../model/Reviews.ecore | 62 +- .../model/Reviews.genmodel | 62 +- .../org.eclipse.emf.cdo.lm.reviews/pom.xml | 2 +- .../eclipse/emf/cdo/lm/reviews/Comment.java | 4 +- .../emf/cdo/lm/reviews/Commentable.java | 54 +- .../emf/cdo/lm/reviews/DeliveryReview.java | 122 +-- .../emf/cdo/lm/reviews/DropReview.java | 60 +- .../eclipse/emf/cdo/lm/reviews/Heading.java | 27 - .../eclipse/emf/cdo/lm/reviews/Review.java | 53 +- .../emf/cdo/lm/reviews/ReviewStatus.java | 182 +--- .../emf/cdo/lm/reviews/ReviewTemplate.java | 28 +- .../emf/cdo/lm/reviews/ReviewType.java | 229 +++++ .../emf/cdo/lm/reviews/ReviewsFactory.java | 11 - .../emf/cdo/lm/reviews/ReviewsPackage.java | 861 ++---------------- .../emf/cdo/lm/reviews/impl/CommentImpl.java | 17 - .../cdo/lm/reviews/impl/CommentableImpl.java | 222 ----- .../lm/reviews/impl/DeliveryReviewImpl.java | 255 ++---- .../cdo/lm/reviews/impl/DropReviewImpl.java | 148 +-- .../emf/cdo/lm/reviews/impl/ReviewImpl.java | 199 +--- .../lm/reviews/impl/ReviewStatemachine.java | 499 ---------- .../lm/reviews/impl/ReviewTemplateImpl.java | 72 +- .../lm/reviews/impl/ReviewsFactoryImpl.java | 46 +- .../lm/reviews/impl/ReviewsPackageImpl.java | 247 +---- .../emf/cdo/lm/reviews/tests/CommentTest.java | 82 ++ .../cdo/lm/reviews/tests/CommentableTest.java | 65 ++ .../lm/reviews/tests/DeliveryReviewTest.java | 126 +++ .../cdo/lm/reviews/tests/DropReviewTest.java | 100 ++ .../lm/reviews/tests/ReviewTemplateTest.java | 82 ++ .../emf/cdo/lm/reviews/tests/ReviewTest.java | 83 ++ .../ReviewsAllTests.java} | 35 +- .../cdo/lm/reviews/tests/ReviewsExample.java | 133 +++ .../cdo/lm/reviews/tests/ReviewsTests.java | 57 ++ .../emf/cdo/lm/reviews/tests/TestCase.java | 42 + .../emf/cdo/lm/reviews/tests/TestRunner.java} | 16 +- .../emf/cdo/lm/reviews/tests/TestSuite.java} | 25 +- .../reviews/util/ReviewsAdapterFactory.java | 22 - .../cdo/lm/reviews/util/ReviewsSwitch.java | 55 -- .../CDOServer (LM).launch | 2 - .../META-INF/MANIFEST.MF | 13 +- .../config/cdo-server.xml | 4 - plugins/org.eclipse.emf.cdo.lm.server/pom.xml | 2 +- .../lm/server/AbstractLifecycleManager.java | 432 +++------ .../emf/cdo/lm/server/LMAppExtension.java | 30 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../META-INF/MANIFEST.MF | 20 +- .../plugin.properties | 6 +- plugins/org.eclipse.emf.cdo.lm.ui/plugin.xml | 6 +- plugins/org.eclipse.emf.cdo.lm.ui/pom.xml | 2 +- .../emf/cdo/lm/ui/actions/CheckoutAction.java | 26 +- .../emf/cdo/lm/ui/actions/LMAction.java | 42 +- .../cdo/lm/ui/actions/NewChangeAction.java | 13 +- .../cdo/lm/ui/actions/NewDeliveryAction.java | 12 +- .../emf/cdo/lm/ui/actions/NewDropAction.java | 12 +- .../cdo/lm/ui/actions/NewModuleAction.java | 14 +- .../cdo/lm/ui/actions/NewStreamAction.java | 11 +- .../emf/cdo/lm/ui/views/SystemsView.java | 40 +- .../.settings/.api_filters | 8 - .../META-INF/MANIFEST.MF | 8 +- plugins/org.eclipse.emf.cdo.lm/model/LM.aird | 10 +- .../org.eclipse.emf.cdo.lm/model/LM.genmodel | 3 +- plugins/org.eclipse.emf.cdo.lm/pom.xml | 2 +- .../src/org/eclipse/emf/cdo/lm/Baseline.java | 7 +- .../src/org/eclipse/emf/cdo/lm/Module.java | 6 - .../src/org/eclipse/emf/cdo/lm/Stream.java | 6 - .../src/org/eclipse/emf/cdo/lm/System.java | 6 - .../eclipse/emf/cdo/lm/impl/BaselineImpl.java | 46 - .../emf/cdo/lm/impl/FixedBaselineImpl.java | 44 +- .../emf/cdo/lm/impl/FloatingBaselineImpl.java | 10 +- .../eclipse/emf/cdo/lm/impl/ModuleImpl.java | 20 +- .../eclipse/emf/cdo/lm/impl/StreamImpl.java | 22 - .../eclipse/emf/cdo/lm/impl/SystemImpl.java | 15 - .../emf/cdo/lm/util/CoreDeliveryMerger.java | 69 -- .../org/eclipse/emf/cdo/lm/util/LMMerger.java | 35 +- .../META-INF/MANIFEST.MF | 14 +- plugins/org.eclipse.emf.cdo.net4j/pom.xml | 2 +- .../protocol/CommitTransactionRequest.java | 8 +- .../META-INF/MANIFEST.MF | 8 +- .../org.eclipse.emf.cdo.server.net4j/pom.xml | 2 +- .../protocol/CommitTransactionIndication.java | 3 - .../META-INF/MANIFEST.MF | 16 +- plugins/org.eclipse.emf.cdo.server/pom.xml | 2 +- .../server/DelegatingCommitContext.java | 6 - .../server/TransactionCommitContext.java | 14 - .../syncing/SynchronizableRepository.java | 6 - .../emf/cdo/server/IStoreAccessor.java | 5 - .../cdo/spi/server/InternalCommitContext.java | 5 - .../org.eclipse.emf.cdo.ui/CDOClient1.launch | 5 +- .../META-INF/MANIFEST.MF | 36 +- plugins/org.eclipse.emf.cdo.ui/pom.xml | 2 +- .../ui/views/CDORemoteTopicsView.java | 3 +- .../org.eclipse.emf.cdo/META-INF/MANIFEST.MF | 52 +- plugins/org.eclipse.emf.cdo/pom.xml | 2 +- .../emf/cdo/transaction/CDOCommitContext.java | 5 - .../cdo/transaction/CDOPushTransaction.java | 12 - .../emf/cdo/transaction/CDOTransaction.java | 10 - .../CDOSingleTransactionStrategyImpl.java | 1 - .../cdo/transaction/CDOTransactionImpl.java | 85 -- .../transaction/CDOXACommitContextImpl.java | 6 - .../emf/spi/cdo/InternalCDOTransaction.java | 10 - .../net4j/util/fsm/FiniteStateMachine.java | 128 +-- .../eclipse/net4j/util/fsm/ITransition.java | 3 +- .../eclipse/net4j/util/io/ExtendedIOUtil.java | 36 - .../features/pom.xml | 1 - .../plugins/pom.xml | 4 - 235 files changed, 2217 insertions(+), 9698 deletions(-) delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/.project delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.core.resources.prefs delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.ltk.core.refactoring.prefs delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.team.ui.prefs delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/build.properties delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/feature.properties delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/feature.xml delete mode 100644 features/org.eclipse.emf.cdo.lm.reviews-feature/pom.xml delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment1.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment7.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/DeliveryReview - Kopie.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/DropReview - Kopie.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/JSF_SELECTMANYCHECKBOX1 - Kopie.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/JSF_SELECTMANYCHECKBOX1.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Review.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_drop_ovr.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_review_ovr.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/chat.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/insert-comment.ico delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/review.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/template_obj.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/Heading.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/ReleaseReview.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/ovr16/Resolved.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/ovr16/Unresolved.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/HeadingItemProvider.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.classpath delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.project delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.core.resources.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.core.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.ltk.core.refactoring.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.mylyn.tasks.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.mylyn.team.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.pde.api.tools.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.pde.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/META-INF/MANIFEST.MF delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/about.html delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/build.properties delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/plugin.properties delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/plugin.xml delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/pom.xml delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/src/org/eclipse/emf/cdo/lm/reviews/server/ReviewManager.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/src/org/eclipse/emf/cdo/lm/reviews/server/ReviewsAppExtension.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/src/org/eclipse/emf/cdo/lm/reviews/server/ServerReviewStatemachine.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.server/src/org/eclipse/emf/cdo/lm/reviews/server/internal/bundle/OM.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.classpath delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.project delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.core.resources.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.jdt.core.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.jdt.launching.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.ltk.core.refactoring.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.mylyn.team.ui.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.pde.api.tools.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/.settings/org.eclipse.pde.prefs delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/META-INF/MANIFEST.MF delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/about.html delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/build.properties delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Abandon.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Delete.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/MergeFromSource.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/RebaseToTarget.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Resolve.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Restore.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Submit.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/Unresolve.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/AbandonReview.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/DeleteReview.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/MergeFromSource.gif delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/NewComment.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/RebaseToTarget.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/RestoreReview.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/icons/wizban/SubmitReview.png delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/plugin.properties delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/plugin.xml delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/pom.xml delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/ClientReviewStatemachine.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/ReviewsMenuFiller.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/AbandonReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/AbstractReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/DeleteReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/MergeFromSourceAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/NewCommentAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/NewDeliveryReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/NewDropReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/RebaseToTargetAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/ResolveCommentAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/RestoreReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/SubmitReviewAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/actions/UnresolveCommentAction.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews.ui/src/org/eclipse/emf/cdo/lm/reviews/ui/bundle/OM.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/Heading.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/ReviewType.java delete mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/impl/ReviewStatemachine.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/CommentTest.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/CommentableTest.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/DeliveryReviewTest.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/DropReviewTest.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/ReviewTemplateTest.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/ReviewTest.java rename plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/{impl/HeadingImpl.java => tests/ReviewsAllTests.java} (55%) create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/ReviewsExample.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/ReviewsTests.java create mode 100644 plugins/org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/TestCase.java rename plugins/{org.eclipse.emf.cdo.lm.reviews.server/src/org/eclipse/emf/cdo/lm/reviews/server/package-info.java => org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/TestRunner.java} (60%) rename plugins/{org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/impl/ExtendedBaseline.java => org.eclipse.emf.cdo.lm.reviews/src/org/eclipse/emf/cdo/lm/reviews/tests/TestSuite.java} (53%) delete mode 100644 plugins/org.eclipse.emf.cdo.lm/src/org/eclipse/emf/cdo/lm/util/CoreDeliveryMerger.java diff --git a/features/org.eclipse.emf.cdo-feature/feature.xml b/features/org.eclipse.emf.cdo-feature/feature.xml index 087157e438e..b7249691a3c 100644 --- a/features/org.eclipse.emf.cdo-feature/feature.xml +++ b/features/org.eclipse.emf.cdo-feature/feature.xml @@ -13,7 +13,7 @@ diff --git a/features/org.eclipse.emf.cdo-feature/pom.xml b/features/org.eclipse.emf.cdo-feature/pom.xml index ea58410e0d6..57c87afe1d8 100644 --- a/features/org.eclipse.emf.cdo-feature/pom.xml +++ b/features/org.eclipse.emf.cdo-feature/pom.xml @@ -25,7 +25,7 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo - 4.26.0-SNAPSHOT + 4.25.1-SNAPSHOT eclipse-feature diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml index cf02ee8b74a..e661f545b71 100644 --- a/features/org.eclipse.emf.cdo.all-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml @@ -40,7 +40,7 @@ version="0.0.0"/> - - org.eclipse.emf.cdo.lm.reviews-feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - org.eclipse.oomph.version.VersionBuilder - - - check.maven.pom - true - - - release.path - /org.eclipse.emf.cdo.releng/versions/release.xml - - - - - - org.eclipse.pde.FeatureNature - org.eclipse.oomph.version.VersionNature - - - - 1396938000000 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-projectRelativePath-matches-true-false-target - - - - diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.ltk.core.refactoring.prefs b/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index 9b58a308595..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Jul 04 12:36:04 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index d5736345023..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Thu Feb 04 10:06:10 CET 2010 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 3556bac0764..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Feb 04 10:06:10 CET 2010 -commit.comment.template=[${task.id}] ${task.description}\r\n\r\n${task.url} -eclipse.preferences.version=1 diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/build.properties b/features/org.eclipse.emf.cdo.lm.reviews-feature/build.properties deleted file mode 100644 index 42d1d3cbdb6..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/build.properties +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2022 Eike Stepper (Loehne, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Eike Stepper - initial API and implementation - -# NLS_MESSAGEFORMAT_VAR - -bin.includes = feature.xml,\ - feature.properties -src.includes = pom.xml diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.properties b/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.properties deleted file mode 100644 index 5539546352a..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022, 2023 Eike Stepper (Loehne, Germany) and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html - -featureName = CDO Model Repository Lifecycle Management -description = Contains the CDO lifecycle management client and user interface plugins. diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.xml b/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.xml deleted file mode 100644 index 7c4ea18161b..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/feature.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - - - diff --git a/features/org.eclipse.emf.cdo.lm.reviews-feature/pom.xml b/features/org.eclipse.emf.cdo.lm.reviews-feature/pom.xml deleted file mode 100644 index dcf4cf703c3..00000000000 --- a/features/org.eclipse.emf.cdo.lm.reviews-feature/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.emf.cdo - org.eclipse.emf.cdo.features - 4.7.0-SNAPSHOT - ../../releng/org.eclipse.emf.cdo.releng.parent/features - - - org.eclipse.emf.cdo.features - org.eclipse.emf.cdo.lm.reviews - 1.0.0-SNAPSHOT - eclipse-feature - - diff --git a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml index 6ce5c496d41..bffe4fd7838 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/feature.xml @@ -12,7 +12,7 @@ - - diff --git a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml index 21175762b89..12351ee34dd 100644 --- a/features/org.eclipse.emf.cdo.sdk-feature/pom.xml +++ b/features/org.eclipse.emf.cdo.sdk-feature/pom.xml @@ -25,7 +25,7 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.sdk - 5.14.2-SNAPSHOT + 5.14.1-SNAPSHOT eclipse-feature diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml index 5fda460427e..60030abe300 100644 --- a/features/org.eclipse.emf.cdo.server-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml @@ -12,7 +12,7 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.server - 4.26.0-SNAPSHOT + 4.25.1-SNAPSHOT eclipse-feature diff --git a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml index d35d5cf76b5..3105cb0dfef 100644 --- a/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.server.embedded-feature/feature.xml @@ -12,7 +12,7 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.server.embedded - 4.26.0-SNAPSHOT + 4.25.1-SNAPSHOT eclipse-feature diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF index 5432030176e..baccbc4fed3 100644 --- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.emf.cdo.common;singleton:=true -Bundle-Version: 4.23.0.qualifier +Bundle-Version: 4.22.2.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,21 +15,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibili org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", - org.eclipse.emf.cdo.common.admin;version="4.23.0", - org.eclipse.emf.cdo.common.branch;version="4.23.0", - org.eclipse.emf.cdo.common.commit;version="4.23.0", - org.eclipse.emf.cdo.common.commit.handler;version="4.23.0", - org.eclipse.emf.cdo.common.id;version="4.23.0", - org.eclipse.emf.cdo.common.lob;version="4.23.0", - org.eclipse.emf.cdo.common.lock;version="4.23.0", - org.eclipse.emf.cdo.common.model;version="4.23.0", - org.eclipse.emf.cdo.common.protocol;version="4.23.0", - org.eclipse.emf.cdo.common.revision;version="4.23.0", - org.eclipse.emf.cdo.common.revision.delta;version="4.23.0", - org.eclipse.emf.cdo.common.security;version="4.23.0", - org.eclipse.emf.cdo.common.util;version="4.23.0", - org.eclipse.emf.cdo.internal.common;version="4.23.0"; +Export-Package: org.eclipse.emf.cdo.common;version="4.22.2", + org.eclipse.emf.cdo.common.admin;version="4.22.2", + org.eclipse.emf.cdo.common.branch;version="4.22.2", + org.eclipse.emf.cdo.common.commit;version="4.22.2", + org.eclipse.emf.cdo.common.commit.handler;version="4.22.2", + org.eclipse.emf.cdo.common.id;version="4.22.2", + org.eclipse.emf.cdo.common.lob;version="4.22.2", + org.eclipse.emf.cdo.common.lock;version="4.22.2", + org.eclipse.emf.cdo.common.model;version="4.22.2", + org.eclipse.emf.cdo.common.protocol;version="4.22.2", + org.eclipse.emf.cdo.common.revision;version="4.22.2", + org.eclipse.emf.cdo.common.revision.delta;version="4.22.2", + org.eclipse.emf.cdo.common.security;version="4.22.2", + org.eclipse.emf.cdo.common.util;version="4.22.2", + org.eclipse.emf.cdo.internal.common;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -38,9 +38,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.common.branch;version="4.23.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui", - org.eclipse.emf.cdo.internal.common.bundle;version="4.23.0";x-internal:=true, - org.eclipse.emf.cdo.internal.common.commit;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.branch;version="4.22.2";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.ui", + org.eclipse.emf.cdo.internal.common.bundle;version="4.22.2";x-internal:=true, + org.eclipse.emf.cdo.internal.common.commit;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -49,7 +49,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.common.id;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.id;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -60,9 +60,9 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.tests, org.eclipse.emf.cdo.admin, org.eclipse.emf.cdo.server.admin", - org.eclipse.emf.cdo.internal.common.lock;version="4.23.0";x-internal:=true, - org.eclipse.emf.cdo.internal.common.messages;version="4.23.0";x-internal:=true, - org.eclipse.emf.cdo.internal.common.model;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.lock;version="4.22.2";x-internal:=true, + org.eclipse.emf.cdo.internal.common.messages;version="4.22.2";x-internal:=true, + org.eclipse.emf.cdo.internal.common.model;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -71,7 +71,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.common.revision;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.revision;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -80,7 +80,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.common.revision.delta;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.revision.delta;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -89,7 +89,7 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.internal.common.util;version="4.23.0"; + org.eclipse.emf.cdo.internal.common.util;version="4.22.2"; x-friends:="org.eclipse.emf.cdo.common, org.eclipse.emf.cdo.common.db, org.eclipse.emf.cdo, @@ -98,15 +98,15 @@ Export-Package: org.eclipse.emf.cdo.common;version="4.23.0", org.eclipse.emf.cdo.server.net4j, org.eclipse.emf.cdo.ui, org.eclipse.emf.cdo.tests", - org.eclipse.emf.cdo.spi.common;version="4.23.0", - org.eclipse.emf.cdo.spi.common.admin;version="4.23.0", - org.eclipse.emf.cdo.spi.common.branch;version="4.23.0", - org.eclipse.emf.cdo.spi.common.commit;version="4.23.0", - org.eclipse.emf.cdo.spi.common.id;version="4.23.0", - org.eclipse.emf.cdo.spi.common.lock;version="4.23.0", - org.eclipse.emf.cdo.spi.common.model;version="4.23.0", - org.eclipse.emf.cdo.spi.common.protocol;version="4.23.0", - org.eclipse.emf.cdo.spi.common.revision;version="4.23.0", - org.eclipse.emf.cdo.spi.common.util;version="4.23.0" + org.eclipse.emf.cdo.spi.common;version="4.22.2", + org.eclipse.emf.cdo.spi.common.admin;version="4.22.2", + org.eclipse.emf.cdo.spi.common.branch;version="4.22.2", + org.eclipse.emf.cdo.spi.common.commit;version="4.22.2", + org.eclipse.emf.cdo.spi.common.id;version="4.22.2", + org.eclipse.emf.cdo.spi.common.lock;version="4.22.2", + org.eclipse.emf.cdo.spi.common.model;version="4.22.2", + org.eclipse.emf.cdo.spi.common.protocol;version="4.22.2", + org.eclipse.emf.cdo.spi.common.revision;version="4.22.2", + org.eclipse.emf.cdo.spi.common.util;version="4.22.2" Automatic-Module-Name: org.eclipse.emf.cdo.common Eclipse-RegisterBuddy: org.eclipse.net4j.util diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml index 67d2c169f70..5590347d213 100644 --- a/plugins/org.eclipse.emf.cdo.common/pom.xml +++ b/plugins/org.eclipse.emf.cdo.common/pom.xml @@ -25,7 +25,7 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.common - 4.23.0-SNAPSHOT + 4.22.2-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java index 12f66288e87..b2818c9e10a 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/branch/CDOBranchRef.java @@ -82,23 +82,6 @@ public CDOBranchPointRef getHeadRef() return getPointRef(CDOBranchPoint.UNSPECIFIED_DATE); } - /** - * @since 4.23 - */ - public CDOBranchRef getBaseBranchRef() - { - if (!isMainBranch()) - { - int lastSlash = branchPath.lastIndexOf(CDOBranch.PATH_SEPARATOR); - if (lastSlash != -1) - { - return new CDOBranchRef(branchPath.substring(0, lastSlash)); - } - } - - return null; - } - public CDOBranch resolve(CDOBranchManager branchManager) { return branchManager.getBranch(branchPath); diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java index 5c1cbcd099c..9727f60bfc4 100644 --- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/commit/CDOCommitHistoryImpl.java @@ -44,8 +44,6 @@ */ public class CDOCommitHistoryImpl extends Container implements CDOCommitHistory { - private static final ThreadLocal START_TIME_THREAD_LOCAL = new ThreadLocal<>(); - private static final CDOCommitInfo[] NO_ELEMENTS = {}; private final TriggerLoadElement triggerLoadElement = new TriggerLoadElementImpl(); @@ -54,8 +52,6 @@ public class CDOCommitHistoryImpl extends Container implements CD private final CDOBranch branch; - private final long startTime; - private final IListener branchListener = new IListener() { @Override @@ -87,17 +83,6 @@ public CDOCommitHistoryImpl(CDOCommitInfoManager manager, CDOBranch branch) super(true); this.manager = manager; this.branch = branch; - - Long time = START_TIME_THREAD_LOCAL.get(); - if (time != null) - { - startTime = time; - START_TIME_THREAD_LOCAL.remove(); - } - else - { - startTime = CDOBranchPoint.UNSPECIFIED_DATE; - } } @Override @@ -112,11 +97,6 @@ public final CDOBranch getBranch() return branch; } - public final long getStartTime() - { - return startTime; - } - @Override public final int getLoadCount() { @@ -554,22 +534,7 @@ public void handleCommitInfo(CDOCommitInfo commitInfo) protected boolean filterCommitInfo(CDOCommitInfo commitInfo) { CDOBranch commitBranch = commitInfo.getBranch(); - if (commitBranch.isDeleted()) - { - return true; - } - - if (branch != null && commitBranch != branch) - { - return true; - } - - if (startTime != CDOBranchPoint.UNSPECIFIED_DATE && commitInfo.getTimeStamp() < startTime) - { - return true; - } - - return false; + return commitBranch.isDeleted() || branch != null && commitBranch != branch; } protected final boolean addCommitInfo(CDOCommitInfo commitInfo) @@ -694,11 +659,6 @@ private CDOCommitInfo getLastCommitInfo() return commitInfos.getLast(); } - public static void setNextStartTime(long startTime) - { - START_TIME_THREAD_LOCAL.set(startTime); - } - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF index e56e5dedd25..0572dfbe555 100644 --- a/plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.lm.client/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.emf.cdo.lm.client;version="1.4.0", - org.eclipse.emf.cdo.lm.internal.client;version="1.4.0";x-friends:="org.eclipse.emf.cdo.lm.ui,org.eclipse.emf.cdo.lm.reviews.ui", + org.eclipse.emf.cdo.lm.internal.client;version="1.4.0";x-friends:="org.eclipse.emf.cdo.lm.ui", org.eclipse.emf.cdo.lm.internal.client.bundle;version="1.4.0";x-internal:=true, org.eclipse.emf.cdo.lm.internal.client.properties;version="1.4.0";x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", diff --git a/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java b/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java index 8564f8b4097..c5ee36675fb 100644 --- a/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java +++ b/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/LMNamingStrategy.java @@ -23,11 +23,6 @@ private LMNamingStrategy() public static String getChangeBranchName(String changeLabel) { - return "change-" + sanitizeBranchName(changeLabel); - } - - public static String sanitizeBranchName(String branchName) - { - return branchName.trim().replace('/', '-').replace(' ', '-'); + return "change-" + changeLabel.trim().replace('/', '-').replace(' ', '-'); } } diff --git a/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java b/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java index 0bbbb973f8f..22db3672900 100644 --- a/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java +++ b/plugins/org.eclipse.emf.cdo.lm.client/src/org/eclipse/emf/cdo/lm/internal/client/SystemDescriptor.java @@ -855,7 +855,7 @@ private void resolveDependencies(ModuleDefinition rootDefinition, Assembly assem List ius = new ArrayList<>(); system.forEachBaseline(baseline -> { - if (baseline instanceof Delivery || baseline instanceof Drop) + if (baseline instanceof FixedBaseline) { FixedBaseline fixedBaseline = (FixedBaseline)baseline; String moduleName = fixedBaseline.getModule().getName(); @@ -1158,25 +1158,20 @@ public void deleteChange(Change change, IProgressMonitor monitor) throws Concurr @Override public Delivery createDelivery(Stream stream, Change change, LMMerger merger, IProgressMonitor monitor) throws ConcurrentAccessException, CommitException - { - return createDelivery(stream, change, change, merger, monitor); - } - - public Delivery createDelivery(Stream stream, Change change, FloatingBaseline mergeSource, LMMerger merger, IProgressMonitor monitor) throws CommitException { Delivery[] result = { null }; CommitException[] commitException = { null }; String moduleName = stream.getModule().getName(); - withModuleSession(moduleName, moduleSession -> { - CDOBranchRef sourceBranchRef = mergeSource.getBranch(); + withModuleSession(moduleName, session -> { + CDOBranchRef sourceBranchRef = change.getBranch(); CDOBranchRef targetBranchRef = stream.getBranch(); - CDOBranchManager branchManager = moduleSession.getBranchManager(); + CDOBranchManager branchManager = session.getBranchManager(); CDOBranch sourceBranch = sourceBranchRef.resolve(branchManager); CDOBranch targetBranch = targetBranchRef.resolve(branchManager); - CDOCommitInfoManager commitInfoManager = moduleSession.getCommitInfoManager(); + CDOCommitInfoManager commitInfoManager = session.getCommitInfoManager(); long sourceCommitTime = commitInfoManager.getLastCommitOfBranch(sourceBranch, true); CDOBranchPointRef sourceBranchPointRef = sourceBranchRef.getPointRef(sourceCommitTime); @@ -1188,8 +1183,8 @@ public Delivery createDelivery(Stream stream, Change change, FloatingBaseline me LMMerger2 merger2 = (LMMerger2)merger; LMMergeInfos infos = new LMMergeInfos(); - infos.setSession(moduleSession); - infos.setSourceBaseline(mergeSource); + infos.setSession(session); + infos.setSourceBaseline(change); infos.setSourceBranchPoint(sourceBranchPoint); infos.setTargetBaseline(stream); infos.setTargetBranch(targetBranch); @@ -1198,7 +1193,7 @@ public Delivery createDelivery(Stream stream, Change change, FloatingBaseline me } else { - targetCommitTime = merger.mergeDelivery(moduleSession, sourceBranchPoint, targetBranch); + targetCommitTime = merger.mergeDelivery(session, sourceBranchPoint, targetBranch); } if (targetCommitTime != CDOBranchPoint.INVALID_DATE) @@ -1248,7 +1243,7 @@ public Assembly createEmptyAssembly() return assembly; } - public void addDependencies(ModuleDefinition from, FixedBaseline to) + private void addDependencies(ModuleDefinition from, FixedBaseline to) { for (DependencyDefinition dependencyDefinition : from.getDependencies()) { diff --git a/plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF index 084794abd1a..bc77a48b836 100644 --- a/plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.lm.edit/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.lm.edit;singleton:=true Automatic-Module-Name: org.eclipse.emf.cdo.lm.edit -Bundle-Version: 1.1.2.qualifier +Bundle-Version: 1.1.1.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.lm.provider.LMEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.emf.cdo.lm.provider;version="1.1.2" +Export-Package: org.eclipse.emf.cdo.lm.provider;version="1.1.1" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.lm;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, diff --git a/plugins/org.eclipse.emf.cdo.lm.edit/pom.xml b/plugins/org.eclipse.emf.cdo.lm.edit/pom.xml index caea48d647c..6bf4fefeac0 100644 --- a/plugins/org.eclipse.emf.cdo.lm.edit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.lm.edit/pom.xml @@ -25,7 +25,7 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.lm.edit - 1.1.2-SNAPSHOT + 1.1.1-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java index f1512475fbf..8464e9eea2b 100644 --- a/plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.edit/src/org/eclipse/emf/cdo/lm/provider/ChangeItemProvider.java @@ -15,8 +15,6 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; @@ -129,46 +127,7 @@ protected void addDeliveriesPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Change_deliveries_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Change_deliveries_feature", "_UI_Change_type"), - LMPackage.Literals.CHANGE__DELIVERIES, false, false, false, null, null, null)); - } - - @Override - protected Object wrap(EObject object, EStructuralFeature feature, Object value, int index) - { - return super.wrap(object, feature, value, index); - } - - /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * - * - * @generated - */ - @Override - public Collection getChildrenFeatures(Object object) - { - if (childrenFeatures == null) - { - super.getChildrenFeatures(object); - childrenFeatures.add(LMPackage.Literals.CHANGE__DELIVERIES); - } - return childrenFeatures; - } - - /** - * - * - * @generated - */ - @Override - protected EStructuralFeature getChildFeature(Object object, Object child) - { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); + LMPackage.Literals.CHANGE__DELIVERIES, true, false, true, null, null, null)); } /** diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/META-INF/MANIFEST.MF index f6559494306..c0480820c52 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/META-INF/MANIFEST.MF @@ -3,17 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.lm.reviews.edit;singleton:=true Automatic-Module-Name: org.eclipse.emf.cdo.lm.reviews.edit -Bundle-Version: 1.0.2.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.cdo.lm.reviews.provider.ReviewsEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.emf.cdo.lm.reviews.provider;version="1.0.2" +Export-Package: org.eclipse.emf.cdo.lm.reviews.provider;version="1.0.1" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.lm.reviews;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, org.eclipse.emf.cdo.lm;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.lm.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.lm.modules;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.cdo.lm.modules.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.emf.cdo.lm.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment1.png b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment1.png deleted file mode 100644 index 7bc9233ea63c89d52a99494dd0f0735a29a3ec3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmV;O0b>4%P)i2vikyMR~)n*keF9=!Gc_n*K2@qsNT?}H4v4a974 z1ArVJApZ0B-@pGKzWw|E^3%Wn&p!V9|K$C@{}12&`+x7vzyG&i{r!LE6~yrB1;;^# zm?0Y=moxPMSn>r>N00000NkvXX Hu0mjf$^yWL diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment7.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/Comment7.gif deleted file mode 100644 index c495731c68242d4752a1343a3dc0e26ca36e9763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmZ?wbhEHb6krfwxXQrr<;P#^^yxN0lrh~dd$x7PbjN}Pjs^2wOP9HoF8loB@2@}q zB>d`3GiP|#tnsQ@5;vUw*&-^6UTq{|poZ#h)yU z3=EnKIv|rkeqvxtJTRreLr1Fr#FC=SlNR&+y#qI`h*~T8(qK^l!@h(AEWwgaZVS8~ zFS=O}utGTHhr!MF6_b-YG-|Kp+Z^ zi$R`22P6ZslY!OrfqGv`=Ddtm>)vo~nZJQW=b?l1y5~y-Jr5*oaBvFHncPz}({hT4 WxKEPT+*wkhY;PD}S4Ar_SOWlcH$b@n diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/DropReview - Kopie.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/DropReview - Kopie.gif deleted file mode 100644 index 8144d114e06f5944247d976d036d86c8a0367728..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmZ?wbhEHb6krfwc+A1z9@ACSvao02kptwxTui4kRSZ(Iu)cg^KzHsP>6 Rz;r;FQD^3b6(&p!)&RWGKy?5B diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/JSF_SELECTMANYCHECKBOX1 - Kopie.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/JSF_SELECTMANYCHECKBOX1 - Kopie.gif deleted file mode 100644 index 2e2370d3179680a90949ea4cfa30935ce8bb8268..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmZ?wbhEHb6krfwxXQrr@8AE92`dr`W)w86xOnw$_q5d&6LvJrI1rH0q3Mx*;lq!g zfB${|^Y_c|KOcYn{`~vTiyuE;{rK_r*RMA}f4=+m>%;HgAAkS;{0Aue>)W3{-~asi z{qNu3|NsB|0~-AQ<* zRUp7XE>Qf*!pOj&1B5^T@)HAFtwUIXhmKTh*OH=@JPObSw|3UpWx6jE5$JH57;sBMj8BPARIyp9v8-HNnO9kbpT8`oK$S;Q zibqv)N(`%7dL{?=yaH)i*%j)V-GOp)8d?l8GPzTC?2K^R%;HgAAkS;{0Aue>)W3{-~asi z{qNu3|NsB|0~-AQ<* zRUp7XE>Qf*!pOj&1B5^T@)HAFtwUIXhmKTh*OH=@JPObSw|3UpWx6jE5$JH57;sBMj8BPARIyp9v8-HNnO9kbpT8`oK$S;Q zibqv)N(`%7dL{?=yaH)i*%j)V-GOp)8d?l8GPzTC?2K^R;_xHblfByab`~UyH{~(}D98mnp!pOxS&!EEq1Ry&ZSi>Kv_oZkuWvp5! zFR-V8hdEc_PDS12cMtwM$m=_3NcA60Ogx#R*WT7#;$_Pt+_9#tTS8Cd!G;LK9D{Q& jOp;$z?708oxB=73+wUhVOgaDleWiAzrdo@#B7-#mne1ov diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_drop_ovr.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_drop_ovr.gif deleted file mode 100644 index e3d386a0210bfa82cf6ef79534632ed2369a78e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmZ?wbhEHb6krfwIKsf7=heD;`?+g(oLR7gC0h9_OiI^y zG;j55-xl1xGj`&h#3}nyrtQy~btrq*;q2Lm`ZishvGeMJ{Wp$WfBxh5-~V91fC?0U zvM@3*NHOSugh6&Pum&zr>r2U;w?b^Gs)^&87a^A(Z}3eGEN#}?b-ML?L<+-9hJ+;v z7X0i-6RdbA2%Tq1JbiYG0J}?~kDiWqdr#utV-kDR9Mk;#=P@)cj+1=-`>!H{H2`rJ BUS0qI diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_review_ovr.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/_review_ovr.gif deleted file mode 100644 index efc39b067ae979d452440bf7d629624d13d2e39d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmZ?wbhEHb6krfwc+A6K4Qkd)n%Gt9Py3bZq6;Lr-43x%&D4>tFx> z{Qs|v1QdU=Fmf^QGw3h?0muvn7Ml+znT|}f@D{otENl=n!?5CfDvMA@;ejj$M#YIj n6EqGi{w(F`urYzR`(TJdfu&C2$rUADYopfRSR*FQ$Y2cs^VBx7 diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/chat.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/OLD/chat.gif deleted file mode 100644 index 62c99217518849d79f205ebd0dd5eb0fc6447777..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmZ?wbhEHb6krfwSZc-a;N|Oof8XzI5!-z1&bix9E2kg1@%ZJRHyi(cyZZ0j)n(ZN zlUAJd&0BTw;=|&;0~OPb-gx|CSEHy;=DfD~r?%CKWOVNN`|V2G;EAs?qY`mOMx9z}%hi>Uh3i=Q9t+=qZSa4H?@Y3Bkn&zBX zy8F6U*7B8kf*UJ@4_c*3_rtKw@4$atj#VL8w)d$bd-Fmug_w}_!LfdOa{$l{e zpDc_F4E78<3_t+#69b$7f%ydl=gAemD6o;Q|Rb)!IX>HUfVM}-_JbH{AfiiKJmD?+fY=blByQwr)pU4 zHwDLvH&vDYu5CQ`5SDk%CP%Fms6!I{7{N3$SjQgD@Mh}#o&My+%gdspvW!(nt!`VR zj-zEr*tYhO8O9WrkcBUQ&V#rH)5tU4Rb#BHLL+)Gh%uz$%g@n!9v!wyCswG}n1%kO zs3()c07irIhxE+j1Q)o$BVJUk57lxqHE2RFeEnPLIYZA`q|wg4ndP2yWZ37PM3^In zhM@c|>-KSgBOK!tm$=0fUR5KXs)?ZdBt4qx*8*>rBy|dAmIaQR=hH>a_4wxB;QX7& sVH-Oro~Pj66y~?C7%1fC<%zlPkl7Ezfe-<`?!6{ZKpR! z(w5(9xxwz(v9jfhS>(++ZTkZoZXBuah<^~?VHS2Prn~goNtMV*ojo5C8LQ6rQNLVz!v)k;Ew4RM~ChuP`<3v`&n*7%FW!;-=ChlmO zzPEGk!QO>O+NP}Qn7XEC`l^XbkN3}7F=fuuUw{99|MUObpZ`Dq{=fS9|LdRsXUt#p z@%R6iKmWh|_5anc|F3`j|NQ6w_rL$Y{r&&z-~XTg{?A)9Z_(1(D^^TjyL!sMk5zx3 zm;Jbqbz+9Y|Ns9P$O4K#Sr{1@bQyF&xVYt-wQvFY?3^ACMz{#Kk(g`wyfkn^Yr043r7O%g2Q{jJD=(^pM^;SxP*Mfy#ZS+1)Q@d(b V-m_AZUw1iUr`wTVfJ7$7>gz=v;Mn=C&(ycU)b0@Ya@-_b)vDd*R97 zi%*?KUo;L80;Bz7=QreCkD2p1M>?!bfo&-8;VZqF!5p3@myECp}m1wRrvIn+pHKLf7r4thZ7UycR6{YNPjYn%Y&f@}8BN S{JP5-JKc^<6cT1+um%8^m@icT literal 341 zcmZ?wbhEHb6krfwSgOqs)GQg^E+5gZ7}KQ|+pV6^ubbGfpElJveX42pOv|iUHhJ^R z^5)y;&v)#Yu%cwKZOIb1x{dCgYf?Hlhfmp-vwUCQ%7gvO54W#AIC;(S-gEc%T=?+g z#g88^fBty$^XI!?zdro_{qgtj&%ghC`}61L-+w><{r&y#-=BYf|Nj5~?>`7AQw9`& zvM_Qn*fZ!b00GEP3~WUQ<`;PAaLJxnQuMPpXWj*kD;Mt+th@1M>Z>;u`xErbA8Rt7 z%J}l*v!D*s8;fclB^#yYJ#_+7(kjA@O^vKd$sD5MB2qoQ?8?ciToRI;)24H(B&(_O kit(r~T%?|?si7gTeATLCt##`+tc&s9;_0^C*^$8-0DIezUjP6A diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/DropReview.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/DropReview.gif index a6731d059193a9777f2c61b452e89ed649b9da74..35ef84e20e26f1cef1dcd7ae80d192fd40472368 100644 GIT binary patch literal 129 zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}loH-5+2OJz6 z6o0ZXGB9v5=zw&B%wS;AGdStFdauRnFW*%79~Qc9H)Xw*lHj#q;a3~IkJHqynw9sg T)a2J)&e-X8WTKETBZD;nnfEVV literal 242 zcmZ?wbhEHb6krfwXpv^nNSfvz(-qjTs;FgQ>EweQ6IS#rJaXvrqYEE?JbU-^#g88^ zfBty$^XI!?zdro_{qgtj&%ghC{`2P>5dHo0^Y6c(|Nj2|_wUcYzkmP#|MwpRlu?1= zPZmZl26+Y@1|R_0$-tWbK)o+TQ!HcEy7dYCQf-rY|>S@kBH}nAp>CzQH7c!P8HLv7}02qKdYNSB$~=;7MZQO@$1M gO--JX65SGvj6L0+Qj@1loouH)Q&Vk@vLb^u01xnTV*mgE diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/Heading.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/Heading.gif deleted file mode 100644 index 2c843c44627a92b56c2988ed490565c4333b82d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmZ?wbhEHb6krfwSgOLH7_Fiht!j~H9nrocXX=6K1;=X_ohVyV-nr`R%xzcZ?zp=0 z;H@nu?_YTQ_u`Yk*Pj2q{^IYgmw#`+`g`~Fzq@b#-Fx%z!P|ci-~D^^?%(rwU!T1H z_w>WRXCMB(`1tSTr+@E1|M>9j-|s(v|Ni^;|Nnnw8UV$gER0+X_6#}^JgzvwtR)VBZD;n D^<{+6 diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/ReleaseReview.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/obj16/ReleaseReview.gif deleted file mode 100644 index ce937e65c64eba36a7d01e3e47088da1ad950d4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmZ?wbhEHb6krfwXpv^9)0o!f-ZedN)x4sGyGsvtOjvQC=g93tk1l-p@%`D)7e9Wy z{Q2X}&!6vp{rd3x_s8GAKmY#o`OlwkK=k*|&%ghE{`>p;-@iZq{{H>{|KEQQP(}rc zKUo;L7~~mr7=Qp|Cj)E#1NFWXO|gts>*5>t6!3`aF1lmx_`v+F-T~Hw3JNUZb}Y%3 zHUeGVZksMQ#{B#H zD=#fm{K>+|z`)6%1JVgHgMmfQ;H2m3y%w*(d{g0nSm?Ull=W6hg4cqDUv2b0PE)&T WR^GExlV5i^W2f7Zi9*7R4AuaR0y3!p literal 218 zcmZ?wbhEHb6krfwXc1=Un6To)haWF~{CN5E$D5x&-~Iaa;rH*4zkh%J{pa(aKi`1p z@1LK4|NZ>;_xHblfByab`~UyH{~(}D98mnp!pOxS&!EEq1Ry&ZSi>Kv_oZkuWvp5! zFR-V8hdEc_PDS12cMtwM$m=_3NcA60Ogx#R*WT7#;$_Pt+_9#tTS8Cd!G;LK9D{Q& jOp;$z?708oxB=73+wUhVOgaDleWiAzrdo@#B7-#mne1ov diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/ovr16/Resolved.gif b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/icons/full/ovr16/Resolved.gif deleted file mode 100644 index 01f71adcc4f74a092f06d53c0eeb33695c855412..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmZ?wbhEHb6krfwc+AbfP|V0s%g9j2#M;8i+{Px^FbgBadlrj11NQn_ds; diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/plugin.properties index 78fc4a0b077..43dc960b198 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/plugin.properties @@ -18,59 +18,38 @@ _UI_CreateSibling_description = Create a new sibling of type {0} for the selecte _UI_PropertyDescriptor_description = The {0} of the {1} +_UI_Commentable_type = Commentable +_UI_Comment_type = Comment +_UI_ReviewTemplate_type = Review Template +_UI_Review_type = Review +_UI_DeliveryReview_type = Delivery Review +_UI_DropReview_type = Drop Review _UI_Unknown_type = Object + _UI_Unknown_datatype= Value -_UI_Unknown_feature = Unspecified -_UI_Drop = Drop -_UI_CommentStatus_None_literal = None -_UI_CommentStatus_Resolved_literal = Resolved -_UI_CommentStatus_Unresolved_literal = Unresolved +_UI_Commentable_comments_feature = Comments _UI_Comment_commentable_feature = Commentable -_UI_Comment_status_feature = Status _UI_Comment_text_feature = Text -_UI_Comment_type = Comment -_UI_Commentable_commentCount_feature = Comment Count -_UI_Commentable_comments_feature = Comments -_UI_Commentable_resolvedCount_feature = Resolved Count -_UI_Commentable_type = Commentable -_UI_Commentable_unresolvedCount_feature = Unresolved Count -_UI_DeliveryReview_base_feature = Base -_UI_DeliveryReview_branch_feature = Branch -_UI_DeliveryReview_deliveries_feature = Deliveries -_UI_DeliveryReview_impact_feature = Impact -_UI_DeliveryReview_label_feature = Label -_UI_DeliveryReview_rebaseCount_feature = Rebase Count +_UI_Comment_status_feature = Status +_UI_ReviewTemplate_type_feature = Type +_UI_ReviewTemplate_reviewers_feature = Reviewers +_UI_Review_type_feature = Type +_UI_Review_author_feature = Author +_UI_Review_reviewers_feature = Reviewers _UI_DeliveryReview_sourceChange_feature = Source Change _UI_DeliveryReview_sourceCommit_feature = Source Commit _UI_DeliveryReview_targetCommit_feature = Target Commit -_UI_DeliveryReview_type = Delivery Review -_UI_DropReview_delivery_feature = Delivery -_UI_DropReview_dropLabel_feature = Drop Label -_UI_DropReview_dropType_feature = Drop Type _UI_DropReview_targetTimeStamp_feature = Target Time Stamp -_UI_DropReview_type = Drop Review -_UI_Heading_type = Heading -_UI_ReviewStatus_Abandoned_literal = Abandoned -_UI_ReviewStatus_Conflict_literal = Conflict -_UI_ReviewStatus_Deleted_literal = Deleted -_UI_ReviewStatus_Merged_literal = Merged -_UI_ReviewStatus_New_literal = New -_UI_ReviewStatus_Open_literal = Open -_UI_ReviewStatus_Outdated_literal = Outdated -_UI_ReviewStatus_Restoring_literal = Restoring -_UI_ReviewStatus_SourceOutdated_literal = Source Outdated -_UI_ReviewStatus_Submitted_literal = Submitted -_UI_ReviewStatus_TargetOutdated_literal = Target Outdated -_UI_ReviewTemplate_reviewers_feature = Reviewers -_UI_ReviewTemplate_type = Review Template -_UI_ReviewTemplate_type_feature = Type +_UI_DropReview_dropType_feature = Drop Type +_UI_Unknown_feature = Unspecified + +_UI_CommentStatus_None_literal = None +_UI_CommentStatus_Unresolved_literal = Unresolved +_UI_CommentStatus_Resolved_literal = Resolved _UI_ReviewType_Delivery_literal = Delivery _UI_ReviewType_Drop_literal = Drop -_UI_Review_author_feature = Author -_UI_Review_id_feature = Id -_UI_Review_reviewers_feature = Reviewers -_UI_Review_status_feature = Status -_UI_Review_type = Review -_UI_Review_type_feature = Type -_UI_Commentable_review_feature = Review +_UI_ReviewStatus_Open_literal = Open +_UI_ReviewStatus_Conflict_literal = Conflict +_UI_ReviewStatus_Merged_literal = Merged +_UI_ReviewStatus_Abandoned_literal = Abandoned diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/pom.xml b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/pom.xml index 3211a9bfced..281bec6e581 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/pom.xml +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/pom.xml @@ -25,7 +25,7 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.lm.reviews.edit - 1.0.2-SNAPSHOT + 1.0.1-SNAPSHOT eclipse-plugin diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentItemProvider.java index f823b6e4626..8107c9e8562 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentItemProvider.java @@ -11,17 +11,14 @@ package org.eclipse.emf.cdo.lm.reviews.provider; import org.eclipse.emf.cdo.lm.reviews.Comment; -import org.eclipse.emf.cdo.lm.reviews.CommentStatus; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.URI; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.StyledString; -import org.eclipse.emf.edit.provider.StyledString.Style; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; @@ -35,12 +32,6 @@ */ public class CommentItemProvider extends CommentableItemProvider { - private static final Style STYLE_UNRESOLVED = Style.newBuilder().setForegroundColor(URI.createURI("color://rgb/220/40/40")).toStyle(); - - private static final Style STYLE_RESOLVED = Style.newBuilder().setForegroundColor(URI.createURI("color://rgb/20/180/20")).toStyle(); - - private ItemPropertyDescriptor statusPropertyDescriptor; - /** * This constructs an instance from a factory and a notifier. * @@ -81,22 +72,20 @@ protected void addTextPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Comment_text_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Comment_text_feature", "_UI_Comment_type"), - ReviewsPackage.Literals.COMMENT__TEXT, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.COMMENT__TEXT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** * This adds a property descriptor for the Status feature. * * - * @generated NOT + * @generated */ protected void addStatusPropertyDescriptor(Object object) { - // Remember the statusPropertyDescriptor for appendStatus() below. - statusPropertyDescriptor = createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Comment_status_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Comment_status_feature", "_UI_Comment_type"), - ReviewsPackage.Literals.COMMENT__STATUS, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null); - itemPropertyDescriptors.add(statusPropertyDescriptor); + ReviewsPackage.Literals.COMMENT__STATUS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -111,13 +100,6 @@ public Object getImage(Object object) return overlayImage(object, getResourceLocator().getImage("full/obj16/Comment")); } - @Override - protected Object overlayImage(Object object, Object image) - { - image = super.overlayImage(object, image); - return CommentableItemProvider.overlayCommentableImage((Comment)object, image); - } - /** * * @@ -145,34 +127,22 @@ public String getText(Object object) * This returns the label styled text for the adapted class. * * - * @generated NOT + * @generated */ @Override public Object getStyledText(Object object) { - Comment comment = (Comment)object; - StyledString styledString = new StyledString(getString("_UI_Comment_type"), StyledString.Style.QUALIFIER_STYLER).append(" ").append(comment.getText()); - - CommentStatus status = comment.getStatus(); - Style style = null; - if (status == CommentStatus.UNRESOLVED) + String label = ((Comment)object).getText(); + StyledString styledLabel = new StyledString(); + if (label == null || label.length() == 0) { - style = STYLE_UNRESOLVED; + styledLabel.append(getString("_UI_Comment_type"), StyledString.Style.QUALIFIER_STYLER); } - else if (status == CommentStatus.RESOLVED) + else { - style = STYLE_RESOLVED; - } - - if (style != null) - { - getPropertyDescriptors(comment); // Ensure that the descriptors are initialized. - - String statusLabel = statusPropertyDescriptor.getLabelProvider(comment).getText(status); - styledString.append(" ").append("[" + statusLabel + "]", style); + styledLabel.append(getString("_UI_Comment_type"), StyledString.Style.QUALIFIER_STYLER).append(" " + label); } - - return styledString; + return styledLabel; } /** @@ -180,26 +150,20 @@ else if (status == CommentStatus.RESOLVED) * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * * - * @generated NOT + * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - Object notifier = notification.getNotifier(); switch (notification.getFeatureID(Comment.class)) { case ReviewsPackage.COMMENT__TEXT: - fireNotifyChanged(new ViewerNotification(notification, notifier, false, true)); - return; - case ReviewsPackage.COMMENT__STATUS: - fireNotifyChanged(new ViewerNotification(notification, notifier, false, true)); - CommentableItemProvider.propagateNotification(this, notification, notifier); + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } - super.notifyChanged(notification); } diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentableItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentableItemProvider.java index 54a0ed01fda..f2654fd0640 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentableItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/CommentableItemProvider.java @@ -12,23 +12,16 @@ import org.eclipse.emf.cdo.etypes.provider.ModelElementItemProvider; import org.eclipse.emf.cdo.lm.reviews.Commentable; +import org.eclipse.emf.cdo.lm.reviews.ReviewsFactory; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; -import org.eclipse.emf.cdo.lm.reviews.impl.CommentableImpl; -import org.eclipse.emf.cdo.lm.reviews.impl.CommentableImpl.CommentStatistics; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.ComposedImage; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.StyledString; import org.eclipse.emf.edit.provider.ViewerNotification; -import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -64,69 +57,10 @@ public List getPropertyDescriptors(Object object) { super.getPropertyDescriptors(object); - addReviewPropertyDescriptor(object); - addCommentCountPropertyDescriptor(object); - addUnresolvedCountPropertyDescriptor(object); - addResolvedCountPropertyDescriptor(object); } return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Review feature. - * - * - * @generated - */ - protected void addReviewPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_review_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Commentable_review_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__REVIEW, false, false, false, null, null, null)); - } - - /** - * This adds a property descriptor for the Comment Count feature. - * - * - * @generated - */ - protected void addCommentCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_commentCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_commentCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__COMMENT_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Unresolved Count feature. - * - * - * @generated - */ - protected void addUnresolvedCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_unresolvedCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_unresolvedCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__UNRESOLVED_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Resolved Count feature. - * - * - * @generated - */ - protected void addResolvedCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_resolvedCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_resolvedCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__RESOLVED_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or @@ -192,9 +126,7 @@ public String getText(Object object) @Override public Object getStyledText(Object object) { - Commentable commentable = (Commentable)object; - return new StyledString(getString("_UI_Commentable_type"), StyledString.Style.QUALIFIER_STYLER).append(" ") - .append(Integer.toString(commentable.getCommentCount())); + return new StyledString(getString("_UI_Commentable_type")); } /** @@ -202,22 +134,19 @@ public Object getStyledText(Object object) * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * * - * @generated NOT + * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - Object notifier = notification.getNotifier(); switch (notification.getFeatureID(Commentable.class)) { case ReviewsPackage.COMMENTABLE__COMMENTS: - fireNotifyChanged(new ViewerNotification(notification, notifier, true, true)); - propagateNotification(this, notification, notifier); + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } - super.notifyChanged(notification); } @@ -232,45 +161,8 @@ public void notifyChanged(Notification notification) protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - } - - static Object overlayCommentableImage(Commentable commentable, Object image) - { - CommentStatistics statistics = CommentableImpl.getCommentStatistics(commentable); - String overlayKey = null; - if (statistics.getUnresolvedCount() != 0) - { - overlayKey = "Unresolved"; - } - else if (statistics.getResolvedCount() != 0) - { - overlayKey = "Resolved"; - } - - if (overlayKey != null) - { - List images = new ArrayList<>(2); - images.add(image); - images.add(ReviewsEditPlugin.INSTANCE.getImage("full/ovr16/" + overlayKey + ".gif")); - image = new ComposedImage(images); - } - - return image; - } - - static void propagateNotification(ItemProviderAdapter itemProvider, Notification notification, Object notifier) - { - if (notifier instanceof EObject) - { - EObject eContainer = ((EObject)notifier).eContainer(); - - while (eContainer instanceof Commentable) - { - itemProvider.fireNotifyChanged(new ViewerNotification(notification, eContainer, false, true)); - eContainer = eContainer.eContainer(); - } - } + newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.COMMENTABLE__COMMENTS, ReviewsFactory.eINSTANCE.createComment())); } } diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DeliveryReviewItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DeliveryReviewItemProvider.java index 93cadcb0096..6293eded635 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DeliveryReviewItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DeliveryReviewItemProvider.java @@ -10,14 +10,10 @@ */ package org.eclipse.emf.cdo.lm.reviews.provider; -import org.eclipse.emf.cdo.lm.Change; import org.eclipse.emf.cdo.lm.LMPackage; import org.eclipse.emf.cdo.lm.reviews.DeliveryReview; -import org.eclipse.emf.cdo.lm.reviews.Review; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; -import org.eclipse.net4j.util.StringUtil; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; @@ -62,14 +58,9 @@ public List getPropertyDescriptors(Object object) super.getPropertyDescriptors(object); addClosedPropertyDescriptor(object); - addBasePropertyDescriptor(object); - addImpactPropertyDescriptor(object); - addBranchPropertyDescriptor(object); - addDeliveriesPropertyDescriptor(object); addSourceChangePropertyDescriptor(object); addSourceCommitPropertyDescriptor(object); addTargetCommitPropertyDescriptor(object); - addRebaseCountPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -88,62 +79,6 @@ protected void addClosedPropertyDescriptor(Object object) LMPackage.Literals.FLOATING_BASELINE__CLOSED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); } - /** - * This adds a property descriptor for the Base feature. - * - * - * @generated - */ - protected void addBasePropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DeliveryReview_base_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_base_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__BASE, false, false, true, null, null, null)); - } - - /** - * This adds a property descriptor for the Impact feature. - * - * - * @generated - */ - protected void addImpactPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DeliveryReview_impact_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_impact_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__IMPACT, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Branch feature. - * - * - * @generated - */ - protected void addBranchPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DeliveryReview_branch_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_branch_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__BRANCH, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Deliveries feature. - * - * - * @generated - */ - protected void addDeliveriesPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DeliveryReview_deliveries_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_deliveries_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__DELIVERIES, false, false, true, null, null, null)); - } - /** * This adds a property descriptor for the Source Change feature. * @@ -155,7 +90,7 @@ protected void addSourceChangePropertyDescriptor(Object object) itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DeliveryReview_sourceChange_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_sourceChange_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__SOURCE_CHANGE, false, false, true, null, null, null)); + ReviewsPackage.Literals.DELIVERY_REVIEW__SOURCE_CHANGE, true, false, true, null, null, null)); } /** @@ -169,7 +104,7 @@ protected void addSourceCommitPropertyDescriptor(Object object) itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DeliveryReview_sourceCommit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_sourceCommit_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__SOURCE_COMMIT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.DELIVERY_REVIEW__SOURCE_COMMIT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } /** @@ -183,21 +118,7 @@ protected void addTargetCommitPropertyDescriptor(Object object) itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DeliveryReview_targetCommit_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_targetCommit_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__TARGET_COMMIT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Rebase Count feature. - * - * - * @generated - */ - protected void addRebaseCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DeliveryReview_rebaseCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DeliveryReview_rebaseCount_feature", "_UI_DeliveryReview_type"), - ReviewsPackage.Literals.DELIVERY_REVIEW__REBASE_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.DELIVERY_REVIEW__TARGET_COMMIT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } /** @@ -212,13 +133,6 @@ public Object getImage(Object object) return overlayImage(object, getResourceLocator().getImage("full/obj16/DeliveryReview")); } - @Override - protected Object overlayImage(Object object, Object image) - { - image = super.overlayImage(object, image); - return CommentableItemProvider.overlayCommentableImage((Review)object, image); - } - /** * * @@ -246,20 +160,14 @@ public String getText(Object object) * This returns the label styled text for the adapted class. * * - * @generated NOT + * @generated */ @Override public Object getStyledText(Object object) { - DeliveryReview review = (DeliveryReview)object; - StyledString styledString = new StyledString(getString("_UI_DeliveryReview_type"), StyledString.Style.QUALIFIER_STYLER) // - .append(" ").append(Integer.toString(review.getId())); - - Change change = review.getSourceChange(); - String name = change == null ? null : change.getName(); - styledString.append(" - ").append(StringUtil.isEmpty(name) ? "???" : name); - - return appendStatus(styledString, review); + DeliveryReview deliveryReview = (DeliveryReview)object; + return new StyledString(getString("_UI_DeliveryReview_type"), StyledString.Style.QUALIFIER_STYLER).append(" ") + .append(Boolean.toString(deliveryReview.isFloating())); } /** @@ -277,11 +185,8 @@ public void notifyChanged(Notification notification) switch (notification.getFeatureID(DeliveryReview.class)) { case ReviewsPackage.DELIVERY_REVIEW__CLOSED: - case ReviewsPackage.DELIVERY_REVIEW__IMPACT: - case ReviewsPackage.DELIVERY_REVIEW__BRANCH: case ReviewsPackage.DELIVERY_REVIEW__SOURCE_COMMIT: case ReviewsPackage.DELIVERY_REVIEW__TARGET_COMMIT: - case ReviewsPackage.DELIVERY_REVIEW__REBASE_COUNT: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DropReviewItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DropReviewItemProvider.java index cfb0f28bc78..a3e6b8aaec6 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DropReviewItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/DropReviewItemProvider.java @@ -10,11 +10,9 @@ */ package org.eclipse.emf.cdo.lm.reviews.provider; -import org.eclipse.emf.cdo.lm.DropType; import org.eclipse.emf.cdo.lm.LMFactory; import org.eclipse.emf.cdo.lm.LMPackage; import org.eclipse.emf.cdo.lm.reviews.DropReview; -import org.eclipse.emf.cdo.lm.reviews.Review; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; import org.eclipse.emf.common.notify.AdapterFactory; @@ -62,10 +60,8 @@ public List getPropertyDescriptors(Object object) super.getPropertyDescriptors(object); addVersionPropertyDescriptor(object); - addDeliveryPropertyDescriptor(object); addTargetTimeStampPropertyDescriptor(object); addDropTypePropertyDescriptor(object); - addDropLabelPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -84,19 +80,6 @@ protected void addVersionPropertyDescriptor(Object object) LMPackage.Literals.FIXED_BASELINE__VERSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } - /** - * This adds a property descriptor for the Delivery feature. - * - * - * @generated - */ - protected void addDeliveryPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DropReview_delivery_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DropReview_delivery_feature", "_UI_DropReview_type"), - ReviewsPackage.Literals.DROP_REVIEW__DELIVERY, false, false, true, null, null, null)); - } - /** * This adds a property descriptor for the Target Time Stamp feature. * @@ -108,7 +91,7 @@ protected void addTargetTimeStampPropertyDescriptor(Object object) itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DropReview_targetTimeStamp_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DropReview_targetTimeStamp_feature", "_UI_DropReview_type"), - ReviewsPackage.Literals.DROP_REVIEW__TARGET_TIME_STAMP, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.DROP_REVIEW__TARGET_TIME_STAMP, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); } /** @@ -121,21 +104,7 @@ protected void addDropTypePropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_DropReview_dropType_feature"), getString("_UI_PropertyDescriptor_description", "_UI_DropReview_dropType_feature", "_UI_DropReview_type"), - ReviewsPackage.Literals.DROP_REVIEW__DROP_TYPE, false, false, true, null, null, null)); - } - - /** - * This adds a property descriptor for the Drop Label feature. - * - * - * @generated - */ - protected void addDropLabelPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_DropReview_dropLabel_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_DropReview_dropLabel_feature", "_UI_DropReview_type"), - ReviewsPackage.Literals.DROP_REVIEW__DROP_LABEL, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.DROP_REVIEW__DROP_TYPE, true, false, true, null, null, null)); } /** @@ -175,22 +144,12 @@ protected EStructuralFeature getChildFeature(Object object, Object child) * This returns DropReview.gif. * * - * @generated NOT + * @generated */ @Override public Object getImage(Object object) { - DropReview review = (DropReview)object; - DropType dropType = review.getDropType(); - String key = dropType != null && dropType.isRelease() ? "Release" : "Drop"; - return overlayImage(object, getResourceLocator().getImage("full/obj16/" + key + "Review")); - } - - @Override - protected Object overlayImage(Object object, Object image) - { - image = super.overlayImage(object, image); - return CommentableItemProvider.overlayCommentableImage((Review)object, image); + return overlayImage(object, getResourceLocator().getImage("full/obj16/DropReview")); } /** @@ -220,19 +179,14 @@ public String getText(Object object) * This returns the label styled text for the adapted class. * * - * @generated NOT + * @generated */ @Override public Object getStyledText(Object object) { - DropReview review = (DropReview)object; - DropType dropType = review.getDropType(); - String type = dropType == null ? getString("_UI_Drop") : dropType.getName(); - - StyledString styledString = new StyledString(type + " " + getString("_UI_Review_type"), StyledString.Style.QUALIFIER_STYLER) // - .append(" ").append(Integer.toString(review.getId()) + " - " + review.getDropLabel()); - - return appendStatus(styledString, review); + DropReview dropReview = (DropReview)object; + return new StyledString(getString("_UI_DropReview_type"), StyledString.Style.QUALIFIER_STYLER).append(" ") + .append(Boolean.toString(dropReview.isFloating())); } /** @@ -251,7 +205,6 @@ public void notifyChanged(Notification notification) { case ReviewsPackage.DROP_REVIEW__VERSION: case ReviewsPackage.DROP_REVIEW__TARGET_TIME_STAMP: - case ReviewsPackage.DROP_REVIEW__DROP_LABEL: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case ReviewsPackage.DROP_REVIEW__DEPENDENCIES: diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/HeadingItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/HeadingItemProvider.java deleted file mode 100644 index a3f4bf36631..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/HeadingItemProvider.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - */ -package org.eclipse.emf.cdo.lm.reviews.provider; - -import org.eclipse.emf.cdo.lm.reviews.Heading; - -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.StyledString; - -import java.util.Collection; -import java.util.List; - -/** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.lm.reviews.Heading} object. - * - * - * @generated - */ -public class HeadingItemProvider extends CommentItemProvider -{ - /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public HeadingItemProvider(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ - @Override - public List getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - - } - return itemPropertyDescriptors; - } - - /** - * This returns Heading.gif. - * - * - * @generated - */ - @Override - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/Heading")); - } - - /** - * - * - * @generated - */ - @Override - protected boolean shouldComposeCreationImage() - { - return true; - } - - /** - * This returns the label text for the adapted class. - * - * - * @generated - */ - @Override - public String getText(Object object) - { - return ((StyledString)getStyledText(object)).getString(); - } - - /** - * This returns the label styled text for the adapted class. - * - * - * @generated - */ - @Override - public Object getStyledText(Object object) - { - Heading heading = (Heading)object; - return new StyledString(getString("_UI_Heading_type"), StyledString.Style.QUALIFIER_STYLER).append(" ").append(Integer.toString(heading.getCommentCount())); - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ - @Override - public void notifyChanged(Notification notification) - { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * - * @generated - */ - @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - -} diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewItemProvider.java index 5cde5c7c3a2..80053eef44d 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewItemProvider.java @@ -12,6 +12,7 @@ import org.eclipse.emf.cdo.lm.provider.BaselineItemProvider; import org.eclipse.emf.cdo.lm.reviews.Review; +import org.eclipse.emf.cdo.lm.reviews.ReviewsFactory; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; import org.eclipse.emf.common.notify.AdapterFactory; @@ -34,8 +35,6 @@ */ public class ReviewItemProvider extends BaselineItemProvider { - private IItemPropertyDescriptor statusPropertyDescriptor; - /** * This constructs an instance from a factory and a notifier. * @@ -60,84 +59,24 @@ public List getPropertyDescriptors(Object object) { super.getPropertyDescriptors(object); - addReviewPropertyDescriptor(object); - addCommentCountPropertyDescriptor(object); - addUnresolvedCountPropertyDescriptor(object); - addResolvedCountPropertyDescriptor(object); - addIdPropertyDescriptor(object); + addTypePropertyDescriptor(object); addAuthorPropertyDescriptor(object); addReviewersPropertyDescriptor(object); - addStatusPropertyDescriptor(object); } return itemPropertyDescriptors; } /** - * This adds a property descriptor for the Review feature. - * - * - * @generated - */ - protected void addReviewPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_review_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Commentable_review_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__REVIEW, false, false, false, null, null, null)); - } - - /** - * This adds a property descriptor for the Comment Count feature. - * - * - * @generated - */ - protected void addCommentCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_commentCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_commentCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__COMMENT_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Unresolved Count feature. + * This adds a property descriptor for the Type feature. * * * @generated */ - protected void addUnresolvedCountPropertyDescriptor(Object object) + protected void addTypePropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_unresolvedCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_unresolvedCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__UNRESOLVED_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Resolved Count feature. - * - * - * @generated - */ - protected void addResolvedCountPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Commentable_resolvedCount_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_Commentable_resolvedCount_feature", "_UI_Commentable_type"), - ReviewsPackage.Literals.COMMENTABLE__RESOLVED_COUNT, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); - } - - /** - * This adds a property descriptor for the Id feature. - * - * - * @generated - */ - protected void addIdPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Review_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Review_id_feature", "_UI_Review_type"), - ReviewsPackage.Literals.REVIEW__ID, false, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null)); + getString("_UI_Review_type_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Review_type_feature", "_UI_Review_type"), + ReviewsPackage.Literals.REVIEW__TYPE, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -150,7 +89,7 @@ protected void addAuthorPropertyDescriptor(Object object) { itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Review_author_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Review_author_feature", "_UI_Review_type"), - ReviewsPackage.Literals.REVIEW__AUTHOR, false, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + ReviewsPackage.Literals.REVIEW__AUTHOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -166,21 +105,6 @@ protected void addReviewersPropertyDescriptor(Object object) ReviewsPackage.Literals.REVIEW__REVIEWERS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } - /** - * This adds a property descriptor for the Status feature. - * - * - * @generated NOT - */ - protected void addStatusPropertyDescriptor(Object object) - { - // Remember the statusPropertyDescriptor for appendStatus() below. - statusPropertyDescriptor = createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), - getString("_UI_Review_status_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Review_status_feature", "_UI_Review_type"), - ReviewsPackage.Literals.REVIEW__STATUS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null); - itemPropertyDescriptors.add(statusPropertyDescriptor); - } - /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or @@ -247,7 +171,7 @@ public String getText(Object object) public Object getStyledText(Object object) { Review review = (Review)object; - return new StyledString(getString("_UI_Review_type"), StyledString.Style.QUALIFIER_STYLER).append(" ").append(Integer.toString(review.getId())); + return new StyledString(getString("_UI_Review_type"), StyledString.Style.QUALIFIER_STYLER).append(" ").append(Boolean.toString(review.isFloating())); } /** @@ -255,29 +179,24 @@ public Object getStyledText(Object object) * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. * * - * @generated NOT + * @generated */ @Override public void notifyChanged(Notification notification) { updateChildren(notification); - Object notifier = notification.getNotifier(); switch (notification.getFeatureID(Review.class)) { - case ReviewsPackage.REVIEW__ID: + case ReviewsPackage.REVIEW__TYPE: case ReviewsPackage.REVIEW__AUTHOR: case ReviewsPackage.REVIEW__REVIEWERS: - case ReviewsPackage.REVIEW__STATUS: - fireNotifyChanged(new ViewerNotification(notification, notifier, false, true)); + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case ReviewsPackage.REVIEW__COMMENTS: - fireNotifyChanged(new ViewerNotification(notification, notifier, true, true)); - CommentableItemProvider.propagateNotification(this, notification, notifier); + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } - super.notifyChanged(notification); } @@ -292,14 +211,8 @@ public void notifyChanged(Notification notification) protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - } - protected final StyledString appendStatus(StyledString styledString, Review review) - { - getPropertyDescriptors(review); // Ensure that the descriptors are initialized. - - String status = statusPropertyDescriptor.getLabelProvider(review).getText(review.getStatus()); - styledString.append(" ").append("[" + status + "]", StyledString.Style.COUNTER_STYLER); - return styledString; + newChildDescriptors.add(createChildParameter(ReviewsPackage.Literals.COMMENTABLE__COMMENTS, ReviewsFactory.eINSTANCE.createComment())); } + } diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewTemplateItemProvider.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewTemplateItemProvider.java index bb3d12d9eec..e27f91c88ee 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewTemplateItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewTemplateItemProvider.java @@ -11,6 +11,7 @@ package org.eclipse.emf.cdo.lm.reviews.provider; import org.eclipse.emf.cdo.lm.reviews.ReviewTemplate; +import org.eclipse.emf.cdo.lm.reviews.ReviewType; import org.eclipse.emf.cdo.lm.reviews.ReviewsPackage; import org.eclipse.emf.common.notify.AdapterFactory; @@ -56,11 +57,26 @@ public List getPropertyDescriptors(Object object) { super.getPropertyDescriptors(object); + addTypePropertyDescriptor(object); addReviewersPropertyDescriptor(object); } return itemPropertyDescriptors; } + /** + * This adds a property descriptor for the Type feature. + * + * + * @generated + */ + protected void addTypePropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_ReviewTemplate_type_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_ReviewTemplate_type_feature", "_UI_ReviewTemplate_type"), + ReviewsPackage.Literals.REVIEW_TEMPLATE__TYPE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + /** * This adds a property descriptor for the Reviewers feature. * @@ -119,9 +135,18 @@ public String getText(Object object) @Override public Object getStyledText(Object object) { - ReviewTemplate reviewTemplate = (ReviewTemplate)object; - return new StyledString(getString("_UI_ReviewTemplate_type"), StyledString.Style.QUALIFIER_STYLER).append(" ") - .append(Integer.toString(reviewTemplate.getCommentCount())); + ReviewType labelValue = ((ReviewTemplate)object).getType(); + String label = labelValue == null ? null : labelValue.toString(); + StyledString styledLabel = new StyledString(); + if (label == null || label.length() == 0) + { + styledLabel.append(getString("_UI_ReviewTemplate_type"), StyledString.Style.QUALIFIER_STYLER); + } + else + { + styledLabel.append(getString("_UI_ReviewTemplate_type"), StyledString.Style.QUALIFIER_STYLER).append(" " + label); + } + return styledLabel; } /** @@ -138,6 +163,7 @@ public void notifyChanged(Notification notification) switch (notification.getFeatureID(ReviewTemplate.class)) { + case ReviewsPackage.REVIEW_TEMPLATE__TYPE: case ReviewsPackage.REVIEW_TEMPLATE__REVIEWERS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewsItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewsItemProviderAdapterFactory.java index ac257f04c7a..fcf10942027 100644 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewsItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.lm.reviews.edit/src/org/eclipse/emf/cdo/lm/reviews/provider/ReviewsItemProviderAdapterFactory.java @@ -128,31 +128,6 @@ public Adapter createCommentAdapter() return commentItemProvider; } - /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.lm.reviews.Heading} instances. - * - * - * @generated - */ - protected HeadingItemProvider headingItemProvider; - - /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.lm.reviews.Heading}. - * - * - * @generated - */ - @Override - public Adapter createHeadingAdapter() - { - if (headingItemProvider == null) - { - headingItemProvider = new HeadingItemProvider(this); - } - - return headingItemProvider; - } - /** * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.lm.reviews.ReviewTemplate} instances. * @@ -381,10 +356,6 @@ public void dispose() { commentItemProvider.dispose(); } - if (headingItemProvider != null) - { - headingItemProvider.dispose(); - } if (reviewTemplateItemProvider != null) { reviewTemplateItemProvider.dispose(); diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.classpath b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.classpath deleted file mode 100644 index 28c6382f490..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.project b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.project deleted file mode 100644 index 60db987a3f3..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.project +++ /dev/null @@ -1,58 +0,0 @@ - - - org.eclipse.emf.cdo.lm.reviews.server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.api.tools.apiAnalysisBuilder - - - - - org.eclipse.oomph.version.VersionBuilder - - - check.maven.pom - true - - - ignore.lower.bound.dependency.ranges - true - - - release.path - /org.eclipse.emf.cdo.releng/versions/release.xml - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - org.eclipse.pde.api.tools.apiAnalysisNature - org.eclipse.oomph.version.VersionNature - - - - 1396939000000 - - 10 - - org.eclipse.ui.ide.multiFilter - 1.0-projectRelativePath-matches-true-false-target - - - - diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 4fb4d146356..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,441 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,*.ucls,doc-files/,package.html,package-info.java,package-info.java -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled -org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW -org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=next_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=120 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=2 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=160 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.launching.prefs b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 556ed07a3cb..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Sep 02 05:38:34 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 84aacacf70b..00000000000 --- a/plugins/org.eclipse.emf.cdo.lm.reviews.server/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,141 +0,0 @@ -cleanup.add_default_serial_version_id=true -cleanup.add_generated_serial_version_id=false -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=true -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=false -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_functional_interfaces=false -cleanup.convert_to_enhanced_for_loop=false -cleanup.correct_indentation=true -cleanup.format_source_code=true -cleanup.format_source_code_changes_only=false -cleanup.insert_inferred_type_arguments=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=false -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=false -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=true -cleanup.push_down_negation=false -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=false -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_redundant_modifiers=false -cleanup.remove_redundant_semicolons=true -cleanup.remove_redundant_type_arguments=true -cleanup.remove_trailing_whitespaces=true -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_array_creation=true -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=false -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.sort_members=false -cleanup.sort_members_all=false -cleanup.use_anonymous_class_creation=false -cleanup.use_autoboxing=false -cleanup.use_blocks=true -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_lambda=true -cleanup.use_parentheses_in_expressions=true -cleanup.use_this_for_non_static_field_access=true -cleanup.use_this_for_non_static_field_access_only_if_necessary=true -cleanup.use_this_for_non_static_method_access=true -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup.use_unboxing=false -cleanup_profile=_CDO -cleanup_settings_version=2 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_EMFT -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=ex -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates=