Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2016-06-15 04:13:57 -0400
committerMathieu Cartaud2016-06-15 10:29:59 -0400
commit6477d1125eebfd494f4a3d1a666519e24daedf9d (patch)
treedf98e6aaac6dfb813ea055617a1ce1387064f041
parent5722fba2307aeda65d7367dd302bcd9b20f02a7a (diff)
downloadorg.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.gz
org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.tar.xz
org.eclipse.emf.compare-6477d1125eebfd494f4a3d1a666519e24daedf9d.zip
Switch to Eclipse mars.2
Format all non generated classes to get ride of formatter incompatibilities Migrate checkstyle config for checkstyle 6.19 Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
-rw-r--r--org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml (renamed from org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml)49
-rw-r--r--org.eclipse.emf.compare-parent/codeStyle/EMFCompareFormatter.xml508
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/.checkstyle10
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomMediaWikiLanguage.java16
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomTableOfContentsBlock.java17
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/PrimaryTOCWriter.java48
-rw-r--r--packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/WikiTextToHTML.java290
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/.checkstyle10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java56
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java58
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java12
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java21
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java13
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java21
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java15
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java21
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java112
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java57
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java48
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java12
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java11
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java12
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java128
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java12
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java44
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java10
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java9
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java74
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java6
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java8
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java8
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java41
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java17
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java5
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java137
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/data/NodeChangesInputData.java7
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/show/ShowTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/suite/AllTests.java3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/extensions/provider/spec/DiagramChangeItemProviderSpec.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/extensions/provider/spec/EdgeChangeItemProviderSpec.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/extensions/provider/spec/ExtensionsItemProviderAdapterFactorySpec.java16
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/extensions/provider/spec/ForwardingDiagramDiffItemProvider.java20
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/extensions/provider/spec/NodeChangeItemProviderSpec.java8
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/matchs/provider/spec/DiagramCompareItemProviderAdapterFactorySpec.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.edit/src/org/eclipse/emf/compare/diagram/internal/matchs/provider/spec/ViewItemProviderSpec.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/nodechanges/NodechangesTest.java69
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/nodechanges/data/NodeChangesInputData.java9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ide/ecoretools/tests/suite/AllTests.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/AbstractPapyrusResourceSetHook.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/ElementTypeSetConfigurationRegistryInitializingHook.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/context/PapyrusContextUtil.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/merge/PapyrusResourceAttachmentChangeMerger.java10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/util/ModelExtensionUtil.java12
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius/src/org/eclipse/emf/compare/diagram/ide/ui/sirius/internal/SiriusTechnicalElementsFilter.java5
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/CompareDiagramIDEUIPlugin.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/accessor/DiagramMatchAccessorImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/accessor/factory/DiagramDiffAccessorFactory.java1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/accessor/factory/DiagramMatchAccessorFactory.java10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramContentMergeViewer.java68
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/DiagramMergeViewer.java6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/figures/DecoratorFigure.java11
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/figures/EdgeFigure.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/contentmergeviewer/diagram/figures/NodeListFigure.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/structuremergeviewer/filters/groups/extenders/DiagramChangeExtender.java5
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/structuremergeviewer/filters/groups/extenders/EdgeChangeExtender.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.ide.ui/src/org/eclipse/emf/compare/diagram/ide/ui/internal/structuremergeviewer/filters/groups/extenders/NodeChangeExtender.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/AbstractGitMergeTestCase.java100
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/IgnoreDiFileChangesInGitMergeTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeAdd1GitMergeTest.java28
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeAdd2GitMergeTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeDelete1GitMergeTest.java38
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/ResourceAttachmentChangeDelete2GitMergeTest.java29
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/StereotypeConflictTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/egit/fixture/GitTestRepository.java47
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/implication/AttachmentChangeImplicationTest.java24
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/AbstractResourceAttachmentChangeMoveTests.java16
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveConflictTests.java233
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveNoConflictTests.java160
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/resourceattachmentchange/move/ResourceAttachmentChangeMoveOrderTests.java65
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/PapyrusGitTests.java39
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java80
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/DiagramInputData.java14
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/comparison/DiagramTooltipProviderTest.java61
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/context/PapyrusContextUtilInputData.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/difile/IgnoreDiFilePostProcessorTest.java21
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusConflictsGroupProviderTests.java32
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/groups/PapyrusDifferencesOrderTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/AssocMergeTest.java211
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java1818
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/NodeMergeTest.java484
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/c1/package-info.java7
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/conflict/t1/package-info.java6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/c1/package-info.java7
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/threeway/t1/package-info.java6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a1/package-info.java7
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/a2/package-info.java6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/data/assocs/twoway/t1/package-info.java8
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/ModelExtensionUtilTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/modelextension/data/nullparametermodel/NullParameterModel.java3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/saveparameter/SaveParameterHookIntegrationTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/uriattachment/URIAttachmentTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/util/PapyrusSaveParameterUtil.java25
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/AbstractPapyrusDiagramDiffHandler.java3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/FeatureInstance.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagram2WayDiffHandler.java14
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/PapyrusDiagram3WayDiffHandler.java5
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/SidedEObject.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus/src/org/eclipse/emf/compare/diagram/papyrus/internal/SidedFeatureInstance.java2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.sirius/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.sirius/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.sirius/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.sirius/src/org/eclipse/emf/compare/diagram/sirius/internal/SiriusDiffPostProcessor.java9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/AbstractDiagramChangeFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/CoordinatesChangeFactory.java11
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/DiagramChangeFactory.java8
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/EdgeChangeFactory.java15
-rw-r--r--plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/internal/factories/extensions/NodeChangeFactory.java12
-rw-r--r--plugins/org.eclipse.emf.compare.edit/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.edit/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java17
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/ExtendedAdapterFactoryItemDelegator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java4
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java17
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java10
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java23
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java18
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceLocationChangeItemProviderSpec.java5
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/utils/IStyledString.java6
-rw-r--r--plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/tooltip/AbstractTooltipProvider.java20
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/merge/ModelGitMergeEditorInput.java70
-rw-r--r--plugins/org.eclipse.emf.compare.egit/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.egit/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/match/EGitMatchEngineFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/DirCacheResourceVariantTreeProvider.java4
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/LogicalModels.java8
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/RecursiveModelMerger.java40
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/merge/TreeWalkResourceVariantTreeProvider.java22
-rw-r--r--plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/postprocessor/EgitPostProcessor.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/utils/tests/ResourceUtil_BinaryIdentical2Test.java2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/utils/tests/ResourceUtil_BinaryIdentical3Test.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.tests/src/org/eclipse/emf/compare/ide/utils/tests/ResourceUtil_BinaryIdentical3_ReadLimitTest.java60
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.e4/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.e4/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.e4/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.e4/src/org/eclipse/emf/compare/ide/ui/e4/E4DeferredTreeContentManager.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.e4/src/org/eclipse/emf/compare/ide/ui/e4/EMFCompareDeferredTreeContentManagerProviderImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/src/org/eclipse/emf/compare/ide/ui/tests/framework/AbstractCompareStatement.java34
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/src/org/eclipse/emf/compare/ide/ui/tests/framework/AbstractCompareTestRunner.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/src/org/eclipse/emf/compare/ide/ui/tests/framework/internal/CompareStatement.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.framework/src/org/eclipse/emf/compare/ide/ui/tests/framework/internal/CompareTestCaseJUnitBlock.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/GitTestRunner.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/GitTestCaseJUnitBlock.java14
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/GitTestStatement.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/GitTestSupport.java24
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/src/org/eclipse/emf/compare/ide/ui/tests/git/framework/internal/MergeStatement.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/egit/fixture/GitTestRepository.java26
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/DirCacheResourceVariantTreeProviderTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/GitResourceVariantTreeSubscriberTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RemoteNewProjectTests.java91
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/RenamedControlledResourceTests.java40
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/ResourceVariantTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/merge/StrategyRecursiveModelTest.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/ModelTestCase.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/models/SampleResourceMapping.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/suite/GitTests.java20
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/AbstractGitLogicalModelTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/AbstractURITest.java78
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeTest.java9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitLogicalMergeWithCustomDependenciesTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/GitMergeTest.java74
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/LocalResolutionTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/ModelResolverLocalTest.java48
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/ModelResolverRemoteTest.java473
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/MovedImplicitResourceAmongChangedResourcesTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/ResourceUtilPathTest.java40
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/RevisionedURIConverterTest.java94
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/ThreadedModelResolverResolutionTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/incoming/IncomingMultiEReferenceTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/incoming/IncomingSingleEReferenceOldSerializationTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/incoming/IncomingSingleEReferenceTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/outgoing/OutgoingMultiEReferenceTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/outgoing/OutgoingSingleEReferenceOldSerializationTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git/src/org/eclipse/emf/compare/ide/ui/tests/unit/outgoing/OutgoingSingleEReferenceTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/command/MergeAllCommandTests.java40
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/compareconfiguration/EMFCompareConfigurationTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/contentmergeviewer/notloadedfragment/NotLoadedFragmentItemTest.java32
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/AbstractMonitoredProxyCreationListenerTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/GraphResolutionTest.java52
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ResourceComputationSchedulerTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ThreadedModelResolverGraphTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/resolver/ThreadedModelResolverWithCustomDependencyProviderTest.java45
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/logical/synchronizationmodel/SynchronizationModelDiagnosticTest.java52
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/NavigatableTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/MergeActionTest.java52
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/MergeNonConflictingRunnableTest.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/PseudoConflictsMergeActionTest.java113
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug434827.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TooltipProviderTest.java106
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/data/tooltips/NodeTooltipsInputData.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/notloadedfragment/NotLoadedFragmentNodeTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/suite/BugsTestSuite.java9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/TestBug459131.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/dependency/DependencyProviderDescriptor.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/EMFCompareConfiguration.java13
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EMFCompareContentMergeViewer.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/label/LabeledViewerCreator.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/table/TableContentMergeViewer.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/tree/TreeContentMergeViewer.java23
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/EMFCompareColor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/util/UndoAction.java5
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/AbstractEMFCompareEditorInput.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonEditorInput.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/editor/ComparisonScopeEditorInput.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/AbstractCompareHandler.java15
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInDialog.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/CompareInNewEditor.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/EMFComparisonSourceActionHandler.java32
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/handler/SelectAncestorDialog.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ComparisonScopeBuilder.java82
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFModelProvider.java42
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMappingMerger.java42
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFSynchronizationCompareAdapter.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/RenameDetector.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResolution.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/AbstractResourceResolver.java5
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalModelResolution.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/LocalModelsResolution.java19
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ModelsResolution.java37
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/RemoteResolveComputation.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceComputationScheduler.java33
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyFoundEvent.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyLocalResolver.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceDependencyRemoteResolver.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ResourceUnloader.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/RevisionedURIConverter.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/ThreadedModelResolver.java5
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/registry/ModelResolverDescriptor.java9
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/resolver/registry/ModelResolverRegistryListener.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/view/ExplorersViewSelectionLMVHandler.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/view/LogicalModelView.java41
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/view/LogicalModelViewHandlerUtil.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/view/registry/LogicalModelViewHandlerDescriptor.java5
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/view/registry/LogicalModelViewHandlerRegistryListener.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/mergeresolution/MergeResolutionListenerDescriptor.java11
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/preferences/ModelResolutionPreferencePage.java35
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractStructuredViewerWrapper.java14
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java16
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/DependencyData.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareDiffTreeRuler.java11
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java89
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerContentProvider.java21
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java5
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/ForwardingCompareInput.java14
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/ProblemIndicationComposite.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/WrappableTreeViewer.java1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/AbstractMergeRunnable.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAction.java16
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeAllNonConflictingAction.java24
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeContainedNonConflictingAction.java20
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeNonConflictingRunnable.java13
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/MergeRunnableImpl.java7
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java8
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/treecontentmanager/EMFCompareDeferredTreeContentManagerProvider.java3
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/util/CompareHandlerService.java12
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/AbstractModelResolver.java1
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/IStorageProviderAccessor.java24
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java34
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/mergeresolution/MergeResolutionManager.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.ide/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.ide/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/hook/ResourceSetHookDescriptor.java10
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/hook/ResourceSetHookRegistry.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/ForwardingXMLHandler.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NoNotificationParserPool.java2
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotLoadingResourceSet.java13
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/NotifyingParserPool.java13
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java4
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/ResourceUtil.java23
-rw-r--r--plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java7
-rw-r--r--plugins/org.eclipse.emf.compare.log4j.fragment/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.log4j.fragment/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.log4j.fragment/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.tests/src/org/eclipse/emf/compare/rcp/tests/MatchEngineFactoryRegistryWrapperTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/match/RCPMatchEngineFactoryRegistryTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/mergeviewer/item/MergeViewerItemFeatureMapsTest.java29
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/mergeviewer/item/MergeViewerItemPseudoConflictTest.java21
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/mergeviewer/item/MergeViewerItemTest.java93
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/TestBug435365.java7
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/filters/TestFeatureMapDifferencesFilter.java13
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/TestBasicDifferenceGroupImpl.java959
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/AbstractTestTreeNodeItemProviderAdapter.java38
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestComparisonTreeNodeItemProviderSpec.java9
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestMatchTreeNodeItemProviderSpec.java113
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/TestReferenceChangeTreeNodeItemProviderSpec.java146
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/provider/ThreeWayComparisonGroupProviderTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/suite/AllTests.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java12
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/IComparisonAndScopeChange.java1
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/AdapterFactoryChange.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/impl/ComparisonAndScopeChange.java14
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/ConfigurationUIRegistryEventListener.java14
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguatorUIFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/configuration/ui/match/DefaultMatchEngineConfiguratorUI.java20
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/factory/impl/SingleStructuralFeatureAccessorFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ContainmentReferenceChangeAccessorImpl.java12
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/FeatureMapKeyChangeAccessorImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/MatchAccessor.java12
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceContentsAccessorImpl.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/ResourceLocationChangeAccessorImpl.java5
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/SingleStructuralFeatureAccessorImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/contentmergeviewer/accessor/impl/StringAttributeChangeAccessor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/ColorChangeEvent.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/CompareColorImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractStructuredMergeViewer.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/AbstractTableOrTreeMergeViewer.java17
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/impl/TableMergeViewer.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/MergeViewerItem.java90
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/mergeviewer/item/impl/ResourceAttachmentChangeMergeViewerItem.java33
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/AdapterFactoriesPreferencePage.java39
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EditorPreferencePage.java7
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/EnginesPreferencePage.java138
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/FiltersPreferencePage.java33
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/GroupsPreferencePage.java21
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/LoggingPreferencePage.java6
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/PostProcessorPreferencePage.java32
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/GroupsInteractiveContent.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/preferences/impl/InteractiveUIContent.java26
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/FilterAction.java16
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupAction.java19
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/actions/GroupActionMenu.java14
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/CascadingDifferencesFilter.java5
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/filters/impl/DifferenceFilterManager.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/StructureMergeViewerGrouper.java3
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/BasicDifferenceGroupImpl.java24
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupDescriptorWrapper.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupProviderExtensionRegistryListener.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/DifferenceGroupRegistryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/KindGroupProvider.java20
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/impl/ThreeWayComparisonGroupProvider.java44
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java31
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/MergeViewerUtil.java23
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/util/ResourceUIUtil.java7
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java38
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/extension/AbstractRegistryEventListener.java6
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IEMFCompareBuilderConfigurator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/AbstractItemDescriptor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/DescriptorRegistryEventListener.java10
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/EMFCompareBuilderConfigurator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/WrapperItemDescriptor.java1
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/DefaultRCPMatchEngineFactory.java10
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryDescriptor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryListener.java10
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryWrapper.java14
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/WeightProviderDescriptorRegistryListener.java14
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/merger/MergerExtensionRegistryListener.java20
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/policy/LoadOnDemandPolicyRegistryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorFactoryRegistryListener.java6
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/postprocessor/PostProcessorRegistryImpl.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/preferences/EMFComparePreferences.java8
-rw-r--r--plugins/org.eclipse.emf.compare.rcptt.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.specifications/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.specifications/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/.project6
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/src/org/eclipse/emf/compare/subversive/internal/adapter/ResourceElementIFileRevisionAdapterFactory.java14
-rw-r--r--plugins/org.eclipse.emf.compare.subversive/src/org/eclipse/emf/compare/subversive/internal/adapter/SubversiveFileRevision.java37
-rw-r--r--plugins/org.eclipse.emf.compare.tests.fuzzy/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.tests.fuzzy/.settings/org.eclipse.jdt.core.prefs285
-rw-r--r--plugins/org.eclipse.emf.compare.tests.fuzzy/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--plugins/org.eclipse.emf.compare.tests.fuzzy/src/org/eclipse/emf/compare/tests/FuzzyTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/adapterfactory/EMFCompareAdapterFactoryTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/command/TestTransactionalDualCompareCommandStack.java13
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/ConflictDetectionTest.java537
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ComparisonUtilTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java42
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/ThreeWayTextDiffTest.java6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/URIDistanceTest.java6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/AbstractTestCompareItemProviderAdapter.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestAttributeChangeItemProviderSpec.java8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/edit/TestReferenceChangeItemProviderSpec.java68
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java84
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/FragmentationTest.java64
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fragmentation/ResourceAttachmentChangeBug492261.java16
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/EMFCompareAssert.java19
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/ConflictStatement.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/DiffStatement.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/MatchStatement.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/framework/junit/internal/UseCaseRunner.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DistanceAxiomsTests.java7
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/DynamicInstanceComparisonTest.java24
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ExtLibraryTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/IdentifierComparisonTest.java34
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/MatchPerformanceComparisonTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/fullcomparison/ProximityComparisonTest.java25
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/ProximityIndexTest.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/RootIDMatchingTest.java3
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/Bug485266_MoveDeleteConflict_Test.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ComplexMergeTest.java19
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictImplicationsTest_Bug484579.java16
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/ConflictMergeTest.java132
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps2wayMergeTest.java164
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/FeatureMaps3wayMergeTest.java68
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java104
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/MultipleMergeTest.java68
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/PseudoConflictMergeTest.java48
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java27
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/TwoWayMergeInputData.java15
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/postprocess/PostProcessorTest.java42
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java32
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/scope/DefaultComparisonScopeTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/utils/GraphTest.java48
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit.papyrus/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit.papyrus/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit.papyrus/src/org/eclipse/emf/compre/uml2/edit/papyrus/internal/decorator/PapyrusStereotypedElementItemProviderDecorator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/DanglingStereotypeApplicationCustomItemProvider.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/StereotypeApplicationChangeCustomItemProvider.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/custom/UMLDiffCustomItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/decorator/StereotypeAttributeChangeItemProviderDecorator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/decorator/StereotypeReferenceChangeItemProviderDecorator.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/decorator/StereotypedElementItemProviderDecorator.java21
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/profile/StereotypeAttributeChangeProfileSupportItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/profile/StereotypeReferenceChangeProfileSupportItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/profile/ProfileLoadingTest.java39
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.tests/src/org/eclipse/emf/compare/uml2/ide/tests/util/ProfileTestUtil.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/Activator.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/comparison/tooltip/UMLTooltipProviderTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide.ui.tests/src/org/eclipse/emf/compare/uml2/ide/ui/tests/logical/ComparisonScopeBuilderTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/.project6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/Activator.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.ide/src/org/eclipse/emf/compare/uml2/ide/ResourceSetProfileUnloader.java43
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/groups/AbstractDifferenceOrderTest.java27
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/DynamicProfileIntegrationDisplayTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests/src/org/eclipse/emf/compare/uml2/rcp/ui/tests/profile/StaticProfileIntegrationDisplayTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/OpaqueElementBodyChangeAccessor.java10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLStereotypeApplicationChangeFeatureAccessor.java10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLStereotypeManyStructuralFeatureChangeAccessor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/UMLStereotypeStringAttributeChangeAccessor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/accessor/factory/MultiplicityElementAttributeChangeAccessorFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp.ui/src/org/eclipse/emf/compare/uml2/rcp/ui/internal/mergeviewer/item/impl/DanglingStereotypeApplicationMergeViewerItem.java18
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/.checkstyle10
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/.project6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.rcp/src/org/eclipse/emf/compare/uml2/rcp/internal/policy/UMLLoadOnDemandPolicy.java7
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/ACliche2.java6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/UML2CompareTestProfilePackage.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/ACliche2Impl.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/ACliche3Impl.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/AClicheImpl.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/impl/UML2CompareTestProfilePackageImpl.java109
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche2ItemProvider.java166
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/ACliche3ItemProvider.java72
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/AClicheItemProvider.java164
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileEditPlugin.java41
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/provider/UML2CompareTestProfileItemProviderAdapterFactory.java120
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/profile/org/eclipse/emf/compare/uml2/profile/test/uml2comparetestprofile/util/UML2CompareTestProfileSwitch.java69
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java15
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLInputData.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java34
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java40
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java40
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java44
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java17
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java12
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StereotypedElementItemProviderTestUtil.java6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java24
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java140
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java122
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java52
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java14
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java88
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/multiplicitychanges/MultiplicityElementChangesTest.java42
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java20
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java145
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java52
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java49
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/dangling/DanglingStereotypeApplicationInputData.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/AbstractUMLChangeFactory.java22
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/MultiplicityElementChangePostProcessor.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/OpaqueElementBodyChangePostProcessor.java8
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/UMLPostProcessor.java14
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLOpaqueElementBodyChangeFactory.java5
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/sequence/UMLIntervalConstraintChangeFactory.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLStereotypeApplicationChangeFactory.java19
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLStereotypeAttributeChangeFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLStereotypeReferenceChangeFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/stereotype/UMLStereotypedElementChangeFactory.java21
-rw-r--r--plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareUtil.java4
-rw-r--r--plugins/org.eclipse.emf.compare/.checkstyle2
-rw-r--r--plugins/org.eclipse.emf.compare/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/EMFCompare.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java54
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/MatchBasedConflictDetector.java7
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DefaultDiffEngine.java17
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DiffBuilder.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/FeatureFilter.java7
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java27
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/ThreeWayTextDiff.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/AbstractConflictSearch.java17
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ConflictSearchFactory.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ContainmentRefChangeConflictSearch.java35
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/FeatureMapChangeConflictSearch.java7
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/conflict/ResourceAttachmentChangeConflictSearch.java15
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/dmp/diff_match_patch.java51
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDependenciesUtil.java24
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeMode.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeOperation.java1
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/AttributeChangeSpec.java9
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ComparisonSpec.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ConflictSpec.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/FeatureMapChangeSpec.java13
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/MatchSpec.java6
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ReferenceChangeSpec.java15
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/spec/ResourceLocationChangeSpec.java10
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/ComparisonUtil.java16
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/DiffUtil.java25
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/utils/Graph.java22
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/DefaultMatchEngine.java12
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/IMatchEngine.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/EditionDistance.java80
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/IdentifierEObjectMatcher.java16
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java18
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/WeightProviderDescriptorRegistryImpl.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryRegistryImpl.java7
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/LocationMatchingStrategy.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/resource/NameSimilarityMatchingStrategy.java2
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java64
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java6
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/BatchMerger.java1
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ConflictMerger.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java25
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IMerger.java2
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ReferenceChangeMerger.java13
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceAttachmentChangeMerger.java22
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/ResourceLocationChangeMerger.java4
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/BasicPostProcessorDescriptorImpl.java3
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/postprocessor/IPostProcessor.java2
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/req/DefaultReqEngine.java59
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/scope/FilterComparisonScope.java6
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/DiffUtil.java8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EMFComparePredicates.java60
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/EqualityHelper.java12
-rw-r--r--tutorial/org.eclipse.emf.examples.library.edit/.settings/org.eclipse.jdt.core.prefs286
-rw-r--r--tutorial/org.eclipse.emf.examples.library.edit/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/.settings/org.eclipse.jdt.core.prefs286
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/actions/AddLibraryCommand.java93
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/actions/CreateLibraryAction.java55
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/actions/EXTLibraryExtendedActionBarContributor.java140
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/actions/ExtendedDeleteAction.java117
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/actions/RemoveLibraryCommand.java95
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryActionBarContributor.java343
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditor.java1638
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryEditorPlugin.java89
-rw-r--r--tutorial/org.eclipse.emf.examples.library.editor/src/org/eclipse/emf/examples/extlibrary/presentation/EXTLibraryModelWizard.java489
-rw-r--r--tutorial/org.eclipse.emf.examples.library/.settings/org.eclipse.jdt.core.prefs286
-rw-r--r--tutorial/org.eclipse.emf.examples.library/.settings/org.eclipse.jdt.ui.prefs62
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Addressable.java36
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/AudioVisualItem.java86
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Book.java133
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookCategory.java214
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/BookOnTape.java60
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Borrower.java27
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/CirculatingItem.java12
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/EXTLibraryFactory.java104
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/EXTLibraryPackage.java2067
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Employee.java35
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Item.java35
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Lendable.java52
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Library.java168
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Periodical.java60
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Person.java60
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/VideoCassette.java24
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/Writer.java52
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/AudioVisualItemImpl.java220
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookImpl.java353
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BookOnTapeImpl.java172
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/BorrowerImpl.java129
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/CirculatingItemImpl.java227
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryFactoryImpl.java218
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EXTLibraryPackageImpl.java889
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/EmployeeImpl.java124
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/ItemImpl.java136
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/LibraryImpl.java561
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PeriodicalImpl.java177
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/PersonImpl.java222
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/VideoCassetteImpl.java102
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/impl/WriterImpl.java250
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibraryAdapterFactory.java435
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibraryResourceFactoryImpl.java17
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibraryResourceImpl.java12
-rw-r--r--tutorial/org.eclipse.emf.examples.library/src/org/eclipse/emf/examples/extlibrary/util/EXTLibrarySwitch.java434
768 files changed, 19554 insertions, 14259 deletions
diff --git a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml
index 6a560b3af..31e9e1d7b 100644
--- a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle5Configuration.xml
+++ b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml
@@ -14,7 +14,6 @@
<module name="FileContentsHolder"/>
<module name="JavadocMethod">
<property name="severity" value="error"/>
- <property name="allowUndeclaredRTE" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/>
<property name="suppressLoadErrors" value="true"/>
</module>
@@ -22,6 +21,9 @@
<property name="severity" value="error"/>
<property name="checkEmptyJavadoc" value="true"/>
<property name="checkHtml" value="false"/>
+ <message key="javadoc.extrahtml" value="Balise HTML en trop : {0}"/>
+ <message key="javadoc.noperiod" value="La première ligne doit se terminer avec un point."/>
+ <message key="javadoc.unclosedhtml" value="Balise HTML trouvée dans la javadoc : {0}"/>
</module>
<module name="JavadocType">
<property name="severity" value="error"/>
@@ -54,11 +56,13 @@
</module>
<module name="ParameterName">
<property name="severity" value="error"/>
+ <property name="ignoreOverridden" value="true"/>
</module>
<module name="StaticVariableName">
<property name="severity" value="error"/>
</module>
- <module name="TypeName">
+ <module name="TypeName"/>
+ <module name="AbstractClassName">
<property name="severity" value="error"/>
</module>
<module name="AvoidStarImport">
@@ -70,13 +74,13 @@
<module name="ImportOrder">
<property name="severity" value="error"/>
<property name="option" value="top"/>
+ <property name="sortStaticImportsAlphabetically" value="true"/>
</module>
<module name="RedundantImport">
<property name="severity" value="error"/>
</module>
<module name="UnusedImports">
<property name="severity" value="error"/>
- <property name="processJavadoc" value="true"/>
</module>
<module name="AnonInnerLength">
<property name="severity" value="error"/>
@@ -93,6 +97,7 @@
</module>
<module name="ParameterNumber">
<property name="severity" value="error"/>
+ <property name="ignoreOverriddenMethods" value="true"/>
</module>
<module name="OuterTypeNumber">
<property name="severity" value="error"/>
@@ -109,13 +114,14 @@
<module name="NoWhitespaceBefore">
<property name="severity" value="error"/>
<property name="allowLineBreaks" value="true"/>
- <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+ <property name="tokens" value="COMMA,SEMI,POST_DEC,POST_INC,GENERIC_END"/>
</module>
<module name="MethodParamPad">
<property name="severity" value="error"/>
</module>
<module name="ParenPad">
<property name="severity" value="error"/>
+ <property name="tokens" value="ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_DEF,CTOR_CALL,ENUM_CONSTANT_DEF,EXPR,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL"/>
</module>
<module name="TypecastParenPad">
<property name="severity" value="error"/>
@@ -127,7 +133,8 @@
</module>
<module name="WhitespaceAround">
<property name="severity" value="error"/>
- <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND,WILDCARD_TYPE"/>
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
+ <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="error"/>
</module>
<module name="ModifierOrder">
<property name="severity" value="error"/>
@@ -147,14 +154,18 @@
</module>
<module name="NeedBraces">
<property name="severity" value="error"/>
+ <property name="allowSingleLineStatement" value="true"/>
</module>
<module name="RightCurly">
<property name="severity" value="error"/>
</module>
- <module name="RightCurly"/>
- <module name="LeftCurly">
+ <module name="EmptyCatchBlock">
<property name="severity" value="error"/>
</module>
+ <module name="FinalLocalVariable">
+ <property name="severity" value="ignore"/>
+ <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+ </module>
<module name="AvoidInlineConditionals">
<property name="severity" value="error"/>
</module>
@@ -167,10 +178,6 @@
<module name="DeclarationOrder">
<property name="severity" value="error"/>
</module>
- <module name="FinalLocalVariable">
- <property name="severity" value="ignore"/>
- <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
- </module>
<module name="EmptyStatement">
<property name="severity" value="error"/>
</module>
@@ -190,6 +197,7 @@
<property name="severity" value="error"/>
<property name="ignoreConstructorParameter" value="true"/>
<property name="ignoreSetter" value="true"/>
+ <property name="setterCanReturnItsClass" value="true"/>
</module>
<module name="IllegalInstantiation">
<property name="severity" value="error"/>
@@ -204,13 +212,6 @@
<module name="InnerAssignment">
<property name="severity" value="error"/>
</module>
- <module name="JUnitTestCase">
- <property name="severity" value="error"/>
- </module>
- <module name="MagicNumber">
- <property name="severity" value="error"/>
- <property name="ignoreNumbers" value="-100, -10, -1, -0.75, -0.5, -0.1, 0, 0.1, 0.5, 0.75, 1, 2, 3, 4, 5, 6, 10, 11, 13, 100, 1000, 10000"/>
- </module>
<module name="MissingSwitchDefault">
<property name="severity" value="error"/>
</module>
@@ -248,15 +249,10 @@
<module name="ParameterAssignment">
<property name="severity" value="error"/>
</module>
- <module name="RedundantThrows">
- <property name="severity" value="error"/>
- <property name="allowUnchecked" value="true"/>
- <property name="allowSubclasses" value="true"/>
- <property name="suppressLoadErrors" value="true"/>
- </module>
<module name="ReturnCount">
<property name="severity" value="error"/>
<property name="max" value="4"/>
+ <property name="maxForVoid" value="3"/>
<property name="format" value="^$"/>
</module>
<module name="SimplifyBooleanExpression">
@@ -330,9 +326,10 @@
<module name="OuterTypeFilename">
<property name="severity" value="error"/>
</module>
- <module name="AbstractClassName">
+ <module name="MagicNumber">
<property name="severity" value="error"/>
- <property name="format" value="^Abstract.*$"/>
+ <property name="ignoreNumbers" value="-100, -10, -1, -0.75, -0.5, -0.1, 0, 0.1, 0.5, 0.75, 1, 2, 3, 4, 5, 6, 10, 11, 13, 100, 1000, 10000"/>
+ <property name="constantWaiverParentToken" value="TYPECAST,METHOD_CALL,EXPR,ARRAY_INIT,UNARY_MINUS,UNARY_PLUS,ELIST,STAR,ASSIGN,PLUS,MINUS,DIV,LITERAL_NEW"/>
</module>
</module>
<module name="FileLength">
diff --git a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareFormatter.xml b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareFormatter.xml
index 471a1d2cb..96214ea81 100644
--- a/org.eclipse.emf.compare-parent/codeStyle/EMFCompareFormatter.xml
+++ b/org.eclipse.emf.compare-parent/codeStyle/EMFCompareFormatter.xml
@@ -1,279 +1,295 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="EMF Compare" version="11">
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="EMF Compare" version="12">
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="110"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="110"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="110"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="110"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
</profile>
</profiles>
diff --git a/packaging/org.eclipse.emf.compare.gendoc/.checkstyle b/packaging/org.eclipse.emf.compare.gendoc/.checkstyle
new file mode 100644
index 000000000..2684ff12f
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.gendoc/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="EMF Compare" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.core.prefs b/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.core.prefs
index 7341ab168..5fc7f0ca0 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.core.prefs
+++ b/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.core.prefs
@@ -9,3 +9,288 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+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_binary_expression=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_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=true
+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=110
+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=true
+org.eclipse.jdt.core.formatter.indentation.size=8
+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_after_type_annotation=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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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_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_binary_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_lambda_arrow=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=do not 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_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_unary_operator=do not 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_binary_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_lambda_arrow=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=do not 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_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_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=110
+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=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+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_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.ui.prefs b/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..de1c79644
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.gendoc/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,62 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_EMF Compare
+formatter_settings_version=12
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomMediaWikiLanguage.java b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomMediaWikiLanguage.java
index 9fccd12dd..04c13980a 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomMediaWikiLanguage.java
+++ b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomMediaWikiLanguage.java
@@ -20,18 +20,16 @@ import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public class CustomMediaWikiLanguage extends MediaWikiLanguage {
-
+
public CustomMediaWikiLanguage() {
super();
setName("CustomMediaWikiLanguage");
}
-
+
@Override
- protected void addStandardBlocks(List<Block> blocks,
- List<Block> paragraphBreakingBlocks) {
+ protected void addStandardBlocks(List<Block> blocks, List<Block> paragraphBreakingBlocks) {
super.addStandardBlocks(blocks, paragraphBreakingBlocks);
CustomTableOfContentsBlock customTOCBlock = new CustomTableOfContentsBlock();
replaceTOCBlock(blocks, customTOCBlock);
@@ -41,14 +39,14 @@ public class CustomMediaWikiLanguage extends MediaWikiLanguage {
private void replaceTOCBlock(List<Block> blocksList, CustomTableOfContentsBlock customTOCBlock) {
for (Block block : new ArrayList<>(blocksList)) {
if (block instanceof TableOfContentsBlock) {
-
+
blocksList.set(blocksList.indexOf(block), customTOCBlock);
}
}
}
-
+
@Override
public MarkupLanguage clone() {
- return (CustomMediaWikiLanguage) super.clone();
+ return (CustomMediaWikiLanguage)super.clone();
}
-} \ No newline at end of file
+}
diff --git a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomTableOfContentsBlock.java b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomTableOfContentsBlock.java
index ce369edaf..d83ad7429 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomTableOfContentsBlock.java
+++ b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/CustomTableOfContentsBlock.java
@@ -22,16 +22,15 @@ import org.eclipse.mylyn.wikitext.mediawiki.core.MediaWikiLanguage;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public class CustomTableOfContentsBlock extends TableOfContentsBlock {
static final Pattern startPattern = Pattern.compile("\\s*__TOC__\\s*(.*?)"); //$NON-NLS-1$
-
+
private int blockLineNumber = 0;
private Matcher matcher;
-
+
protected void emitToc(OutlineItem item) {
if (item.getChildren().isEmpty()) {
return;
@@ -50,7 +49,7 @@ public class CustomTableOfContentsBlock extends TableOfContentsBlock {
}
builder.endBlock();
}
-
+
@Override
public int processLineContent(String line, int offset) {
if (blockLineNumber++ > 0) {
@@ -66,13 +65,13 @@ public class CustomTableOfContentsBlock extends TableOfContentsBlock {
builder.beginHeading(3, new Attributes(null, "toc-title", null, null));
builder.characters("Table of Contents");
builder.endHeading();
-
+
if (rootItem.getChildren().size() == 1 && rootItem.getChildren().get(0).getLevel() == 1) {
emitToc(rootItem.getChildren().get(0));
} else {
emitToc(rootItem);
}
-
+
builder.endBlock();
}
int start = matcher.start(1);
@@ -81,7 +80,7 @@ public class CustomTableOfContentsBlock extends TableOfContentsBlock {
}
return start;
}
-
+
@Override
public boolean canStart(String line, int lineOffset) {
if (lineOffset == 0 && !getMarkupLanguage().isFilterGenerativeContents()) {
@@ -93,9 +92,9 @@ public class CustomTableOfContentsBlock extends TableOfContentsBlock {
return false;
}
}
-
+
@Override
public CustomTableOfContentsBlock clone() {
- return (CustomTableOfContentsBlock) super.clone();
+ return (CustomTableOfContentsBlock)super.clone();
}
}
diff --git a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/PrimaryTOCWriter.java b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/PrimaryTOCWriter.java
index a754d1f9c..e6b3f9c0b 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/PrimaryTOCWriter.java
+++ b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/PrimaryTOCWriter.java
@@ -20,93 +20,95 @@ import org.eclipse.mylyn.wikitext.core.util.XmlStreamWriter;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public class PrimaryTOCWriter {
-
+
private StringWriter primaryTOCOut;
+
private XmlStreamWriter primaryTOCWriter;
-
+
private StringWriter pluginOut;
+
private XmlStreamWriter pluginWriter;
+
private Path baseDir;
void startPrimaryTOC(Path indexHTMLFile, String title, String anchorId) {
baseDir = indexHTMLFile.getParent();
primaryTOCOut = new StringWriter(8096);
primaryTOCWriter = createXmlStreamWriter(primaryTOCOut);
-
+
pluginOut = new StringWriter(8096);
pluginWriter = createXmlStreamWriter(pluginOut);
primaryTOCWriter.writeStartDocument("UTF-8", "1.0");
- primaryTOCWriter.writeStartElement("toc");
- primaryTOCWriter.writeAttribute("topic", indexHTMLFile.toString());
+ primaryTOCWriter.writeStartElement("toc");
+ primaryTOCWriter.writeAttribute("topic", indexHTMLFile.toString());
primaryTOCWriter.writeAttribute("label", title);
if (anchorId != null && !"".equals(anchorId.trim())) {
// link the primary TOC to the given anchor id.
- primaryTOCWriter.writeAttribute("link_to", anchorId);
+ primaryTOCWriter.writeAttribute("link_to", anchorId);
}
-
+
pluginWriter.writeStartDocument("UTF-8", "1.0");
pluginWriter.writeLiteral("\n<?eclipse version=\"3.2\"?>\n");
pluginWriter.writeStartElement("plugin");
-
+
pluginWriter.writeStartElement("extension");
pluginWriter.writeAttribute("point", "org.eclipse.help.toc");
-
+
pluginWriter.writeEmptyElement("toc");
pluginWriter.writeAttribute("file", "help/toc.xml");
pluginWriter.writeAttribute("primary", "true");
-
+
pluginWriter.writeEndElement();
-
+
pluginWriter.writeStartElement("extension");
pluginWriter.writeAttribute("point", "org.eclipse.help.toc");
-
+
}
-
+
void endPrimaryTOC() {
primaryTOCWriter.writeEndElement();
primaryTOCWriter.writeEndDocument();
primaryTOCWriter.close();
-
+
pluginWriter.writeEndElement();
pluginWriter.writeEndElement();
pluginWriter.writeEndDocument();
pluginWriter.close();
}
-
+
void startTopic(String label, Path href) {
primaryTOCWriter.writeStartElement("topic");
primaryTOCWriter.writeAttribute("label", label);
-
+
if (href != null) {
primaryTOCWriter.writeAttribute("href", href.toString());
}
}
-
+
void createLink(Path linkedTOC) {
primaryTOCWriter.writeStartElement("link");
primaryTOCWriter.writeAttribute("toc", baseDir.resolve(linkedTOC).toString());
primaryTOCWriter.writeEndElement();
-
+
pluginWriter.writeEmptyElement("toc");
pluginWriter.writeAttribute("file", baseDir.resolve(linkedTOC).toString());
}
-
+
void endTopic() {
primaryTOCWriter.writeEndElement();
}
-
+
String getPrimaryTOCContent() {
return primaryTOCOut.toString();
}
-
+
String getPluginContent() {
return pluginOut.toString();
}
-
+
protected XmlStreamWriter createXmlStreamWriter(Writer out) {
XmlStreamWriter writer = new DefaultXmlStreamWriter(out);
return new FormattingXMLStreamWriter(writer);
diff --git a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/WikiTextToHTML.java b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/WikiTextToHTML.java
index fb19e49fd..30e89c82b 100644
--- a/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/WikiTextToHTML.java
+++ b/packaging/org.eclipse.emf.compare.gendoc/src/org/eclipse/emf/compare/doc/WikiTextToHTML.java
@@ -64,7 +64,7 @@ public class WikiTextToHTML {
private static final Charset UTF_8 = Charset.forName("UTF-8");
private static final String MEDIA_WIKI = "MediaWiki";
-
+
private MarkupLanguage markupLanguage;
private boolean navigationImages = false;
@@ -92,9 +92,11 @@ public class WikiTextToHTML {
private String htmlDoctype;
private List<Stylesheet> stylesheets;
+
private List<Stylesheet> helpStylesheets = new ArrayList<>();
+
private List<Stylesheet> websiteStylesheets = new ArrayList<>();
-
+
private PrimaryTOCWriter primaryTOCWriter = new PrimaryTOCWriter();
private Path sourceFolder;
@@ -116,17 +118,17 @@ public class WikiTextToHTML {
private String projectName;
private String projectId;
-
+
private String anchorId;
-
+
public static void main(String[] args) throws Exception {
WikiTextToHTML wikiTextToHTML = new WikiTextToHTML();
wikiTextToHTML.run(args);
}
-
+
public void run(String[] args) throws Exception {
processCommandLineArgs(args);
-
+
if (targetRootFolder == null) {
System.err.println("Error: unable to find -location argument");
usage();
@@ -142,117 +144,126 @@ public class WikiTextToHTML {
usage();
System.exit(1);
}
-
+
if (projectName == null || "".equals(projectName)) {
System.err.println("Error: unable to find -projectname argument");
usage();
System.exit(1);
}
-
+
if (genEclipseHelp && (projectId == null || "".equals(projectId.trim()))) {
System.err.println("Error: -projectid is mandatory when using -eclipsehelp");
usage();
System.exit(1);
}
-
+
if (!genEclipseHelp && anchorId != null && !anchorId.trim().equals("")) {
System.err.println("Error: -anchorid can be used only with -eclipsehelp");
usage();
System.exit(1);
}
-
+
markupLanguage = new CustomMediaWikiLanguage();
markupLanguage.setInternalLinkPattern("{0}");
Stylesheet ss1 = new Stylesheet();
- ss1.setUrl("/help/topic/"+projectId+"/help/resources/bootstrap.css");
+ ss1.setUrl("/help/topic/" + projectId + "/help/resources/bootstrap.css");
helpStylesheets.add(ss1);
Stylesheet ss2 = new Stylesheet();
- ss2.setUrl("/help/topic/"+projectId+"/help/resources/custom.css");
+ ss2.setUrl("/help/topic/" + projectId + "/help/resources/custom.css");
helpStylesheets.add(ss2);
-
+
ss1 = new Stylesheet();
ss1.setUrl("resources/bootstrap.css");
websiteStylesheets.add(ss1);
ss2 = new Stylesheet();
ss2.setUrl("resources/custom.css");
websiteStylesheets.add(ss2);
-
+
sourceFolder = DEFAULT_FS.getPath("src");
foldersToCopy = new ArrayList<>();
foldersToCopy.add(targetRootFolder.resolve(sourceFolder).resolve("images"));
foldersToCopy.add(targetRootFolder.resolve(sourceFolder).resolve("resources"));
-
+
final Path resolvedTargetHelpFolder = targetRootFolder.resolve(targetHelpFolder);
if (genEclipseHelp) {
if (Files.exists(resolvedTargetHelpFolder)) {
- System.out.println("Deleting "+ resolvedTargetHelpFolder + " before regenerating Eclipse help");
+ System.out.println(
+ "Deleting " + resolvedTargetHelpFolder + " before regenerating Eclipse help");
removeRecursiveContent(resolvedTargetHelpFolder);
}
- primaryTOCWriter.startPrimaryTOC(targetHelpFolder.resolve("index.html"), projectName+" Documentation", anchorId);
+ primaryTOCWriter.startPrimaryTOC(targetHelpFolder.resolve("index.html"),
+ projectName + " Documentation", anchorId);
}
-
+
final PathMatcher mediawikiPattern = DEFAULT_FS.getPathMatcher("glob:**/*.mediawiki");
-
+
Files.walkFileTree(targetRootFolder.resolve(sourceFolder), new SimpleFileVisitor<Path>() {
- @Override
- public FileVisitResult visitFile(Path markupPath, BasicFileAttributes attrs) throws IOException {
- if (mediawikiPattern.matches(markupPath)) {
- if ("~javadoc.mediawiki".equals(markupPath.getFileName().toString())) {
- processJavadoc(sourceFolder, targetWebsiteFolder, targetHelpFolder, markupPath);
- } else {
- processFile(sourceFolder, targetWebsiteFolder, targetHelpFolder, markupPath);
- }
- }
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
- System.err.println("Failed to visit " + file);
- exc.printStackTrace();
- return FileVisitResult.CONTINUE;
- }
-
- /**
- * {@inheritDoc}
- * @see java.nio.file.SimpleFileVisitor#preVisitDirectory(java.lang.Object, java.nio.file.attribute.BasicFileAttributes)
- */
- @Override
- public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
- if (genEclipseHelp && !dir.equals(targetRootFolder.resolve(sourceFolder)) && !foldersToCopy.contains(dir)) {
+ @Override
+ public FileVisitResult visitFile(Path markupPath, BasicFileAttributes attrs) throws IOException {
+ if (mediawikiPattern.matches(markupPath)) {
+ if ("~javadoc.mediawiki".equals(markupPath.getFileName().toString())) {
+ processJavadoc(sourceFolder, targetWebsiteFolder, targetHelpFolder, markupPath);
+ } else {
+ processFile(sourceFolder, targetWebsiteFolder, targetHelpFolder, markupPath);
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
+ System.err.println("Failed to visit " + file);
+ exc.printStackTrace();
+ return FileVisitResult.CONTINUE;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.nio.file.SimpleFileVisitor#preVisitDirectory(java.lang.Object,
+ * java.nio.file.attribute.BasicFileAttributes)
+ */
+ @Override
+ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+ if (genEclipseHelp && !dir.equals(targetRootFolder.resolve(sourceFolder))
+ && !foldersToCopy.contains(dir)) {
if (dir.resolve("index.mediawiki").toFile().exists()) {
- primaryTOCWriter.startTopic(getTitle(dir), dir.resolve("index.html"));
- } else {
- primaryTOCWriter.startTopic(getTitle(dir), null);
- }
- }
- return FileVisitResult.CONTINUE;
- }
-
- /**
- * {@inheritDoc}
- * @see java.nio.file.SimpleFileVisitor#postVisitDirectory(java.lang.Object, java.io.IOException)
- */
- @Override
- public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
- if (genEclipseHelp && !dir.equals(targetRootFolder.resolve(sourceFolder)) && !foldersToCopy.contains(dir)) {
- primaryTOCWriter.endTopic();
- }
- return FileVisitResult.CONTINUE;
- }
- });
-
+ primaryTOCWriter.startTopic(getTitle(dir), dir.resolve("index.html"));
+ } else {
+ primaryTOCWriter.startTopic(getTitle(dir), null);
+ }
+ }
+ return FileVisitResult.CONTINUE;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.nio.file.SimpleFileVisitor#postVisitDirectory(java.lang.Object, java.io.IOException)
+ */
+ @Override
+ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+ if (genEclipseHelp && !dir.equals(targetRootFolder.resolve(sourceFolder))
+ && !foldersToCopy.contains(dir)) {
+ primaryTOCWriter.endTopic();
+ }
+ return FileVisitResult.CONTINUE;
+ }
+ });
+
if (genEclipseHelp) {
primaryTOCWriter.endPrimaryTOC();
- writeStringToFile(primaryTOCWriter.getPrimaryTOCContent(), resolvedTargetHelpFolder.resolve("toc.xml"));
+ writeStringToFile(primaryTOCWriter.getPrimaryTOCContent(),
+ resolvedTargetHelpFolder.resolve("toc.xml"));
writeStringToFile(primaryTOCWriter.getPluginContent(), targetRootFolder.resolve("plugin.xml"));
}
-
+
for (Path folder : foldersToCopy) {
if (genWebsite)
- copy(folder, targetRootFolder.resolve(targetWebsiteFolder).resolve(folder.getFileName()), "glob:**/*");
+ copy(folder, targetRootFolder.resolve(targetWebsiteFolder).resolve(folder.getFileName()),
+ "glob:**/*");
if (genEclipseHelp)
copy(folder, resolvedTargetHelpFolder.resolve(folder.getFileName()), "glob:**/*");
}
@@ -262,7 +273,8 @@ public class WikiTextToHTML {
*
*/
private void usage() {
- System.out.println("Usage: wikiTextToHTML -projectname \"Name of the Project\" -projectid org.eclipse.emf.compare.doc -location path -version version [-eclipsehelp path] [-website path] [-anchorId path/id]");
+ System.out.println(
+ "Usage: wikiTextToHTML -projectname \"Name of the Project\" -projectid org.eclipse.emf.compare.doc -location path -version version [-eclipsehelp path] [-website path] [-anchorId path/id]");
}
private void processCommandLineArgs(String[] args) throws Exception {
@@ -290,33 +302,33 @@ public class WikiTextToHTML {
genWebsite = true;
targetWebsiteFolder = DEFAULT_FS.getPath(arg);
}
-
+
if (option.equalsIgnoreCase("-version")) { //$NON-NLS-1$
version = arg.trim();
}
-
+
if (option.equalsIgnoreCase("-projectname")) { //$NON-NLS-1$
projectName = arg.trim();
}
-
+
if (option.equalsIgnoreCase("-projectid")) { //$NON-NLS-1$
projectId = arg.trim();
}
-
+
if (option.equalsIgnoreCase("-anchorid")) { //$NON-NLS-1$
anchorId = arg.trim();
}
}
-
+
if (targetHelpFolder.isAbsolute()) {
targetHelpFolder = targetRootFolder.relativize(targetHelpFolder);
}
-
+
if (targetWebsiteFolder.isAbsolute()) {
targetWebsiteFolder = targetRootFolder.relativize(targetWebsiteFolder);
}
}
-
+
private String getTitle(Path path) {
String filename = path.getFileName().toString();
int lastIndexOf = filename.lastIndexOf('.');
@@ -324,7 +336,7 @@ public class WikiTextToHTML {
filename = filename.substring(0, lastIndexOf);
}
String[] split = filename.split("-");
-
+
StringBuilder sb = new StringBuilder();
for (int i = 0; i < split.length; i++) {
String str = split[i].trim();
@@ -341,16 +353,14 @@ public class WikiTextToHTML {
}
return sb.toString().trim();
}
-
- private void processJavadoc(final Path sourceFolder,
- final Path targetWebsiteFolder,
+
+ private void processJavadoc(final Path sourceFolder, final Path targetWebsiteFolder,
final Path targetHelpFolder, Path markupPath)
- throws IOException, FileNotFoundException,
- UnsupportedEncodingException {
+ throws IOException, FileNotFoundException, UnsupportedEncodingException {
System.out.println("Processing " + markupPath);
-
+
Path relativeMarkupPath = targetRootFolder.resolve(sourceFolder).relativize(markupPath);
-
+
Path relativeTOCPath = relativeMarkupPath.getParent().resolve("toc-javadoc.xml");
Path targetTOC = targetHelpFolder.resolve(relativeTOCPath);
Path targetHelp = targetHelpFolder.resolve(changeFilename(relativeMarkupPath, ".html"));
@@ -370,41 +380,40 @@ public class WikiTextToHTML {
}
}
}
-
- private void processFile(final Path sourceFolder,
- final Path targetWebsiteFolder,
+
+ private void processFile(final Path sourceFolder, final Path targetWebsiteFolder,
final Path targetHelpFolder, Path markupPath)
- throws IOException, FileNotFoundException,
- UnsupportedEncodingException {
+ throws IOException, FileNotFoundException, UnsupportedEncodingException {
System.out.println("Processing " + markupPath);
-
+
Path relativeMarkupPath = targetRootFolder.resolve(sourceFolder).relativize(markupPath);
-
+
Path targetHTML = targetWebsiteFolder.resolve(changeFilename(relativeMarkupPath, ".html"));
-
+
Path relativeTOCPath = changeFilename(relativeMarkupPath, "toc-", ".xml");
Path targetTOC = targetHelpFolder.resolve(relativeTOCPath);
Path targetHelp = targetHelpFolder.resolve(changeFilename(relativeMarkupPath, ".html"));
if (genWebsite) {
mkdirs(targetRootFolder.resolve(targetHTML));
- }
+ }
if (genEclipseHelp) {
mkdirs(targetRootFolder.resolve(targetTOC));
mkdirs(targetRootFolder.resolve(targetHelp));
}
-
+
String markupContent = new String(Files.readAllBytes(markupPath), UTF_8);
-
+
final String markupContentWithTOC;
if ("index.mediawiki".equals(markupPath.getFileName().toString())) {
- markupContentWithTOC = markupContent.replaceFirst("=(.*)=", "="+projectName+" — $1=\n\nVersion " + version +"\n\n") +
- "\n\nVersion " + version;
+ markupContentWithTOC = markupContent.replaceFirst("=(.*)=",
+ "=" + projectName + " — $1=\n\nVersion " + version + "\n\n") + "\n\nVersion " + version;
} else {
- Path relativeToRoot = targetHTML.getParent().relativize(targetWebsiteFolder.resolve("index.html"));
- markupContentWithTOC = markupContent.replaceFirst("=(.*)=", "="+projectName+" — $1=\n\nVersion " + version +"\n\n__TOC__\n\n") +
- "\n\nPart of ["+relativeToRoot+" "+projectName+" Documentation]" +
- "\n\nVersion " + version;
+ Path relativeToRoot = targetHTML.getParent()
+ .relativize(targetWebsiteFolder.resolve("index.html"));
+ markupContentWithTOC = markupContent.replaceFirst("=(.*)=",
+ "=" + projectName + " — $1=\n\nVersion " + version + "\n\n__TOC__\n\n") + "\n\nPart of ["
+ + relativeToRoot + " " + projectName + " Documentation]" + "\n\nVersion " + version;
}
if (performValidation(markupPath, markupContent)) {
@@ -413,16 +422,16 @@ public class WikiTextToHTML {
stylesheets = websiteStylesheets;
genHTML(getTitle(targetHTML), markupContentWithTOC, targetRootFolder.resolve(targetHTML));
}
-
+
// for eclipse help
if (genEclipseHelp) {
stylesheets = helpStylesheets;
genHTML(getTitle(targetHTML), markupContent, targetRootFolder.resolve(targetHelp));
-
-
+
final PathMatcher indexPattern = DEFAULT_FS.getPathMatcher("glob:**/index.mediawiki");
if (!indexPattern.matches(markupPath)) {
- genTOC(getTitle(targetHelp), markupContent, targetRootFolder.resolve(targetTOC), targetHelp);
+ genTOC(getTitle(targetHelp), markupContent, targetRootFolder.resolve(targetTOC),
+ targetHelp);
primaryTOCWriter.startTopic(getTitle(targetHelp), targetHelp);
primaryTOCWriter.createLink(relativeTOCPath);
primaryTOCWriter.endTopic();
@@ -433,14 +442,13 @@ public class WikiTextToHTML {
}
}
-
private void mkdirs(Path file) {
File parentFile = file.getParent().toFile();
if (!parentFile.exists()) {
file.getParent().toFile().mkdirs();
}
}
-
+
private static void removeRecursiveContent(final Path path) throws IOException {
Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
@Override
@@ -450,8 +458,7 @@ public class WikiTextToHTML {
}
@Override
- public FileVisitResult visitFileFailed(Path file, IOException exc)
- throws IOException {
+ public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
// try to delete the file anyway, even if its attributes
// could not be read, since delete-only access is
// theoretically possible
@@ -460,8 +467,7 @@ public class WikiTextToHTML {
}
@Override
- public FileVisitResult postVisitDirectory(Path dir, IOException exc)
- throws IOException {
+ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
if (exc == null) {
if (!dir.equals(path)) {
Files.delete(dir);
@@ -478,7 +484,7 @@ public class WikiTextToHTML {
private Path changeFilename(Path source, String newFileExtension) {
return changeFilename(source, "", newFileExtension);
}
-
+
private Path changeFilename(Path source, String prefix, String newFileExtension) {
String filename = source.getFileName().toString();
int lastIndexOf = filename.lastIndexOf(".");
@@ -486,7 +492,8 @@ public class WikiTextToHTML {
return source.resolveSibling(newFileName);
}
- private void genTOC(String name, String markupContent, Path targetToc, Path targetHTML) throws IOException, UnsupportedEncodingException, FileNotFoundException {
+ private void genTOC(String name, String markupContent, Path targetToc, Path targetHTML)
+ throws IOException, UnsupportedEncodingException, FileNotFoundException {
MarkupToEclipseToc toEclipseToc = new MarkupToEclipseToc() {
public String createToc(OutlineItem root) {
StringWriter out = new StringWriter(8096);
@@ -498,10 +505,11 @@ public class WikiTextToHTML {
if (copyrightNotice != null) {
writer.writeComment(copyrightNotice);
}
-
+
Method method = null;
try {
- method = MarkupToEclipseToc.class.getDeclaredMethod("emitToc", XmlStreamWriter.class, List.class);
+ method = MarkupToEclipseToc.class.getDeclaredMethod("emitToc", XmlStreamWriter.class,
+ List.class);
method.setAccessible(true);
} catch (NoSuchMethodException | SecurityException | IllegalArgumentException e) {
throw new RuntimeException(e);
@@ -514,7 +522,8 @@ public class WikiTextToHTML {
writer.writeAttribute("label", innerRoot.getLabel()); //$NON-NLS-1$
try {
method.invoke(this, writer, innerRoot.getChildren());
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ } catch (IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {
throw new RuntimeException(e);
}
} else {
@@ -523,7 +532,8 @@ public class WikiTextToHTML {
writer.writeAttribute("label", root.getLabel()); //$NON-NLS-1$
try {
method.invoke(this, writer, root.getChildren());
- } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+ } catch (IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException e) {
throw new RuntimeException(e);
}
}
@@ -540,18 +550,22 @@ public class WikiTextToHTML {
toEclipseToc.setHtmlFile(targetHTML.toString());
toEclipseToc.setBookTitle(name);
String tocContents = toEclipseToc.parse(markupContent);
-
+
writeStringToFile(tocContents, targetToc);
}
-
- private void writeStringToFile(String content, Path path) throws UnsupportedEncodingException, FileNotFoundException, IOException {
- try(Writer writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(path.toFile())), "UTF-8")) {
+
+ private void writeStringToFile(String content, Path path)
+ throws UnsupportedEncodingException, FileNotFoundException, IOException {
+ try (Writer writer = new OutputStreamWriter(
+ new BufferedOutputStream(new FileOutputStream(path.toFile())), "UTF-8")) {
writer.write(content);
}
}
- private void genHTML(String name, String markupContent, Path htmlOutputFile) throws IOException, FileNotFoundException {
- try (Writer writer = new OutputStreamWriter(new BufferedOutputStream(new FileOutputStream(htmlOutputFile.toFile())), UTF_8)) {
+ private void genHTML(String name, String markupContent, Path htmlOutputFile)
+ throws IOException, FileNotFoundException {
+ try (Writer writer = new OutputStreamWriter(
+ new BufferedOutputStream(new FileOutputStream(htmlOutputFile.toFile())), UTF_8)) {
HtmlDocumentBuilder builder = new HtmlDocumentBuilder(writer, FORMAT_OUTPUT);
for (Stylesheet stylesheet : stylesheets) {
HtmlDocumentBuilder.Stylesheet builderStylesheet;
@@ -559,9 +573,12 @@ public class WikiTextToHTML {
if (stylesheet.url != null) {
if (stylesheets == websiteStylesheets) {
Path stylesheetPath = DEFAULT_FS.getPath(stylesheet.url);
- Path targetStylesheetPath = targetRootFolder.resolve(targetWebsiteFolder.resolve(stylesheetPath));
- Path relativeStylesheetPath = htmlOutputFile.getParent().relativize(targetStylesheetPath);
- builderStylesheet = new HtmlDocumentBuilder.Stylesheet(relativeStylesheetPath.toString());
+ Path targetStylesheetPath = targetRootFolder
+ .resolve(targetWebsiteFolder.resolve(stylesheetPath));
+ Path relativeStylesheetPath = htmlOutputFile.getParent()
+ .relativize(targetStylesheetPath);
+ builderStylesheet = new HtmlDocumentBuilder.Stylesheet(
+ relativeStylesheetPath.toString());
} else {
builderStylesheet = new HtmlDocumentBuilder.Stylesheet(stylesheet.url);
}
@@ -590,8 +607,7 @@ public class WikiTextToHTML {
builder.setXhtmlStrict(xhtmlStrict);
builder.setCopyrightNotice(copyrightNotice);
- SplittingStrategy splittingStrategy = multipleOutputFiles
- ? new DefaultSplittingStrategy()
+ SplittingStrategy splittingStrategy = multipleOutputFiles ? new DefaultSplittingStrategy()
: new NoSplittingStrategy();
SplittingOutlineParser outlineParser = new SplittingOutlineParser();
outlineParser.setMarkupLanguage(markupLanguage.clone());
@@ -612,14 +628,14 @@ public class WikiTextToHTML {
}
}
- private void copy(final Path sourceFolder,
- final Path targetFolder, String pattern) throws IOException {
+ private void copy(final Path sourceFolder, final Path targetFolder, String pattern) throws IOException {
final PathMatcher imageMatcher = DEFAULT_FS.getPathMatcher(pattern);
Files.walkFileTree(sourceFolder, new SimpleFileVisitor<Path>() {
@Override
public FileVisitResult visitFile(Path sourcePath, BasicFileAttributes attrs) throws IOException {
if (imageMatcher.matches(sourcePath)) {
- String targetFile = sourcePath.toString().replace(sourceFolder.toString(), targetFolder.toString());
+ String targetFile = sourcePath.toString().replace(sourceFolder.toString(),
+ targetFolder.toString());
Path targetPath = DEFAULT_FS.getPath(targetFile);
targetPath.getParent().toFile().mkdirs();
Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
@@ -628,9 +644,10 @@ public class WikiTextToHTML {
}
});
}
-
+
/**
* Returns true if valid (may have warning).
+ *
* @param source
* @param markupContent
* @return
@@ -646,12 +663,13 @@ public class WikiTextToHTML {
if (problem.getSeverity() == Severity.ERROR) {
errorCount++;
}
- System.out.println(String.format("%s: %s:%s %s", messageLevel, source.toString(), problem.getOffset(), problem.getMessage())); //$NON-NLS-1$
+ System.out.println(String.format("%s: %s:%s %s", messageLevel, source.toString(), //$NON-NLS-1$
+ problem.getOffset(), problem.getMessage()));
}
return errorCount == 0;
}
-
+
public static class Stylesheet {
private File file;
@@ -679,7 +697,7 @@ public class WikiTextToHTML {
attributes.put(attribute.getName(), attribute.getValue());
}
}
-
+
public static class Attribute {
private String name;
diff --git a/performance/org.eclipse.emf.compare.tests.performance/.checkstyle b/performance/org.eclipse.emf.compare.tests.performance/.checkstyle
new file mode 100644
index 000000000..2684ff12f
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="EMF Compare" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs
index af0f20f97..024d3f43a 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs
+++ b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,288 @@ org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+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_binary_expression=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_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=true
+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=110
+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=true
+org.eclipse.jdt.core.formatter.indentation.size=8
+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_after_type_annotation=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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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_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_binary_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_lambda_arrow=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=do not 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_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_unary_operator=do not 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_binary_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_lambda_arrow=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=do not 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_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_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=110
+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=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+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_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..de1c79644
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,62 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_EMF Compare
+formatter_settings_version=12
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java
index c01a38d91..6f854ae84 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java
@@ -59,15 +59,21 @@ import com.google.common.io.Closeables;
public abstract class Data {
private List<ResourceSet> resourceSets = newArrayList();
+
private Comparison comparison;
+
private final Notifier left;
+
private final Notifier right;
+
private final Notifier ancestor;
-
+
public abstract Notifier loadLeft();
+
public abstract Notifier loadRight();
+
public abstract Notifier loadAncestor();
-
+
/**
*
*/
@@ -76,73 +82,75 @@ public abstract class Data {
right = loadRight();
ancestor = loadAncestor();
}
-
+
/**
* @return the left
*/
public Notifier getLeft() {
return left;
}
-
+
/**
* @return the right
*/
public Notifier getRight() {
return right;
}
-
+
/**
* @return the ancestor
*/
public Notifier getAncestor() {
return ancestor;
}
-
+
protected ResourceSet createResourceSet() {
ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION,
+ UMLResource.Factory.INSTANCE);
resourceSets.add(resourceSet);
return resourceSet;
}
-
+
public void logicalModel(ITypedElement leftTypedElement, ITypedElement rightTypedElement) {
- ComparisonScopeBuilder.create(null, leftTypedElement, rightTypedElement, null, new NullProgressMonitor());
+ ComparisonScopeBuilder.create(null, leftTypedElement, rightTypedElement, null,
+ new NullProgressMonitor());
}
-
+
public Comparison match() {
return match(UseIdentifiers.ONLY);
}
-
+
public Comparison match(UseIdentifiers useIDs) {
final IComparisonScope scope = new DefaultComparisonScope(getLeft(), getRight(), getAncestor());
final IMatchEngine matchEngine = DefaultMatchEngine.create(useIDs);
comparison = matchEngine.match(scope, new BasicMonitor());
return comparison;
}
-
+
public Comparison diff() {
final IDiffProcessor diffBuilder = new DiffBuilder();
final IDiffEngine diffEngine = new DefaultDiffEngine(diffBuilder);
- diffEngine.diff(comparison, new BasicMonitor());
+ diffEngine.diff(comparison, new BasicMonitor());
return comparison;
}
-
+
public void req() {
final IReqEngine reqEngine = new DefaultReqEngine();
reqEngine.computeRequirements(comparison, new BasicMonitor());
}
-
+
public void equi() {
final IEquiEngine equiEngine = new DefaultEquiEngine();
equiEngine.computeEquivalences(comparison, new BasicMonitor());
}
-
+
public void conflict() {
final IConflictDetector conflictDetector = new MatchBasedConflictDetector();
conflictDetector.detect(comparison, new BasicMonitor());
}
-
+
public void compare() {
final IComparisonScope scope = new DefaultComparisonScope(getLeft(), getRight(), getAncestor());
EMFCompare.builder().build().compare(scope);
@@ -152,18 +160,17 @@ public abstract class Data {
final IPostProcessor postProcessor = new CompareDiagramPostProcessor();
postProcessor.postComparison(comparison, new BasicMonitor());
}
-
+
public void postMatchUML() {
final IPostProcessor postProcessor = new UMLPostProcessor();
postProcessor.postMatch(comparison, new BasicMonitor());
}
-
+
public void postComparisonUML() {
final IPostProcessor postProcessor = new UMLPostProcessor();
postProcessor.postComparison(comparison, new BasicMonitor());
}
-
-
+
public void dispose() {
comparison = null;
for (ResourceSet rs : resourceSets) {
@@ -176,12 +183,11 @@ public abstract class Data {
}
resource.eAdapters().clear();
}
-
+
rs.getResources().clear();
rs.eAdapters().clear();
}
-
-
+
resourceSets = null;
}
@@ -226,4 +232,4 @@ public abstract class Data {
return resource;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
index 81ea64593..8eb515d5b 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
@@ -78,7 +78,6 @@ import com.google.common.base.Throwables;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@SuppressWarnings("restriction")
public class DataGit {
@@ -86,11 +85,11 @@ public class DataGit {
private static final String MASTER = Constants.R_HEADS + Constants.MASTER;
private static final String MODIFIED = Constants.R_HEADS + "modified";
-
+
private List<Runnable> disposers;
-
+
private List<ResourceSet> resourceSets = newArrayList();
-
+
private IComparisonScope scope;
private Comparison comparison;
@@ -106,13 +105,13 @@ public class DataGit {
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
URL entry = bundle.getEntry(zippedRepoLocation);
repoFile = new File(systemTmpDir + File.separator + repoName);
-
+
// Delete repo if it already exists
GitUtil.deleteRepo(repoFile);
-
+
// Unzip repository to temp directory
GitUtil.unzipRepo(entry, systemTmpDir, new NullProgressMonitor());
-
+
Job importJob = new Job("ImportProjects") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -122,7 +121,7 @@ public class DataGit {
};
importJob.schedule();
importJob.join();
-
+
Job connectJob = new Job("ConnectProjects") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -140,12 +139,13 @@ public class DataGit {
};
connectJob.schedule();
connectJob.join();
-
+
IProject rootProject = ResourcesPlugin.getWorkspace().getRoot().getProject(rootProjectName);
-
+
final IFile model = rootProject.getFile(new Path(modelName));
final String fullPath = model.getFullPath().toString();
- final Subscriber subscriber = GitUtil.createSubscriberForComparison(repository, MASTER, MODIFIED, model, disposers);
+ final Subscriber subscriber = GitUtil.createSubscriberForComparison(repository, MASTER, MODIFIED,
+ model, disposers);
final IStorageProviderAccessor accessor = new SubscriberStorageAccessor(subscriber);
final IStorageProvider sourceProvider = accessor.getStorageProvider(model,
IStorageProviderAccessor.DiffSide.SOURCE);
@@ -171,7 +171,7 @@ public class DataGit {
resourceSets.add((ResourceSet)scope.getLeft());
resourceSets.add((ResourceSet)scope.getRight());
resourceSets.add((ResourceSet)scope.getOrigin());
-
+
} catch (IOException e) {
Throwables.propagate(e);
} catch (CoreException e) {
@@ -180,58 +180,58 @@ public class DataGit {
Throwables.propagate(e);
}
}
-
+
public Comparison match() {
return match(UseIdentifiers.ONLY);
}
-
+
public Comparison match(UseIdentifiers useIDs) {
final IMatchEngine matchEngine = DefaultMatchEngine.create(useIDs);
comparison = matchEngine.match(scope, new BasicMonitor());
return comparison;
}
-
+
public Comparison diff() {
final IDiffProcessor diffBuilder = new DiffBuilder();
final IDiffEngine diffEngine = new DefaultDiffEngine(diffBuilder);
- diffEngine.diff(comparison, new BasicMonitor());
+ diffEngine.diff(comparison, new BasicMonitor());
return comparison;
}
-
+
public void req() {
final IReqEngine reqEngine = new DefaultReqEngine();
reqEngine.computeRequirements(comparison, new BasicMonitor());
}
-
+
public void equi() {
final IEquiEngine equiEngine = new DefaultEquiEngine();
equiEngine.computeEquivalences(comparison, new BasicMonitor());
}
-
+
public void conflict() {
final IConflictDetector conflictDetector = new MatchBasedConflictDetector();
conflictDetector.detect(comparison, new BasicMonitor());
}
-
+
public void compare() {
EMFCompare.builder().build().compare(scope);
}
-
+
public void postComparisonGMF() {
final IPostProcessor postProcessor = new CompareDiagramPostProcessor();
postProcessor.postComparison(comparison, new BasicMonitor());
}
-
+
public void postMatchUML() {
final IPostProcessor postProcessor = new UMLPostProcessor();
postProcessor.postMatch(comparison, new BasicMonitor());
}
-
+
public void postComparisonUML() {
final IPostProcessor postProcessor = new UMLPostProcessor();
postProcessor.postComparison(comparison, new BasicMonitor());
}
-
+
public void dispose() {
comparison = null;
for (ResourceSet rs : resourceSets) {
@@ -244,14 +244,13 @@ public class DataGit {
}
resource.eAdapters().clear();
}
-
+
rs.getResources().clear();
rs.eAdapters().clear();
}
-
-
+
resourceSets = null;
-
+
Job cleanJob = new Job("ClearWorkspace") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -274,7 +273,6 @@ public class DataGit {
} catch (InterruptedException e) {
Throwables.propagate(e);
}
-
if (repository != null) {
repository.close();
@@ -284,7 +282,7 @@ public class DataGit {
disposer.run();
}
disposers.clear();
-
+
// Delete repository from temp directory
GitUtil.deleteRepo(repoFile);
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java
index 014ed9f53..5a22630c5 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class LargeGitInputData extends DataGit {
public LargeGitInputData() {
- super("src/data/models/git/model_size_large_repo.zip", "model_size_large_repo", "model_size_large_git", "model.uml");
+ super("src/data/models/git/model_size_large_repo.zip", "model_size_large_repo",
+ "model_size_large_git", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java
index f81ac6e43..5834232a1 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java
@@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class LargeInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
@@ -29,18 +28,21 @@ public class LargeInputData extends Data {
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
Resource ret = loadFromClassLoader("model_size_large/modified/model.uml", resourceSet);
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java
index fb5db4ce5..60091be55 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class LargeSplitGitInputData extends DataGit {
public LargeSplitGitInputData() {
- super("src/data/models/git/model_size_large_split_repo.zip", "model_size_large_split_repo", "model_size_large_git_model", "model.uml");
+ super("src/data/models/git/model_size_large_split_repo.zip", "model_size_large_split_repo",
+ "model_size_large_git_model", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java
index cf96d0c47..1a95961a5 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java
@@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class LargeSplitInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_original_model/model.uml", resourceSet);
+ Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_original_model/model.uml",
+ resourceSet);
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_modified_model/model.uml", resourceSet);
- EcoreUtil.resolveAll(resourceSet);
+ Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_modified_model/model.uml",
+ resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java
index 83bc0ca25..dd71a06d9 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class NominalGitInputData extends DataGit {
public NominalGitInputData() {
- super("src/data/models/git/model_size_nominal_repo.zip", "model_size_nominal_repo", "model_size_nominal_git", "model.uml");
+ super("src/data/models/git/model_size_nominal_repo.zip", "model_size_nominal_repo",
+ "model_size_nominal_git", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java
index c782eefaa..af1cb8c4c 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java
@@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class NominalInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
@@ -29,19 +28,21 @@ public class NominalInputData extends Data {
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
Resource ret = loadFromClassLoader("model_size_nominal/modified/model.uml", resourceSet);
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java
index d9c85439d..87d5e642b 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class NominalSplitGitInputData extends DataGit {
public NominalSplitGitInputData() {
- super("src/data/models/git/model_size_nominal_split_repo.zip", "model_size_nominal_split_repo", "model_size_nominal_git_model", "model.uml");
+ super("src/data/models/git/model_size_nominal_split_repo.zip", "model_size_nominal_split_repo",
+ "model_size_nominal_git_model", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java
index 9b72710e3..c7e7b7b05 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java
@@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class NominalSplitInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_nominal_split/model_size_nominal_original_model/model.uml", resourceSet);
+ Resource ret = loadFromClassLoader(
+ "model_size_nominal_split/model_size_nominal_original_model/model.uml", resourceSet);
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_nominal_split/model_size_nominal_modified_model/model.uml", resourceSet);
- EcoreUtil.resolveAll(resourceSet);
+ Resource ret = loadFromClassLoader(
+ "model_size_nominal_split/model_size_nominal_modified_model/model.uml", resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java
index 2cfd0a134..b02f4a757 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class SmallGitInputData extends DataGit {
public SmallGitInputData() {
- super("src/data/models/git/model_size_small_repo.zip", "model_size_small_repo", "model_small_size_git", "model.uml");
+ super("src/data/models/git/model_size_small_repo.zip", "model_size_small_repo",
+ "model_small_size_git", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java
index f39070f7e..024837e23 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java
@@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class SmallInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
@@ -29,19 +28,21 @@ public class SmallInputData extends Data {
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
Resource ret = loadFromClassLoader("model_size_small/modified/model.uml", resourceSet);
- EcoreUtil.resolveAll(resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java
index 1f06284c6..32ea8c309 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java
@@ -12,11 +12,11 @@ package data.models;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
public class SmallSplitGitInputData extends DataGit {
public SmallSplitGitInputData() {
- super("src/data/models/git/model_size_small_split_repo.zip", "model_size_small_split_repo", "model_size_small_git_model", "model.uml");
+ super("src/data/models/git/model_size_small_split_repo.zip", "model_size_small_split_repo",
+ "model_size_small_git_model", "model.uml");
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java
index b6e8cfa38..c7bcf2af8 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java
@@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
public class SmallSplitInputData extends Data {
/**
- * @return
- * @throws IOException
- *
+ * @return
+ * @throws IOException
*/
public ResourceSet loadLeft() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_original_model/model.uml", resourceSet);
+ Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_original_model/model.uml",
+ resourceSet);
EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
+
public ResourceSet loadRight() {
ResourceSet resourceSet = createResourceSet();
- Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_modified_model/model.uml", resourceSet);
- EcoreUtil.resolveAll(resourceSet);
+ Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_modified_model/model.uml",
+ resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
return resourceSet;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see data.models.TestMatchUML.Data#loadAncestor()
*/
@Override
public Notifier loadAncestor() {
return null;
}
-} \ No newline at end of file
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
index 8caa630a0..609f5f0aa 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
@@ -63,7 +63,6 @@ import fr.obeo.performance.api.Performance;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public abstract class AbstractEMFComparePerformanceTest {
@@ -73,8 +72,7 @@ public abstract class AbstractEMFComparePerformanceTest {
private static final Function<Measure, Scenario> MEASURE__SCENARIO = new Function<Measure, Scenario>() {
public Scenario apply(Measure measure) {
- return ((TestResult) ((DataPoint) measure.eContainer())
- .eContainer()).getScenario();
+ return ((TestResult)((DataPoint)measure.eContainer()).eContainer()).getScenario();
}
};
@@ -83,6 +81,7 @@ public abstract class AbstractEMFComparePerformanceTest {
return measure.getValue();
}
};
+
private static final Function<Measure, String> MEASURE__NAME = new Function<Measure, String>() {
public String apply(Measure measure) {
return measure.getName();
@@ -94,49 +93,50 @@ public abstract class AbstractEMFComparePerformanceTest {
return point.getMeasures();
}
};
-
+
private static final Function<TestResult, List<DataPoint>> TEST_RESULT__DATA_POINTS = new Function<TestResult, List<DataPoint>>() {
public List<DataPoint> apply(TestResult testResult) {
return testResult.getDataPoints();
}
};
-
+
private static final Function<Iterable<Double>, Double> AVERAGE = new Function<Iterable<Double>, Double>() {
public Double apply(Iterable<Double> it) {
Double sum = 0.0;
- if(!Iterables.isEmpty(it)) {
- for (Double d : it) {
- sum += d;
- }
- return sum.doubleValue() / Iterables.size(it);
- }
- return sum;
+ if (!Iterables.isEmpty(it)) {
+ for (Double d : it) {
+ sum += d;
+ }
+ return sum.doubleValue() / Iterables.size(it);
+ }
+ return sum;
}
};
private static final int DEFAULT_STEPS_NUMBER = 3;
private static final boolean DEFAULT_WARMUP = true;
-
+
@BeforeClass
public static void setUp() throws Exception {
if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
EPackage perf = PerformancePackage.eINSTANCE;
EPackage.Registry.INSTANCE.put(perf.getNsURI(), perf);
- Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("performance", new XMIResourceFactoryImpl());
+ Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("performance",
+ new XMIResourceFactoryImpl());
}
-
- //Deactivate auto-building
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- if (workspace != null) {
- IWorkspaceDescription desc= workspace.getDescription();
- boolean isAutoBuilding= desc.isAutoBuilding();
+
+ // Deactivate auto-building
+ IWorkspace workspace = ResourcesPlugin.getWorkspace();
+ if (workspace != null) {
+ IWorkspaceDescription desc = workspace.getDescription();
+ boolean isAutoBuilding = desc.isAutoBuilding();
if (isAutoBuilding == true) {
desc.setAutoBuilding(false);
workspace.setDescription(desc);
}
}
-
+
timestamp = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date());
performance = new Performance("emf.compare.performance");
}
@@ -145,24 +145,24 @@ public abstract class AbstractEMFComparePerformanceTest {
public final void configureSUTName() {
setSUTName();
}
-
+
protected static final Performance getPerformance() {
return performance;
}
-
+
/**
- * Should be static but want to force impl.
+ * Should be static but want to force impl.
*/
protected abstract void setSUTName();
-
+
protected int getStepsNumber() {
return DEFAULT_STEPS_NUMBER;
}
-
+
protected boolean warmup() {
return DEFAULT_WARMUP;
}
-
+
@AfterClass
public static void tearDown() {
final NumberFormat nf = NumberFormat.getInstance(Locale.US);
@@ -176,8 +176,8 @@ public abstract class AbstractEMFComparePerformanceTest {
for (Entry<String, Collection<Measure>> entry : measuresByName.asMap().entrySet()) {
String measureName = entry.getKey();
- File output = new File(MessageFormat.format("{0}-{1}.csv", performance
- .getSystemUnderTest().getName().replaceAll(" ", "_"),
+ File output = new File(MessageFormat.format("{0}-{1}.csv",
+ performance.getSystemUnderTest().getName().replaceAll(" ", "_"),
measureName.replaceAll(" ", "_")));
PrintWriter writer = null;
@@ -191,45 +191,45 @@ public abstract class AbstractEMFComparePerformanceTest {
writer.println("Date, Small UML, Nominal UML, Small Split UML, Nominal Split UML");
columns = 4;
} else {
- //Get number of columns that contains measures
+ // Get number of columns that contains measures
columns = readLine.split(",").length - 1;
}
writer.print(timestamp + ",");
Collection<Measure> measures = entry.getValue();
- ImmutableListMultimap<Scenario, Measure> measuresByScenario = Multimaps.index(measures, MEASURE__SCENARIO);
- String joinedMeasure = Joiner.on(',').join(
- transform(measuresByScenario.asMap().entrySet(),
- new Function<Entry<Scenario, Collection<Measure>>, String>() {
- public String apply(Entry<Scenario, Collection<Measure>> entry) {
- final Dimension dimension = getFirst(entry.getValue(), null).getDimension();
- Iterable<Double> transform = transform(entry.getValue(), MEASURE__VALUE);
-
- List<Double> minAvMax = Lists.newArrayList();
- minAvMax.add(Ordering.natural().min(transform));
- minAvMax.add(AVERAGE.apply(transform));
- minAvMax.add(Ordering.natural().max(transform));
-
- Iterable<String> transform2 = transform(minAvMax,
+ ImmutableListMultimap<Scenario, Measure> measuresByScenario = Multimaps.index(measures,
+ MEASURE__SCENARIO);
+ String joinedMeasure = Joiner.on(',').join(transform(measuresByScenario.asMap().entrySet(),
+ new Function<Entry<Scenario, Collection<Measure>>, String>() {
+ public String apply(Entry<Scenario, Collection<Measure>> entry) {
+ final Dimension dimension = getFirst(entry.getValue(), null).getDimension();
+ Iterable<Double> transform = transform(entry.getValue(), MEASURE__VALUE);
+
+ List<Double> minAvMax = Lists.newArrayList();
+ minAvMax.add(Ordering.natural().min(transform));
+ minAvMax.add(AVERAGE.apply(transform));
+ minAvMax.add(Ordering.natural().max(transform));
+
+ Iterable<String> transform2 = transform(minAvMax,
new Function<Double, String>() {
public String apply(Double d) {
switch (dimension) {
- case MEMORY:
- return nf.format(SizeUnit.MEBI.convert(d)).replaceAll(",", "");
- case TIME:
- return nf.format(d).replaceAll(",", "");
+ case MEMORY:
+ return nf.format(SizeUnit.MEBI.convert(d))
+ .replaceAll(",", "");
+ case TIME:
+ return nf.format(d).replaceAll(",", "");
}
return "";
}
});
-
- String ret = Joiner.on(';').join(transform2);
- return ret;
- }
- })
- );
+
+ String ret = Joiner.on(';').join(transform2);
+ return ret;
+ }
+ }));
joinedMeasure = fillEmptyColumns(joinedMeasure, columns);
writer.println(joinedMeasure);
-
+
} catch (IOException e) {
Throwables.propagate(e);
} finally {
@@ -242,7 +242,7 @@ public abstract class AbstractEMFComparePerformanceTest {
}
performance = null;
}
-
+
private static String fillEmptyColumns(String joinedMeasure, int columns) {
final int filled = joinedMeasure.split(",").length;
for (int i = 0; i < columns - filled; i++) {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
index c9dc7cfe3..2025e5983 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java
@@ -17,94 +17,95 @@ import java.util.concurrent.TimeUnit;
import com.google.common.base.Stopwatch;
-
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public class EMFComparePerfStats {
private MemoryMXBean fMemoryBean;
-
+
private MemoryUsage beforeMatchHeapMemoryUsage;
+
private MemoryUsage afterMatchHeapMemoryUsage;
-
+
private MemoryUsage beforeDiffHeapMemoryUsage;
+
private MemoryUsage afterDiffHeapMemoryUsage;
-
+
private final Stopwatch elapsedTimeInMatch;
+
private final Stopwatch elapsedTimeInDiff;
-
+
EMFComparePerfStats() {
fMemoryBean = ManagementFactory.getMemoryMXBean();
elapsedTimeInMatch = new Stopwatch();
elapsedTimeInDiff = new Stopwatch();
}
-
+
void beforeMatch() {
beforeMatchHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage();
elapsedTimeInMatch.start();
}
-
+
void afterMatch() {
elapsedTimeInMatch.stop();
afterMatchHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage();
}
-
+
void beforeDiff() {
beforeDiffHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage();
elapsedTimeInDiff.start();
}
-
+
void afterDiff() {
elapsedTimeInDiff.stop();
afterDiffHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage();
}
-
+
public long elapsedTimeInMatch(TimeUnit unit) {
return elapsedTimeInMatch.elapsedTime(unit);
}
-
+
public long usedHeapBeforeMatch(SizeUnit unit) {
return unit.convert(beforeMatchHeapMemoryUsage.getUsed());
}
-
+
public long usedHeapAfterMatch(SizeUnit unit) {
return unit.convert(afterMatchHeapMemoryUsage.getUsed());
}
-
+
public long elapsedTimeInDiff(TimeUnit unit) {
return elapsedTimeInDiff.elapsedTime(unit);
}
-
+
public long usedHeapBeforeDiff(SizeUnit unit) {
return unit.convert(beforeDiffHeapMemoryUsage.getUsed());
}
-
+
public long usedHeapAfterDiff(SizeUnit unit) {
return unit.convert(afterDiffHeapMemoryUsage.getUsed());
}
-
+
public EMFComparePerfStats minus(EMFComparePerfStats stats) {
return null;
}
-
- /**
+
+ /**
* {@inheritDoc}
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder(256);
- sb.append("Match\n").
- append("\tElapsed time: " + elapsedTimeInMatch(TimeUnit.MILLISECONDS) + " msec.\n").
- append("\tUsed heap before: " + usedHeapBeforeMatch(SizeUnit.MEBI)+ " MiB\n").
- append("\tUsed heap after : " + usedHeapAfterMatch(SizeUnit.MEBI)+ " MiB\n").
- append("Diff\n").
- append("\tElapsed time: " + elapsedTimeInDiff(TimeUnit.MILLISECONDS) + " msec.\n").
- append("\tUsed heap before: " + usedHeapBeforeDiff(SizeUnit.MEBI)+ " MiB\n").
- append("\tUsed heap after : " + usedHeapAfterDiff(SizeUnit.MEBI)+ " MiB\n")
- ;
+ sb.append("Match\n")
+ .append("\tElapsed time: " + elapsedTimeInMatch(TimeUnit.MILLISECONDS) + " msec.\n")
+ .append("\tUsed heap before: " + usedHeapBeforeMatch(SizeUnit.MEBI) + " MiB\n")
+ .append("\tUsed heap after : " + usedHeapAfterMatch(SizeUnit.MEBI) + " MiB\n")
+ .append("Diff\n")
+ .append("\tElapsed time: " + elapsedTimeInDiff(TimeUnit.MILLISECONDS) + " msec.\n")
+ .append("\tUsed heap before: " + usedHeapBeforeDiff(SizeUnit.MEBI) + " MiB\n")
+ .append("\tUsed heap after : " + usedHeapAfterDiff(SizeUnit.MEBI) + " MiB\n");
return sb.toString();
}
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java
index f53521833..9fe448d05 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java
@@ -22,18 +22,10 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({
- TestGitMatchId.class,
-// TestGitMatchContent.class,
- TestGitDiff.class,
- TestGitReq.class,
- TestGitEqui.class,
- TestGitConflict.class,
- TestGitCompare.class,
- TestGitPostMatchUML.class,
- TestGitPostComparisonUML.class,
-})
+@SuiteClasses({TestGitMatchId.class,
+ // TestGitMatchContent.class,
+ TestGitDiff.class, TestGitReq.class, TestGitEqui.class, TestGitConflict.class, TestGitCompare.class,
+ TestGitPostMatchUML.class, TestGitPostComparisonUML.class, })
public class PerformanceGitSuite {
-
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java
index 68d3523ed..8a7ca3cbf 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java
@@ -21,18 +21,10 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({
- TestLargeGitMatchId.class,
-// TestLargeGitMatchContent.class,
- TestLargeGitDiff.class,
- TestLargeGitReq.class,
- TestLargeGitEqui.class,
- TestLargeGitConflict.class,
- TestLargeGitCompare.class,
- TestLargeGitPostMatchUML.class,
- TestLargeGitPostComparisonUML.class,
-})
+@SuiteClasses({TestLargeGitMatchId.class,
+ // TestLargeGitMatchContent.class,
+ TestLargeGitDiff.class, TestLargeGitReq.class, TestLargeGitEqui.class, TestLargeGitConflict.class,
+ TestLargeGitCompare.class, TestLargeGitPostMatchUML.class, TestLargeGitPostComparisonUML.class, })
public class PerformanceLargeGitSuite {
-
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java
index dc065914e..db33031ac 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java
@@ -22,19 +22,11 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({
- TestLargeMatchId.class,
-// TestLargeMatchContent.class,
- TestLargeDiff.class,
- TestLargeReq.class,
- TestLargeEqui.class,
- TestLargeConflict.class,
- TestLargeCompare.class,
- TestLargePostMatchUML.class,
- TestLargePostComparisonUML.class,
- TestLargeLogicalModel.class,
-})
+@SuiteClasses({TestLargeMatchId.class,
+ // TestLargeMatchContent.class,
+ TestLargeDiff.class, TestLargeReq.class, TestLargeEqui.class, TestLargeConflict.class,
+ TestLargeCompare.class, TestLargePostMatchUML.class, TestLargePostComparisonUML.class,
+ TestLargeLogicalModel.class, })
public class PerformanceLargeSuite {
-
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java
index e76bb4e15..32a7c915e 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java
@@ -13,19 +13,9 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({
- TestMatchId.class,
- TestMatchContent.class,
- TestDiff.class,
- TestReq.class,
- TestEqui.class,
- TestConflict.class,
- TestCompare.class,
- TestPostMatchUML.class,
- TestPostComparisonUML.class,
- TestLogicalModel.class,
-})
+@SuiteClasses({TestMatchId.class, TestMatchContent.class, TestDiff.class, TestReq.class, TestEqui.class,
+ TestConflict.class, TestCompare.class, TestPostMatchUML.class, TestPostComparisonUML.class,
+ TestLogicalModel.class, })
public class PerformanceSuite {
-
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java
index 76b02d5ad..40a0c18e8 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java
@@ -12,53 +12,31 @@ package org.eclipse.emf.compare.tests.performance;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
public enum SizeUnit {
/**
- * Prefixes binaires (prefixes CEI)
-Nom Symb. Facteur
-kibi Ki 2^10 = 1 024
-mebi Mi 2^20 = 1 048 576
-gibi Gi 2^30 = 1 073 741 824
-tebi Ti 2^40 = 1 099 511 627 776
-pebi Pi 2^50 = 1 125 899 906 842 624
-exbi Ei 2^60 = 1 152 921 504 606 846 976
-zebi Zi 2^70 = 1 180 591 620 717 411 303 424
-yobi Yi 2^80 = 1 208 925 819 614 629 174 706 176
-Prefixes decimaux (prefixes SI)
-Nom Symb. Facteur Err.
-kilo k 10^3 = 1 000 2 %
-mega M 10^6 = 1 000 000 5 %
-giga G 10^9 = 1 000 000 000 7 %
-tera T 10^12 = 1 000 000 000 000 10 %
-peta P 10^15 = 1 000 000 000 000 000 13 %
-exa E 10^18 = 1 000 000 000 000 000 000 15 %
-zetta Z 10^21 = 1 000 000 000 000 000 000 000 18 %
-yotta Y 10^24 = 1 000 000 000 000 000 000 000 000 21 %
-
+ * Prefixes binaires (prefixes CEI) Nom Symb. Facteur kibi Ki 2^10 = 1 024 mebi Mi 2^20 = 1 048 576 gibi
+ * Gi 2^30 = 1 073 741 824 tebi Ti 2^40 = 1 099 511 627 776 pebi Pi 2^50 = 1 125 899 906 842 624 exbi Ei
+ * 2^60 = 1 152 921 504 606 846 976 zebi Zi 2^70 = 1 180 591 620 717 411 303 424 yobi Yi 2^80 = 1 208 925
+ * 819 614 629 174 706 176 Prefixes decimaux (prefixes SI) Nom Symb. Facteur Err. kilo k 10^3 = 1 000 2 %
+ * mega M 10^6 = 1 000 000 5 % giga G 10^9 = 1 000 000 000 7 % tera T 10^12 = 1 000 000 000 000 10 % peta
+ * P 10^15 = 1 000 000 000 000 000 13 % exa E 10^18 = 1 000 000 000 000 000 000 15 % zetta Z 10^21 = 1 000
+ * 000 000 000 000 000 000 18 % yotta Y 10^24 = 1 000 000 000 000 000 000 000 000 21 %
*/
-
- KIBI(1024),
- MEBI(KIBI.fFactor * 1024),
- GIBI(MEBI.fFactor * 1024),
- TEBI(GIBI.fFactor * 1024),
- PEBI(TEBI.fFactor * 1024),
- EXBI(PEBI.fFactor * 1024),
- ZEBI(EXBI.fFactor * 1024),
- YOBI(ZEBI.fFactor * 1024);
-
+
+ KIBI(1024), MEBI(KIBI.fFactor * 1024), GIBI(MEBI.fFactor * 1024), TEBI(GIBI.fFactor * 1024), PEBI(TEBI.fFactor * 1024), EXBI(PEBI.fFactor * 1024), ZEBI(EXBI.fFactor * 1024), YOBI(ZEBI.fFactor * 1024);
+
private final long fFactor;
-
+
private SizeUnit(long factor) {
fFactor = factor;
}
-
+
public long convert(long value) {
return (value / fFactor);
}
-
+
public double convert(double value) {
return (value / fFactor);
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java
index 23642aa56..62012265e 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestCompare extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -50,7 +50,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_compareUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominal");
@@ -62,7 +62,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_compareUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit");
@@ -74,7 +74,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_compareUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java
index 27c363932..39c6dbf93 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestConflict extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName());
}
-
+
@Test
public void a_conflictUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmall");
@@ -54,7 +54,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_conflictUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominal");
@@ -70,7 +70,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_conflictUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit");
@@ -86,7 +86,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_conflictUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java
index c3b7d8beb..06450196b 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java
@@ -25,14 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestDiff extends AbstractEMFComparePerformanceTest {
-
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -52,7 +51,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_diffUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominal");
@@ -65,7 +64,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_diffUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit");
@@ -78,7 +77,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_diffUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java
index 2106adc65..a1bff6654 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestEqui extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName());
}
-
+
@Test
public void a_equiUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmall");
@@ -52,7 +52,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_equiUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominal");
@@ -66,7 +66,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_equiUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit");
@@ -80,7 +80,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_equiUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java
index 9a90d407d..14c660ca2 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java
@@ -47,13 +47,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -66,21 +66,24 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLSmall");
final Data data = new SmallInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
URL entry = bundle.getEntry("src/data/models/model_size_small/.project");
URL fileURL = FileLocator.toFileURL(entry);
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath()));
-
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(fileURL.getPath()));
+
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
-
+
final IFile leftFile = project.getFile(new Path("original/model.uml"));
final IFile rightFile = project.getFile(new Path("modified/model.uml"));
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
-
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
+
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
data.logicalModel(leftTypedElement, rightTypedElement);
@@ -94,25 +97,28 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
-
+
@Test
public void b_logicalModelUMLNominal() {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLNominal");
final Data data = new NominalInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
URL entry = bundle.getEntry("src/data/models/model_size_nominal/.project");
URL fileURL = FileLocator.toFileURL(entry);
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath()));
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(fileURL.getPath()));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
final IFile leftFile = project.getFile(new Path("original/model.uml"));
final IFile rightFile = project.getFile(new Path("modified/model.uml"));
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
-
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
+
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
data.logicalModel(leftTypedElement, rightTypedElement);
@@ -126,40 +132,46 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
-
+
@SuppressWarnings("restriction")
@Test
public void c_logicalModelUMLSmallSplit() {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLSmallSplit");
final Data data = new SmallSplitInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
-
- final ResourceSet leftResourceSet = (ResourceSet) data.getLeft();
- final ResourceSet rightResourceSet = (ResourceSet) data.getRight();
-
+
+ final ResourceSet leftResourceSet = (ResourceSet)data.getLeft();
+ final ResourceSet rightResourceSet = (ResourceSet)data.getRight();
+
IFile leftFile = null;
IFile rightFile = null;
-
+
final List<IProject> projects = new ArrayList<IProject>();
-
- leftFile = createProjects(bundle, leftResourceSet, "model_size_small_split", "model_size_small_original_model", projects);
- rightFile = createProjects(bundle, rightResourceSet, "model_size_small_split", "model_size_small_modified_model", projects);
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
+ leftFile = createProjects(bundle, leftResourceSet, "model_size_small_split",
+ "model_size_small_original_model", projects);
+ rightFile = createProjects(bundle, rightResourceSet, "model_size_small_split",
+ "model_size_small_modified_model", projects);
+
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore();
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name());
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ CrossReferenceResolutionScope.WORKSPACE.name());
data.logicalModel(leftTypedElement, rightTypedElement);
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
}
});
data.dispose();
-
+
for (IProject project : projects) {
project.close(new NullProgressMonitor());
project.delete(false, new NullProgressMonitor());
@@ -170,40 +182,46 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
-
+
@SuppressWarnings("restriction")
@Test
public void d_logicalModelUMLNominalSplit() {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLNominalSplit");
final Data data = new NominalSplitInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
-
- final ResourceSet leftResourceSet = (ResourceSet) data.getLeft();
- final ResourceSet rightResourceSet = (ResourceSet) data.getRight();
-
+
+ final ResourceSet leftResourceSet = (ResourceSet)data.getLeft();
+ final ResourceSet rightResourceSet = (ResourceSet)data.getRight();
+
IFile leftFile = null;
IFile rightFile = null;
-
+
final List<IProject> projects = new ArrayList<IProject>();
-
- leftFile = createProjects(bundle, leftResourceSet, "model_size_nominal_split", "model_size_nominal_original_model", projects);
- rightFile = createProjects(bundle, rightResourceSet, "model_size_nominal_split", "model_size_nominal_modified_model", projects);
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
+ leftFile = createProjects(bundle, leftResourceSet, "model_size_nominal_split",
+ "model_size_nominal_original_model", projects);
+ rightFile = createProjects(bundle, rightResourceSet, "model_size_nominal_split",
+ "model_size_nominal_modified_model", projects);
+
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore();
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name());
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ CrossReferenceResolutionScope.WORKSPACE.name());
data.logicalModel(leftTypedElement, rightTypedElement);
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
}
});
data.dispose();
-
+
for (IProject project : projects) {
project.close(new NullProgressMonitor());
project.delete(false, new NullProgressMonitor());
@@ -214,23 +232,25 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
-
- private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet,
- String sourceProjectName, String projectName, final List<IProject> projects) throws IOException,
- CoreException {
+
+ private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, String sourceProjectName,
+ String projectName, final List<IProject> projects) throws IOException, CoreException {
IFile file = null;
for (Resource right : rightResourceSet.getResources()) {
- //URIs pattern : bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml
- //We have to retrieve the second to last segment
+ // URIs pattern :
+ // bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml
+ // We have to retrieve the second to last segment
String projectPartName = right.getURI().segment(3);
- URL entry = bundle.getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project");
+ URL entry = bundle
+ .getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project");
URL fileURL = FileLocator.toFileURL(entry);
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath()));
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(fileURL.getPath()));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
projects.add(project);
- if (file == null && projectPartName.equals(projectName)){
+ if (file == null && projectPartName.equals(projectName)) {
file = project.getFile(new Path("model.uml"));
}
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java
index 65bd03c7b..b6d23f3b5 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java
@@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestMatchContent extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -51,7 +51,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchContentUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominal");
@@ -63,7 +63,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_matchContentUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit");
@@ -75,7 +75,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_matchContentUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java
index 9b50e656c..7f6f4781d 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java
@@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestMatchId extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -49,7 +49,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchIdUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominal");
@@ -61,7 +61,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_matchIdUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit");
@@ -73,7 +73,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_matchIdUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java
index a402da0b2..f1f2fb6d8 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -55,7 +55,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_pcGMFUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominal");
@@ -72,7 +72,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_pcGMFUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit");
@@ -89,7 +89,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_pcGMFUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java
index 53171b599..76c3ec0a0 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -56,7 +56,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_pcUMLUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominal");
@@ -74,7 +74,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_pcUMLUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit");
@@ -92,7 +92,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_pcUMLUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java
index f6d9d1076..5052ec055 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestPostMatchUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -51,7 +51,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_pmUMLUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominal");
@@ -64,7 +64,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_pmUMLUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit");
@@ -77,7 +77,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_pmUMLUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java
index 3146c9e15..294614453 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestReq extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName());
}
-
+
@Test
public void a_reqUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmall");
@@ -52,7 +52,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_reqUMLNominal() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominal");
@@ -66,7 +66,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_reqUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit");
@@ -80,7 +80,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_reqUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominalSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java
index 149fc0ce7..be8db00ef 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java
@@ -51,7 +51,6 @@ import com.google.common.base.Throwables;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@SuppressWarnings("restriction")
public final class GitUtil {
@@ -116,18 +115,18 @@ public final class GitUtil {
Throwables.propagate(e);
}
}
-
+
/**
* Delete the repository (and all files contained in).
*
* @param repository
- * the File representing the repository.
+ * the File representing the repository.
*/
public static void deleteRepo(File repository) {
if (repository.exists()) {
File[] files = repository.listFiles();
if (null != files) {
- for (int i=0; i < files.length; i++) {
+ for (int i = 0; i < files.length; i++) {
if (files[i].isDirectory()) {
deleteRepo(files[i]);
} else {
@@ -138,7 +137,7 @@ public final class GitUtil {
repository.delete();
}
}
-
+
/**
* Import the project from the given repository.
*
@@ -150,18 +149,19 @@ public final class GitUtil {
*/
public static IProject importProjectFromRepo(File repository, String projectFilePath) {
try {
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(repository.getPath() + File.separator + projectFilePath));
+ IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(
+ new Path(repository.getPath() + File.separator + projectFilePath));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
-
+
return project;
} catch (CoreException e) {
Throwables.propagate(e);
}
return null;
}
-
+
/**
* Import all projects contain in the given repository.
*
@@ -172,8 +172,9 @@ public final class GitUtil {
Collection<IProject> projects = new ArrayList<IProject>();
try {
Collection<File> projectsFromRepo = getProjectsFromRepo(repository);
- for (File file : projectsFromRepo) {
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(file.getPath()));
+ for (File file : projectsFromRepo) {
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(file.getPath()));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
@@ -184,9 +185,10 @@ public final class GitUtil {
}
return projects;
}
-
+
/**
* Get the ".projects" files from the given repository.
+ *
* @param repository
* the given repository.
* @return the ".projects" files from the given repository.
@@ -196,7 +198,7 @@ public final class GitUtil {
if (repository.exists()) {
File[] files = repository.listFiles();
if (null != files) {
- for (int i=0; i < files.length; i++) {
+ for (int i = 0; i < files.length; i++) {
if (files[i].isDirectory()) {
projects.addAll(getProjectsFromRepo(files[i]));
} else if (files[i].getName().endsWith(IProjectDescription.DESCRIPTION_FILE_NAME)) {
@@ -207,9 +209,10 @@ public final class GitUtil {
}
return projects;
}
-
+
/**
* Connect given projects to the given repository.
+ *
* @param repository
* the given repository.
* @param projects
@@ -218,14 +221,15 @@ public final class GitUtil {
public static void connectProjectsToRepo(Repository repository, Collection<IProject> projects) {
for (IProject project : projects) {
try {
- ConnectProviderOperation op = new ConnectProviderOperation(project, repository.getDirectory());
+ ConnectProviderOperation op = new ConnectProviderOperation(project,
+ repository.getDirectory());
op.execute(new NullProgressMonitor());
} catch (CoreException e) {
Throwables.propagate(e);
}
}
}
-
+
/**
* Simulate a comparison between the two given references and returns back the subscriber that can provide
* all computed synchronization information.
@@ -238,16 +242,16 @@ public final class GitUtil {
* The file we are comparing (that would be the file right-clicked into the workspace).
* @return The created subscriber.
*/
- public static Subscriber createSubscriberForComparison(Repository repository, String sourceRef, String targetRef, IFile comparedFile, List<Runnable> disposers)
- throws IOException {
+ public static Subscriber createSubscriberForComparison(Repository repository, String sourceRef,
+ String targetRef, IFile comparedFile, List<Runnable> disposers) throws IOException {
final GitSynchronizeData data = new GitSynchronizeData(repository, sourceRef, targetRef, false);
final GitSynchronizeDataSet dataSet = new GitSynchronizeDataSet(data);
final ResourceMapping[] mappings = getResourceMappings(comparedFile);
final GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(dataSet);
subscriber.init(new NullProgressMonitor());
- final RemoteResourceMappingContext remoteContext = new GitSubscriberResourceMappingContext(
- subscriber, dataSet);
+ final RemoteResourceMappingContext remoteContext = new GitSubscriberResourceMappingContext(subscriber,
+ dataSet);
final SubscriberScopeManager manager = new SubscriberScopeManager(subscriber.getName(), mappings,
subscriber, remoteContext, true);
final GitSubscriberMergeContext context = new GitSubscriberMergeContext(subscriber, manager, dataSet);
@@ -260,7 +264,7 @@ public final class GitUtil {
});
return context.getSubscriber();
}
-
+
/**
* This will query all model providers for those that are enabled on the given file and list all mappings
* available for that file.
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java
index 47ec917d4..eed87b73f 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitCompare extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest {
@Test
public void a_compareUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -51,11 +51,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_compareUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -64,11 +64,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_compareUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -77,11 +77,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_compareUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java
index 49f3ffb1e..a7a7aba92 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitConflict extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest {
@Test
public void a_conflictUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
data.diff();
@@ -55,11 +55,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_conflictUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
data.diff();
@@ -72,11 +72,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_conflictUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
data.diff();
@@ -89,11 +89,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_conflictUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java
index 6cf5cee4a..3c56a78ab 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitDiff extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest {
@Test
public void a_diffUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -52,11 +52,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_diffUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -66,11 +66,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_diffUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -80,11 +80,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_diffUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java
index c093734c3..222af82f7 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitEqui extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest {
@Test
public void a_equiUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
data.diff();
@@ -53,11 +53,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_equiUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
data.diff();
@@ -68,11 +68,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_equiUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
data.diff();
@@ -83,11 +83,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_equiUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java
index 34e5425ea..f2335b006 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java
@@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -43,7 +43,7 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
@Test
public void a_matchContentUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -52,11 +52,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchContentUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -65,11 +65,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_matchContentUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -78,11 +78,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_matchContentUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java
index 23e79069e..26c115928 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java
@@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -43,7 +43,7 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
@Test
public void a_matchIdUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -52,11 +52,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchIdUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -65,11 +65,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_matchIdUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -78,11 +78,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_matchIdUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java
index 5fab090f4..f1c81981e 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest
@Test
public void a_pcGMFUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
data.diff();
@@ -56,11 +56,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void b_pcGMFUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
data.diff();
@@ -74,11 +74,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void c_pcGMFUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
data.diff();
@@ -92,11 +92,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void d_pcGMFUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java
index f150f82d1..994579cdc 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest
@Test
public void a_pcUMLUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
data.postMatchUML();
@@ -57,11 +57,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void b_pcUMLUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
data.postMatchUML();
@@ -76,11 +76,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void c_pcUMLUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
data.postMatchUML();
@@ -95,11 +95,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void d_pcUMLUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
data.postMatchUML();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java
index b19ce32c0..e809b6cda 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
@Test
public void a_pmUMLUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -52,11 +52,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_pmUMLUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -66,11 +66,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_pmUMLUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -80,11 +80,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_pmUMLUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java
index 83a2eff3f..2509b7a53 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestGitReq extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -42,7 +42,7 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest {
@Test
public void a_reqUMLSmall() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmall");
-
+
final DataGit data = new SmallGitInputData();
data.match();
data.diff();
@@ -53,11 +53,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_reqUMLNominal() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominal");
-
+
final DataGit data = new NominalGitInputData();
data.match();
data.diff();
@@ -68,11 +68,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void c_reqUMLSmallSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit");
-
+
final DataGit data = new SmallSplitGitInputData();
data.match();
data.diff();
@@ -83,11 +83,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void d_reqUMLNominalSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominalSplit");
-
+
final DataGit data = new NominalSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
index 2c8ba7e1a..832595dd9 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest {
@Test
public void a_compareUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -49,11 +49,11 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_compareUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
index 3b662f33b..2e9da1e7d 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest {
@Test
public void a_conflictUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
data.diff();
@@ -53,11 +53,11 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_conflictUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
index 365c1fd10..f9a50503d 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest {
@Test
public void a_diffUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -50,11 +50,11 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_diffUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
index 1badf86bd..7517de7bc 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest {
@Test
public void a_equiUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
data.diff();
@@ -51,11 +51,11 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_equiUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
index 4ed79e3d9..150d89246 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
@@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -41,7 +41,7 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest
@Test
public void a_matchContentUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -50,11 +50,11 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void b_matchContentUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
index ded41c2dd..c0df3b247 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
@@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -41,7 +41,7 @@ public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest {
@Test
public void a_matchIdUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
@@ -50,11 +50,11 @@ public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchIdUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
public void run() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
index 9055efc03..b74b9c012 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance
@Test
public void a_pcGMFUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
data.diff();
@@ -54,11 +54,11 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance
});
data.dispose();
}
-
+
@Test
public void b_pcGMFUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
index c0642a0d4..846c02118 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance
@Test
public void a_pcUMLUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
data.postMatchUML();
@@ -55,11 +55,11 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance
});
data.dispose();
}
-
+
@Test
public void b_pcUMLUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
data.postMatchUML();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
index c3f5ee4de..ac1583181 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest
@Test
public void a_pmUMLUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -50,11 +50,11 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
-
+
@Test
public void b_pmUMLUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
index e44937358..46eb6d1ab 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
@@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeGitReq extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -40,7 +40,7 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest {
@Test
public void a_reqUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge");
-
+
final DataGit data = new LargeGitInputData();
data.match();
data.diff();
@@ -51,11 +51,11 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_reqUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLargeSplit");
-
+
final DataGit data = new LargeSplitGitInputData();
data.match();
data.diff();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
index ea8a73891..2195ed316 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeCompare extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestCompare.class.getSimpleName());
}
-
+
@Test
public void a_compareUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge");
@@ -50,7 +50,7 @@ public class TestLargeCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_compareUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
index 2158e0309..6790b2dec 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeConflict extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName());
}
-
+
@Test
public void a_conflictUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge");
@@ -54,7 +54,7 @@ public class TestLargeConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_conflictUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
index ce7770977..d936b6e8a 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
@@ -25,21 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeDiff extends AbstractEMFComparePerformanceTest {
-
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestDiff.class.getSimpleName());
}
-
+
@Test
public void a_diffUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge");
@@ -52,7 +51,7 @@ public class TestLargeDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_diffUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
index 53f0d0456..d3126a60f 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeEqui extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName());
}
-
+
@Test
public void a_equiUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge");
@@ -52,7 +52,7 @@ public class TestLargeEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_equiUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
index a70db7faf..288a2a193 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
@@ -48,38 +48,41 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestLogicalModel.class.getSimpleName());
}
-
+
@Test
public void a_logicalModelUMLLarge() {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLarge");
final Data data = new LargeInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
URL entry = bundle.getEntry("src/data/models/model_size_large/.project");
URL fileURL = FileLocator.toFileURL(entry);
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath()));
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(fileURL.getPath()));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
final IFile leftFile = project.getFile(new Path("original/model.uml"));
final IFile rightFile = project.getFile(new Path("modified/model.uml"));
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
-
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
+
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
data.logicalModel(leftTypedElement, rightTypedElement);
@@ -93,40 +96,46 @@ public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
-
+
@SuppressWarnings("restriction")
@Test
public void b_logicalModelUMLLargeSplit() {
try {
PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLargeSplit");
final Data data = new LargeSplitInputData();
-
+
Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");
-
- final ResourceSet leftResourceSet = (ResourceSet) data.getLeft();
- final ResourceSet rightResourceSet = (ResourceSet) data.getRight();
-
+
+ final ResourceSet leftResourceSet = (ResourceSet)data.getLeft();
+ final ResourceSet rightResourceSet = (ResourceSet)data.getRight();
+
IFile leftFile = null;
IFile rightFile = null;
-
+
final List<IProject> projects = new ArrayList<IProject>();
-
- leftFile = createProjects(bundle, leftResourceSet, "model_size_large_split", "model_size_large_original_model", projects);
- rightFile = createProjects(bundle, rightResourceSet, "model_size_large_split", "model_size_large_modified_model", projects);
- final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString());
- final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString());
+ leftFile = createProjects(bundle, leftResourceSet, "model_size_large_split",
+ "model_size_large_original_model", projects);
+ rightFile = createProjects(bundle, rightResourceSet, "model_size_large_split",
+ "model_size_large_modified_model", projects);
+
+ final ITypedElement leftTypedElement = new StorageTypedElement(leftFile,
+ leftFile.getFullPath().toOSString());
+ final ITypedElement rightTypedElement = new StorageTypedElement(rightFile,
+ rightFile.getFullPath().toOSString());
final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore();
monitor.measure(false, getStepsNumber(), new Runnable() {
public void run() {
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name());
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ CrossReferenceResolutionScope.WORKSPACE.name());
data.logicalModel(leftTypedElement, rightTypedElement);
- store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
+ store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE,
+ store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE));
}
});
data.dispose();
-
+
for (IProject project : projects) {
project.close(new NullProgressMonitor());
project.delete(false, new NullProgressMonitor());
@@ -137,22 +146,25 @@ public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest {
Assert.fail();
}
}
- private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet,
- String sourceProjectName, String projectName, final List<IProject> projects) throws IOException,
- CoreException {
+
+ private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, String sourceProjectName,
+ String projectName, final List<IProject> projects) throws IOException, CoreException {
IFile file = null;
for (Resource right : rightResourceSet.getResources()) {
- //URIs pattern : bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml
- //We have to retrieve the second to last segment
+ // URIs pattern :
+ // bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml
+ // We have to retrieve the second to last segment
String projectPartName = right.getURI().segment(3);
- URL entry = bundle.getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project");
+ URL entry = bundle
+ .getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project");
URL fileURL = FileLocator.toFileURL(entry);
- IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath()));
+ IProjectDescription description = ResourcesPlugin.getWorkspace()
+ .loadProjectDescription(new Path(fileURL.getPath()));
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
project.create(description, new NullProgressMonitor());
project.open(new NullProgressMonitor());
projects.add(project);
- if (file == null && projectPartName.equals(projectName)){
+ if (file == null && projectPartName.equals(projectName)) {
file = project.getFile(new Path("model.uml"));
}
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
index c88802786..f8cf06b77 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
@@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeMatchContent extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -51,7 +51,7 @@ public class TestLargeMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchContentUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
index 874e74f8b..8050d75a5 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
@@ -24,20 +24,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeMatchId extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestMatchId.class.getSimpleName());
}
-
+
@Test
public void a_matchIdUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge");
@@ -49,7 +49,7 @@ public class TestLargeMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_matchIdUMLLargeSplit() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
index 0df93200b..0f9278ce3 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
@@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargePostComparisonGMF extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
@@ -55,7 +55,7 @@ public class TestLargePostComparisonGMF extends AbstractEMFComparePerformanceTes
});
data.dispose();
}
-
+
@Test
public void b_pcGMFUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
index c72b31c99..4d0e90e57 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargePostComparisonUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestPostComparisonUML.class.getSimpleName());
}
-
+
@Test
public void a_pcUMLUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge");
@@ -56,7 +56,7 @@ public class TestLargePostComparisonUML extends AbstractEMFComparePerformanceTes
});
data.dispose();
}
-
+
@Test
public void b_pcUMLUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
index 63f116628..14c2fda4a 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargePostMatchUML extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestPostMatchUML.class.getSimpleName());
}
-
+
@Test
public void a_pmUMLUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge");
@@ -51,7 +51,7 @@ public class TestLargePostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_pmUMLUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLargeSplit");
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
index 4a16491d4..31d156b71 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
@@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
- *
*/
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestLargeReq extends AbstractEMFComparePerformanceTest {
- /**
+ /**
* {@inheritDoc}
+ *
* @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
*/
@Override
protected void setSUTName() {
getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName());
}
-
+
@Test
public void a_reqUMLLarge() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge");
@@ -52,7 +52,7 @@ public class TestLargeReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
-
+
@Test
public void b_reqUMLLargeSplit() throws IOException {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLargeSplit");
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.checkstyle b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.checkstyle
new file mode 100644
index 000000000..2684ff12f
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EMF Compare" location="/org.eclipse.emf.compare-parent/codeStyle/EMFCompareCheckstyle6Configuration.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="EMF Compare" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs
index 416f4fb69..b032fe1f7 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,3 +9,288 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+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_binary_expression=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_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_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=true
+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=110
+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=true
+org.eclipse.jdt.core.formatter.indentation.size=8
+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_after_type_annotation=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=do not 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=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not 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_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_binary_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_lambda_arrow=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=do not 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_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_unary_operator=do not 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_binary_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_lambda_arrow=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=do not 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_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_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=110
+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=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+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_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..de1c79644
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,62 @@
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_EMF Compare
+formatter_settings_version=12
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=false
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java
index a40ef7ee8..7fae9305a 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/AbstractTest.java
@@ -39,21 +39,23 @@ import com.google.common.collect.Iterators;
public abstract class AbstractTest {
private EMFCompare emfCompare;
-
+
private PostProcessorDescriptorRegistryImpl<String> postProcessorRegistry;
@Before
public void before() {
postProcessorRegistry = new PostProcessorDescriptorRegistryImpl<String>();
- postProcessorRegistry.put(CompareDiagramPostProcessor.class.getName(), new TestPostProcessor.TestPostProcessorDescriptor(
- Pattern.compile("http://www.eclipse.org/gmf/runtime/\\d.\\d.\\d/notation"), null, new CompareDiagramPostProcessor(), 30));
+ postProcessorRegistry.put(CompareDiagramPostProcessor.class.getName(),
+ new TestPostProcessor.TestPostProcessorDescriptor(
+ Pattern.compile("http://www.eclipse.org/gmf/runtime/\\d.\\d.\\d/notation"), null,
+ new CompareDiagramPostProcessor(), 30));
emfCompare = EMFCompare.builder().setPostProcessorRegistry(postProcessorRegistry).build();
}
protected EMFCompare getCompare() {
return emfCompare;
}
-
+
protected Comparison compare(Notifier left, Notifier right) {
return compare(left, right, null);
}
@@ -62,7 +64,7 @@ public abstract class AbstractTest {
IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
return getCompare().compare(scope);
}
-
+
@After
public void after() {
if (getInput() != null && getInput().getSets() != null) {
@@ -92,9 +94,9 @@ public abstract class AbstractTest {
}
return Integer.valueOf(count);
}
-
+
protected abstract DiagramInputData getInput();
-
+
protected void testIntersections(Comparison comparison) {
assertFalse(Iterables.any(comparison.getDifferences(), new Predicate<Diff>() {
public boolean apply(Diff input) {
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java
index f6cb56f7f..b69dd0076 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/EdgechangesTest.java
@@ -51,8 +51,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA1Left();
final Resource right = input.getA1Right();
- final Comparison comparison = compare(left.getResourceSet(),
- right.getResourceSet());
+ final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -69,7 +68,7 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size());
assertTrue(edgeChange.getRefinedBy().contains(attributeChange));
-
+
testIntersections(comparison);
}
@@ -78,8 +77,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA1Left();
final Resource right = input.getA1Right();
- final Comparison comparison = compare(right.getResourceSet(),
- left.getResourceSet());
+ final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -96,7 +94,7 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size());
assertTrue(edgeChange.getRefinedBy().contains(attributeChange));
-
+
testIntersections(comparison);
}
@@ -105,8 +103,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA2Left();
final Resource right = input.getA2Right();
- final Comparison comparison = compare(left.getResourceSet(),
- right.getResourceSet());
+ final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -124,7 +121,7 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(3), edgeChange.getRefinedBy().size());
assertTrue(edgeChange.getRefinedBy().containsAll(diffs));
-
+
testIntersections(comparison);
}
@@ -134,8 +131,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA2Left();
final Resource right = input.getA2Right();
- final Comparison comparison = compare(right.getResourceSet(),
- left.getResourceSet());
+ final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -153,7 +149,7 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(3), edgeChange.getRefinedBy().size());
assertTrue(edgeChange.getRefinedBy().containsAll(diffs));
-
+
testIntersections(comparison);
}
@@ -162,8 +158,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();
- final Comparison comparison = compare(left.getResourceSet(),
- right.getResourceSet());
+ final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -189,8 +184,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();
- final Comparison comparison = compare(right.getResourceSet(),
- left.getResourceSet());
+ final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -207,7 +201,7 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(1), edgeChange.getRefinedBy().size());
assertTrue(edgeChange.getRefinedBy().contains(attributeChange));
-
+
testIntersections(comparison);
}
@@ -216,8 +210,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA4Left();
final Resource right = input.getA4Right();
- final Comparison comparison = compare(left.getResourceSet(),
- right.getResourceSet());
+ final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -234,9 +227,10 @@ public class EdgechangesTest extends AbstractTest {
assertSame(Integer.valueOf(12), diffs.size());
assertNotNull(edgeChange);
- assertSame(Integer.valueOf(12), edgeChange.getRefinedBy().size());// 11 + the add of edge for convenience...
+ assertSame(Integer.valueOf(12), edgeChange.getRefinedBy().size());// 11 + the add of edge for
+ // convenience...
assertTrue(edgeChange.getRefinedBy().contains(addEdge)); // for convenience...
-
+
testIntersections(comparison);
}
@@ -246,8 +240,7 @@ public class EdgechangesTest extends AbstractTest {
final Resource left = input.getA4Left();
final Resource right = input.getA4Right();
- final Comparison comparison = compare(right.getResourceSet(),
- left.getResourceSet());
+ final Comparison comparison = compare(right.getResourceSet(), left.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -266,7 +259,7 @@ public class EdgechangesTest extends AbstractTest {
Diff deleteEdge = Iterators.find(differences.iterator(),
and(valueIsEdge, ofKind(DifferenceKind.DELETE)));
assertTrue(edgeChange.getRefinedBy().contains(deleteEdge));
-
+
testIntersections(comparison);
}
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java
index f186f6b98..823e0971b 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/edgechanges/data/EdgeChangesInputData.java
@@ -35,7 +35,7 @@ public class EdgeChangesInputData extends DiagramInputData {
public Resource getA1Right() throws IOException {
return loadFromClassLoader("a1/TC02.ecorediag"); //$NON-NLS-1$
}
-
+
public Resource getA2Left() throws IOException {
return loadFromClassLoader("a2/TC01.ecorediag"); //$NON-NLS-1$
}
@@ -43,7 +43,7 @@ public class EdgeChangesInputData extends DiagramInputData {
public Resource getA2Right() throws IOException {
return loadFromClassLoader("a2/TC02.ecorediag"); //$NON-NLS-1$
}
-
+
public Resource getA3Left() throws IOException {
return loadFromClassLoader("a3/TC01.ecorediag"); //$NON-NLS-1$
}
@@ -51,7 +51,7 @@ public class EdgeChangesInputData extends DiagramInputData {
public Resource getA3Right() throws IOException {
return loadFromClassLoader("a3/TC02.ecorediag"); //$NON-NLS-1$
}
-
+
public Resource getA4Left() throws IOException {
return loadFromClassLoader("a4/TC01.ecorediag"); //$NON-NLS-1$
}
@@ -59,7 +59,7 @@ public class EdgeChangesInputData extends DiagramInputData {
public Resource getA4Right() throws IOException {
return loadFromClassLoader("a4/TC02.ecorediag"); //$NON-NLS-1$
}
-
+
@Override
protected Resource loadFromClassLoader(String string) throws IOException {
final URL fileURL = getClass().getResource(string);
@@ -82,7 +82,7 @@ public class EdgeChangesInputData extends DiagramInputData {
resource.load(str, Collections.emptyMap());
str.close();
-
+
EcoreUtil.resolveAll(resourceSet);
return resource;
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java
index 7788d5f25..f42cced38 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/hide/HideTest.java
@@ -48,27 +48,28 @@ public class HideTest extends AbstractTest {
final Resource right = input.getA1Right();
final Comparison comparison = compare(left, right, null);
-
+
final List<Diff> differences = comparison.getDifferences();
// We should have no less and no more than 2 differences
assertSame(Integer.valueOf(2), Integer.valueOf(differences.size()));
-
- Predicate<? super Diff> attributeChangeDescription = attributeValueMatch(NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.FALSE, false);
+
+ Predicate<? super Diff> attributeChangeDescription = attributeValueMatch(
+ NotationPackage.Literals.VIEW__VISIBLE.getName(), Boolean.FALSE, false);
Predicate<? super Diff> hideDescription = and(instanceOf(Hide.class), ofKind(DifferenceKind.CHANGE));
-
+
assertSame(Integer.valueOf(1), count(differences, instanceOf(Hide.class)));
final Diff attributeChange = Iterators.find(differences.iterator(), attributeChangeDescription);
final Diff hide = Iterators.find(differences.iterator(), hideDescription);
-
+
assertNotNull(attributeChange);
assertNotNull(hide);
-
+
assertSame(Integer.valueOf(1), Integer.valueOf(hide.getRefinedBy().size()));
assertTrue(hide.getRefinedBy().contains(attributeChange));
-
- testIntersections(comparison);
+
+ testIntersections(comparison);
}
@Override
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java
index a65bf3dff..f8064234f 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/merge/ExtensionMergeTest.java
@@ -46,7 +46,6 @@ public class ExtensionMergeTest extends AbstractTest {
testMergeRightToLeft(left, right, null);
}
-
protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin) {
final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
final Comparison comparisonBefore = getCompare().compare(scope);
@@ -71,8 +70,8 @@ public class ExtensionMergeTest extends AbstractTest {
merger.copyRightToLeft(diff, null);
}
final Comparison comparisonAfter = getCompare().compare(scope);
- assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft", comparisonAfter
- .getDifferences().isEmpty());
+ assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft",
+ comparisonAfter.getDifferences().isEmpty());
}
@Override
diff --git a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java
index 6030dad3d..76ca9eeca 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ecoretools.tests/src/org/eclipse/emf/compare/diagram/ecoretools/tests/nodechanges/NodechangesTest.java
@@ -66,8 +66,7 @@ public class NodechangesTest extends AbstractTest {
final Resource left = input.getA1Left();
final Resource right = input.getA1Right();
- final Comparison comparison = compare(left.getResourceSet(),
- right.getResourceSet());
+ final Comparison comparison = compare(left.getResourceSet(), right.getResourceSet());
final List<Diff> differences = comparison.getDifferences();
@@ -76,8 +75,7 @@ public class NodechangesTest extends AbstractTest {
final Diff addEPackage = Iterators.find(differences.iterator(), added("tc1.EPackage0"));
- final Diff addEPackageView = Iterators.find(
- differences.iterator(),
+ final Diff addEPackageView = Iterators.find(differences.iterator(),
and(valueIsView, valueNameMatches("1002", NotationPackage.Literals.VIEW__TYPE),
elementIs(((ReferenceChange)addEPackage).getValue())));
final Diff addNodeInEPackageView1 = Iterators.find(differences.iterator(),
@@ -101,8 +99,7 @@ public class NodechangesTest extends AbstractTest {
final Diff addEClass = Iterators.find(differences.iterator(), added("tc1.EClass0"));
- final Diff addEClassView = Iterators.find(
- differences.iterator(),
+ final Diff addEClassView = Iterators.find(differences.iterator(),
and(valueIsView, valueNameMatches("1001", NotationPackage.Literals.VIEW__TYPE),
elementIs(((ReferenceChange)addEClass).getValue())));
final Diff addNodeInEClassView1 = Iterators.find(differences.iterator(),
@@ -132,8 +129,7 @@ public class NodechangesTest extends AbstractTest {
final Diff addEDataType = Iterators.find(differences.iterator(), added("tc1.EDataType0"));
- final Diff addEDataTypeView = Iterators.find(
- differences.iterator(),
+ final Diff addEDataTypeView = Iterators.find(differences.iterator(),
and(valueIsView, valueNameMatches("1004", NotationPackage.Literals.VIEW__TYPE),
elementIs(((ReferenceChange)addEDataType).getValue())));
final Diff addNodeInEDataTypeView1 = Iterators.find(differences.iterator(),
@@ -149,8 +145,7 @@ public class NodechangesTest extends AbstractTest {
final Diff addEEnum = Iterators.find(differences.iterator(), added("tc1.EEnum0"));
- final Diff addEEnumView = Iterators.find(
- differences.iterator(),
+ final Diff addEEnumView = Iterators.find(differences.iterator(),
and(valueIsView, valueNameMatches("1005", NotationPackage.Literals.VIEW__TYPE),
elementIs(((ReferenceChange)addEEnum).getValue())));
final Diff addNodeInEEnumView1 = Iterators.find(differences.iterator(),
@@ -170,13 +165,10 @@ public class NodechangesTest extends AbstractTest {
final Diff addBoundsInEEnumView = Iterators.find(differences.iterator(),
and(valueUnder(addEEnumView), valueIsInstanceof(Bounds.class)));
- final Diff addEAnnotation = Iterators.find(
- differences.iterator(),
- addedToReference("tc1", "eAnnotations", "tc1.EAnnotation0",
- EcorePackage.Literals.EANNOTATION__SOURCE));
+ final Diff addEAnnotation = Iterators.find(differences.iterator(), addedToReference("tc1",
+ "eAnnotations", "tc1.EAnnotation0", EcorePackage.Literals.EANNOTATION__SOURCE));
- final Diff addEAnnotationView = Iterators.find(
- differences.iterator(),
+ final Diff addEAnnotationView = Iterators.find(differences.iterator(),
and(valueIsView, valueNameMatches("1003", NotationPackage.Literals.VIEW__TYPE),
elementIs(((ReferenceChange)addEAnnotation).getValue())));
final Diff addNodeInEAnnotationView1 = Iterators.find(differences.iterator(),
@@ -199,29 +191,24 @@ public class NodechangesTest extends AbstractTest {
assertSame(Integer.valueOf(5),
count(differences, and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD))));
- final Diff addNodeEPackageExtension = Iterators.find(
- differences.iterator(),
+ final Diff addNodeEPackageExtension = Iterators.find(differences.iterator(),
and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD),
refinedBy(addRefElementInEPackageView)));
- final Diff addNodeEClassExtension = Iterators.find(