Bug 432387 The justification buttons in the appearance property tab of
geometric shape does not have any effect.
diff --git a/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF b/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF
index 80023e8..e0c8df4 100644
--- a/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmf.runtime.diagram.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.gmf.runtime.diagram.ui; singleton:=true
-Bundle-Version: 1.7.0.qualifier
+Bundle-Version: 1.8.0.qualifier
Bundle-Activator: org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmf.runtime.diagram.ui/pom.xml b/org.eclipse.gmf.runtime.diagram.ui/pom.xml
index 54cdc30..23c8a07 100644
--- a/org.eclipse.gmf.runtime.diagram.ui/pom.xml
+++ b/org.eclipse.gmf.runtime.diagram.ui/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.gmf.runtime.diagram.ui</groupId>
<artifactId>org.eclipse.gmf.runtime.diagram.ui</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java
index c9fe4dc..5a7bb4e 100644
--- a/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java
+++ b/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java
@@ -1,5 +1,5 @@
/******************************************************************************
- * Copyright (c) 2002, 2009 IBM Corporation and others.
+ * Copyright (c) 2002, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,6 @@
* Dmitry Stadnik (Borland) - contribution for bugzilla 135694
* Dmitry Stadnik (Borland) - contribution for bugzilla 136582
****************************************************************************/
-
package org.eclipse.gmf.runtime.diagram.ui.editparts;
import java.beans.PropertyChangeEvent;
@@ -760,12 +759,21 @@
TextStyle style = (TextStyle) getPrimaryView().getStyle(NotationPackage.eINSTANCE.getTextStyle());
if (style != null) {
if (style.getTextAlignment() == TextAlignment.RIGHT_LITERAL) {
- getLabelDelegate().setTextJustification(PositionConstants.RIGHT);
+ if((getLabelDelegate().getIcon(0)==null) )
+ getLabelDelegate().setAlignment(PositionConstants.RIGHT);
+ else
+ getLabelDelegate().setTextJustification(PositionConstants.RIGHT);
} else if (style.getTextAlignment() == TextAlignment.CENTER_LITERAL) {
- getLabelDelegate().setTextJustification(PositionConstants.CENTER);
+ if((getLabelDelegate().getIcon(0)==null) )
+ getLabelDelegate().setAlignment(PositionConstants.CENTER);
+ else
+ getLabelDelegate().setTextJustification(PositionConstants.CENTER);
} else {
// default to TextAlignment.LEFT_LITERAL
- getLabelDelegate().setTextJustification(PositionConstants.LEFT);
+ if((getLabelDelegate().getIcon(0)==null) )
+ getLabelDelegate().setAlignment(PositionConstants.LEFT);
+ else
+ getLabelDelegate().setTextJustification(PositionConstants.LEFT);
}
}
}
