diff options
| author | cletavernie | 2011-11-10 09:10:24 +0000 |
|---|---|---|
| committer | cletavernie | 2011-11-10 09:10:24 +0000 |
| commit | e5ea8ee63787c2b2c5e728454cbfab54e1a37886 (patch) | |
| tree | 4d0954745663596b507c670911b8fb77cd782040 /plugins | |
| parent | 48aa08235a861167bad0a39cd39ce63fce9f5d08 (diff) | |
| download | org.eclipse.papyrus-e5ea8ee63787c2b2c5e728454cbfab54e1a37886.tar.gz org.eclipse.papyrus-e5ea8ee63787c2b2c5e728454cbfab54e1a37886.tar.xz org.eclipse.papyrus-e5ea8ee63787c2b2c5e728454cbfab54e1a37886.zip | |
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins')
150 files changed, 588 insertions, 644 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml index c9a863914b3..05523ce2369 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/plugin.xml @@ -2,7 +2,7 @@ <?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.navigation.navigationRules">
+ point="org.eclipse.papyrus.infra.gmfdiag.navigation.navigationRules">
<navigationRule
rule="org.eclipse.papyrus.uml.diagram.navigation.BehavioredClassifierRule"></navigationRule>
<navigationRule
@@ -21,7 +21,7 @@ rule="org.eclipse.papyrus.uml.diagram.navigation.TransitionRule"></navigationRule>
</extension>
<extension
- point="org.eclipse.papyrus.navigation.navigationDecoratorRules">
+ point="org.eclipse.papyrus.infra.gmfdiag.navigation.navigationDecoratorRules">
<decoratedClass
class="org.eclipse.uml2.uml.BehavioredClassifier">
</decoratedClass>
@@ -36,7 +36,7 @@ </decoratedClass>
</extension>
<extension
- point="org.eclipse.papyrus.navigation.navigationColorProviders">
+ point="org.eclipse.papyrus.infra.gmfdiag.navigation.navigationColorProviders">
<navigationColorProvider
provider="org.eclipse.papyrus.uml.diagram.navigation.UMLNavigationColorProvider">
</navigationColorProvider>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java index 35a6fa5c9ca..bb0723490e8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/BehavioredClassifierRule.java @@ -18,10 +18,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.BehavioredClassifier;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java index 850bacb1ac4..60aa26d0e35 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/CBARule.java @@ -18,10 +18,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.CallBehaviorAction;
import org.eclipse.uml2.uml.PackageableElement;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java index 4e7d34be845..5580393e5ca 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/OperationRule.java @@ -18,10 +18,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java index 4b2c6370b33..115a24e7f7e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/PackageRule.java @@ -18,11 +18,11 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.CreatedNavigableElement;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreatedNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Collaboration;
import org.eclipse.uml2.uml.Package;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java index 140d50a1b34..e791da5becf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/StateRule.java @@ -17,10 +17,10 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.State;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java index 14388246954..9cabe819f11 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/TransitionRule.java @@ -18,10 +18,10 @@ import java.util.List; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.ExistingNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.INavigationRule;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.ExistingNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.INavigationRule;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.Behavior;
import org.eclipse.uml2.uml.Transition;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java index f6bf4e97494..99686821a5e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLBaseNameSetter.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.List;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.navigation.IBaseNameSetter;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IBaseNameSetter;
import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
import org.eclipse.uml2.uml.NamedElement;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java index b035a3222c4..d6190e69e5a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationColorProvider.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.navigation; import org.eclipse.draw2d.ColorConstants;
import org.eclipse.jface.viewers.IColorProvider;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.swt.graphics.Color;
public class UMLNavigationColorProvider implements IColorProvider {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java index ab3b8f43e3e..406abd20198 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLNavigationHelper.java @@ -16,7 +16,7 @@ package org.eclipse.papyrus.uml.diagram.navigation; import java.util.HashMap;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java index 7f23e338eeb..5bcd84d66fb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.navigation/src/org/eclipse/papyrus/uml/diagram/navigation/UMLRuleHelper.java @@ -18,9 +18,9 @@ import java.util.List; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.navigation.CreatedNavigableElement;
-import org.eclipse.papyrus.navigation.IModelLinker;
-import org.eclipse.papyrus.navigation.NavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreatedNavigableElement;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.IModelLinker;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.NavigableElement;
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.UMLPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project index 72d7ebfc1fb..c1f24eaf16d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.uml.diagram.pkg</name>
+ <name>org.eclipse.papyrus.uml.diagram.package</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF index 49404f04248..6c1dc45c38a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/META-INF/MANIFEST.MF @@ -13,6 +13,6 @@ Bundle-Version: 0.9.0.qualifier Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.uml.diagram.pkg.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.pkg;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.package;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml index 30619ebbd46..66c2b4d1bcf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.gen.xml @@ -3,7 +3,7 @@ <plugin> <!-- Diagram declaration --> -<extension point="org.eclipse.papyrus.core.papyrusDiagram"> +<extension point="org.eclipse.papyrus.infra.core.papyrusDiagram"> <creationCommand creationCommandClass="org.eclipse.papyrus.uml.diagram.pkg.PackageDiagramCreateCommand" icon="icons/obj16/Diagram_Package.gif" @@ -30,7 +30,7 @@ commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand"> <activeWhen> <with variable="activeEditorId"> - <equals value="org.eclipse.papyrus.core.papyrusEditor" /> + <equals value="org.eclipse.papyrus.infra.core.papyrusEditor" /> </with> </activeWhen> </handler> @@ -40,7 +40,7 @@ <extension point="org.eclipse.ui.menus"> <menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu"> - <menu id="org.eclipse.papyrus.diagram.ui.menu.diagrams" label="Diagrams"> + <menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams"> <command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand" icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram" style="push" tooltip="Create a new Package Diagram"> @@ -53,7 +53,7 @@ </menuContribution> <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar"> - <toolbar id="org.eclipse.papyrus.diagram.ui.toolbar"> + <toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar"> <command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand" icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram" style="push" tooltip="Create a new Package Diagram"> @@ -255,7 +255,7 @@ <page id="org.eclipse.papyrus.uml.diagram.pkg.preferences" name="Package Diagram" - category="org.eclipse.papyrus.preferences.diagrams" + category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams" class="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackageDiagramGeneralPreferencePage"> </page> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml index 95e37772748..0a335632571 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/plugin.xml @@ -3,7 +3,7 @@ <plugin> <!-- Diagram declaration --> -<extension point="org.eclipse.papyrus.core.papyrusDiagram"> +<extension point="org.eclipse.papyrus.infra.core.papyrusDiagram"> <creationCommand creationCommandClass="org.eclipse.papyrus.uml.diagram.pkg.PackageDiagramCreateCommand" creationCondition="org.eclipse.papyrus.uml.diagram.pkg.PackageDiagramCreationCondition"
@@ -31,7 +31,7 @@ commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand"> <activeWhen> <with variable="activeEditorId"> - <equals value="org.eclipse.papyrus.core.papyrusEditor" /> + <equals value="org.eclipse.papyrus.infra.core.papyrusEditor" /> </with> </activeWhen> </handler> @@ -41,7 +41,7 @@ <extension point="org.eclipse.ui.menus"> <menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu"> - <menu id="org.eclipse.papyrus.diagram.ui.menu.diagrams" label="Diagrams"> + <menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams" label="Diagrams"> <command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand" icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram" style="push" tooltip="Create a new Package Diagram"> @@ -54,7 +54,7 @@ </menuContribution> <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar"> - <toolbar id="org.eclipse.papyrus.diagram.ui.toolbar"> + <toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar"> <command commandId="org.eclipse.papyrus.uml.diagram.pkg.CreateCommand" icon="icons/obj16/Diagram_Package.gif" label="Create a new Package Diagram" style="push" tooltip="Create a new Package Diagram"> @@ -256,7 +256,7 @@ <page id="org.eclipse.papyrus.uml.diagram.pkg.preferences" name="Package Diagram" - category="org.eclipse.papyrus.preferences.diagrams" + category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams" class="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackageDiagramGeneralPreferencePage"> </page> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/Activator.java index 51c4ed6df32..5306a26e89f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/Activator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/Activator.java @@ -16,7 +16,7 @@ package org.eclipse.papyrus.uml.diagram.pkg; import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.papyrus.log.LogHelper; +import org.eclipse.papyrus.infra.core.log.LogHelper; import org.eclipse.papyrus.uml.diagram.pkg.preferences.PackageDiagramPreferenceInitializer; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -101,7 +101,7 @@ public class Activator extends AbstractUIPlugin { */ @Override public IPreferenceStore getPreferenceStore() { - IPreferenceStore store = org.eclipse.papyrus.preferences.Activator.getDefault().getPreferenceStore(); + IPreferenceStore store = org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore(); return store; } } diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreateCommand.java index 51cbee027dd..bf9e3b4fc3f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreateCommand.java @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler; +import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler; import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes; public class PackageDiagramCreateCommand extends AbstractPapyrusGmfCreateDiagramCommandHandler { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramEditorFactory.java index fbaf7cf95f6..6fb11d10745 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramEditorFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramEditorFactory.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.pkg; -import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory; +import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory; import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes; public class PackageDiagramEditorFactory extends GmfEditorFactory { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramForMultiEditor.java index 4a89af26062..30e0cf68d9a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramForMultiEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramForMultiEditor.java @@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.papyrus.core.editor.BackboneException; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.core.services.ServicesRegistry; +import org.eclipse.papyrus.infra.core.editor.BackboneException; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.uml.diagram.pkg.part.PackageDiagramEditor; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java index 1c55a5d2c9d..db1d4908304 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/part/PackageDiagramEditor.java @@ -39,15 +39,15 @@ import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentPro import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider; -import org.eclipse.papyrus.core.editor.IMultiDiagramEditor; -import org.eclipse.papyrus.core.services.ServiceException; -import org.eclipse.papyrus.core.services.ServicesRegistry; import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener; import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider; import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer; import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor; import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService; +import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfMultiDiagramDocumentProvider; +import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor; +import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.core.services.ServicesRegistry; import org.eclipse.papyrus.uml.diagram.pkg.Activator; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.TransferData; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java index 4aa64c08b02..ca658ce057b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/DependencyPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes; public class DependencyPreferencePage extends PackageDiagramLinkPreferencePage { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java index 4b1f856d82b..7e37ff5c55c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramGeneralPreferencePage.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.pkg.preferences; -import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage; import org.eclipse.papyrus.uml.diagram.pkg.Activator; public class PackageDiagramGeneralPreferencePage extends DiagramPreferencePage { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramLinkPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramLinkPreferencePage.java index 3859957634a..25dda03ef50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramLinkPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramLinkPreferencePage.java @@ -18,8 +18,8 @@ import java.util.Collections; import java.util.List; import java.util.TreeMap; -import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage; -import org.eclipse.papyrus.preferences.ui.OrderedLabelGroup; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage; +import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup; import org.eclipse.papyrus.uml.diagram.pkg.Activator; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramNodePreferencePage.java index 9c1fec09813..ce450bade06 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramNodePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramNodePreferencePage.java @@ -18,9 +18,9 @@ import java.util.Collections; import java.util.List; import java.util.TreeMap; -import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage; -import org.eclipse.papyrus.preferences.ui.OrderedCompartmentGroup; -import org.eclipse.papyrus.preferences.ui.OrderedLabelGroup; +import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage; +import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedCompartmentGroup; +import org.eclipse.papyrus.infra.gmfdiag.preferences.ui.OrderedLabelGroup; import org.eclipse.papyrus.uml.diagram.pkg.Activator; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java index 2b5ae72550b..6ce87092a76 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageImportPreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes; public class PackageImportPreferencePage extends PackageDiagramLinkPreferencePage { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java index b83023bf079..1821f8c3396 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackagePreferencePage.java @@ -18,7 +18,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper; +import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper; import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes; public class PackagePreferencePage extends PackageDiagramNodePreferencePage { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java index c4e10d318dd..acf7c29b6b7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.pkg.provider; -import static org.eclipse.papyrus.core.Activator.log; +import static org.eclipse.papyrus.infra.core.Activator.log; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EAnnotation; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPartProvider.java index 6ad314124ae..bec9f88c4ae 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPartProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPartProvider.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.pkg.provider; -import static org.eclipse.papyrus.core.Activator.log; +import static org.eclipse.papyrus.infra.core.Activator.log; import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramViewProvider.java index 8fc79b04320..5a22aca9ade 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramViewProvider.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.eclipse.papyrus.uml.diagram.pkg.provider; -import static org.eclipse.papyrus.core.Activator.log; +import static org.eclipse.papyrus.infra.core.Activator.log; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/CreatePackageDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/CreatePackageDiagramWithNavigationHandler.java index 694f8857d8d..e0b3d3b2897 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/CreatePackageDiagramWithNavigationHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/CreatePackageDiagramWithNavigationHandler.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.pkg;
-import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;
public class CreatePackageDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreationCondition.java index 44109955ba5..08c43df7061 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreationCondition.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.package/src/org/eclipse/papyrus/uml/diagram/pkg/PackageDiagramCreationCondition.java @@ -11,7 +11,7 @@ package org.eclipse.papyrus.uml.diagram.pkg;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;
+import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;
/**
* PackageDiagramCreationCondition class allows to check if a Class diagram can be added to the
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ChildConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ChildConfigurationItemProvider.java index c1ec9c4e78d..0b93638f031 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ChildConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ChildConfigurationItemProvider.java @@ -12,14 +12,12 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ConfigurationItemProvider.java index accaa1722cf..cc61c40f1c9 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ConfigurationItemProvider.java @@ -12,11 +12,8 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -27,7 +24,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/DrawerConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/DrawerConfigurationItemProvider.java index b3b88551dc9..62140c30bd1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/DrawerConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/DrawerConfigurationItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -22,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ElementDescriptorItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ElementDescriptorItemProvider.java index 42ce41ae85f..5b18663e04b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ElementDescriptorItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ElementDescriptorItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +23,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/IconDescriptorItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/IconDescriptorItemProvider.java index 075e92f373a..fc20d3aaaf6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/IconDescriptorItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/IconDescriptorItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -25,7 +23,6 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/LeafConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/LeafConfigurationItemProvider.java index 04ed2b51235..911fbec96a7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/LeafConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/LeafConfigurationItemProvider.java @@ -12,14 +12,12 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationEditPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationEditPlugin.java index fdc72c49f6b..a63daeb7400 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationEditPlugin.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationEditPlugin.java @@ -7,15 +7,10 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit.provider;
import org.eclipse.emf.common.EMFPlugin;
-
import org.eclipse.emf.common.util.ResourceLocator;
-
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
import org.eclipse.emf.facet.infra.query.edit.provider.QueryEditPlugin;
-
-import org.eclipse.papyrus.core.queries.configuration.provider.ConfigurationEditPlugin;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.provider.ConfigurationEditPlugin;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationItemProvider.java index 114842c0937..1a58a13701d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteConfigurationItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -22,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteconfigurationItemProviderAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteconfigurationItemProviderAdapterFactory.java index 6373ba13716..0ecb8636ea8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteconfigurationItemProviderAdapterFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/PaletteconfigurationItemProviderAdapterFactory.java @@ -12,7 +12,6 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.edit.provider.ChangeNotifier;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -24,7 +23,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.INotifyChangedListener;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationAdapterFactory;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/SeparatorConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/SeparatorConfigurationItemProvider.java index 407a06d5601..f8b5d2eecbf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/SeparatorConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/SeparatorConfigurationItemProvider.java @@ -12,14 +12,12 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/StackConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/StackConfigurationItemProvider.java index 486ca5920a2..08a699eb8d5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/StackConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/StackConfigurationItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -22,7 +20,6 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ToolConfigurationItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ToolConfigurationItemProvider.java index e38ce68b77d..69f16efc273 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ToolConfigurationItemProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/edit/provider/ToolConfigurationItemProvider.java @@ -12,9 +12,7 @@ import java.util.List; import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -24,7 +22,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore index 314acaf30b7..c1a3bec3865 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecore @@ -8,7 +8,7 @@ upperBound="-1" eType="#//DrawerConfiguration" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ToolConfiguration" eSuperTypes="#//LeafConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="preValidationQuery" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="preValidationQuery" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//ToolKind"
defaultValueLiteral="CreationTool"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="elementDescriptors" upperBound="-1"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag index b8bbb430a82..71ee41642f5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.ecorediag @@ -43,7 +43,7 @@ <children xmi:type="notation:Node" xmi:id="_UiCXM93eEd-vY7OSNoF8nA" type="4001"/>
<children xmi:type="notation:Node" xmi:id="_UiCXNN3eEd-vY7OSNoF8nA" type="5001">
<children xmi:type="notation:Node" xmi:id="_TSNWsOECEd-0CYOJPs0ewQ" type="2001">
- <element xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration/name"/>
+ <element xmi:type="ecore:EAttribute" href="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration/name"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_TSNWseECEd-0CYOJPs0ewQ"/>
</children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_UiCXNd3eEd-vY7OSNoF8nA"/>
@@ -56,7 +56,7 @@ <styles xmi:type="notation:FilteringStyle" xmi:id="_UiCXO93eEd-vY7OSNoF8nA"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_UiCXMd3eEd-vY7OSNoF8nA" fontColor="4210752" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
- <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.ecore#//QueryConfiguration"/>
+ <element xmi:type="ecore:EClass" href="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.ecore#//QueryConfiguration"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_UiCXMt3eEd-vY7OSNoF8nA" x="1095" y="490" width="178"/>
</children>
<children xmi:type="notation:Node" xmi:id="_tJSakOAfEd-0CYOJPs0ewQ" type="1001">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel index bcb545302ee..6b801a10631 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/model/PaletteConfiguration.genmodel @@ -8,7 +8,7 @@ editorPluginClass="org.eclipse.papyrus.uml.diagram.paletteconfiguration.presentation.PaletteConfigurationEditorPlugin"
testsDirectory="/org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests/src-gen" testSuiteClass="org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests.PaletteConfigurationAllTests"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- usedGenPackages="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+ usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
<foreignModel>PaletteConfiguration.ecore</foreignModel>
<genPackages prefix="Paletteconfiguration" basePackage="org.eclipse.papyrus" resource="XML"
disposableProviderFactory="true" ecorePackage="PaletteConfiguration.ecore#/">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java index 42b798a79dd..ed5221d4fa6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ElementDescriptor.java @@ -7,7 +7,6 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java index 157bb274e83..51cf71a4d20 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/ToolConfiguration.java @@ -7,8 +7,7 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration;
import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;
+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java index f141cb2eb6f..71664689275 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ChildConfigurationImpl.java @@ -7,7 +7,6 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java index b6c3a9230db..62b8cddef13 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ConfigurationImpl.java @@ -8,13 +8,10 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java index 0c55f19ed63..ec719d95c1a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java @@ -9,15 +9,11 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl; import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java index dbc6358ccd9..d464452a549 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ElementDescriptorImpl.java @@ -9,16 +9,11 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl; import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java index b54b946391a..361c2def541 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/IconDescriptorImpl.java @@ -7,12 +7,9 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java index 3b833232908..a8f3fce261b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/LeafConfigurationImpl.java @@ -7,7 +7,6 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java index 79d6c186959..0146f972e50 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteConfigurationImpl.java @@ -9,15 +9,11 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl; import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java index 8e72f1009aa..4b94482e28f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationFactoryImpl.java @@ -10,12 +10,18 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationFactory;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolKind;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java index ec999c0589f..4b4da02bd8a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/PaletteconfigurationPackageImpl.java @@ -12,11 +12,8 @@ import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EcorePackage;
-
import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.papyrus.core.queries.configuration.ConfigurationPackage;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.ConfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java index 61f2fa02e6f..a47e1631520 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/SeparatorConfigurationImpl.java @@ -7,7 +7,6 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;
import org.eclipse.emf.ecore.EClass;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java index 3e65bc1c5fc..9a799418c76 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/StackConfigurationImpl.java @@ -9,15 +9,11 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl; import java.util.Collection;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java index f15b990f37b..396b21a8773 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/ToolConfigurationImpl.java @@ -10,19 +10,13 @@ import java.util.Collection; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.papyrus.core.queries.configuration.QueryConfiguration;
-
+import org.eclipse.papyrus.infra.queries.core.configuration.QueryConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java index a8518bd0e6d..d42b07e0a36 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationAdapterFactory.java @@ -8,12 +8,19 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util; import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
-
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java index 1551e482376..40d83bcb1a7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceFactoryImpl.java @@ -7,11 +7,8 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
import org.eclipse.emf.ecore.xmi.XMLResource;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java index 2a834d91e8a..0c386f73aef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationResourceImpl.java @@ -7,7 +7,6 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util;
import org.eclipse.emf.common.util.URI;
-
import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java index dd255b17bbc..bb3da931ca3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationSwitch.java @@ -8,10 +8,18 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.util.Switch;
-
-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.*;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Configuration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.IconDescriptor;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.LeafConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
+import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java index f4a5d376c25..795829e788e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteconfigurationXMLProcessor.java @@ -9,11 +9,8 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.util; import java.util.Map;
import org.eclipse.emf.ecore.EPackage;
-
import org.eclipse.emf.ecore.resource.Resource;
-
import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Activator.java index 89f35a9624c..bae561832f4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Activator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/Activator.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedConnectionToolEntry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedConnectionToolEntry.java index 4a00dff8861..6272821c83f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedConnectionToolEntry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedConnectionToolEntry.java @@ -19,7 +19,7 @@ import java.util.List; import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedCreationToolEntry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedCreationToolEntry.java index 0576b9deeb2..3724cf0320f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedCreationToolEntry.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/provider/ExtendedCreationToolEntry.java @@ -16,11 +16,10 @@ package org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider; import java.util.ArrayList;
import java.util.List;
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
import org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.extendedtypes.ExtendedTypesRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ElementDescriptor;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteConfigurationUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteConfigurationUtils.java index eb3f58e6c5e..7071babdd6b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteConfigurationUtils.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src/org/eclipse/papyrus/uml/diagram/paletteconfiguration/util/PaletteConfigurationUtils.java @@ -26,7 +26,6 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration import org.eclipse.papyrus.uml.diagram.paletteconfiguration.SeparatorConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.StackConfiguration;
import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ToolConfiguration;
-import org.eclipse.papyrus.uml.diagram.paletteconfiguration.util.PaletteconfigurationSwitch;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java index 19f7af64d54..5cb5deb321e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramCommand.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile; import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint; -import org.eclipse.papyrus.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler; +import org.eclipse.papyrus.infra.core.adaptor.gmf.AbstractPapyrusGmfCreateDiagramCommandHandler; import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart; import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin; diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java index 2be4dc99539..99300d9cbbe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileDiagramWithNavigationHandler.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile;
-import org.eclipse.papyrus.navigation.CreateDiagramWithNavigationHandler;
+import org.eclipse.papyrus.infra.gmfdiag.navigation.CreateDiagramWithNavigationHandler;
public class CreateProfileDiagramWithNavigationHandler extends CreateDiagramWithNavigationHandler {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java index a0907719b0d..c4e457f0a03 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/CreateProfileModelCommand.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.profile;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.core.extension.commands.ModelCreationCommandBase;
+import org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase;
import org.eclipse.uml2.uml.UMLFactory;
@@ -26,7 +26,7 @@ public class CreateProfileModelCommand extends ModelCreationCommandBase { public static final String COMMAND_ID = "profile";
/**
- * @see org.eclipse.papyrus.core.extension.commands.ModelCreationCommandBase#createRootElement()
+ * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
*
* @return
*/
@@ -37,7 +37,7 @@ public class CreateProfileModelCommand extends ModelCreationCommandBase { }
/**
- * @see org.eclipse.papyrus.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
+ * @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#initializeModel(org.eclipse.emf.ecore.EObject)
*
* @param owner
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java index d974a26d486..7b5240983bb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramCreationCondition.java @@ -11,7 +11,7 @@ package org.eclipse.papyrus.uml.diagram.profile;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.core.extension.commands.PerspectiveContextDependence;
+import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;
import org.eclipse.uml2.uml.Profile;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java index 268a9a7b110..02f8a09728f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/ProfileDiagramEditorFactory.java @@ -15,7 +15,7 @@ package org.eclipse.papyrus.uml.diagram.profile;
-import org.eclipse.papyrus.core.adaptor.gmf.GmfEditorFactory;
+import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfEditorFactory;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java index ce1dffff7b3..e860f6bbe6d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/UmlProfileDiagramForMultiEditor.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2009 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,9 +22,9 @@ import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.l10n.EditorM import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.editor.BackboneException;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.editor.BackboneException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditor;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
import org.eclipse.swt.widgets.Composite;
@@ -35,7 +35,7 @@ import org.eclipse.ui.PartInitException; /**
* <pre>
- * An editor to be used in multitabs editor.
+ * An editor to be used in multitabs editor.
* This editor extends the original UMLDiagramEditor generated by GMF.
* </pre>
*/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java index 309f92a7cf4..b35419d9421 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomExtensionCreateCommand.java @@ -49,7 +49,7 @@ import org.eclipse.uml2.uml.UMLFactory; * </pre>
*/
/**
- * This class looks like org.eclipse.papyrus.diagram.composite.custom.edit.commandConnectorCreateCommand
+ * This class looks like org.eclipse.papyrus.uml.diagram.composite.custom.edit.commandConnectorCreateCommand
*/
public class CustomExtensionCreateCommand extends ExtensionCreateCommand {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java index 60961ed1876..2757e6d7dd5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/CustomSemanticCreateCommand.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,10 +29,10 @@ import org.eclipse.gmf.runtime.common.core.command.CompositeCommand; import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.papyrus.profile.ImageManager;
import org.eclipse.papyrus.uml.diagram.profile.custom.messages.Messages;
import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;
import org.eclipse.papyrus.uml.diagram.profile.custom.ui.dialog.ChooseSetMetaclassDialog;
+import org.eclipse.papyrus.uml.profile.ImageManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
@@ -144,7 +144,7 @@ public class CustomSemanticCreateCommand extends AbstractTransactionalCommand { if(!metaclassSet.contains(this.addedMetaclasses.get(i))) {
//we create an ElementImport for the new metaclass
ElementImport ei = UMLFactory.eINSTANCE.createElementImport();
- //we create the class
+ //we create the class
ei.setImportedElement((PackageableElement)this.addedMetaclasses.get(i));
@@ -170,7 +170,7 @@ public class CustomSemanticCreateCommand extends AbstractTransactionalCommand { //we add the metaclass in metaclassReference
SetRequest setRequest = new SetRequest(this.profile, UMLPackage.eINSTANCE.getProfile_MetaclassReference(), added);
- org.eclipse.papyrus.service.edit.service.IElementEditService provider = org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils.getCommandProvider(this.profile);
+ org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(this.profile);
if(provider != null) {
ICommand editCommand = null;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java index b173ee4cb91..670132d7e58 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/DefineProfileCommand.java @@ -30,8 +30,8 @@ import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;
-import org.eclipse.papyrus.profile.definition.ProfileRedefinition;
+import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;
+import org.eclipse.papyrus.uml.profile.definition.ProfileRedefinition;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
import org.eclipse.uml2.uml.Profile;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java index 1b78d8b0ff6..e6a63deb0c2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ExtensionHelper.java @@ -30,9 +30,9 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.core.editor.CoreMultiDiagramEditor;
import org.eclipse.papyrus.commands.wrappers.EMFtoGEFCommandWrapper;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.editor.CoreMultiDiagramEditor;
import org.eclipse.papyrus.uml.diagram.common.helper.ElementHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;
import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java index 8a29efeb0d8..2af3549f438 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/MetaclassHelper.java @@ -31,8 +31,6 @@ import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartCN;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfilePackageableElementCompartmentEditPartTN;
import org.eclipse.uml2.uml.ElementImport;
-import org.eclipse.uml2.uml.Extension;
-import org.eclipse.uml2.uml.ExtensionEnd;
import org.eclipse.uml2.uml.Profile;
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java index a0894d4c6b3..b0196ed0a78 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/helper/ProfileDiagramAssociationHelper.java @@ -13,7 +13,6 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.custom.helper;
-import java.awt.Container;
import java.util.List;
import org.eclipse.emf.ecore.EObject;
@@ -21,7 +20,7 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.ui.toolbox.LookForElement;
+import org.eclipse.papyrus.infra.widgets.toolbox.LookForElement;
import org.eclipse.papyrus.uml.diagram.common.helper.NamedElementHelper;
import org.eclipse.papyrus.uml.diagram.profile.custom.commands.PropertyCommandForAssociation;
import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java index 9943a974872..25336c0c632 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypeElementImportLabelDisplayEditPolicy.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.uml.diagram.profile.custom.policies;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.uml2.uml.ElementImport;
/**
* Edit Policy for Applied Stereotype Label for {@link ElementImport}.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java index 6aaaa2096b8..9b37cab7a86 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.uml.diagram.profile.custom.policies;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.uml2.uml.PackageImport;
/**
* Edit Policy for Applied Stereotype Label for {@link PackageImport}.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java index cb2b7e26990..d5c7356a929 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/CustomCreationRoleEditPolicy.java @@ -35,7 +35,6 @@ import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
@@ -43,7 +42,6 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
@@ -55,8 +53,8 @@ import org.eclipse.papyrus.uml.diagram.profile.custom.commands.CustomSemanticCre import org.eclipse.papyrus.uml.diagram.profile.custom.helper.MetaclassHelper;
import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateElementRequestAdapter;
import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewAndElementRequest;
-import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewRequest;
import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewAndElementRequest.ViewAndElementDescriptor;
+import org.eclipse.papyrus.uml.diagram.profile.custom.requests.CustomCreateViewRequest;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPartCN;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java index ee0bff79225..506321675a0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndEditPolicy.java @@ -125,7 +125,7 @@ public class DisplayAssociationEndEditPolicy extends AbstractMaskManagedEditPoli }
public String getPreferencePageID() {
- return "org.eclipse.papyrus.diagram.clazz.custom.preferences.PropertyPreferencePage"; //$NON-NLS-1$
+ return "org.eclipse.papyrus.uml.diagram.clazz.custom.preferences.PropertyPreferencePage"; //$NON-NLS-1$
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java index 33821942c98..681413a9bbd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndSourceMultiplicityEditPolicy.java @@ -23,7 +23,7 @@ public class DisplayAssociationEndSourceMultiplicityEditPolicy extends DisplayAs /**
*
- * @see org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndEditPolicy#getDefaultDisplayValue()
+ * @see org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndEditPolicy#getDefaultDisplayValue()
*
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java index 3a00d49c531..5d3cff622fd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/DisplayAssociationEndTargetMultiplicityEditPolicy.java @@ -23,7 +23,7 @@ public class DisplayAssociationEndTargetMultiplicityEditPolicy extends DisplayAs /**
*
- * @see org.eclipse.papyrus.diagram.clazz.custom.policies.DisplayAssociationEndEditPolicy#getDefaultDisplayValue()
+ * @see org.eclipse.papyrus.uml.diagram.clazz.custom.policies.DisplayAssociationEndEditPolicy#getDefaultDisplayValue()
*
*/
@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java index 3c33d177ab2..76a7c411962 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/policies/ExtensionCustomNameEditPolicy.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy; import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.core.listenerservice.IPapyrusListener;
-import org.eclipse.papyrus.core.utils.EditorUtils;
+import org.eclipse.papyrus.infra.core.listenerservice.IPapyrusListener;
+import org.eclipse.papyrus.infra.core.utils.EditorUtils;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.papyrus.uml.diagram.profile.custom.helper.ExtensionHelper;
import org.eclipse.swt.widgets.Display;
@@ -152,7 +152,7 @@ public class ExtensionCustomNameEditPolicy extends AbstractEditPolicy implements String newExtensionName = ExtensionHelper.getExtensionName((Element)hostSemanticElement, ((Extension)hostSemanticElement).getStereotype(), ((Extension)hostSemanticElement).getMetaclass());
if(systemExtensionName.equals(((Extension)hostSemanticElement).getName())) {
SetRequest setRequestExt = new SetRequest(domain, ext, UMLPackage.eINSTANCE.getNamedElement_Name(), newExtensionName);
- org.eclipse.papyrus.service.edit.service.IElementEditService provider = org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils.getCommandProvider(ext);
+ org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(ext);
if(provider != null) {
ICommand editCommand = null;
editCommand = provider.getEditCommand(setRequestExt);
@@ -163,12 +163,12 @@ public class ExtensionCustomNameEditPolicy extends AbstractEditPolicy implements systemExtensionName = newExtensionName;
systemExtensionName = newExtensionName;
}
- //command to change the ExtensionEnd's name
+ //command to change the ExtensionEnd's name
//There is only ONE ExtensionEnd
ExtensionEnd extEnd = (ExtensionEnd)((Extension)hostSemanticElement).getOwnedEnds().get(0);
SetRequest setRequestExtEnd = new SetRequest(domain, extEnd, UMLPackage.eINSTANCE.getNamedElement_Name(), newExtEndName.replaceFirst("E", "e")); //$NON-NLS-1$ //$NON-NLS-2$
- org.eclipse.papyrus.service.edit.service.IElementEditService provider = org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils.getCommandProvider(extEnd);
+ org.eclipse.papyrus.infra.services.edit.service.IElementEditService provider = org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils.getCommandProvider(extEnd);
if(provider != null) {
ICommand editCommand = null;
editCommand = provider.getEditCommand(setRequestExtEnd);
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java index d43bd928c76..aed07480ebd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusOperationPreferencesConstant.java @@ -13,7 +13,6 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;
-import org.eclipse.uml2.uml.Operation;
/**
* Constants for {@link Operation} preferences.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java index 5861f4b9e81..9318b2a10e8 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/IPapyrusPropertyPreferencesConstant.java @@ -13,7 +13,6 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.custom.preferences;
-import org.eclipse.uml2.uml.Property;
/**
* Constants for {@link Property} preferences.
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java index 4247d16f485..505b365f1dd 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/OperationPreferencePage.java @@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.diagram.profile.custom.preferences; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusElementPreferencePage;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;
import org.eclipse.swt.SWT;
@@ -30,7 +30,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.uml2.uml.Operation;
/**
* Specific {@link Operation} preference page
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java index e00ec1ac9fd..f576c2dd238 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/preferences/PropertyPreferencePage.java @@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.diagram.profile.custom.preferences; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusElementPreferencePage;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusElementPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.tools.utils.ICustomAppearence;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -29,7 +29,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.uml2.uml.Property;
/**
* Specific {@link Property} preference page
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java index fa5479b6259..e5a44369b55 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ChooseSetMetaclassDialog.java @@ -24,12 +24,12 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.papyrus.profile.ui.dialogs.AlphabeticalViewerSorter;
-import org.eclipse.papyrus.profile.ui.dialogs.ChooseSetAssistedDialog;
-import org.eclipse.papyrus.profile.ui.dialogs.IChooseDialog;
import org.eclipse.papyrus.uml.diagram.common.Activator;
import org.eclipse.papyrus.uml.diagram.profile.custom.messages.Messages;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.AlphabeticalViewerSorter;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ChooseSetAssistedDialog;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.IChooseDialog;
import org.eclipse.papyrus.uml.tools.utils.ElementUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java index 2351fb049c3..d36213aeee1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/custom/ui/dialog/ElementListWithComparator.java @@ -18,7 +18,7 @@ import java.util.Comparator; import java.util.Iterator;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.papyrus.profile.ui.dialogs.ElementList;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ElementList;
/**
* Creates a new ElementList with a special comparator. This comparator is used to modify the
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java index baf1e050861..bbe6ba9625c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/PreSaveProfileListener.java @@ -27,14 +27,14 @@ import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer; import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;
-import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;
import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;
-import org.eclipse.papyrus.profile.definition.PapyrusDefinitionAnnotation;
-import org.eclipse.papyrus.profile.ui.dialogs.ProfileDefinitionDialog;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.lifecycleevents.DoSaveEvent;
+import org.eclipse.papyrus.infra.core.lifecycleevents.ISaveEventListener;
import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DefineProfileCommand;
+import org.eclipse.papyrus.uml.profile.definition.PapyrusDefinitionAnnotation;
+import org.eclipse.papyrus.uml.profile.ui.dialogs.ProfileDefinitionDialog;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.uml2.uml.Profile;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java index 87c3b07441a..5468f58616d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/custom-src/org/eclipse/papyrus/uml/diagram/profile/service/ProfileService.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,11 +13,10 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.service;
-import org.eclipse.papyrus.core.lifecycleevents.ILifeCycleEventsProvider;
-import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider;
-import org.eclipse.papyrus.core.services.IService;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.lifecycleevents.ILifeCycleEventsProvider;
+import org.eclipse.papyrus.infra.core.services.IService;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
/**
@@ -57,7 +56,7 @@ public class ProfileService implements IService { }
/**
- * @see org.eclipse.papyrus.core.services.IService#disposeService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#disposeService()
*
*/
public void disposeService() {
@@ -70,7 +69,7 @@ public class ProfileService implements IService { * Initialize the service. Set the {@link ServicesRegistry} that can be used to retrieve other services.
* This method is called after the object instanciation, and before the service start.
*
- * @see org.eclipse.papyrus.core.services.IService#init(org.eclipse.papyrus.core.services.ServicesRegistry)
+ * @see org.eclipse.papyrus.infra.core.services.IService#init(org.eclipse.papyrus.infra.core.services.ServicesRegistry)
*
* @param servicesRegistry
*/
@@ -80,7 +79,7 @@ public class ProfileService implements IService { }
/**
- * @see org.eclipse.papyrus.core.services.IService#startService()
+ * @see org.eclipse.papyrus.infra.core.services.IService#startService()
*
*/
public void startService() {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen index 2e71dc6bc4f..86a206885ba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/model/profilediagram.gmfgen @@ -3502,37 +3502,37 @@ body="org.eclipse.uml2.uml.LiteralString literalString=org.eclipse.uml2.uml.UMLFactory.eINSTANCE.createLiteralString();
literalString.setValue("");
return literalString;"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//GeneralizationSource
				if(!(source instanceof org.eclipse.uml2.uml.Classifier)) {
					return false;
				}
				if(org.eclipse.papyrus.profile.utils.Util.isMetaclass(source)) {
					return false;
				}
				if(source instanceof org.eclipse.uml2.uml.Extension){
					return false; //meaningless
				}"/>
+ body="//GeneralizationSource
				if(!(source instanceof org.eclipse.uml2.uml.Classifier)) {
					return false;
				}
				if(org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass(source)) {
					return false;
				}
				if(source instanceof org.eclipse.uml2.uml.Extension){
					return false; //meaningless
				}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
body="//GeneralizationTarget
if(target != null) {
					if(!(target instanceof org.eclipse.uml2.uml.Classifier)) {
						return false;
					}
					if(Util.isMetaclass(target)) {
						return false;
					}
					if(target instanceof org.eclipse.uml2.uml.Extension){
						return false;//meaningless
					}
				}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//AssociationSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
+ body="//AssociationSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
body="//AssociationTarget
if(target!=null){
	if(target instanceof org.eclipse.uml2.uml.Extension){
		return false;
	}
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//DependencySource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
+ body="//DependencySource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
body="//DependencyTarget 
if(target!=null){
	if(target instanceof org.eclipse.uml2.uml.Extension){
		return false;
	}
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//ElementImportSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
+ body="//ElementImportSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
body="//ElementImportTarget
if(target!=null){
	if(target instanceof org.eclipse.uml2.uml.Extension){
		return false;
	}
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//PackageImportSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
+ body="//PackageImportSource
if((source instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)source)) {
	return false;
}
if(source instanceof org.eclipse.uml2.uml.Extension){
	return false;
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//AnnotatedElementLink target
if((target instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)target)) {
	return false;
}"/>
+ body="//AnnotatedElementLink target
if((target instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)target)) {
	return false;
}"/>
<expressions
xsi:type="gmfgen:GenConstraint"
- body="//ConstraintedElementLink
if((target instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)target)) {
	return false;
}"/>
+ body="//ConstraintedElementLink
if((target instanceof org.eclipse.uml2.uml.Type) && org.eclipse.papyrus.uml.profile.utils.Util.isMetaclass((org.eclipse.uml2.uml.Type)target)) {
	return false;
}"/>
</providers>
</expressionProviders>
<labelParsers
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml index 8166b66513e..20bdfa8afe6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.xml @@ -6,7 +6,7 @@ <?gmfgen generated="true"?> <context description="%context.description" - id="org.eclipse.papyrus.diagram.profile.ui.diagramContext" + id="org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext" name="%context.name" parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext"> </context> @@ -345,7 +345,7 @@ </contribution>
- <editor id="org.eclipse.papyrus.diagram.profile"/>
+ <editor id="org.eclipse.papyrus.uml.diagram.profile"/>
</paletteProvider>
</extension>
@@ -361,7 +361,7 @@ <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
<?gmfgen generated="true"?>
- <viewProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLViewProvider">
+ <viewProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLViewProvider">
<Priority name="Lowest"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLProfileDiagram"/>
<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2014,2015,1026,1031,1002,1014,2005,1030,2007,2006,2009,2010,2016,3026,3019,1037,3018,3002,3020,1023,3028,1007,1027,1024,1012,1028,3025,3027"/>
@@ -371,7 +371,7 @@ <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
<?gmfgen generated="true"?>
- <editpartProvider class="org.eclipse.papyrus.diagram.profile.providers.UMLEditPartProvider">
+ <editpartProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLEditPartProvider">
<Priority name="Lowest"/>
<object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
<method name="getType()" value="PapyrusUMLProfileDiagram"/>
@@ -395,7 +395,7 @@ id="ep-provider"
point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
<editpartProvider
- class="org.eclipse.papyrus.diagram.profile.custom.providers.CustomUMLEditPartProvider">
+ class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomUMLEditPartProvider">
<Priority
name="Highest">
</Priority>
@@ -449,20 +449,20 @@ <?gmfgen generated="true"?>
<modelingAssistantProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLModelingAssistantProvider">
<Priority name="Lowest"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ProfileDiagramEditPart" id="Profile_1000"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.DependencyNodeEditPart" id="Dependency_2014"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.AssociationNodeEditPart" id="Association_2015"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.StereotypeEditPart" id="Stereotype_1026"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.MetaclassEditPart" id="Class_1031"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.CommentEditPart" id="Comment_1002"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ConstraintEditPart" id="Constraint_1014"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ModelEditPartTN" id="Model_2005"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ProfileEditPartTN" id="Profile_1030"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.PackageEditPart" id="Package_2007"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.EnumerationEditPart" id="Enumeration_2006"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.PrimitiveTypeEditPart" id="PrimitiveType_2009"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.DataTypeEditPart" id="DataType_2010"/>
- <object class="org.eclipse.papyrus.diagram.profile.edit.parts.ShortCutDiagramEditPart" id="Diagram_2016"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart" id="Profile_1000"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.DependencyNodeEditPart" id="Dependency_2014"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationNodeEditPart" id="Association_2015"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.StereotypeEditPart" id="Stereotype_1026"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.MetaclassEditPart" id="Class_1031"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.CommentEditPart" id="Comment_1002"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ConstraintEditPart" id="Constraint_1014"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ModelEditPartTN" id="Model_2005"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileEditPartTN" id="Profile_1030"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.PackageEditPart" id="Package_2007"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.EnumerationEditPart" id="Enumeration_2006"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.PrimitiveTypeEditPart" id="PrimitiveType_2009"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.DataTypeEditPart" id="DataType_2010"/>
+ <object class="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ShortCutDiagramEditPart" id="Diagram_2016"/>
<context elements="Profile_1000,Dependency_2014,Association_2015,Stereotype_1026,Class_1031,Comment_1002,Constraint_1014,Model_2005,Profile_1030,Package_2007,Enumeration_2006,PrimitiveType_2009,DataType_2010,Diagram_2016"/>
</modelingAssistantProvider>
</extension>
@@ -478,7 +478,7 @@ <?gmfgen generated="true"?>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Profile_1000"
+ id="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"
name="%metatype.name.Profile_1000"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Profile"
@@ -488,7 +488,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Dependency_2014"
+ id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"
name="%metatype.name.Dependency_2014"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Dependency"
@@ -498,7 +498,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Association_2015"
+ id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"
name="%metatype.name.Association_2015"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Association"
@@ -508,7 +508,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Stereotype_1026"
+ id="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"
name="%metatype.name.Stereotype_1026"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Stereotype"
@@ -518,16 +518,16 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Metaclass_1031"
+ id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"
name="%metatype.name.Class_1031"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Metaclass_3028"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>
<param name="semanticHint" value="1031"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Comment_1002"
+ id="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"
name="%metatype.name.Comment_1002"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Comment"
@@ -537,7 +537,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Constraint_1014"
+ id="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"
name="%metatype.name.Constraint_1014"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Constraint"
@@ -547,7 +547,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Model_2005"
+ id="org.eclipse.papyrus.uml.diagram.profile.Model_2005"
name="%metatype.name.Model_2005"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Model"
@@ -557,7 +557,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Profile_1030"
+ id="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"
name="%metatype.name.Profile_1030"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Profile"
@@ -567,7 +567,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Package_1004"
+ id="org.eclipse.papyrus.uml.diagram.profile.Package_1004"
name="%metatype.name.Package_2007"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Package"
@@ -577,7 +577,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Enumeration_2006"
+ id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"
name="%metatype.name.Enumeration_2006"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Enumeration"
@@ -587,16 +587,16 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.PrimitiveType_2009"
+ id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"
name="%metatype.name.PrimitiveType_2009"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.PrimitiveType_3026"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>
<param name="semanticHint" value="2009"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.DataType_2010"
+ id="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"
name="%metatype.name.DataType_2010"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="DataType"
@@ -606,7 +606,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Diagram_2016"
+ id="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"
name="%metatype.name.Diagram_2016"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Diagram"
@@ -616,7 +616,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.PrimitiveType_3026"
+ id="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"
name="%metatype.name.PrimitiveType_3026"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="PrimitiveType"
@@ -626,7 +626,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.DataTypeOperation_3019"
+ id="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"
name="%metatype.name.Operation_3019"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Operation"
@@ -636,7 +636,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.EnumerationLiteral_1037"
+ id="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"
name="%metatype.name.EnumerationLiteral_1037"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="EnumerationLiteral"
@@ -646,7 +646,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.DataTypeProperty_3018"
+ id="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"
name="%metatype.name.Property_3018"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Property"
@@ -656,7 +656,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.ClassProperty_3002"
+ id="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"
name="%metatype.name.Property_3002"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Property"
@@ -666,7 +666,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.ClassOperation_3020"
+ id="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"
name="%metatype.name.Operation_3020"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Operation"
@@ -676,7 +676,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Stereotype_1023"
+ id="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"
name="%metatype.name.Stereotype_1023"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Stereotype"
@@ -686,7 +686,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Metaclass_3028"
+ id="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"
name="%metatype.name.Class_3028"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Class"
@@ -696,7 +696,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.CommentCN_1007"
+ id="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"
name="%metatype.name.Comment_1007"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Comment"
@@ -706,25 +706,25 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Model_1027"
+ id="org.eclipse.papyrus.uml.diagram.profile.Model_1027"
name="%metatype.name.Model_1027"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Model_2005"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>
<param name="semanticHint" value="1027"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Profile_1024"
+ id="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"
name="%metatype.name.Profile_1024"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Profile_1030"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>
<param name="semanticHint" value="1024"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.PackageCN_1012"
+ id="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"
name="%metatype.name.Package_1012"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Package"
@@ -734,7 +734,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Constraint_1028"
+ id="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"
name="%metatype.name.Constraint_1028"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Constraint"
@@ -744,25 +744,25 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Enumeration_3025"
+ id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"
name="%metatype.name.Enumeration_3025"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Enumeration_2006"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>
<param name="semanticHint" value="3025"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.DataType_3027"
+ id="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"
name="%metatype.name.DataType_3027"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.DataType_2010"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>
<param name="semanticHint" value="3027"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Extension_1013"
+ id="org.eclipse.papyrus.uml.diagram.profile.Extension_1013"
name="%metatype.name.Extension_1013"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Extension"
@@ -772,16 +772,16 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Association_4001"
+ id="org.eclipse.papyrus.uml.diagram.profile.Association_4001"
name="%metatype.name.Association_4001"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Association_2015"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
<param name="semanticHint" value="4001"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.ProfileApplication_1045"
+ id="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"
name="%metatype.name.ProfileApplication_1045"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="ProfileApplication"
@@ -791,16 +791,16 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Association_4019"
+ id="org.eclipse.papyrus.uml.diagram.profile.Association_4019"
name="%metatype.name.Association_4019"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Association_2015"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
<param name="semanticHint" value="4019"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.Generalization_4002"
+ id="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"
name="%metatype.name.Generalization_4002"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="Generalization"
@@ -810,25 +810,25 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Dependency_4008"
+ id="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"
name="%metatype.name.Dependency_4008"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Dependency_2014"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
<param name="semanticHint" value="4008"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.Dependency_4018"
+ id="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"
name="%metatype.name.Dependency_4018"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
- <specializes id="org.eclipse.papyrus.diagram.profile.Dependency_2014"/>
+ <specializes id="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
<param name="semanticHint" value="4018"/>
</specializationType>
</metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.ElementImport_1064"
+ id="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"
name="%metatype.name.ElementImport_1064"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="ElementImport"
@@ -838,7 +838,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<metamodelType
- id="org.eclipse.papyrus.diagram.profile.PackageImport_1065"
+ id="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"
name="%metatype.name.PackageImport_1065"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
eclass="PackageImport"
@@ -848,7 +848,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.CommentAnnotatedElement_1022"
+ id="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"
name="%metatype.name.CommentAnnotatedElement_1022"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -857,7 +857,7 @@ </metamodel>
<metamodel nsURI="http://www.eclipse.org/uml2/3.0.0/UML">
<specializationType
- id="org.eclipse.papyrus.diagram.profile.ConstraintConstrainedElement_4014"
+ id="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"
name="%metatype.name.ConstraintConstrainedElement_4014"
kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
<specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
@@ -868,54 +868,54 @@ <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
<?gmfgen generated="true"?>
- <clientContext id="org.eclipse.papyrus.diagram.profile.TypeContext">
+ <clientContext id="org.eclipse.papyrus.uml.diagram.profile.TypeContext">
<enablement>
<test
property="org.eclipse.gmf.runtime.emf.core.editingDomain"
- value="org.eclipse.papyrus.diagram.profile.EditingDomain"/>
+ value="org.eclipse.papyrus.uml.diagram.profile.EditingDomain"/>
</enablement>
</clientContext>
- <binding context="org.eclipse.papyrus.diagram.profile.TypeContext">
- <elementType ref="org.eclipse.papyrus.diagram.profile.Profile_1000"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Dependency_2014"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Association_2015"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Stereotype_1026"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Metaclass_1031"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Comment_1002"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Constraint_1014"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Model_2005"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Profile_1030"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Package_1004"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Enumeration_2006"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.PrimitiveType_2009"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.DataType_2010"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Diagram_2016"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.PrimitiveType_3026"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.DataTypeOperation_3019"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.EnumerationLiteral_1037"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.DataTypeProperty_3018"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.ClassProperty_3002"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.ClassOperation_3020"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Stereotype_1023"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Metaclass_3028"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.CommentCN_1007"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Model_1027"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Profile_1024"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.PackageCN_1012"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Constraint_1028"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Enumeration_3025"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.DataType_3027"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Extension_1013"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Association_4001"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.ProfileApplication_1045"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Association_4019"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Generalization_4002"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Dependency_4008"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.Dependency_4018"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.ElementImport_1064"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.PackageImport_1065"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.CommentAnnotatedElement_1022"/>
- <elementType ref="org.eclipse.papyrus.diagram.profile.ConstraintConstrainedElement_4014"/>
+ <binding context="org.eclipse.papyrus.uml.diagram.profile.TypeContext">
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1000"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_2014"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_2015"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1026"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_1031"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Comment_1002"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1014"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_2005"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1030"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Package_1004"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_2006"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_2009"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_2010"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Diagram_2016"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PrimitiveType_3026"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeOperation_3019"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.EnumerationLiteral_1037"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataTypeProperty_3018"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassProperty_3002"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ClassOperation_3020"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Stereotype_1023"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Metaclass_3028"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentCN_1007"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Model_1027"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Profile_1024"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageCN_1012"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Constraint_1028"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Enumeration_3025"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.DataType_3027"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Extension_1013"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4001"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ProfileApplication_1045"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Association_4019"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Generalization_4002"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4008"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.Dependency_4018"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ElementImport_1064"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.PackageImport_1065"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.CommentAnnotatedElement_1022"/>
+ <elementType ref="org.eclipse.papyrus.uml.diagram.profile.ConstraintConstrainedElement_4014"/>
<advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
</binding>
</extension>
@@ -925,15 +925,15 @@ categoryId="org.eclipse.ui.category.edit"
defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramUpdateCommand"
description="%update.diagram.description"
- id="org.eclipse.papyrus.diagram.profile.updateDiagram"
+ id="org.eclipse.papyrus.uml.diagram.profile.updateDiagram"
name="%update.diagram.name"/>
</extension>
<extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
<?gmfgen generated="true"?>
<key
- commandId="org.eclipse.papyrus.diagram.profile.updateDiagram"
- contextId="org.eclipse.papyrus.diagram.profile.ui.diagramContext"
+ commandId="org.eclipse.papyrus.uml.diagram.profile.updateDiagram"
+ contextId="org.eclipse.papyrus.uml.diagram.profile.ui.diagramContext"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="F5"/>
</extension>
@@ -942,8 +942,8 @@ point="org.eclipse.ui.menus">
<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
- <toolbar id="org.eclipse.papyrus.diagram.ui.toolbar">
- <command commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"
+ <toolbar id="org.eclipse.papyrus.uml.diagram.ui.toolbar">
+ <command commandId="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
icon="icons/obj16/Diagram_Profile.gif"
label="Create a new Profile Diagram"
style="push"
@@ -956,9 +956,9 @@ </menuContribution>
<menuContribution locationURI="menu:org.eclipse.papyrus.ui.menu">
- <menu id="org.eclipse.papyrus.diagram.ui.menu.diagrams"
+ <menu id="org.eclipse.papyrus.uml.diagram.ui.menu.diagrams"
label="Diagrams">
- <command commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"
+ <command commandId="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
icon="icons/obj16/Diagram_Profile.gif"
label="Create a new Profile Diagram"
style="push"
@@ -971,7 +971,7 @@ </menuContribution>
<menuContribution locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popupmenu.creatediagram">
- <command commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"
+ <command commandId="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
icon="icons/obj16/Diagram_Profile.gif"
label="Create a new Profile Diagram"
style="push"
@@ -991,10 +991,10 @@ <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
</menuContribution -->
<menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
- <command commandId="org.eclipse.papyrus.diagram.profile.LoadResourceAction">
+ <command commandId="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction">
<visibleWhen>
<and>
- <with variable="activePartId"><equals value="org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID"/></with>
+ <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"/></with>
<with variable="selection"><iterate ifEmpty="false">
<instanceof value="org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart"/>
</iterate></with>
@@ -1004,7 +1004,7 @@ </menuContribution>
</extension>
<extension
- point="org.eclipse.papyrus.core.papyrusDiagram">
+ point="org.eclipse.papyrus.infra.core.papyrusDiagram">
<editorDiagram
actionBarContributorId="org.eclipse.papyrus.uml.diagram.common.part.UMLDiagramActionBarContributor"
factoryClass="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramEditorFactory"
@@ -1014,7 +1014,7 @@ creationCommandClass="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
creationCondition="org.eclipse.papyrus.uml.diagram.profile.ProfileDiagramCreationCondition"
icon="icons/obj16/Diagram_Profile.gif"
- id="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"
+ id="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
language="profile"
label="UML Profile Diagram">
</creationCommand>
@@ -1022,7 +1022,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
<?gmfgen generated="true"?>
<propertyContributor
- contributorId="org.eclipse.papyrus.diagram.profile"
+ contributorId="org.eclipse.papyrus.uml.diagram.profile"
labelProvider="org.eclipse.papyrus.uml.diagram.profile.sheet.UMLSheetLabelProvider">
<propertyCategory category="domain"/>
<propertyCategory category="visual"/>
@@ -1032,7 +1032,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
<?gmfgen generated="true"?>
- <propertyTabs contributorId="org.eclipse.papyrus.diagram.profile">
+ <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.profile">
<propertyTab
category="visual"
id="property.tab.DiagramPropertySection"
@@ -1046,7 +1046,7 @@ <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
<?gmfgen generated="true"?>
- <propertySections contributorId="org.eclipse.papyrus.diagram.profile">
+ <propertySections contributorId="org.eclipse.papyrus.uml.diagram.profile">
<propertySection id="property.section.RulerGridPropertySection"
filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter"
class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection"
@@ -1065,10 +1065,10 @@ <extension point="org.eclipse.ui.commands" id="menu-commands">
<?gmfgen generated="true"?>
- <category id="org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
- <command id="org.eclipse.papyrus.diagram.profile.LoadResourceAction"
+ <category id="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
+ <command id="org.eclipse.papyrus.uml.diagram.profile.LoadResourceAction"
name="Load Resource"
- categoryId="org.eclipse.papyrus.diagram.profile.part.UMLDiagramEditorID"
+ categoryId="org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorID"
defaultHandler="org.eclipse.papyrus.uml.diagram.profile.part.LoadResourceAction"/>
</extension>
@@ -1076,7 +1076,7 @@ <?gmfgen generated="true"?>
</extension>
<extension
- point="org.eclipse.papyrus.core.service">
+ point="org.eclipse.papyrus.infra.core.service">
<service
classname="org.eclipse.papyrus.uml.diagram.profile.service.ProfileService"
priority="1"
@@ -1087,25 +1087,25 @@ <extension point="org.eclipse.ui.preferencePages" id="prefpages">
<?gmfgen generated="true"?>
<page
- id="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ id="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
name="PapyrusUMLProfileDiagram Diagram"
- category="org.eclipse.papyrus.preferences.diagrams"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramGeneralPreferencePage">
</page>
<page
- id="org.eclipse.papyrus.diagram.profile.preferences.DiagramPrintingPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage"
name="%prefpage.org.eclipse.uml2.uml.diagram.printing"
- category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPrintingPreferencePage">
</page>
<page
- id="org.eclipse.papyrus.diagram.profile.preferences.DiagramRulersAndGridPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage"
name="%prefpage.org.eclipse.uml2.uml.diagram.rulersAndGrid"
- category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramRulersAndGridPreferencePage">
</page>
@@ -1115,9 +1115,9 @@ <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
<?gmfgen generated="true"?>
<propertyTester
- id="org.eclipse.papyrus.diagram.profile.URIEditorInputPropertyTester"
+ id="org.eclipse.papyrus.uml.diagram.profile.URIEditorInputPropertyTester"
type="org.eclipse.emf.common.ui.URIEditorInput"
- namespace="org.eclipse.papyrus.diagram.profile"
+ namespace="org.eclipse.papyrus.uml.diagram.profile"
properties="isURIEditorInput"
class="org.eclipse.papyrus.uml.diagram.profile.part.UMLUriEditorInputTester">
</propertyTester>
@@ -1127,14 +1127,14 @@ <?gmfgen generated="true"?>
<viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
- <contentExtension pattern="org.eclipse.papyrus.diagram.profile.resourceContent"/>
- <contentExtension pattern="org.eclipse.papyrus.diagram.profile.domainResourceContent"/>
- <contentExtension pattern="org.eclipse.papyrus.diagram.profile.navigatorLinkHelper"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.resourceContent"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.domainResourceContent"/>
+ <contentExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorLinkHelper"/>
</includes>
</viewerContentBinding>
<viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
<includes>
- <actionExtension pattern="org.eclipse.papyrus.diagram.profile.navigatorActionProvider"/>
+ <actionExtension pattern="org.eclipse.papyrus.uml.diagram.profile.navigatorActionProvider"/>
</includes>
</viewerActionBinding>
</extension>
@@ -1142,7 +1142,7 @@ <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
<?gmfgen generated="true"?>
<navigatorContent
- id="org.eclipse.papyrus.diagram.profile.resourceContent"
+ id="org.eclipse.papyrus.uml.diagram.profile.resourceContent"
name="%navigatorContentName"
priority="normal"
contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorContentProvider"
@@ -1164,7 +1164,7 @@ </or>
</possibleChildren>
<commonSorter
- id="org.eclipse.papyrus.diagram.profile.navigatorSorter"
+ id="org.eclipse.papyrus.uml.diagram.profile.navigatorSorter"
class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorSorter">
<parentExpression>
<or>
@@ -1178,7 +1178,7 @@ </commonSorter>
</navigatorContent>
<navigatorContent
- id="org.eclipse.papyrus.diagram.profile.domainResourceContent"
+ id="org.eclipse.papyrus.uml.diagram.profile.domainResourceContent"
name="%domainNavigatorContentName"
priority="normal"
contentProvider="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLDomainNavigatorContentProvider"
@@ -1199,7 +1199,7 @@ </possibleChildren>
</navigatorContent>
<actionProvider
- id="org.eclipse.papyrus.diagram.profile.navigatorActionProvider"
+ id="org.eclipse.papyrus.uml.diagram.profile.navigatorActionProvider"
class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorActionProvider">
<enablement>
<or>
@@ -1212,12 +1212,12 @@ <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
<?gmfgen generated="true"?>
<linkHelper
- id="org.eclipse.papyrus.diagram.profile.navigatorLinkHelper"
+ id="org.eclipse.papyrus.uml.diagram.profile.navigatorLinkHelper"
class="org.eclipse.papyrus.uml.diagram.profile.navigator.UMLNavigatorLinkHelper">
<editorInputEnablement>
<and>
<instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
- <test property="org.eclipse.papyrus.diagram.profile.isURIEditorInput"/>
+ <test property="org.eclipse.papyrus.uml.diagram.profile.isURIEditorInput"/>
</and>
</editorInputEnablement>
<selectionEnablement>
@@ -1230,7 +1230,7 @@ <command
categoryId="org.eclipse.papyrus.editor.category"
description="Create a New UML2 Profile Diagram"
- id="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand"
+ id="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand"
name="New PapyII Profile Diagram( Papyrus II)">
</command>
</extension>
@@ -1238,12 +1238,12 @@ point="org.eclipse.ui.handlers">
<handler
class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramWithNavigationHandler"
- commandId="org.eclipse.papyrus.diagram.profile.CreateProfileDiagramCommand">
+ commandId="org.eclipse.papyrus.uml.diagram.profile.CreateProfileDiagramCommand">
<activeWhen>
<with
variable="activeEditorId">
<equals
- value="org.eclipse.papyrus.core.papyrusEditor">
+ value="org.eclipse.papyrus.infra.core.papyrusEditor">
</equals>
</with>
</activeWhen>
@@ -1251,7 +1251,7 @@ </extension>
<extension
- point="org.eclipse.papyrus.core.papyrusDiagram">
+ point="org.eclipse.papyrus.infra.core.papyrusDiagram">
<diagramCategory
class="org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand"
description="Profile diagram"
@@ -1266,114 +1266,114 @@ <?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.PropertyPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.PropertyPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.PropertyPreferencePage"
name="Property Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DataTypePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.DataTypePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.DataTypePreferencePage"
name="DataType Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.CommentPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.CommentPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.CommentPreferencePage"
name="Comment Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationLiteralPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.EnumerationLiteralPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationLiteralPreferencePage"
name="EnumerationLiteral Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.PackagePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.PackagePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.PackagePreferencePage"
name="Package Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ShortCutDiagramPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ShortCutDiagramPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ShortCutDiagramPreferencePage"
name="ShortCutDiagram Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"
name="Dependency Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.PrimitiveTypePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.PrimitiveTypePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.PrimitiveTypePreferencePage"
name="PrimitiveType Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.EnumerationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.EnumerationPreferencePage"
name="Enumeration Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ConstraintPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ConstraintPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ConstraintPreferencePage"
name="Constraint Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.OperationPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.OperationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.OperationPreferencePage"
name="Operation Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfilePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ProfilePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfilePreferencePage"
name="Profile Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ModelPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ModelPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ModelPreferencePage"
name="Model Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.MetaclassPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.MetaclassPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.MetaclassPreferencePage"
name="Metaclass Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.StereotypePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.StereotypePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.StereotypePreferencePage"
name="Stereotype Node" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationNodePreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.AssociationNodePreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationNodePreferencePage"
name="AssociationNode Node" />
@@ -1381,49 +1381,49 @@ <?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.PackageImportPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.PackageImportPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.PackageImportPreferencePage"
name="PackageImport Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ExtensionPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ExtensionPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ExtensionPreferencePage"
name="Extension Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ElementImportPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ElementImportPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ElementImportPreferencePage"
name="ElementImport Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.DependencyPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.DependencyPreferencePage"
name="Dependency Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.GeneralizationPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.GeneralizationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.GeneralizationPreferencePage"
name="Generalization Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfileApplicationPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.ProfileApplicationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.ProfileApplicationPreferencePage"
name="ProfileApplication Link" />
@@ -1431,17 +1431,17 @@ <?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationBranchPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.AssociationBranchPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationBranchPreferencePage"
name="AssociationBranch Link" />
<?gmfgen generated="true"?>
- <page category="org.eclipse.papyrus.preferences.diagrams.PapyrusUMLProfileDiagram"
+ <page category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLProfileDiagram"
class="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationPreferencePage"
- id="org.eclipse.papyrus.diagram.profile.preferences.AssociationPreferencePage"
+ id="org.eclipse.papyrus.uml.diagram.profile.preferences.AssociationPreferencePage"
name="Association Link" />
@@ -1455,7 +1455,7 @@ <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
<?gmfgen generated="true"?>
<MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.profile.providers.UMLMarkerNavigationProvider">
- <MarkerType name="org.eclipse.papyrus.diagram.profile.diagnostic"/>
+ <MarkerType name="org.eclipse.papyrus.uml.diagram.profile.diagnostic"/>
<Priority name="Lowest"/>
</MarkerNavigationProvider>
</extension>
@@ -1476,7 +1476,7 @@ <extension
point="org.eclipse.gmf.runtime.diagram.ui.editpolicyProviders">
<editpolicyProvider
- class="org.eclipse.papyrus.diagram.profile.custom.providers.CustomEditPolicyProvider">
+ class="org.eclipse.papyrus.uml.diagram.profile.custom.providers.CustomEditPolicyProvider">
<Priority
name="Lowest">
</Priority>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java index 9f17d05abdd..ce1fc579315 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/AssociationNodeEditPart.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic.CustomAssociationNodeItemSemanticEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java index 445debbba99..edcd7c550a3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPart.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java index 485d7d70479..5333e8aae2b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/CommentEditPartCN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java index 8ea8c44d8e3..b2d2a561d80 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPart.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java index 1c01d6315cc..1f4e7379785 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ConstraintEditPartCN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java index b2666243790..5dcce2e464e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPart.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java index c6852db24cc..511028f7c1d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DataTypeEditPartCN.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java index d447e2f7ffd..60ae4f9e882 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/DependencyNodeEditPart.java @@ -49,8 +49,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.profile.custom.policies.CustomGraphicalNodeEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.edit.policies.DependencyNodeItemSemanticEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java index 376e5702186..70dbc40b036 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPart.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java index 6efb617377b..877377485a7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/EnumerationEditPartCN.java @@ -43,8 +43,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java index f3c68da2b3b..4e3273c35a3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPart.java @@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java index 9b2e01792db..3189f608c5d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/MetaclassEditPartCN.java @@ -41,8 +41,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java index aa6fd6544ad..e69e1bd276f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartCN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java index 0cdae75c6d9..8f3bd1168af 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ModelEditPartTN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java index 8b6a9139bd9..925c6f26079 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPart.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java index 676b4291c3f..53730a591be 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PackageEditPartCN.java @@ -42,8 +42,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java index ca6660c382c..8dc14e97cb4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPart.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java index 93532146af5..8aa6607b929 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/PrimitiveTypeEditPartCN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java index 03e24a28bb0..7098411ff32 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileDiagramEditPart.java @@ -16,9 +16,6 @@ package org.eclipse.papyrus.uml.diagram.profile.edit.parts; import java.util.Collections;
import java.util.List;
-import org.eclipse.draw2d.IClippingStrategy;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.gef.GraphicalEditPart;
@@ -29,7 +26,6 @@ import org.eclipse.gef.handles.MoveHandle; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableLabelEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.providers.ViewInfo;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java index b97d7c00a7d..6927dcc629c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartCN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java index e899a4ef8cb..1fb83a71b08 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ProfileEditPartTN.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java index e67cd6f0b5a..bb76a78ab51 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/ShortCutDiagramEditPart.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractShortCutDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShortCutDiagramEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java index bc0e4a3f071..7fbfd3cf6a4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPart.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java index 85f18c18894..09c69afd079 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/parts/StereotypeEditPartCN.java @@ -44,8 +44,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.editparts.ClassifierEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ConstrainedItemBorderLayoutEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java index 16a13fa4034..1bfdc0183b0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/edit/policies/UMLBaseItemSemanticEditPolicy.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -44,14 +44,14 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.profile.utils.Util;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.profile.providers.UMLElementTypes;
+import org.eclipse.papyrus.uml.profile.utils.Util;
import org.eclipse.uml2.uml.Association;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Classifier;
@@ -115,6 +115,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { *
* @generated
*/
+ @Override
@SuppressWarnings("unchecked")
public Command getCommand(Request request) {
if(request instanceof ReconnectRequest) {
@@ -122,7 +123,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { if(view instanceof View) {
Integer id = new Integer(UMLVisualIDRegistry.getVisualID((View)view));
request.getExtendedData().put(VISUAL_ID_KEY, id);
- request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, (View)view);
+ request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, view);
}
}
return super.getCommand(request);
@@ -141,6 +142,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { /**
* @generated
*/
+ @Override
protected Command getSemanticCommand(IEditCommandRequest request) {
IEditCommandRequest completedRequest = completeRequest(request);
Command semanticCommand = getSemanticCommandSwitch(completedRequest);
@@ -452,7 +454,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { if(source != null) {
if(source.getAnnotatedElements().contains(target)
- ) {
+ ) {
return false;
}
}
@@ -468,7 +470,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { if(source != null) {
if(source.getConstrainedElements().contains(target)
- ) {
+ ) {
return false;
}
}
@@ -506,7 +508,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { public boolean canExistAssociation_4001(Package container, Association linkInstance, Type source, Type target) {
try {
//AssociationSource
- if((source instanceof Type) && Util.isMetaclass((Type)source)) {
+ if((source instanceof Type) && Util.isMetaclass(source)) {
return false;
}
if(source instanceof Extension) {
@@ -538,7 +540,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { public boolean canExistAssociation_4019(Package container, Association linkInstance, Type source, Type target) {
try {
//AssociationSource
- if((source instanceof Type) && Util.isMetaclass((Type)source)) {
+ if((source instanceof Type) && Util.isMetaclass(source)) {
return false;
}
if(source instanceof Extension) {
@@ -603,7 +605,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { if(source instanceof Extension) {
return false;
}
- //DependencyTarget
+ //DependencyTarget
if(target != null) {
if(target instanceof Extension) {
return false;
@@ -628,7 +630,7 @@ public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy { if(source instanceof Extension) {
return false;
}
- //DependencyTarget
+ //DependencyTarget
if(target != null) {
if(target instanceof Extension) {
return false;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java index 7144b1f939e..f8108f3d892 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java @@ -1,7 +1,7 @@ /*****************************************************************************
* Copyright (c) 2010 CEA LIST.
*
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -39,10 +39,10 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.papyrus.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.core.services.ServiceException;
-import org.eclipse.papyrus.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.adaptor.gmf.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
@@ -132,6 +132,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected String getContextID() {
return CONTEXT_ID;
}
@@ -139,6 +140,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
PaletteRoot paletteRoot;
if(existingPaletteRoot == null) {
@@ -154,6 +156,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected PreferencesHint getPreferencesHint() {
return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
}
@@ -161,6 +164,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public String getContributorId() {
return UMLDiagramEditorPlugin.ID;
}
@@ -168,6 +172,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public Object getAdapter(Class type) {
if(type == IShowInTargetList.class) {
return new IShowInTargetList() {
@@ -183,6 +188,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
return documentProvider;
}
@@ -190,6 +196,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public TransactionalEditingDomain getEditingDomain() {
return editingDomain;
}
@@ -197,6 +204,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected final void setDocumentProvider(IEditorInput input) {
// Already set in the constructor
}
@@ -211,6 +219,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public boolean isSaveAsAllowed() {
return true;
}
@@ -218,6 +227,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public void doSaveAs() {
performSaveAs(new NullProgressMonitor());
}
@@ -225,6 +235,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected void performSaveAs(IProgressMonitor progressMonitor) {
// Nothing
}
@@ -232,6 +243,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public ShowInContext getShowInContext() {
return new ShowInContext(getEditorInput(), getNavigatorSelection());
}
@@ -247,6 +259,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected void configureGraphicalViewer() {
super.configureGraphicalViewer();
DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());
@@ -259,6 +272,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected TransactionalEditingDomain createEditingDomain() {
// Already configured
return editingDomain;
@@ -267,6 +281,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected void configureDiagramEditDomain() {
super.configureDiagramEditDomain();
getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
@@ -280,6 +295,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public void doSave(IProgressMonitor progressMonitor) {
// The saving of the resource is done by the CoreMultiDiagramEditor
savedOperation = getOperationHistory().getUndoOperation(getUndoContext());
@@ -288,6 +304,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public boolean isDirty() {
IUndoableOperation op = getOperationHistory().getUndoOperation(getUndoContext());
return savedOperation != op;
@@ -307,6 +324,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
public void dispose() {
// remove palette service listener
// remove preference listener
@@ -327,6 +345,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected PaletteViewer constructPaletteViewer() {
return new PapyrusPaletteViewer();
}
@@ -334,6 +353,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh /**
* @generated
*/
+ @Override
protected PaletteViewerProvider createPaletteViewerProvider() {
getEditDomain().setPaletteRoot(createPaletteRoot(null));
return new PaletteViewerProvider(getEditDomain()) {
@@ -345,6 +365,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
* key which will result in the creation of the shape also.
*/
+ @Override
protected void configurePaletteViewer(PaletteViewer viewer) {
super.configurePaletteViewer(viewer);
@@ -362,6 +383,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh viewer.setCustomizer(createPaletteCustomizer());
}
+ @Override
public PaletteViewer createPaletteViewer(Composite parent) {
PaletteViewer pViewer = constructPaletteViewer();
pViewer.createControl(parent);
@@ -389,6 +411,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh * the KeyEvent
* @return <code>true</code> if KeyEvent was handled in some way
*/
+ @Override
public boolean keyReleased(KeyEvent event) {
if(event.keyCode == SWT.Selection) {
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java index f152e10f28b..332018b94a4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditorPlugin.java @@ -31,7 +31,7 @@ import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry; import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.preferences.Activator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
import org.eclipse.papyrus.uml.diagram.profile.edit.policies.UMLBaseItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.profile.preferences.DiagramPreferenceInitializer;
import org.eclipse.papyrus.uml.diagram.profile.providers.ElementInitializers;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java index 9ffa0f175a8..de8c20c70ba 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationBranchPreferencePage.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java index 70b315b286e..733b37f6141 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationNodePreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class AssociationNodePreferencePage extends AbstractPapyrusNodePreference - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java index e9dc07b21bf..2962b8395fe 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/AssociationPreferencePage.java @@ -15,10 +15,10 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences; import java.util.Map;
import java.util.TreeMap;
+
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java index 2bb354396f9..67ab0a26ed0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/CommentPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class CommentPreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java index 4f213ed3088..f9bb7ed723c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ConstraintPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class ConstraintPreferencePage extends AbstractPapyrusNodePreferencePage - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java index 3f3ceae5248..b7bee63ee8d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DataTypePreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class DataTypePreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java index 54001b1b813..6f637f133b6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DependencyPreferencePage.java @@ -13,13 +13,8 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.preferences;
-import java.util.Map;
-import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
-import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java index 17de6e69842..7e2a3274a31 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/DiagramGeneralPreferencePage.java @@ -13,7 +13,7 @@ *****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.preferences;
-import org.eclipse.papyrus.preferences.pages.DiagramPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java index 1a9c190c243..ddd02c2223b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ElementImportPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java index ff72e9da9ff..be0ae4532b3 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationLiteralPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class EnumerationLiteralPreferencePage extends AbstractPapyrusNodePrefere - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java index 8f3e876d6b8..ad641aa460e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/EnumerationPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class EnumerationPreferencePage extends AbstractPapyrusNodePreferencePage - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java index 5a024c0214c..bbbdf9821f0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ExtensionPreferencePage.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java index fed4b274261..a4831781b9f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/GeneralizationPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java index 18dd1e8b053..420732152a7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/MetaclassPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class MetaclassPreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java index 63415c2fb25..9edc2220190 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ModelPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class ModelPreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java index 945568eb541..810516d52ff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/OperationPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class OperationPreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java index f56d01ecb26..5682dfb0e28 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackageImportPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java index 4d3d891a04c..33afdbaa737 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PackagePreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class PackagePreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java index 535d3dde069..f059e66140c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PrimitiveTypePreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class PrimitiveTypePreferencePage extends AbstractPapyrusNodePreferencePa - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java index 3cbc9417594..d80c2d5be24 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfileApplicationPreferencePage.java @@ -14,7 +14,7 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusLinkPreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusLinkPreferencePage;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java index da6b48ce4d3..35adeb2a6ed 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ProfilePreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class ProfilePreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java index bb683043adc..0ca4b5f39f4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/PropertyPreferencePage.java @@ -14,8 +14,8 @@ package org.eclipse.papyrus.uml.diagram.profile.preferences;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -55,15 +55,15 @@ public class PropertyPreferencePage extends AbstractPapyrusNodePreferencePage { - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java index 8cb1754ee2d..f4af555f97d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/ShortCutDiagramPreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.util.StringComparator;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -66,15 +66,15 @@ public class ShortCutDiagramPreferencePage extends AbstractPapyrusNodePreference }
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java index d1345cbbee0..5d9b07b7784 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/preferences/StereotypePreferencePage.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.TreeMap;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.preferences.pages.AbstractPapyrusNodePreferencePage;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.AbstractPapyrusNodePreferencePage;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.ProfileDiagramEditPart;
import org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin;
@@ -73,15 +73,15 @@ public class StereotypePreferencePage extends AbstractPapyrusNodePreferencePage - //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
- //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_FILL), new org.eclipse.swt.graphics.RGB(255, 255, 255));
+ //org.eclipse.jface.preference.PreferenceConverter.setDefault(store, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_LINE), new org.eclipse.swt.graphics.RGB(0, 0, 0));
// Set the default for the gradient
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
- //org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter(
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.GRADIENT_POLICY),false);
+ //org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter gradientPreferenceConverter = new org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter(
// new org.eclipse.swt.graphics.RGB(255, 255, 255),
// new org.eclipse.swt.graphics.RGB(0, 0, 0), 0, 0);
- //store.setDefault(org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
+ //store.setDefault(org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.getElementConstant(elementName, org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper.COLOR_GRADIENT), gradientPreferenceConverter.getPreferenceValue());
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java index c8fc95cbaa3..f4c4b06cc48 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/providers/UMLViewProvider.java @@ -52,8 +52,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AppliedStereotypeElementImportEditPart;
import org.eclipse.papyrus.uml.diagram.profile.edit.parts.AssociationAppliedStereotypeEditPart;
|