c7abb686e4b7a7fc88b81969d7333fdd2f5f71dd - henshin/org.eclipse.emft.henshin

commit	c7abb686e4b7a7fc88b81969d7333fdd2f5f71dd	[log] [tgz]
author	Daniel Strueber <strueber@mathematik.uni-marburg.de>	Mon Jan 22 10:07:22 2018 -0500
committer	Daniel Strueber <strueber@mathematik.uni-marburg.de>	Mon Jan 22 10:07:22 2018 -0500
tree	e313e9812ce81a876eeda48efbc685fd9b288190
parent	8f6cb0e4f79388681fb74d5add83ace9dfce1d92 [diff]

Revert "Refactoring folders: prepare for multicda merge. Conflict Analysis result representation shows a diagram Editor instead of ecore Editor for minimal Model."

This reverts commit 8f6cb0e4f79388681fb74d5add83ace9dfce1d92.

Change-Id: I53e2d5c5e8dc51783f755c41334c9c8556051db0

plugins/org.eclipse.emf.henshin.cpa.ui/.classpath[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/.classpath - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/.gitignore[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/.gitignore - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/.project[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/.project - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/META-INF/MANIFEST.MF[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/META-INF/MANIFEST.MF - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/build.properties[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/build.properties - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/icons/sample.gif[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/icons/sample.gif - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/plugin.properties[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/plugin.properties - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/plugin.xml[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/plugin.xml - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/pom.xml[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/pom.xml - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/CriticalPairAnalysisUIPlugin.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/ConflictReasonAnalysisUIPlugin.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/action/ExecuteCpaHandler.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/action/ExecuteCpaHandler.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/action/OpenCpHandler.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/action/OpenCpHandler.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/presentation/CpaResultsView.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/presentation/CpaResultsView.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/presentation/HenshinCPEditor.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/presentation/HenshinCPEditor.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/results/MultiEditorLauncher.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/results/MultiEditorLauncher.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/results/MultiEditorSelectionProvider.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/results/MultiEditorSelectionProvider.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/results/MultiPageEditorContributor.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/results/MultiPageEditorContributor.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/util/CpEditorUtil.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/util/CpEditorUtil.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/wizard/CpaWizard.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/wizard/CpaWizard.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/wizard/OptionSettingsWizardPage.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/wizard/OptionSettingsWizardPage.java - diff]
plugins/org.eclipse.emf.henshin.cpa.ui/src/org/eclipse/emf/henshin/cpa/ui/wizard/RuleAndCpKindSelectionWizardPage.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa.ui/src/org/eclipse/emf/henshin/multicda/cpa/ui/wizard/RuleAndCpKindSelectionWizardPage.java - diff]
plugins/org.eclipse.emf.henshin.cpa/.classpath[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/.classpath - diff]
plugins/org.eclipse.emf.henshin.cpa/.project[Copied from plugins/org.eclipse.emf.henshin.multicda.cpa/.project - diff]
plugins/org.eclipse.emf.henshin.cpa/META-INF/MANIFEST.MF[Added - diff]
plugins/org.eclipse.emf.henshin.cpa/README-obtain_AGG_plugin.txt[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/README-obtain_AGG_plugin.txt - diff]
plugins/org.eclipse.emf.henshin.cpa/build.properties[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/build.properties - diff]
plugins/org.eclipse.emf.henshin.cpa/model/criticalPair.ecore[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/model/criticalPair.ecore - diff]
plugins/org.eclipse.emf.henshin.cpa/model/criticalPair.ecorediag[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/model/criticalPair.ecorediag - diff]
plugins/org.eclipse.emf.henshin.cpa/model/criticalPair.genmodel[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/model/criticalPair.genmodel - diff]
plugins/org.eclipse.emf.henshin.cpa/plugin.properties[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/plugin.properties - diff]
plugins/org.eclipse.emf.henshin.cpa/plugin.xml[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/plugin.xml - diff]
plugins/org.eclipse.emf.henshin.cpa/pom.xml[Copied from plugins/org.eclipse.emf.henshin.multicda.cpa/pom.xml - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/CPAOptions.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/CPAOptions.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/CPAUtility.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/CPAUtility.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/CpaByAGG.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/CpaByAGG.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/CriticalPairAnalysisPlugin.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/ConflictReasonAnalysisPlugin.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/ICriticalPairAnalysis.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/IConflictReasonAnalysis.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/InputDataChecker.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/InputDataChecker.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/UnsupportedRuleException.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/UnsupportedRuleException.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/CriticalPair.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/IConflictReason.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/CriticalpairFactory.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/IConflictReasonFactory.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/CriticalpairPackage.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/IConflictReasonPackage.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/impl/CriticalPairImpl.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/impl/ConflictReasonImpl.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/impl/CriticalpairFactoryImpl.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/impl/ConflictReasonFactoryImpl.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/impl/CriticalpairPackageImpl.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/impl/ConflictReasonPackageImpl.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/util/CriticalpairAdapterFactory.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/util/ConflictReasonAdapterFactory.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/criticalpair/util/CriticalpairSwitch.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/conflictreason/util/ConflictReasonSwitch.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/importer/AggHenshinCriticalPairTranslator.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/importer/AggHenshinConflictReasonTranslator.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/importer/CriticalGraphMapping.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/importer/ConflictGraphMapping.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/modelExtension/ComatchImpl.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/modelExtension/ComatchImpl.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/modelExtension/ExtendedMatchImpl.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/modelExtension/ExtendedMatchImpl.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/persist/CriticalPairNode.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/persist/ConflictReasonNode.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/persist/RootElement.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/persist/RootElement.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/persist/TreeFolder.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/persist/TreeFolder.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/CPAResult.java[Added - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/Conflict.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/Conflict.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/ConflictKind.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/ConflictKind.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/CriticalElement.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/ConflictElement.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/CriticalPair.java[Added - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/Dependency.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/Dependency.java - diff]
plugins/org.eclipse.emf.henshin.cpa/src/org/eclipse/emf/henshin/cpa/result/DependencyKind.java[Renamed from plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/DependencyKind.java - diff]
plugins/org.eclipse.emf.henshin.multicda.cpa.ui/.project[Deleted - diff]
plugins/org.eclipse.emf.henshin.multicda.cpa.ui/pom.xml[Deleted - diff]
plugins/org.eclipse.emf.henshin.multicda.cpa/META-INF/MANIFEST.MF[Deleted - diff]
plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/CPAResult.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.multicda.cpa/src/org/eclipse/emf/henshin/multicda/cpa/result/ConflictReason.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.tests/META-INF/MANIFEST.MF[diff]
plugins/org.eclipse.emf.henshin.tests/src/org/eclipse/emf/henshin/tests/cpa/BasicInheritanceTesting.java[diff]
plugins/org.eclipse.emf.henshin.tests/src/org/eclipse/emf/henshin/tests/cpa/DanglingOptionTest.java[diff]
plugins/org.eclipse.emf.henshin.tests/src/org/eclipse/emf/henshin/tests/cpa/InheritedReferenceTesting.java[diff]
plugins/org.eclipse.emf.henshin.tests/src/org/eclipse/emf/henshin/tests/cpa/InjectiveMatchingOptionTest.java[diff]
plugins/org.eclipse.emf.henshin.tests/src/org/eclipse/emf/henshin/tests/cpa/PreventDuplicateReferencesTest.java[diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.FormulaFormattingTests.xtendbin[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.MultiRuleFormattingTests.xtendbin[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.RuleFormattingTests.xtendbin[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.TransformationFormattingTests.xtendbin[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.UnitFormattingTests.xtendbin[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/.gitignore[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/FormulaFormattingTests.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/MultiRuleFormattingTests.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/RuleFormattingTests.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/TransformationFormattingTests.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.tests/xtend-gen/org/eclipse/emf/henshin/text/tests/formatting/UnitFormattingTests.java[Deleted - diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/contentassist/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/labeling/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/labeling/Henshin_textLabelProvider.java[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/outline/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/quickfix/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/util/.Transformation.xtendbin[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/util/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/util/ModifyModelUnits.java[diff]
plugins/org.eclipse.emf.henshin.text.ui/xtend-gen/org/eclipse/emf/henshin/text/ui/util/Transformation.java[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/Henshin_textRuntimeModule.java[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/Henshin_textStandaloneSetup.java[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/formatting2/.Henshin_textFormatter.xtendbin[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/formatting2/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/formatting2/Henshin_textFormatter.java[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/generator/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/scoping/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/typesystem/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/typesystem/Henshin_textTypeProvider.java[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/validation/.gitignore[diff]
plugins/org.eclipse.emf.henshin.text/xtend-gen/org/eclipse/emf/henshin/text/validation/Henshin_textValidator.java[diff]
pom.xml[diff]

106 files changed

tree: e313e9812ce81a876eeda48efbc685fd9b288190