diff options
author | Saadia Dhouib | 2014-01-27 13:21:53 +0000 |
---|---|---|
committer | Saadia Dhouib | 2014-01-27 13:21:53 +0000 |
commit | b58a26434724150a2c7e0ae6e8a0406151d01774 (patch) | |
tree | 483ed8b252ec54960470dcf9844730eb592d1e61 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java | |
parent | f31451326e4d9000bd53de8e7545221cbec83f66 (diff) | |
parent | 61fe1560ac4f7d2d667c116648cbe5a2eb6a10ef (diff) | |
download | org.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.tar.gz org.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.tar.xz org.eclipse.papyrus-b58a26434724150a2c7e0ae6e8a0406151d01774.zip |
Merge branch 'master' of git://git.eclipse.org/gitroot/papyrus/org.eclipse.papyrus
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java')
-rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java index 56f0962b204..b3e4552f4da 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/edit/parts/InitialNodeEditPart.java @@ -50,7 +50,7 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.ActivityDiagramChangeStereotypedShapeEditpolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.InitialNodeItemSemanticEditPolicy;
import org.eclipse.papyrus.uml.diagram.activity.edit.policies.OpenDiagramEditPolicy;
@@ -1125,15 +1125,15 @@ public class InitialNodeEditPart extends UMLNodeEditPart { if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor() || feature == NotationPackage.eINSTANCE.getFontStyle_FontColor() || feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
String prefColor = null;
if(feature == NotationPackage.eINSTANCE.getLineStyle_LineColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_LINE);
+ prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_LINE);
} else if(feature == NotationPackage.eINSTANCE.getFontStyle_FontColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_FONT);
+ prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_FONT);
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_FillColor()) {
- prefColor = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_FILL);
+ prefColor = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_FILL);
}
result = FigureUtilities.RGBToInteger(PreferenceConverter.getColor((IPreferenceStore)preferenceStore, prefColor));
} else if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency() || feature == NotationPackage.eINSTANCE.getFillStyle_Gradient()) {
- String prefGradient = PreferenceConstantHelper.getElementConstant("InitialNode", PreferenceConstantHelper.COLOR_GRADIENT);
+ String prefGradient = PreferencesConstantsHelper.getElementConstant("InitialNode", PreferencesConstantsHelper.COLOR_GRADIENT);
GradientPreferenceConverter gradientPreferenceConverter = new GradientPreferenceConverter(preferenceStore.getString(prefGradient));
if(feature == NotationPackage.eINSTANCE.getFillStyle_Transparency()) {
result = new Integer(gradientPreferenceConverter.getTransparency());
|