Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordstadnik2006-04-05 13:41:25 +0000
committerdstadnik2006-04-05 13:41:25 +0000
commit2a8a7a2f6f2bbaacb616ddac3d7d6ea4307e27ec (patch)
tree79756d806679487e1a74cd0baf7d2123b664b5f1
parentd2e1de418d32b5d787d87be35a591e86433110c4 (diff)
downloadorg.eclipse.gmf-tooling-2a8a7a2f6f2bbaacb616ddac3d7d6ea4307e27ec.tar.gz
org.eclipse.gmf-tooling-2a8a7a2f6f2bbaacb616ddac3d7d6ea4307e27ec.tar.xz
org.eclipse.gmf-tooling-2a8a7a2f6f2bbaacb616ddac3d7d6ea4307e27ec.zip
use custom port figure
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java1
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java124
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java40
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java1
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java1
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java6
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java1
-rw-r--r--examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Port_locationViewFactory.java4
-rw-r--r--examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgen24
-rw-r--r--examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgraph33
10 files changed, 145 insertions, 90 deletions
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java
index 02b5a2083..f98e3f677 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java
@@ -525,6 +525,7 @@ public class Destination_UnknownEditPart extends LabelEditPart implements ITextA
* @generated
*/
public ShipDestinationTypeFigure() {
+
this.setText("destination");
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java
index 3720de7e3..277f17d5c 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.PortCanonicalEditPolicy;
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.PortGraphicalNodeEditPolicy;
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.PortItemSemanticEditPolicy;
@@ -31,6 +33,7 @@ import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanDiagramEditorPlugin
import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanSemanticHints;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy;
@@ -89,11 +92,13 @@ public class PortEditPart extends ShapeNodeEditPart {
}
/**
- * @generated
+ * @generated NOT
+ *
+ * Manually set to use local coordinates.
*/
protected IFigure createNodeShape() {
PortFigure figure = new PortFigure();
- figure.setUseLocalCoordinates(false);
+ figure.setUseLocalCoordinates(true);
return primaryShape = figure;
}
@@ -107,17 +112,6 @@ public class PortEditPart extends ShapeNodeEditPart {
/**
* @generated
*/
- protected boolean addFixedChild(EditPart childEditPart) {
- if (childEditPart instanceof Port_locationEditPart) {
- ((Port_locationEditPart) childEditPart).setLabel(getPrimaryShape().getFigurePortLocationFigure());
- return true;
- }
- return false;
- }
-
- /**
- * @generated
- */
protected NodeFigure createNodePlate() {
return new DefaultSizeNodeFigure(getMapMode().DPtoLP(40), getMapMode().DPtoLP(40));
}
@@ -199,7 +193,10 @@ public class PortEditPart extends ShapeNodeEditPart {
* @generated
*/
protected void addChildVisual(EditPart childEditPart, int index) {
- if (!addFixedChild(childEditPart)) {
+ if (isExternalLabel(childEditPart)) {
+ IFigure labelFigure = ((GraphicalEditPart) childEditPart).getFigure();
+ getExternalLabelsContainer().add(labelFigure);
+ } else {
super.addChildVisual(childEditPart, -1);
}
}
@@ -207,7 +204,37 @@ public class PortEditPart extends ShapeNodeEditPart {
/**
* @generated
*/
- public class PortFigure extends org.eclipse.draw2d.RectangleFigure {
+ protected void removeChildVisual(EditPart childEditPart) {
+ if (isExternalLabel(childEditPart)) {
+ IFigure labelFigure = ((GraphicalEditPart) childEditPart).getFigure();
+ getExternalLabelsContainer().remove(labelFigure);
+ } else {
+ super.removeChildVisual(childEditPart);
+ }
+ }
+
+ /**
+ * @generated
+ */
+ protected boolean isExternalLabel(EditPart childEditPart) {
+ if (childEditPart instanceof Port_locationEditPart) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * @generated
+ */
+ protected IFigure getExternalLabelsContainer() {
+ DiagramRootEditPart root = (DiagramRootEditPart) getRoot();
+ return root.getLayer(TaiPanEditPartFactory.EXTERNAL_NODE_LABELS_LAYER);
+ }
+
+ /**
+ * @generated
+ */
+ public class PortFigure extends org.eclipse.draw2d.Layer {
/**
* @generated
@@ -219,39 +246,51 @@ public class PortEditPart extends ShapeNodeEditPart {
*/
public PortFigure() {
- org.eclipse.draw2d.Label childPortLocationFigure = createFigurePortLocationFigure();
- setFigurePortLocationFigure(childPortLocationFigure);
- add(childPortLocationFigure);
+ org.eclipse.draw2d.XYLayout genLayoutManager = new org.eclipse.draw2d.XYLayout();
+ // no suitable template found for 'org.eclipse.gmf.gmfgraph.impl.XYLayoutImpl@92d781'
+ this.setLayoutManager(genLayoutManager);
- }
+ this.setPreferredSize(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50));
+ this.setSize(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50));
+ this.setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50)));
+ this.setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50)));
- /**
- * @generated
- */
- private org.eclipse.draw2d.Label fPortLocationFigure;
+ // FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
- /**
- * @generated
- */
- public org.eclipse.draw2d.Label getFigurePortLocationFigure() {
- return fPortLocationFigure;
- }
+ org.eclipse.draw2d.RectangleFigure fig_0 = new org.eclipse.draw2d.RectangleFigure();
+ fig_0.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);
+ fig_0.setBackgroundColor(org.eclipse.draw2d.ColorConstants.darkGray);
- /**
- * @generated
- */
- protected void setFigurePortLocationFigure(org.eclipse.draw2d.Label figure) {
- fPortLocationFigure = figure;
- }
+ this.add(fig_0);
+ org.eclipse.draw2d.geometry.Rectangle layData0 = new org.eclipse.draw2d.geometry.Rectangle();
+ layData0.x = 10;
+ layData0.y = 40;
+ layData0.width = 40;
+ layData0.height = 10;
+ genLayoutManager.setConstraint(fig_0, layData0);
- /**
- * @generated
- */
- private org.eclipse.draw2d.Label createFigurePortLocationFigure() {
- org.eclipse.draw2d.Label rv = new org.eclipse.draw2d.Label();
- rv.setText("<...>");
+ // FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
+
+ org.eclipse.draw2d.Polygon fig_1 = new org.eclipse.draw2d.Polygon();
+ fig_1.setForegroundColor(org.eclipse.draw2d.ColorConstants.orange);
+ fig_1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.orange);
+ fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(30, 10));
+ fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(60, 40));
+ fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(0, 40));
+
+ this.add(fig_1);
+
+ // FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
+
+ org.eclipse.draw2d.Polygon fig_2 = new org.eclipse.draw2d.Polygon();
+ fig_2.setForegroundColor(org.eclipse.draw2d.ColorConstants.orange);
+ fig_2.setBackgroundColor(org.eclipse.draw2d.ColorConstants.orange);
+ fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(30, 0));
+ fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(50, 20));
+ fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(10, 20));
+
+ this.add(fig_2);
- return rv;
}
/**
@@ -267,6 +306,7 @@ public class PortEditPart extends ShapeNodeEditPart {
protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
myUseLocalCoordinates = useLocalCoordinates;
}
+
}
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java
index a9c534899..8f0d035d5 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java
@@ -12,7 +12,6 @@
package org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts;
import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
//import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
//import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.LabelDirectEditPolicy;
@@ -40,10 +39,10 @@ import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy;
-import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanDiagramEditorPlugin;
-
import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes;
+import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanSemanticHints;
+
import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
@@ -71,8 +70,6 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.ImageDescriptor;
-
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.viewers.ICellEditorValidator;
@@ -88,7 +85,7 @@ import org.eclipse.swt.graphics.Image;
/**
* @generated
*/
-public class Port_locationEditPart extends CompartmentEditPart implements ITextAwareEditPart {
+public class Port_locationEditPart extends TaiPanExternalNodeLabelEditPart implements ITextAwareEditPart {
/**
* @generated
@@ -113,6 +110,13 @@ public class Port_locationEditPart extends CompartmentEditPart implements ITextA
/**
* @generated
*/
+ static {
+ registerSnapBackPosition(TaiPanSemanticHints.Port_1001Labels.PORTLOCATION_4001, new Point(0, 0));
+ }
+
+ /**
+ * @generated
+ */
public Port_locationEditPart(View view) {
super(view);
}
@@ -167,12 +171,7 @@ public class Port_locationEditPart extends CompartmentEditPart implements ITextA
* @generated
*/
protected Image getLabelIcon() {
- EObject element = resolveSemanticElement();
- ImageDescriptor descriptor = TaiPanDiagramEditorPlugin.getInstance().getItemImageDescriptor(element);
- if (descriptor == null) {
- descriptor = ImageDescriptor.getMissingImageDescriptor();
- }
- return descriptor.createImage();
+ return null;
}
/**
@@ -459,22 +458,6 @@ public class Port_locationEditPart extends CompartmentEditPart implements ITextA
/**
* @generated
*/
- protected void addNotationalListeners() {
- super.addNotationalListeners();
- addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
- protected void removeNotationalListeners() {
- super.removeNotationalListeners();
- removeListenerFilter("PrimaryView"); //$NON-NLS-1$
- }
-
- /**
- * @generated
- */
protected void handleNotificationEvent(Notification event) {
Object feature = event.getFeature();
if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
@@ -535,6 +518,7 @@ public class Port_locationEditPart extends CompartmentEditPart implements ITextA
* @generated
*/
public PortLocationFigure() {
+
this.setText("<...>");
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java
index 630e83224..778f8346f 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java
@@ -525,6 +525,7 @@ public class Route_descriptionEditPart extends LabelEditPart implements ITextAwa
* @generated
*/
public RouteDescriptionFigure() {
+
this.setText("<...>");
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java
index 53d7818fa..539f0163f 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java
@@ -525,6 +525,7 @@ public class Route_reliabilityEditPart extends LabelEditPart implements ITextAwa
* @generated
*/
public RouteReliabilityFigure() {
+
this.setText("<...>");
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java
index a144ac305..1ec9a5ead 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java
@@ -276,10 +276,10 @@ public class ShipEditPart extends ShapeNodeEditPart {
* @generated
*/
private org.eclipse.draw2d.Label createFigureShipNameFigure() {
- org.eclipse.draw2d.Label rv = new org.eclipse.draw2d.Label();
- rv.setText("<...>");
+ org.eclipse.draw2d.Label ShipNameFigure = new org.eclipse.draw2d.Label();
+ ShipNameFigure.setText("<...>");
- return rv;
+ return ShipNameFigure;
}
/**
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java
index 855fc97de..ed1d8778e 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java
@@ -535,6 +535,7 @@ public class Ship_nameEditPart extends CompartmentEditPart implements ITextAware
* @generated
*/
public ShipNameFigure() {
+
this.setText("<...>");
}
diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Port_locationViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Port_locationViewFactory.java
index c6a92ca93..7c3aae8b8 100644
--- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Port_locationViewFactory.java
+++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Port_locationViewFactory.java
@@ -16,12 +16,12 @@ import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.diagram.ui.view.factories.BasicNodeViewFactory;
+import org.eclipse.gmf.runtime.diagram.ui.view.factories.AbstractLabelViewFactory;
/**
* @generated
*/
-public class Port_locationViewFactory extends BasicNodeViewFactory {
+public class Port_locationViewFactory extends AbstractLabelViewFactory {
/**
* @generated
diff --git a/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgen b/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgen
index 6141b6bfa..0ff75eaf6 100644
--- a/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgen
+++ b/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgen
@@ -6,7 +6,7 @@
<domainDiagramElement href="taipan.genmodel#//taipan/Aquatory"/>
<childNodes visualID="2001" editPartClassName="ItemEditPart" itemSemanticEditPolicyClassName="ItemItemSemanticEditPolicy" notationViewFactoryClassName="ItemViewFactory" canonicalEditPolicyClassName="ItemCanonicalEditPolicy" graphicalNodeEditPolicyClassName="ItemGraphicalNodeEditPolicy" containers="//@diagram/@compartments.0">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ItemFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ItemFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ItemFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.Label childItemLabelFigure = createFigureItemLabelFigure();&#xD;&#xA;&#x9;&#x9;setFigureItemLabelFigure(childItemLabelFigure);&#xD;&#xA;&#x9;&#x9;add(childItemLabelFigure);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label fItemLabelFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.draw2d.Label getFigureItemLabelFigure() {&#xD;&#xA;&#x9;&#x9;return fItemLabelFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setFigureItemLabelFigure(org.eclipse.draw2d.Label figure) {&#xD;&#xA;&#x9;&#x9;fItemLabelFigure = figure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label createFigureItemLabelFigure() {&#xD;&#xA;org.eclipse.draw2d.Label rv = new org.eclipse.draw2d.Label();&#xD;&#xA;rv.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;return rv;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ItemFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ItemFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ItemFigure() {&#x9;&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.Label childItemLabelFigure = createFigureItemLabelFigure();&#xA;&#x9;&#x9;setFigureItemLabelFigure(childItemLabelFigure);&#xA;&#x9;&#x9;add(childItemLabelFigure);&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Label fItemLabelFigure; &#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.Label getFigureItemLabelFigure() {&#xA;&#x9;&#x9;return fItemLabelFigure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setFigureItemLabelFigure(org.eclipse.draw2d.Label figure) {&#xA;&#x9;&#x9;fItemLabelFigure = figure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Label createFigureItemLabelFigure() {&#xA;org.eclipse.draw2d.Label ItemLabelFigure = new org.eclipse.draw2d.Label();&#xA;ItemLabelFigure.setText(&quot;&lt;...>&quot;);&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return ItemLabelFigure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;}&#xA;"/>
<modelFacet>
<metaClass href="taipan.genmodel#//taipan/Item"/>
<containmentMetaFeature href="taipan.genmodel#//taipan/Ship/cargo"/>
@@ -14,7 +14,7 @@
</modelFacet>
<labels visualID="4002" editPartClassName="Item_article_quantityEditPart" itemSemanticEditPolicyClassName="Item_article_quantityItemSemanticEditPolicy" notationViewFactoryClassName="Item_article_quantityViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ItemLabelFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ItemLabelFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ItemLabelFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ItemLabelFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ItemLabelFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ItemLabelFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet xsi:type="gmfgen:CompositeFeatureLabelModelFacet" viewPattern="- {0} [{1,number,integer}]" editPattern="{0} : {1,number,integer}">
<metaFeatures href="taipan.genmodel#//taipan/Item/article"/>
<metaFeatures href="taipan.genmodel#//taipan/Item/quantity"/>
@@ -23,15 +23,15 @@
</childNodes>
<topLevelNodes visualID="1001" editPartClassName="PortEditPart" itemSemanticEditPolicyClassName="PortItemSemanticEditPolicy" notationViewFactoryClassName="PortViewFactory" canonicalEditPolicyClassName="PortCanonicalEditPolicy" graphicalNodeEditPolicyClassName="PortGraphicalNodeEditPolicy">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="PortFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class PortFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public PortFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.Label childPortLocationFigure = createFigurePortLocationFigure();&#xD;&#xA;&#x9;&#x9;setFigurePortLocationFigure(childPortLocationFigure);&#xD;&#xA;&#x9;&#x9;add(childPortLocationFigure);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label fPortLocationFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.draw2d.Label getFigurePortLocationFigure() {&#xD;&#xA;&#x9;&#x9;return fPortLocationFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setFigurePortLocationFigure(org.eclipse.draw2d.Label figure) {&#xD;&#xA;&#x9;&#x9;fPortLocationFigure = figure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label createFigurePortLocationFigure() {&#xD;&#xA;org.eclipse.draw2d.Label rv = new org.eclipse.draw2d.Label();&#xD;&#xA;rv.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;return rv;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="PortFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class PortFigure extends org.eclipse.draw2d.Layer {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public PortFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.XYLayout genLayoutManager = new org.eclipse.draw2d.XYLayout();&#xA;&#x9;&#x9;// no suitable template found for 'org.eclipse.gmf.gmfgraph.impl.XYLayoutImpl@92d781'&#x9;&#xA;&#x9;&#x9;this.setLayoutManager(genLayoutManager);&#xA;&#x9;&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;this.setPreferredSize(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50));&#xA;&#x9;&#x9;this.setSize(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50));&#xA;&#x9;&#x9;this.setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50)));&#xA;&#x9;&#x9;this.setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(getMapMode().DPtoLP(60), getMapMode().DPtoLP(50)));&#xA;&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.RectangleFigure fig_0 = new org.eclipse.draw2d.RectangleFigure();&#xA;&#x9;&#x9;fig_0.setForegroundColor(org.eclipse.draw2d.ColorConstants.black);&#xA;&#x9;&#x9;fig_0.setBackgroundColor(org.eclipse.draw2d.ColorConstants.darkGray);&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;this.add(fig_0);&#xA;&#x9;&#x9;&#x9;&#x9;&#x9;org.eclipse.draw2d.geometry.Rectangle layData0 = new org.eclipse.draw2d.geometry.Rectangle();&#xA;&#x9;&#x9;&#x9;layData0.x = 10;&#xA;&#x9;&#x9;&#x9;layData0.y = 40;&#xA;&#x9;&#x9;&#x9;layData0.width = 40;&#xA;&#x9;&#x9;&#x9;layData0.height = 10;&#xA;&#x9;&#x9;&#x9;genLayoutManager.setConstraint(fig_0, layData0);&#xA;&#x9;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.Polygon fig_1 = new org.eclipse.draw2d.Polygon();&#xA;&#x9;&#x9;fig_1.setForegroundColor(org.eclipse.draw2d.ColorConstants.orange);&#xA;&#x9;&#x9;fig_1.setBackgroundColor(org.eclipse.draw2d.ColorConstants.orange);&#xA;&#x9;&#x9;fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(30, 10));&#xA;&#x9;&#x9;fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(60, 40));&#xA;&#x9;&#x9;fig_1.addPoint(new org.eclipse.draw2d.geometry.Point(0, 40));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;this.add(fig_1);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.Polygon fig_2 = new org.eclipse.draw2d.Polygon();&#xA;&#x9;&#x9;fig_2.setForegroundColor(org.eclipse.draw2d.ColorConstants.orange);&#xA;&#x9;&#x9;fig_2.setBackgroundColor(org.eclipse.draw2d.ColorConstants.orange);&#xA;&#x9;&#x9;fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(30, 0));&#xA;&#x9;&#x9;fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(50, 20));&#xA;&#x9;&#x9;fig_2.addPoint(new org.eclipse.draw2d.geometry.Point(10, 20));&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;this.add(fig_2);&#xA;&#x9;&#x9;&#xA;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet>
<metaClass href="taipan.genmodel#//taipan/Port"/>
<containmentMetaFeature href="taipan.genmodel#//taipan/Aquatory/ports"/>
<childMetaFeature href="taipan.genmodel#//taipan/Aquatory/ports"/>
</modelFacet>
- <labels visualID="4001" editPartClassName="Port_locationEditPart" itemSemanticEditPolicyClassName="Port_locationItemSemanticEditPolicy" notationViewFactoryClassName="Port_locationViewFactory">
+ <labels xsi:type="gmfgen:GenExternalNodeLabel" visualID="4001" editPartClassName="Port_locationEditPart" itemSemanticEditPolicyClassName="Port_locationItemSemanticEditPolicy" notationViewFactoryClassName="Port_locationViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="PortLocationFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class PortLocationFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public PortLocationFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="PortLocationFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class PortLocationFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public PortLocationFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" viewPattern="">
<metaFeature href="taipan.genmodel#//taipan/Port/location"/>
</modelFacet>
@@ -39,7 +39,7 @@
</topLevelNodes>
<topLevelNodes visualID="1002" editPartClassName="ShipEditPart" itemSemanticEditPolicyClassName="ShipItemSemanticEditPolicy" notationViewFactoryClassName="ShipViewFactory" canonicalEditPolicyClassName="ShipCanonicalEditPolicy" compartments="//@diagram/@compartments.0" graphicalNodeEditPolicyClassName="ShipGraphicalNodeEditPolicy">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ShipFigure extends org.eclipse.draw2d.RectangleFigure {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ShipFigure() {&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;org.eclipse.draw2d.Label childShipNameFigure = createFigureShipNameFigure();&#xD;&#xA;&#x9;&#x9;setFigureShipNameFigure(childShipNameFigure);&#xD;&#xA;&#x9;&#x9;add(childShipNameFigure);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label fShipNameFigure; &#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public org.eclipse.draw2d.Label getFigureShipNameFigure() {&#xD;&#xA;&#x9;&#x9;return fShipNameFigure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setFigureShipNameFigure(org.eclipse.draw2d.Label figure) {&#xD;&#xA;&#x9;&#x9;fShipNameFigure = figure;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.Label createFigureShipNameFigure() {&#xD;&#xA;org.eclipse.draw2d.Label rv = new org.eclipse.draw2d.Label();&#xD;&#xA;rv.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;return rv;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ShipFigure extends org.eclipse.draw2d.RectangleFigure {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ShipFigure() {&#x9;&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;org.eclipse.draw2d.Label childShipNameFigure = createFigureShipNameFigure();&#xA;&#x9;&#x9;setFigureShipNameFigure(childShipNameFigure);&#xA;&#x9;&#x9;add(childShipNameFigure);&#xA;&#x9;&#x9;&#xA;&#x9;&#x9;&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Label fShipNameFigure; &#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public org.eclipse.draw2d.Label getFigureShipNameFigure() {&#xA;&#x9;&#x9;return fShipNameFigure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setFigureShipNameFigure(org.eclipse.draw2d.Label figure) {&#xA;&#x9;&#x9;fShipNameFigure = figure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.Label createFigureShipNameFigure() {&#xA;org.eclipse.draw2d.Label ShipNameFigure = new org.eclipse.draw2d.Label();&#xA;ShipNameFigure.setText(&quot;&lt;...>&quot;);&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return ShipNameFigure;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;}&#xA;"/>
<modelFacet>
<metaClass href="taipan.genmodel#//taipan/Ship"/>
<containmentMetaFeature href="taipan.genmodel#//taipan/Aquatory/ships"/>
@@ -47,7 +47,7 @@
</modelFacet>
<labels visualID="4003" editPartClassName="Ship_nameEditPart" itemSemanticEditPolicyClassName="Ship_nameItemSemanticEditPolicy" notationViewFactoryClassName="Ship_nameViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipNameFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ShipNameFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ShipNameFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipNameFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ShipNameFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ShipNameFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet">
<metaFeature href="taipan.genmodel#//taipan/Ship/name"/>
</modelFacet>
@@ -55,18 +55,18 @@
</topLevelNodes>
<links visualID="3001" editPartClassName="DestinationEditPart" itemSemanticEditPolicyClassName="DestinationItemSemanticEditPolicy" notationViewFactoryClassName="DestinationViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipDestinationFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ShipDestinationFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ShipDestinationFigure() {&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {&#xD;&#xA;org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();&#xD;&#xA;// dispatchNext?&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#x9;&#x9;return df;&#xD;&#xA;&#x9;}&#xD;&#xA;}"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipDestinationFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ShipDestinationFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ShipDestinationFigure() {&#xA;&#xA;&#x9;&#x9;setTargetDecoration(createTargetDecoration());&#xA;&#x9;}&#xA;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {&#xA;org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();&#xA;// dispatchNext?&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;&#x9;&#x9;return df;&#xA;&#x9;}&#xA;}"/>
<modelFacet xsi:type="gmfgen:FeatureLinkModelFacet">
<metaFeature href="taipan.genmodel#//taipan/Ship/destination"/>
</modelFacet>
<labels visualID="4004" editPartClassName="Destination_UnknownEditPart" itemSemanticEditPolicyClassName="Destination_UnknownItemSemanticEditPolicy" notationViewFactoryClassName="Destination_UnknownViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipDestinationTypeFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class ShipDestinationTypeFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public ShipDestinationTypeFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;destination&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ShipDestinationTypeFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class ShipDestinationTypeFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public ShipDestinationTypeFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;destination&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
</labels>
</links>
<links visualID="3002" editPartClassName="RouteEditPart" itemSemanticEditPolicyClassName="RouteItemSemanticEditPolicy" notationViewFactoryClassName="RouteViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class RouteFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public RouteFigure() {&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;}"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class RouteFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public RouteFigure() {&#xA;&#xA;&#x9;}&#xA;&#xA;&#xA;}"/>
<modelFacet xsi:type="gmfgen:TypeLinkModelFacet">
<metaClass href="taipan.genmodel#//taipan/Route"/>
<containmentMetaFeature href="taipan.genmodel#//taipan/Aquatory/routes"/>
@@ -76,14 +76,14 @@
</modelFacet>
<labels visualID="4005" editPartClassName="Route_descriptionEditPart" itemSemanticEditPolicyClassName="Route_descriptionItemSemanticEditPolicy" notationViewFactoryClassName="Route_descriptionViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteDescriptionFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class RouteDescriptionFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public RouteDescriptionFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteDescriptionFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class RouteDescriptionFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public RouteDescriptionFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" viewPattern="route : {0}" editPattern="{0}">
<metaFeature href="taipan.genmodel#//taipan/Route/description"/>
</modelFacet>
</labels>
<labels visualID="4006" editPartClassName="Route_reliabilityEditPart" itemSemanticEditPolicyClassName="Route_reliabilityItemSemanticEditPolicy" notationViewFactoryClassName="Route_reliabilityViewFactory">
<diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
- <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteReliabilityFigure" classBody="&#xD;&#xA;&#xD;&#xA;/**&#xD;&#xA; * @generated&#xD;&#xA; */&#xD;&#xA;public class RouteReliabilityFigure extends org.eclipse.draw2d.Label {&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;private boolean myUseLocalCoordinates;&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;public RouteReliabilityFigure() {&#xD;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xD;&#xA;&#x9;&#x9;&#xD;&#xA;&#xD;&#xA;&#x9;}&#xD;&#xA;&#x9;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected boolean useLocalCoordinates() {&#xD;&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;&#x9;/**&#xD;&#xA;&#x9; * @generated&#xD;&#xA;&#x9; */&#xD;&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xD;&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xD;&#xA;&#x9;}&#xD;&#xA;&#xD;&#xA;}&#xD;&#xA;"/>
+ <viewmap xsi:type="gmfgen:InnerClassViewmap" className="RouteReliabilityFigure" classBody="&#xA;&#xA;/**&#xA; * @generated&#xA; */&#xA;public class RouteReliabilityFigure extends org.eclipse.draw2d.Label {&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;private boolean myUseLocalCoordinates;&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;public RouteReliabilityFigure() {&#xA;&#x9;&#x9;&#xA;&#x9;&#xA;&#x9;&#x9;this.setText(&quot;&lt;...>&quot;);&#xA;&#x9;&#x9;&#xA;&#xA;&#x9;}&#xA;&#x9;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected boolean useLocalCoordinates() {&#xA;&#x9;&#x9;return myUseLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;&#x9;/**&#xA;&#x9; * @generated&#xA;&#x9; */&#xA;&#x9;protected void setUseLocalCoordinates(boolean useLocalCoordinates) {&#xA;&#x9;&#x9;myUseLocalCoordinates = useLocalCoordinates;&#xA;&#x9;}&#xA;&#xA;}&#xA;"/>
<modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" viewPattern="reliability : {0,number,percent}" editPattern="{0,number,percent}">
<metaFeature href="taipan.genmodel#//taipan/Route/reliability"/>
</modelFacet>
diff --git a/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgraph b/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgraph
index 0d2c95e2f..60a5b1a3b 100644
--- a/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgraph
+++ b/examples/org.eclipse.gmf.examples.taipan/models/taipan.gmfgraph
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gmfgraph:Canvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgraph="http://www.eclipse.org/gmf/2005/GraphicalDefinition" name="taipan">
<figures name="default">
- <figures xsi:type="gmfgraph:Rectangle" name="PortFigure">
- <children xsi:type="gmfgraph:Label" name="PortLocationFigure" text="&lt;...>"/>
- </figures>
<figures xsi:type="gmfgraph:Rectangle" name="ShipFigure">
<children xsi:type="gmfgraph:Label" name="ShipNameFigure" text="&lt;...>"/>
</figures>
@@ -19,6 +16,36 @@
<children xsi:type="gmfgraph:Label" name="RouteReliabilityFigure" text="&lt;...>"/>
</figures>
<figures xsi:type="gmfgraph:Rectangle" name="CargoFigure"/>
+ <figures xsi:type="gmfgraph:CustomFigure" name="PortFigure" qualifiedClassName="org.eclipse.draw2d.Layer">
+ <layout xsi:type="gmfgraph:XYLayout"/>
+ <children xsi:type="gmfgraph:Rectangle" name="Walls">
+ <layoutData xsi:type="gmfgraph:XYLayoutData">
+ <topLeft x="10" y="40"/>
+ <size dx="40" dy="10"/>
+ </layoutData>
+ <foregroundColor xsi:type="gmfgraph:ConstantColor" value="black"/>
+ <backgroundColor xsi:type="gmfgraph:ConstantColor" value="darkGray"/>
+ </children>
+ <children xsi:type="gmfgraph:Polygon" name="MainRoof">
+ <foregroundColor xsi:type="gmfgraph:ConstantColor" value="orange"/>
+ <backgroundColor xsi:type="gmfgraph:ConstantColor" value="orange"/>
+ <template x="30" y="10"/>
+ <template x="60" y="40"/>
+ <template y="40"/>
+ </children>
+ <children xsi:type="gmfgraph:Polygon" name="TopRoof">
+ <foregroundColor xsi:type="gmfgraph:ConstantColor" value="orange"/>
+ <backgroundColor xsi:type="gmfgraph:ConstantColor" value="orange"/>
+ <template x="30"/>
+ <template x="50" y="20"/>
+ <template x="10" y="20"/>
+ </children>
+ <maximumSize dx="60" dy="50"/>
+ <minimumSize dx="60" dy="50"/>
+ <preferredSize dx="60" dy="50"/>
+ <size x="60" y="50"/>
+ </figures>
+ <figures xsi:type="gmfgraph:Label" name="PortLocationFigure" text="&lt;...>"/>
</figures>
<nodes name="PortNode" figure="PortFigure"/>
<nodes name="ShipNode" figure="ShipFigure"/>

Back to the top