diff options
| author | ptessier | 2012-04-12 14:51:39 +0000 |
|---|---|---|
| committer | ptessier | 2012-04-12 14:51:39 +0000 |
| commit | 527594d23b82b82c48766ef4db9ac57c25097285 (patch) | |
| tree | f9bd9f7cce635e3f89d46b0d97ff5689ee31889e /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase | |
| parent | a56ae24e65ee2b0fe7682f4c618a6f290a197abf (diff) | |
| download | org.eclipse.papyrus-527594d23b82b82c48766ef4db9ac57c25097285.tar.gz org.eclipse.papyrus-527594d23b82b82c48766ef4db9ac57c25097285.tar.xz org.eclipse.papyrus-527594d23b82b82c48766ef4db9ac57c25097285.zip | |
359663: [use case diagram] QN does not work on actors nor on use cases
https://bugs.eclipse.org/bugs/show_bug.cgi?id=359663
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase')
6 files changed, 90 insertions, 144 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java new file mode 100644 index 00000000000..f910bdeee5c --- /dev/null +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseClassifierFigure.java @@ -0,0 +1,54 @@ +/*****************************************************************************
+ * Copyright (c) 2009 Atos Origin.
+ *
+ *
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.usecase.figure;
+
+import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IEllipseFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.IPapyrusNodeUMLElementFigure;
+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
+
+/**
+ * The Class UseCaseFigure.
+ * modified by Patrick Tessier inorder to extends nodeName
+ */
+public class UseCaseClassifierFigure extends NodeNamedElementFigure implements IPapyrusNodeUMLElementFigure, IEllipseFigure {
+
+ private final RectangleFigure shapeCompartment;
+
+ /**
+ * Instantiates a new use case figure.
+ */
+ public UseCaseClassifierFigure() {
+ super();
+ shapeCompartment = new RectangleFigure();
+ add(shapeCompartment);
+ }
+
+ /**
+ * get the gmf container figure of the package
+ *
+ * @return the gmf container
+ */
+ public ShapeCompartmentFigure getGMFExtensionPointContainer() {
+ if(shapeCompartment.getChildren().size() > 0) {
+ return (ShapeCompartmentFigure)shapeCompartment.getChildren().get(0);
+ }
+ return null;
+ }
+
+ public RectangleFigure getExtensionPointContainerFigure() {
+ return shapeCompartment;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java index 0ebc1296322..c5190adc0a0 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/custom-src/org/eclipse/papyrus/uml/diagram/usecase/figure/UseCaseFigure.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.uml.diagram.usecase.figure;
import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.RectangleFigure;
@@ -46,7 +45,6 @@ public class UseCaseFigure extends NodeNamedElementFigure implements IPapyrusNod shapeCompartment.setLineWidth(10);
shapeCompartment.setOpaque(false);
shapeCompartment.setFill(false);
- shapeCompartment.setForegroundColor(ColorConstants.red);
this.setBorder(null);
}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen index 1f98300287e..09597852735 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/models/usecaseDiagram.gmfgen @@ -1156,15 +1156,8 @@ xsi:type="gmfgen:SpecializationType"
metamodelType="/0/@diagram/@topLevelNodes.2/@elementType"/>
<viewmap
- xsi:type="gmfgen:InnerClassViewmap"
- layoutType="TOOLBAR_LAYOUT"
- className="UseCaseAsClassFigure"
- classBody="
/**
 * @generated
 */
public class UseCaseAsClassFigure extends org.eclipse.draw2d.RectangleFigure {


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel fUseCaseAsClassFigure_name; 
	/**
	 * @generated
	 */
	private org.eclipse.draw2d.RectangleFigure fUseCaseAsClass_points; 


	/**
	 * @generated
	 */
	public UseCaseAsClassFigure() {
		
	org.eclipse.draw2d.ToolbarLayout layoutThis = new org.eclipse.draw2d.ToolbarLayout();
	layoutThis.setStretchMinorAxis(true);
	layoutThis.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_CENTER
);

	layoutThis.setSpacing(0);
	layoutThis.setVertical(true);

	this.setLayoutManager(layoutThis);

		this.setLineWidth(1);
		createContents();
	}
	/**
	 * @generated
	 */
	private void createContents(){


org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_Header0 = new org.eclipse.draw2d.RectangleFigure();
useCaseAsClassFigure_Header0.setLineWidth(1);
useCaseAsClassFigure_Header0.setBorder(new org.eclipse.draw2d.LineBorder(null, getMapMode().DPtoLP(1)
));

this.add(useCaseAsClassFigure_Header0);

	org.eclipse.draw2d.ToolbarLayout layoutUseCaseAsClassFigure_Header0 = new org.eclipse.draw2d.ToolbarLayout();
	layoutUseCaseAsClassFigure_Header0.setStretchMinorAxis(true);
	layoutUseCaseAsClassFigure_Header0.setMinorAlignment(org.eclipse.draw2d.ToolbarLayout.ALIGN_TOPLEFT
);

	layoutUseCaseAsClassFigure_Header0.setSpacing(0);
	layoutUseCaseAsClassFigure_Header0.setVertical(true);

	useCaseAsClassFigure_Header0.setLayoutManager(layoutUseCaseAsClassFigure_Header0);



org.eclipse.draw2d.RectangleFigure useCaseAsClassFigure_NameContainer1 = new org.eclipse.draw2d.RectangleFigure();
useCaseAsClassFigure_NameContainer1.setOutline(false);
useCaseAsClassFigure_NameContainer1.setLineWidth(1);

useCaseAsClassFigure_Header0.add(useCaseAsClassFigure_NameContainer1);

	org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout layoutUseCaseAsClassFigure_NameContainer1 = new org.eclipse.papyrus.uml.diagram.common.draw2d.CenterLayout();


	useCaseAsClassFigure_NameContainer1.setLayoutManager(layoutUseCaseAsClassFigure_NameContainer1);



fUseCaseAsClassFigure_name = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel();
fUseCaseAsClassFigure_name.setText("");

fUseCaseAsClassFigure_name.setFont(FUSECASEASCLASSFIGURE_NAME_FONT);



fUseCaseAsClassFigure_name.setBorder(new org.eclipse.draw2d.MarginBorder(getMapMode().DPtoLP(0)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
, getMapMode().DPtoLP(5)
));

useCaseAsClassFigure_NameContainer1.add(fUseCaseAsClassFigure_name);





fUseCaseAsClass_points = new org.eclipse.draw2d.RectangleFigure();
fUseCaseAsClass_points.setLineWidth(1);

this.add(fUseCaseAsClass_points);
fUseCaseAsClass_points.setLayoutManager(new org.eclipse.draw2d.StackLayout());


	}




	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}



	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getUseCaseAsClassFigure_name() {
		return fUseCaseAsClassFigure_name;
	}
	/**
	 * @generated
	 */
	public org.eclipse.draw2d.RectangleFigure getUseCaseAsClass_points() {
		return fUseCaseAsClass_points;
	}


}

/**
 * @generated
 */
static final org.eclipse.swt.graphics.Font FUSECASEASCLASSFIGURE_NAME_FONT = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, org.eclipse.swt.SWT.NORMAL);

">
- <attributes
- xsi:type="gmfgen:DefaultSizeAttributes"
- width="100"
- height="60"/>
- </viewmap>
+ xsi:type="gmfgen:FigureViewmap"
+ figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseClassifierFigure"/>
<behaviour
xsi:type="gmfgen:CustomBehaviour"
key="org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE"
@@ -1204,7 +1197,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
xsi:type="gmfgen:ParentAssignedViewmap"
- getterName="getUseCaseAsClassFigure_name"
+ getterName="getNameLabel"
figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
<attributes
xsi:type="gmfgen:StyleAttributes"
@@ -2584,7 +2577,7 @@ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
<viewmap
xsi:type="gmfgen:ParentAssignedViewmap"
- getterName="getUseCaseAsClass_points"
+ getterName="getExtensionPointContainerFigure"
figureQualifiedClassName="org.eclipse.draw2d.RectangleFigure"/>
<behaviour
xsi:type="gmfgen:CustomBehaviour"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java index 8444fba7464..c456d8cb23b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCaseAsRectangleEditPartTN.java @@ -18,29 +18,24 @@ import java.util.LinkedList; import java.util.List;
import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
import org.eclipse.draw2d.Shape;
import org.eclipse.draw2d.StackLayout;
-import org.eclipse.draw2d.ToolbarLayout;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.Request;
+import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.LayoutEditPolicy;
+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.requests.CreateRequest;
import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
@@ -48,28 +43,24 @@ 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.infra.gmfdiag.common.editpart.NodeEditPart;
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.draw2d.CenterLayout;
+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.HyperLinkPopupBarEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UMLTextSelectionEditPolicy;
import org.eclipse.papyrus.uml.diagram.usecase.edit.policies.UseCaseAsRectangleItemSemanticEditPolicyTN;
+import org.eclipse.papyrus.uml.diagram.usecase.figure.UseCaseClassifierFigure;
import org.eclipse.papyrus.uml.diagram.usecase.part.UMLDiagramEditorPlugin;
import org.eclipse.papyrus.uml.diagram.usecase.part.UMLVisualIDRegistry;
import org.eclipse.papyrus.uml.diagram.usecase.providers.UMLElementTypes;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
/**
* @generated
*/
-public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart {
+public class UseCaseAsRectangleEditPartTN extends NamedElementEditPart {
/**
* @generated
@@ -121,15 +112,22 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { * @generated
*/
protected LayoutEditPolicy createLayoutEditPolicy() {
- ConstrainedToolbarLayoutEditPolicy lep = new ConstrainedToolbarLayoutEditPolicy() {
+ org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
protected EditPolicy createChildEditPolicy(EditPart child) {
- if(child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {
- if(child instanceof ITextAwareEditPart) {
- return new UMLTextSelectionEditPolicy();
- }
+ EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
+ if(result == null) {
+ result = new NonResizableEditPolicy();
}
- return super.createChildEditPolicy(child);
+ return result;
+ }
+
+ protected Command getMoveChildrenCommand(Request request) {
+ return null;
+ }
+
+ protected Command getCreateCommand(CreateRequest request) {
+ return null;
}
};
return lep;
@@ -139,14 +137,14 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { * @generated
*/
protected IFigure createNodeShape() {
- return primaryShape = new UseCaseAsClassFigure();
+ return primaryShape = new UseCaseClassifierFigure();
}
/**
* @generated
*/
- public UseCaseAsClassFigure getPrimaryShape() {
- return (UseCaseAsClassFigure)primaryShape;
+ public UseCaseClassifierFigure getPrimaryShape() {
+ return (UseCaseClassifierFigure)primaryShape;
}
/**
@@ -154,11 +152,11 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { */
protected boolean addFixedChild(EditPart childEditPart) {
if(childEditPart instanceof UseCaseAsRectangleNameEditPartTN) {
- ((UseCaseAsRectangleNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getUseCaseAsClassFigure_name());
+ ((UseCaseAsRectangleNameEditPartTN)childEditPart).setLabel(getPrimaryShape().getNameLabel());
return true;
}
if(childEditPart instanceof UseCasePointsInRectangleEditPart) {
- IFigure pane = getPrimaryShape().getUseCaseAsClass_points();
+ IFigure pane = getPrimaryShape().getExtensionPointContainerFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
pane.add(((UseCasePointsInRectangleEditPart)childEditPart).getFigure());
return true;
@@ -174,7 +172,7 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { return true;
}
if(childEditPart instanceof UseCasePointsInRectangleEditPart) {
- IFigure pane = getPrimaryShape().getUseCaseAsClass_points();
+ IFigure pane = getPrimaryShape().getExtensionPointContainerFigure();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
pane.remove(((UseCasePointsInRectangleEditPart)childEditPart).getFigure());
return true;
@@ -207,7 +205,7 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { */
protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
if(editPart instanceof UseCasePointsInRectangleEditPart) {
- return getPrimaryShape().getUseCaseAsClass_points();
+ return getPrimaryShape().getExtensionPointContainerFigure();
}
return getContentPane();
}
@@ -962,105 +960,6 @@ public class UseCaseAsRectangleEditPartTN extends ShapeNodeEditPart { /**
* @generated
*/
- public class UseCaseAsClassFigure extends RectangleFigure {
-
- /**
- * @generated
- */
- private WrappingLabel fUseCaseAsClassFigure_name;
-
- /**
- * @generated
- */
- private RectangleFigure fUseCaseAsClass_points;
-
- /**
- * @generated
- */
- public UseCaseAsClassFigure() {
- ToolbarLayout layoutThis = new ToolbarLayout();
- layoutThis.setStretchMinorAxis(true);
- layoutThis.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
- layoutThis.setSpacing(0);
- layoutThis.setVertical(true);
- this.setLayoutManager(layoutThis);
- this.setLineWidth(1);
- createContents();
- }
-
- /**
- * @generated
- */
- private void createContents() {
- RectangleFigure useCaseAsClassFigure_Header0 = new RectangleFigure();
- useCaseAsClassFigure_Header0.setLineWidth(1);
- useCaseAsClassFigure_Header0.setBorder(new LineBorder(null, getMapMode().DPtoLP(1)));
- this.add(useCaseAsClassFigure_Header0);
- ToolbarLayout layoutUseCaseAsClassFigure_Header0 = new ToolbarLayout();
- layoutUseCaseAsClassFigure_Header0.setStretchMinorAxis(true);
- layoutUseCaseAsClassFigure_Header0.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
- layoutUseCaseAsClassFigure_Header0.setSpacing(0);
- layoutUseCaseAsClassFigure_Header0.setVertical(true);
- useCaseAsClassFigure_Header0.setLayoutManager(layoutUseCaseAsClassFigure_Header0);
- RectangleFigure useCaseAsClassFigure_NameContainer1 = new RectangleFigure();
- useCaseAsClassFigure_NameContainer1.setOutline(false);
- useCaseAsClassFigure_NameContainer1.setLineWidth(1);
- useCaseAsClassFigure_Header0.add(useCaseAsClassFigure_NameContainer1);
- CenterLayout layoutUseCaseAsClassFigure_NameContainer1 = new CenterLayout();
- useCaseAsClassFigure_NameContainer1.setLayoutManager(layoutUseCaseAsClassFigure_NameContainer1);
- fUseCaseAsClassFigure_name = new WrappingLabel();
- fUseCaseAsClassFigure_name.setText("");
- fUseCaseAsClassFigure_name.setFont(FUSECASEASCLASSFIGURE_NAME_FONT);
- fUseCaseAsClassFigure_name.setBorder(new MarginBorder(getMapMode().DPtoLP(0), getMapMode().DPtoLP(5), getMapMode().DPtoLP(5), getMapMode().DPtoLP(5)));
- useCaseAsClassFigure_NameContainer1.add(fUseCaseAsClassFigure_name);
- fUseCaseAsClass_points = new RectangleFigure();
- fUseCaseAsClass_points.setLineWidth(1);
- this.add(fUseCaseAsClass_points);
- fUseCaseAsClass_points.setLayoutManager(new StackLayout());
- }
-
- /**
- * @generated
- */
- private boolean myUseLocalCoordinates = false;
-
- /**
- * @generated
- */
- protected boolean useLocalCoordinates() {
- return myUseLocalCoordinates;
- }
-
- /**
- * @generated
- */
- protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
- myUseLocalCoordinates = useLocalCoordinates;
- }
-
- /**
- * @generated
- */
- public WrappingLabel getUseCaseAsClassFigure_name() {
- return fUseCaseAsClassFigure_name;
- }
-
- /**
- * @generated
- */
- public RectangleFigure getUseCaseAsClass_points() {
- return fUseCaseAsClass_points;
- }
- }
-
- /**
- * @generated
- */
- static final Font FUSECASEASCLASSFIGURE_NAME_FONT = new Font(Display.getCurrent(), Display.getDefault().getSystemFont().getFontData()[0].getName(), 9, SWT.NORMAL);
-
- /**
- * @generated
- */
@Override
public Object getPreferredValue(EStructuralFeature feature) {
IPreferenceStore preferenceStore = (IPreferenceStore)getDiagramPreferencesHint().getPreferenceStore();
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java index 83a464a4e6b..b067bfe45bc 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/edit/parts/UseCasePointsInRectangleEditPart.java @@ -23,6 +23,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CreationEditPolicy; import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ResizeableListCompartmentEditPart;
@@ -81,8 +82,9 @@ public class UseCasePointsInRectangleEditPart extends ResizeableListCompartmentE * @generated
*/
protected void setRatio(Double ratio) {
- // nothing to do -- parent layout does not accept Double constraints as ratio
- // super.setRatio(ratio);
+ if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
+ super.setRatio(ratio);
+ }
}
/**
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java index 54c7c173bba..77fafd54d90 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/preferences/UseCasePreferencePage.java @@ -53,8 +53,8 @@ public class UseCasePreferencePage extends AbstractPapyrusNodePreferencePage { */
public static void initDefaults(IPreferenceStore store) {
String key = UseCaseDiagramEditPart.MODEL_ID + "_UseCase";
- store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 100);
- store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 60);
+ store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.WIDTH), 40);
+ store.setDefault(PreferenceConstantHelper.getElementConstant(key, PreferenceConstantHelper.HEIGHT), 40);
Map<String, Boolean> map = getStaticCompartmentVisibilityPreferences();
for(String name : map.keySet()) {
String preferenceName = PreferenceConstantHelper.getLabelElementConstant(key, name, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
|