diff options
| author | ashatilov | 2015-07-17 13:27:03 +0000 |
|---|---|---|
| committer | Remi Schnekenburger | 2015-07-29 07:30:33 +0000 |
| commit | 82a9e8d815ace0f18620e61ac323eaaac52ca8bc (patch) | |
| tree | 23233090f09ef5efea8c5d2d1c94b2a43e58122f | |
| parent | 0ce62f74df17ff4ea5a8331d62a002ee87ee7e59 (diff) | |
| download | org.eclipse.papyrus-82a9e8d815ace0f18620e61ac323eaaac52ca8bc.tar.gz org.eclipse.papyrus-82a9e8d815ace0f18620e61ac323eaaac52ca8bc.tar.xz org.eclipse.papyrus-82a9e8d815ace0f18620e61ac323eaaac52ca8bc.zip | |
Sequence diagram generation.
- extract MultilineLabelFigure from inner class
Change-Id: Ib0f341f2fae6d6c1944ca6056805f3edf7c8d6cc
Signed-off-by: ashatilov <shatilov@montages.com>
5 files changed, 29 insertions, 85 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MultilineLabelFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MultilineLabelFigure.java new file mode 100644 index 00000000000..dbd3edccc25 --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MultilineLabelFigure.java @@ -0,0 +1,18 @@ +package org.eclipse.papyrus.uml.diagram.sequence.figures;
+
+import org.eclipse.draw2d.PositionConstants;
+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
+
+public class MultilineLabelFigure extends PapyrusWrappingLabel {
+
+ /**
+ * @generated
+ */
+ public MultilineLabelFigure() {
+ this.setTextAlignment(PositionConstants.CENTER);
+ this.setAlignment(PositionConstants.CENTER);
+ this.setBackgroundColor(getBackgroundColor());
+ this.setTextWrap(true);
+ this.setTextJustification(PositionConstants.CENTER);
+ }
+}
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen index 5f925e5041d..5736fcd3d56 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/model/sequenceDiagram.gmfgen @@ -772,14 +772,8 @@ <diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- className="MultilineLabelFigure"
- classBody="
/**
 * @generated
 */
public class MultilineLabelFigure extends org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel {




	/**
	 * @generated
	 */
	public MultilineLabelFigure() {
				



this.setTextAlignment(
PositionConstants.CENTER);




this.setAlignment(
PositionConstants.CENTER);




this.setBackgroundColor(
getBackgroundColor());




this.setTextWrap(
true);




this.setTextJustification(
PositionConstants.CENTER);


	}





}

">
- <attributes
- xsi:type="gmfgen:LabelOffsetAttributes"
- x="22"
- y="-7"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure" />
<modelFacet
parser="/0/@labelParsers/@implementations.6"/>
</labels>
@@ -860,14 +854,8 @@ <diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- className="MultilineLabelFigure"
- classBody="
/**
 * @generated
 */
public class MultilineLabelFigure extends org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel {




	/**
	 * @generated
	 */
	public MultilineLabelFigure() {
				



this.setTextAlignment(
PositionConstants.CENTER);




this.setAlignment(
PositionConstants.CENTER);




this.setBackgroundColor(
getBackgroundColor());




this.setTextWrap(
true);




this.setTextJustification(
PositionConstants.CENTER);


	}





}

">
- <attributes
- xsi:type="gmfgen:LabelOffsetAttributes"
- x="22"
- y="-7"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure" />
<modelFacet
parser="/0/@labelParsers/@implementations.7"/>
</labels>
@@ -969,14 +957,8 @@ <diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- className="MultilineLabelFigure"
- classBody="
/**
 * @generated
 */
public class MultilineLabelFigure extends org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel {




	/**
	 * @generated
	 */
	public MultilineLabelFigure() {
				



this.setTextAlignment(
PositionConstants.CENTER);




this.setAlignment(
PositionConstants.CENTER);




this.setBackgroundColor(
getBackgroundColor());




this.setTextWrap(
true);




this.setTextJustification(
PositionConstants.CENTER);


	}





}

">
- <attributes
- xsi:type="gmfgen:LabelOffsetAttributes"
- x="25"
- y="45"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure" />
<modelFacet
parser="/0/@labelParsers/@implementations.6"/>
</labels>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java index aa9dc0c2170..cfed5b684a6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/DurationConstraintLabelEditPart.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
@@ -63,11 +62,11 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil; import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;
@@ -81,7 +80,7 @@ import org.eclipse.uml2.uml.Feature; /**
* @generated
- * Manually extends to PapyrusLabelEditPart, modification has been applied to the gmfgen file.
+ * Manually extends to PapyrusLabelEditPart, modification has been applied to the gmfgen file.
*/
public class DurationConstraintLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {
@@ -123,6 +122,7 @@ public class DurationConstraintLabelEditPart extends PapyrusLabelEditPart implem * @generated
*/
protected IDirectEditorConfiguration configuration;
+
/**
* @generated
*/
@@ -779,22 +779,4 @@ public class DurationConstraintLabelEditPart extends PapyrusLabelEditPart implem protected IFigure createFigurePrim() {
return new MultilineLabelFigure();
}
-
- /**
- * @generated
- * Manually changed to PapyrusWrappingLabel modification has been applied to the gmfgen file.
- */
- public class MultilineLabelFigure extends PapyrusWrappingLabel {
-
- /**
- * @generated
- */
- public MultilineLabelFigure() {
- this.setTextAlignment(PositionConstants.CENTER);
- this.setAlignment(PositionConstants.CENTER);
- this.setBackgroundColor(getBackgroundColor());
- this.setTextWrap(true);
- this.setTextJustification(PositionConstants.CENTER);
- }
- }
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java index 59fcd370914..aa500abbc46 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeConstraintLabelEditPart.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
@@ -64,11 +63,11 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;
@@ -782,22 +781,4 @@ public class TimeConstraintLabelEditPart extends PapyrusLabelEditPart implements protected IFigure createFigurePrim() {
return new MultilineLabelFigure();
}
-
- /**
- * @generated
- * Manually changed to PapyrusWrappingLabel modification has been applied to the gmfgen file.
- */
- public class MultilineLabelFigure extends PapyrusWrappingLabel {
-
- /**
- * @generated
- */
- public MultilineLabelFigure() {
- this.setTextAlignment(PositionConstants.CENTER);
- this.setAlignment(PositionConstants.CENTER);
- this.setBackgroundColor(getBackgroundColor());
- this.setTextWrap(true);
- this.setTextJustification(PositionConstants.CENTER);
- }
- }
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java index 90e913b85d8..fe70a7d264d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/TimeObservationLabelEditPart.java @@ -18,7 +18,6 @@ import java.util.List; import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.emf.common.notify.Notification;
@@ -64,11 +63,11 @@ import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds; import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.PapyrusWrappingLabel;
import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.edit.policies.UMLTextSelectionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.sequence.figures.MultilineLabelFigure;
import org.eclipse.papyrus.uml.diagram.sequence.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLParserProvider;
@@ -783,22 +782,4 @@ public class TimeObservationLabelEditPart extends PapyrusLabelEditPart implement protected IFigure createFigurePrim() {
return new MultilineLabelFigure();
}
-
- /**
- * @generated
- * Manually changed to PapyrusWrappingLabel modification has been applied to the gmfgen file.
- */
- public class MultilineLabelFigure extends PapyrusWrappingLabel {
-
- /**
- * @generated
- */
- public MultilineLabelFigure() {
- this.setTextAlignment(PositionConstants.CENTER);
- this.setAlignment(PositionConstants.CENTER);
- this.setBackgroundColor(getBackgroundColor());
- this.setTextWrap(true);
- this.setTextJustification(PositionConstants.CENTER);
- }
- }
}
|