### Eclipse Workspace Patch 1.0 #P org.eclipse.gmf.runtime.diagram.ui.providers Index: src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.providers/src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java,v retrieving revision 1.2 diff -u -r1.2 DiagramEditPartProvider.java --- src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java 8 Nov 2005 16:02:44 -0000 1.2 +++ src/org/eclipse/gmf/runtime/diagram/ui/providers/internal/DiagramEditPartProvider.java 24 Jan 2006 21:15:03 -0000 @@ -105,6 +105,6 @@ * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider#createDiagramRootEditPart() */ public RootEditPart createRootEditPart(Diagram diagram) { - return new DiagramRootEditPart(); + return new DiagramRootEditPart(diagram.getMeasurementUnit()); } } #P org.eclipse.gmf.runtime.notation.edit Index: plugin.properties =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.edit/plugin.properties,v retrieving revision 1.3 diff -u -r1.3 plugin.properties --- plugin.properties 16 Nov 2005 03:05:04 -0000 1.3 +++ plugin.properties 24 Jan 2006 21:15:04 -0000 @@ -168,3 +168,11 @@ _UI_CreateChild_text3 = {1} _UI_Unknown_datatype= Value +_UI_MeasuredLayoutConstraint_type = Measured Layout Constraint +_UI_Guide_measurementUnit_feature = Measurement Unit +_UI_MeasuredLayoutConstraint_measurementUnit_feature = Measurement Unit +_UI_MeasurementUnit_Himetric_literal = Himetric +_UI_MeasurementUnit_Pixel_literal = Pixel +_UI_MeasuredConstraint_type = Measured Constraint +_UI_MeasuredConstraint_measurementUnit_feature = Measurement Unit +_UI_Diagram_measurementUnit_feature = Measurement Unit Index: src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation.edit/src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java,v retrieving revision 1.2 diff -u -r1.2 DiagramItemProvider.java --- src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java 12 Sep 2005 21:29:24 -0000 1.2 +++ src/org/eclipse/gmf/runtime/notation/provider/DiagramItemProvider.java 24 Jan 2006 21:15:04 -0000 @@ -68,6 +68,7 @@ super.getPropertyDescriptors(object); addNamePropertyDescriptor(object); + addMeasurementUnitPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -93,6 +94,26 @@ } /** + * This adds a property descriptor for the Measurement Unit feature. + * + * + * @generated + */ + protected void addMeasurementUnitPropertyDescriptor(Object object) { + itemPropertyDescriptors.add + (createItemPropertyDescriptor + (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Diagram_measurementUnit_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Diagram_measurementUnit_feature", "_UI_Diagram_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + NotationPackage.eINSTANCE.getDiagram_MeasurementUnit(), + false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, + null)); + } + + /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. @@ -156,6 +177,7 @@ switch (notification.getFeatureID(Diagram.class)) { case NotationPackage.DIAGRAM__NAME: + case NotationPackage.DIAGRAM__MEASUREMENT_UNIT: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; case NotationPackage.DIAGRAM__PERSISTED_EDGES: #P org.eclipse.gmf.runtime.diagram.ui Index: src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java,v retrieving revision 1.9 diff -u -r1.9 ContainerEditPolicy.java --- src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java 25 Nov 2005 19:38:12 -0000 1.9 +++ src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ContainerEditPolicy.java 24 Jan 2006 21:15:07 -0000 @@ -118,15 +118,11 @@ if (data != null && viewContext != null && editPart instanceof ISurfaceEditPart) { - return new EtoolsProxyCommand(new PasteCommand(DiagramUIMessages.PasteCommand_Label, viewContext, data, getPasteOffset())); + return new EtoolsProxyCommand(new PasteCommand(DiagramUIMessages.PasteCommand_Label, viewContext, data, MapModeUtil.getMapMode(((org.eclipse.gef.GraphicalEditPart)getHost()).getFigure()))); } return null; } - - private int getPasteOffset() { - return MapModeUtil.getMapMode(((org.eclipse.gef.GraphicalEditPart)getHost()).getFigure()).DPtoLP(10); - } private class EditPartComparator implements Comparator { @@ -406,6 +402,10 @@ return null; } + private int getPasteOffset() { + return MapModeUtil.getMapMode(((org.eclipse.gef.GraphicalEditPart)getHost()).getFigure()).DPtoLP(10); + } + /** * @see org.eclipse.gef.EditPolicy#getCommand(Request) */ Index: src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java,v retrieving revision 1.6 diff -u -r1.6 AbstractViewFactory.java --- src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java 20 Dec 2005 16:49:27 -0000 1.6 +++ src/org/eclipse/gmf/runtime/diagram/ui/view/factories/AbstractViewFactory.java 24 Jan 2006 21:15:07 -0000 @@ -91,7 +91,7 @@ */ protected boolean requiresElement(EObject semanticElement, View view) { EObject containerSemanticElement = view.getElement(); - if (containerSemanticElement==semanticElement) + if (containerSemanticElement==semanticElement && containerSemanticElement != null) return false; return true; } Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java,v retrieving revision 1.14 diff -u -r1.14 DiagramRootEditPart.java --- src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java 20 Jan 2006 22:10:12 -0000 1.14 +++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java 24 Jan 2006 21:15:06 -0000 @@ -20,6 +20,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.draw2d.geometry.Translatable; import org.eclipse.gef.Request; import org.eclipse.gef.SnapToGeometry; import org.eclipse.gef.SnapToGrid; @@ -39,6 +40,7 @@ import org.eclipse.gmf.runtime.diagram.ui.internal.pagesetup.PageInfoHelper; import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties; import org.eclipse.gmf.runtime.diagram.ui.internal.ruler.DiagramRuler; +import org.eclipse.gmf.runtime.diagram.ui.internal.util.MeasurementUnitHelper; import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer; import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants; import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants; @@ -48,6 +50,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes; import org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatableZoomManager; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.swt.SWT; @@ -64,6 +67,75 @@ extends ScalableFreeformRootEditPart implements ZoomableEditPart, IDiagramPreferenceSupport { + private WrapperMapMode mm; + + /** + * @author sshaw + * This pattern is necessary because, the constructor of the ScalableFreeformRootEditPart forces + * the scalable layered pane class to be instantiated where it gets initialized with the MapMode + * of the this root editpart. However, we haven't had a chance to initialize the mapmode value yet since + * super must be called first. So, this pattern allows us to set the mapmode into this container after + * super is called, but still have the scalable layered pane initialized with the mapmode value. + */ + private class WrapperMapMode implements IMapMode { + + public WrapperMapMode() { + super(); + } + + IMapMode containedMM = MapModeTypes.DEFAULT_MM; + public void setContainedMapMode(IMapMode mm) { + this.containedMM = mm; + } + + /* (non-Javadoc) + * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(int) + */ + public int DPtoLP(int deviceUnit) { + return containedMM.DPtoLP(deviceUnit); + } + + /* (non-Javadoc) + * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#DPtoLP(org.eclipse.draw2d.geometry.Translatable) + */ + public Translatable DPtoLP(Translatable t) { + return containedMM.DPtoLP(t); + } + + /* (non-Javadoc) + * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(int) + */ + public int LPtoDP(int logicalUnit) { + return containedMM.LPtoDP(logicalUnit); + } + + /* (non-Javadoc) + * @see org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode#LPtoDP(org.eclipse.draw2d.geometry.Translatable) + */ + public Translatable LPtoDP(Translatable t) { + return containedMM.LPtoDP(t); + } + + } + + /** + * Default constructor + */ + public DiagramRootEditPart() { + super(); + } + + /** + * @param mu the MeasurementUnit that is used to display all contents + * within the root edit part. + */ + public DiagramRootEditPart(MeasurementUnit mu) { + super(); + + if (getMapMode() != null) + mm.setContainedMapMode(MeasurementUnitHelper.getMapMode(mu)); + } + /** * GEF does not scale the FEEDBACK_LAYER but we do. */ @@ -684,13 +756,16 @@ } /** - * Override this if the Editor wishes to support a coordinate system other then the default - * (usually HiMetric coordinates). + * Clients must define the measurement unit in the Diagram notation + * object for their editor to affect this mapping mode object value. + * * @return IMapMode that is the coordinate mapping for the Editor from device to * logical coordinates. */ - public IMapMode getMapMode() { - return MapModeTypes.DEFAULT_MM; + final public IMapMode getMapMode() { + if (mm == null) + mm = new WrapperMapMode(); + return mm; } public DiagramRuler getHorizontalRuler() { Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java,v retrieving revision 1.25 diff -u -r1.25 GraphicalEditPart.java --- src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java 17 Jan 2006 18:47:09 -0000 1.25 +++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java 24 Jan 2006 21:15:07 -0000 @@ -38,6 +38,7 @@ import org.eclipse.gef.EditPolicy; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.RootEditPart; import org.eclipse.gef.commands.Command; import org.eclipse.gef.commands.CompoundCommand; import org.eclipse.gef.commands.UnexecutableCommand; @@ -1279,10 +1280,12 @@ * logical units. */ final protected IMapMode getMapMode() { - EditPart parent = getParent(); - if (parent instanceof org.eclipse.gef.GraphicalEditPart) - return MapModeUtil.getMapMode(((org.eclipse.gef.GraphicalEditPart)parent).getFigure()); - + RootEditPart root = getRoot(); + if (root instanceof DiagramRootEditPart) { + DiagramRootEditPart dgrmRoot = (DiagramRootEditPart)root; + return dgrmRoot.getMapMode(); + } + return MapModeUtil.getMapMode(); } Index: src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java,v retrieving revision 1.19 diff -u -r1.19 ConnectionEditPart.java --- src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java 17 Jan 2006 18:47:09 -0000 1.19 +++ src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java 24 Jan 2006 21:15:05 -0000 @@ -42,6 +42,7 @@ import org.eclipse.gef.LayerConstants; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.RootEditPart; import org.eclipse.gef.SnapToGeometry; import org.eclipse.gef.SnapToGrid; import org.eclipse.gef.SnapToGuides; @@ -1490,18 +1491,16 @@ } /** - * @return IMapMode that allows for the coordinate mapping - * from device to logical units. + * @return IMapMode that allows for the coordinate mapping from device to + * logical units. */ final protected IMapMode getMapMode() { - EditPart parent = getParent(); - if (parent instanceof DiagramRootEditPart) - return ((DiagramRootEditPart) parent).getMapMode(); - else if (parent instanceof org.eclipse.gef.GraphicalEditPart) - return MapModeUtil - .getMapMode(((org.eclipse.gef.GraphicalEditPart) parent) - .getFigure()); - + RootEditPart root = getRoot(); + if (root instanceof DiagramRootEditPart) { + DiagramRootEditPart dgrmRoot = (DiagramRootEditPart)root; + return dgrmRoot.getMapMode(); + } + return MapModeUtil.getMapMode(); } } Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/PasteCommand.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/PasteCommand.java,v retrieving revision 1.7 diff -u -r1.7 PasteCommand.java --- src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/PasteCommand.java 17 Nov 2005 22:17:17 -0000 1.7 +++ src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/PasteCommand.java 24 Jan 2006 21:15:07 -0000 @@ -13,18 +13,34 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.ListIterator; +import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.gmf.runtime.common.core.command.CommandResult; import org.eclipse.gmf.runtime.common.ui.util.ICustomData; import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil; +import org.eclipse.gmf.runtime.diagram.ui.internal.util.MeasurementUnitHelper; +import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; import org.eclipse.gmf.runtime.emf.core.util.EObjectUtil; +import org.eclipse.gmf.runtime.notation.Bendpoints; +import org.eclipse.gmf.runtime.notation.Edge; +import org.eclipse.gmf.runtime.notation.LayoutConstraint; import org.eclipse.gmf.runtime.notation.Location; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationPackage; +import org.eclipse.gmf.runtime.notation.RelativeBendpoints; +import org.eclipse.gmf.runtime.notation.Size; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint; import org.eclipse.jface.util.Assert; /** @@ -40,39 +56,27 @@ private final ICustomData[] data; private int offset = 0; - - /** - * Constructor for PasteCommand. - * @param viewContext - * @param data - * @param offset - * the int that is the offset from the original views that - * the new views will be placed in logical coordinates - */ - public PasteCommand( - View viewContext, - ICustomData[] data, int offset) { - this(null, viewContext, data, offset); - } + private IMapMode mm; /** * Constructor for PasteCommand. * @param label * @param viewContext * @param data - * @param offset - * the int that is the offset from the original views that - * the new views will be placed in logical coordinates + * @param mm + * the IMapMode that is used to convert the layout constraint + * and calculate the offset in logical coordinates */ public PasteCommand( String label, View viewContext, - ICustomData[] data, int offset) { + ICustomData[] data, IMapMode mm) { super(label, viewContext); Assert.isNotNull(data); this.data = data; - this.offset = offset; + this.offset = mm.DPtoLP(10); + this.mm = mm; } protected CommandResult doExecute(IProgressMonitor progressMonitor) { @@ -86,18 +90,6 @@ /* Paste the xml on to the target view's diagram */ List views = pasteFromString(getViewContext(),xml); allViews.addAll(views); - - /* Set the new bounds for the pasted IShapeView views */ - for (Iterator i = views.iterator(); i.hasNext();) { - View view = (View) i.next(); - if (view instanceof Node && - ((Node)view).getLayoutConstraint() instanceof Location/*view instanceof IShapeView*/) { - Integer x = (Integer) ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X()); - ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_X(), new Integer(x.intValue() + offset)); - Integer y = (Integer) ViewUtil.getStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y()); - ViewUtil.setStructuralFeatureValue(view,NotationPackage.eINSTANCE.getLocation_Y(), new Integer(y.intValue() + offset)); - } - } } return newOKCommandResult(allViews); } @@ -113,13 +105,124 @@ private List pasteFromString(View view, String clipboard) { ArrayList retval = new ArrayList(); Iterator pastedElements = EObjectUtil.deserialize(view, clipboard, Collections.EMPTY_MAP).iterator(); - while( pastedElements.hasNext() ) { + + // get the measurement unit + MeasurementUnit mu = MeasurementUnit.HIMETRIC_LITERAL; + + while( pastedElements.hasNext() ) { Object element = pastedElements.next(); if (element instanceof View) { retval.add(element); } + else if (element instanceof EAnnotation) { + EAnnotation measureUnitAnnotation = (EAnnotation)element; + String unitName = measureUnitAnnotation.getSource(); + mu = MeasurementUnit.get(unitName); + } } + + /* Set the new bounds for the pasted IShapeView views */ + Set edges = convertNodesConstraint(retval, mu); + + // now go through all associated edges and adjust the bendpoints + convertEdgeBendpoints(mu, edges); + return retval; } + /** + * @param mu the MeasurementUnit for the notation diagram. + * @param edges the Set of edges to convert the bendpoints of. + */ + private void convertEdgeBendpoints(MeasurementUnit mu, Set edges) { + for (Iterator i = edges.iterator(); i.hasNext();) { + Edge nextEdge = (Edge)i.next(); + Bendpoints bendpoints = nextEdge.getBendpoints(); + + if (bendpoints instanceof RelativeBendpoints) { + RelativeBendpoints relBendpoints = (RelativeBendpoints)bendpoints; + List points = relBendpoints.getPoints(); + List newpoints = new ArrayList(points.size()); + ListIterator li = points.listIterator(); + + IMapMode viewMapMode = MeasurementUnitHelper.getMapMode(mu); + + while (li.hasNext()) { + RelativeBendpoint rb = (RelativeBendpoint)li.next(); + + Dimension source = new Dimension(rb.getSourceX(), rb.getSourceY()); + Dimension target = new Dimension(rb.getTargetX(), rb.getTargetY()); + if (!viewMapMode.equals(mm)) { + source = (Dimension)viewMapMode.LPtoDP(source); + source = (Dimension)mm.DPtoLP(source); + + target = (Dimension)viewMapMode.LPtoDP(target); + target = (Dimension)mm.DPtoLP(target); + } + + newpoints.add(new RelativeBendpoint(source.width, source.height, + target.width, target.height)); + } + + relBendpoints.setPoints(newpoints); + } + + } + } + + /** + * @param retval the List of Node objects to convert the constraint of. + * @param mu the MeasurementUnit for the notation diagram. + * @return the Set of Edge views that are attached to the list of nodes + */ + private Set convertNodesConstraint(List retval, MeasurementUnit mu) { + Set edges = new HashSet(); + for (Iterator i = retval.iterator(); i.hasNext();) { + View nextView = (View) i.next(); + if (nextView instanceof Node) { + Node node = (Node)nextView; + Point loc = new Point(0, 0); + LayoutConstraint lc = node.getLayoutConstraint(); + if (lc instanceof Location) { + Location locC = (Location)lc; + loc = new Point(locC.getX(), locC.getY()); + } + + Dimension size = new Dimension(0, 0); + if (lc instanceof Size) { + Size sizeC = (Size)lc; + size = new Dimension(sizeC.getWidth(), sizeC.getHeight()); + } + + IMapMode viewMapMode = MeasurementUnitHelper.getMapMode(mu); + + if (!viewMapMode.equals(mm)) { + // convert location to native coordinates + loc = (Point)viewMapMode.LPtoDP(loc); + loc = (Point)mm.DPtoLP(loc); + + // convert size to native coordinates + Dimension origSize = new Dimension(size); + size = (Dimension)viewMapMode.LPtoDP(size); + size = (Dimension)mm.DPtoLP(size); + if (origSize.width == -1) + size.width = -1; + if (origSize.height == -1) + size.height = -1; + } + + Rectangle constraintRect = new Rectangle(loc, size); + constraintRect.getTranslated(offset, offset); + ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getLocation_X(), new Integer(constraintRect.x)); + ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getLocation_Y(), new Integer(constraintRect.y)); + ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getSize_Width(), new Integer(constraintRect.width)); + ViewUtil.setStructuralFeatureValue(nextView,NotationPackage.eINSTANCE.getSize_Height(), new Integer(constraintRect.height)); + + edges.addAll(((Node)nextView).getTargetEdges()); + edges.addAll(((Node)nextView).getSourceEdges()); + } + } + return edges; + } + } Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java,v retrieving revision 1.3 diff -u -r1.3 ClipboardCommand.java --- src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java 12 Sep 2005 21:29:10 -0000 1.3 +++ src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java 24 Jan 2006 21:15:07 -0000 @@ -16,16 +16,18 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jface.util.Assert; - +import org.eclipse.emf.ecore.EcoreFactory; import org.eclipse.gmf.runtime.common.ui.action.actions.global.ClipboardManager; import org.eclipse.gmf.runtime.common.ui.util.CustomData; import org.eclipse.gmf.runtime.common.ui.util.CustomDataTransfer; import org.eclipse.gmf.runtime.common.ui.util.ICustomData; import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractModelCommand; import org.eclipse.gmf.runtime.emf.core.util.EObjectUtil; +import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.jface.util.Assert; /** * Abstract parent for all concrete clipboard commands used for IViews @@ -119,11 +121,19 @@ /* views iterator */ Iterator iter = views.iterator(); + // add the measurement unit in a annotation + View firstView = (View)views.get(0); + Diagram dgrm = firstView.getDiagram(); + EAnnotation measureUnitAnnotation = EcoreFactory.eINSTANCE.createEAnnotation(); + measureUnitAnnotation.setSource(dgrm.getMeasurementUnit().getName()); + selection.add(measureUnitAnnotation); + /* Add the elements to the selection */ while (iter.hasNext()) { EObject viewElement =(View)iter.next(); - if (viewElement != null) + if (viewElement != null) { selection.add(viewElement); + } } /* Copy the selection to the string */ Index: src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java,v retrieving revision 1.10 diff -u -r1.10 EditPartService.java --- src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java 20 Jan 2006 22:10:12 -0000 1.10 +++ src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java 24 Jan 2006 21:15:07 -0000 @@ -237,7 +237,7 @@ result = (RootEditPart) execute(createRootEditPartOperation); // provide default implementation - return (result == null) ? new DiagramRootEditPart() + return (result == null) ? new DiagramRootEditPart(diagram.getMeasurementUnit()) : result; } Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/util/MeasurementUnitHelper.java =================================================================== RCS file: src/org/eclipse/gmf/runtime/diagram/ui/internal/util/MeasurementUnitHelper.java diff -N src/org/eclipse/gmf/runtime/diagram/ui/internal/util/MeasurementUnitHelper.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/gmf/runtime/diagram/ui/internal/util/MeasurementUnitHelper.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,42 @@ +/****************************************************************************** + * Copyright (c) 2006 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + ****************************************************************************/ + +package org.eclipse.gmf.runtime.diagram.ui.internal.util; + +import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; +import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; + + +/** + * @author sshaw + * Helper class to retrieve appropriate IMapMode implementation + * for a given MeasurementUnit enumerated type. + * + */ +public class MeasurementUnitHelper { + + /** + * @param unit the MeasurementUnit to find the appropriate + * IMapMode implementation that will convert from the coordinate + * system of the unit to device coordinates. + * @return the IMapMode class that knows how to convert the unit + * to device coordinates. + */ + static public IMapMode getMapMode(MeasurementUnit unit) { + if (unit.equals(MeasurementUnit.PIXEL_LITERAL)) + return MapModeTypes.IDENTITY_MM; + else if (unit.equals(MeasurementUnit.HIMETRIC_LITERAL)) + return MapModeTypes.HIMETRIC_MM; + + return MapModeTypes.DEFAULT_MM; + } +} #P org.eclipse.gmf.examples.runtime.diagram.geoshapes Index: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/package.html =================================================================== RCS file: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/package.html diff -N src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/package.html --- src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/package.html 12 Sep 2005 21:25:37 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,38 +0,0 @@ - - - - - - - -Aurora internal packages - - -

Package Specification

-

-Provides a set of classes to use when creating views. -

-

Each created view façade object has two constructors:

- -

- -@canBeSeenBy %level1 - - - Index: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/editparts/GeoshapesDiagramRootEditPart.java =================================================================== RCS file: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/editparts/GeoshapesDiagramRootEditPart.java diff -N src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/editparts/GeoshapesDiagramRootEditPart.java --- src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/editparts/GeoshapesDiagramRootEditPart.java 8 Nov 2005 16:02:46 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,39 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - ****************************************************************************/ - -package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.editparts; - -import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; -import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode; -import org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes; - - -/** - * Override to provide the identity map mode for the editor in - * instead of the HiMetric default. - * - * @author sshaw - * - */ -public class GeoshapesDiagramRootEditPart - extends DiagramRootEditPart { - - /* - * Overridden to use the identity mapmode for this editor. This means that there is no - * mapping of device coordinates to an absolute measurement for persistance. Some clients - * may not need or desire the precision of HiMetric coordinate system and by using the - * Identity map mode it allows easier reuse of pure GEF figures. - */ - public IMapMode getMapMode() { - return MapModeTypes.IDENTITY_MM; - } - -} Index: plugin.xml =================================================================== RCS file: /home/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.diagram.geoshapes/plugin.xml,v retrieving revision 1.8 diff -u -r1.8 plugin.xml --- plugin.xml 24 Nov 2005 18:55:35 -0000 1.8 +++ plugin.xml 24 Jan 2006 21:15:09 -0000 @@ -34,7 +34,7 @@ - + @@ -119,7 +119,7 @@ name="%ext.globalActionHandlerProviders" point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders"> Index: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramEditPartProvider.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramEditPartProvider.java,v retrieving revision 1.5 diff -u -r1.5 DiagramEditPartProvider.java --- src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramEditPartProvider.java 8 Nov 2005 22:30:33 -0000 1.5 +++ src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramEditPartProvider.java 24 Jan 2006 21:15:09 -0000 @@ -11,13 +11,10 @@ package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers; -import org.eclipse.gef.RootEditPart; -import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.editparts.GeoshapesDiagramRootEditPart; import org.eclipse.gmf.runtime.common.core.service.IOperation; import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; import org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider; import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation; -import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; @@ -46,26 +43,11 @@ */ public boolean provides(IOperation operation) { String dgrmType ="Geoshape"; //$NON-NLS-1$ - if (operation instanceof CreateRootEditPartOperation) { - View view = ((CreateRootEditPartOperation)operation).getView(); - if (view instanceof Diagram && view.getType().equals(dgrmType)) - return true; - } - else if (operation instanceof CreateGraphicEditPartOperation) { + if (operation instanceof CreateGraphicEditPartOperation) { View view = ((CreateGraphicEditPartOperation)operation).getView(); if (view instanceof Diagram && view.getType().equals(dgrmType)) return true; } return false; - } - - /* - * (non-Javadoc) - * @see org.eclipse.gmf.runtime.diagram.ui.internal.services.editpart.IEditPartProvider#createRootEditPart() - */ - public RootEditPart createRootEditPart(Diagram diagram) { - return new GeoshapesDiagramRootEditPart(); - } - - + } } Index: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.diagram.geoshapes/src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java,v retrieving revision 1.3 diff -u -r1.3 DiagramViewProvider.java --- src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java 12 Sep 2005 21:25:37 -0000 1.3 +++ src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/providers/DiagramViewProvider.java 24 Jan 2006 21:15:09 -0000 @@ -14,8 +14,8 @@ import java.util.HashMap; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories.GeoshapesDiagramViewFactory; import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider; -import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory; /** * @@ -28,7 +28,7 @@ HashMap diagramMap = new HashMap(); { - diagramMap.put("Geoshape", DiagramViewFactory.class);//$NON-NLS-1$ + diagramMap.put("Geoshape", GeoshapesDiagramViewFactory.class);//$NON-NLS-1$ } /** Index: META-INF/MANIFEST.MF =================================================================== RCS file: /home/technology/org.eclipse.gmf/examples/org.eclipse.gmf.examples.runtime.diagram.geoshapes/META-INF/MANIFEST.MF,v retrieving revision 1.11 diff -u -r1.11 MANIFEST.MF --- META-INF/MANIFEST.MF 23 Dec 2005 16:46:07 -0000 1.11 +++ META-INF/MANIFEST.MF 24 Jan 2006 21:15:09 -0000 @@ -12,7 +12,6 @@ org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.providers, org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.section, org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.util, - org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views, org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories, org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.wizards Require-Bundle: org.eclipse.core.runtime.compatibility, @@ -35,6 +34,7 @@ org.eclipse.gmf.runtime.diagram.ui.resources.editor, org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide, org.eclipse.gmf.runtime.diagram.ui.providers, - org.eclipse.gmf.runtime.diagram.ui.providers.ide + org.eclipse.gmf.runtime.diagram.ui.providers.ide, + org.eclipse.gmf.runtime.diagram.ui.render Eclipse-LazyStart: true Index: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java =================================================================== RCS file: src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java diff -N src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/gmf/examples/runtime/diagram/geoshapes/internal/views/factories/GeoshapesDiagramViewFactory.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,37 @@ +/****************************************************************************** + * Copyright (c) 2006 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + ****************************************************************************/ + +package org.eclipse.gmf.examples.runtime.diagram.geoshapes.internal.views.factories; + +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; +import org.eclipse.gmf.runtime.notation.View; + + +public class GeoshapesDiagramViewFactory + extends DiagramViewFactory { + + /* (non-Javadoc) + * @see org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory#decorateView(org.eclipse.gmf.runtime.notation.View, org.eclipse.core.runtime.IAdaptable, java.lang.String) + */ + protected void decorateView(View view, IAdaptable semanticAdapter, String diagramKind) { + super.decorateView(view, semanticAdapter, diagramKind); + + // set the measurement unit to pixels implying that that units + // stored in the notation file are identical to device pixels. + Diagram dgrm = (Diagram)view; + dgrm.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL); + } + + +} #P org.eclipse.gmf.runtime.diagram.ui.render Index: src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java,v retrieving revision 1.3 diff -u -r1.3 DiagramUIRenderEditPartProvider.java --- src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java 8 Nov 2005 16:02:18 -0000 1.3 +++ src/org/eclipse/gmf/runtime/diagram/ui/render/internal/providers/DiagramUIRenderEditPartProvider.java 24 Jan 2006 21:15:10 -0000 @@ -40,6 +40,6 @@ * Creates a diagram root editpart that supports rendering of images. */ public RootEditPart createRootEditPart(Diagram diagram) { - return new RenderedDiagramRootEditPart(); + return new RenderedDiagramRootEditPart(diagram.getMeasurementUnit()); } } \ No newline at end of file Index: src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java,v retrieving revision 1.6 diff -u -r1.6 RenderedDiagramRootEditPart.java --- src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java 5 Dec 2005 19:18:11 -0000 1.6 +++ src/org/eclipse/gmf/runtime/diagram/ui/render/editparts/RenderedDiagramRootEditPart.java 24 Jan 2006 21:15:10 -0000 @@ -29,6 +29,7 @@ import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedMapModeGraphics; import org.eclipse.gmf.runtime.draw2d.ui.render.internal.graphics.RenderedScaledGraphics; import org.eclipse.gmf.runtime.gef.ui.internal.editparts.AnimatedZoomListener; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.PlatformUI; @@ -41,6 +42,21 @@ public class RenderedDiagramRootEditPart extends DiagramRootEditPart { + /** + * Default constructor + */ + public RenderedDiagramRootEditPart() { + super(); + } + + /** + * @param mu the MeasurementUnit that is the native coordinate system + * for this root edit part. + */ + public RenderedDiagramRootEditPart(MeasurementUnit mu) { + super(mu); + } + static protected class DiagramRenderedScalableFreeformLayeredPane extends DiagramScalableFreeformLayeredPane implements AnimatedZoomListener { #P org.eclipse.gmf.runtime.notation Index: src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java,v retrieving revision 1.2 diff -u -r1.2 NotationPackageImpl.java --- src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java 12 Sep 2005 21:29:43 -0000 1.2 +++ src/org/eclipse/gmf/runtime/notation/impl/NotationPackageImpl.java 24 Jan 2006 21:15:16 -0000 @@ -51,6 +51,7 @@ import org.eclipse.gmf.runtime.notation.LayoutConstraint; import org.eclipse.gmf.runtime.notation.LineStyle; import org.eclipse.gmf.runtime.notation.Location; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.gmf.runtime.notation.NotationFactory; import org.eclipse.gmf.runtime.notation.NotationPackage; @@ -375,6 +376,13 @@ * * @generated */ + private EEnum measurementUnitEEnum = null; + + /** + * + * + * @generated + */ private EDataType relativeBendpointListEDataType = null; /** @@ -1061,8 +1069,17 @@ * * @generated */ + public EAttribute getDiagram_MeasurementUnit() { + return (EAttribute)diagramEClass.getEStructuralFeatures().get(1); + } + + /** + * + * + * @generated + */ public EReference getDiagram_PersistedEdges() { - return (EReference)diagramEClass.getEStructuralFeatures().get(1); + return (EReference)diagramEClass.getEStructuralFeatures().get(2); } /** @@ -1071,7 +1088,7 @@ * @generated */ public EReference getDiagram_TransientEdges() { - return (EReference)diagramEClass.getEStructuralFeatures().get(2); + return (EReference)diagramEClass.getEStructuralFeatures().get(3); } /** @@ -1448,6 +1465,15 @@ * * @generated */ + public EEnum getMeasurementUnit() { + return measurementUnitEEnum; + } + + /** + * + * + * @generated + */ public EDataType getRelativeBendpointList() { return relativeBendpointListEDataType; } @@ -1584,6 +1610,7 @@ diagramEClass = createEClass(DIAGRAM); createEAttribute(diagramEClass, DIAGRAM__NAME); + createEAttribute(diagramEClass, DIAGRAM__MEASUREMENT_UNIT); createEReference(diagramEClass, DIAGRAM__PERSISTED_EDGES); createEReference(diagramEClass, DIAGRAM__TRANSIENT_EDGES); @@ -1642,6 +1669,7 @@ jumpLinkTypeEEnum = createEEnum(JUMP_LINK_TYPE); alignmentEEnum = createEEnum(ALIGNMENT); sortingDirectionEEnum = createEEnum(SORTING_DIRECTION); + measurementUnitEEnum = createEEnum(MEASUREMENT_UNIT); // Create data types relativeBendpointListEDataType = createEDataType(RELATIVE_BENDPOINT_LIST); @@ -1836,6 +1864,7 @@ initEClass(diagramEClass, Diagram.class, "Diagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getDiagram_Name(), ecorePackage.getEString(), "name", "", 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ + initEAttribute(getDiagram_MeasurementUnit(), this.getMeasurementUnit(), "measurementUnit", "Himetric", 0, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$ initEReference(getDiagram_PersistedEdges(), this.getEdge(), null, "edges", null, 0, -1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getDiagram_TransientEdges(), this.getEdge(), null, "TransientEdges", null, 0, -1, Diagram.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -1941,6 +1970,10 @@ addEEnumLiteral(sortingDirectionEEnum, SortingDirection.ASCENDING_LITERAL); addEEnumLiteral(sortingDirectionEEnum, SortingDirection.DESCENDING_LITERAL); + initEEnum(measurementUnitEEnum, MeasurementUnit.class, "MeasurementUnit"); //$NON-NLS-1$ + addEEnumLiteral(measurementUnitEEnum, MeasurementUnit.HIMETRIC_LITERAL); + addEEnumLiteral(measurementUnitEEnum, MeasurementUnit.PIXEL_LITERAL); + // Initialize data types initEDataType(relativeBendpointListEDataType, List.class, "RelativeBendpointList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEDataType(filterKeyListEDataType, List.class, "FilterKeyList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ Index: src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java,v retrieving revision 1.3 diff -u -r1.3 DiagramImpl.java --- src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java 14 Dec 2005 21:33:18 -0000 1.3 +++ src/org/eclipse/gmf/runtime/notation/impl/DiagramImpl.java 24 Jan 2006 21:15:15 -0000 @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.Edge; +import org.eclipse.gmf.runtime.notation.MeasurementUnit; import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; @@ -72,6 +73,26 @@ protected String name = NAME_EDEFAULT; /** + * The default value of the '{@link #getMeasurementUnit() Measurement Unit}' attribute. + * + * + * @see #getMeasurementUnit() + * @generated + * @ordered + */ + protected static final MeasurementUnit MEASUREMENT_UNIT_EDEFAULT = MeasurementUnit.HIMETRIC_LITERAL; + + /** + * The cached value of the '{@link #getMeasurementUnit() Measurement Unit}' attribute. + * + * + * @see #getMeasurementUnit() + * @generated + * @ordered + */ + protected MeasurementUnit measurementUnit = MEASUREMENT_UNIT_EDEFAULT; + + /** * The cached value of the '{@link #getPersistedEdges() Persisted Edges}' containment reference list. * * @@ -136,6 +157,27 @@ /** * * + * @generated + */ + public MeasurementUnit getMeasurementUnit() { + return measurementUnit; + } + + /** + * + * + * @generated + */ + public void setMeasurementUnit(MeasurementUnit newMeasurementUnit) { + MeasurementUnit oldMeasurementUnit = measurementUnit; + measurementUnit = newMeasurementUnit == null ? MEASUREMENT_UNIT_EDEFAULT : newMeasurementUnit; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, NotationPackage.DIAGRAM__MEASUREMENT_UNIT, oldMeasurementUnit, measurementUnit)); + } + + /** + * + * */ public EList getEdges() { if (allEdges == null){ @@ -268,6 +310,8 @@ return getTransientChildren(); case NotationPackage.DIAGRAM__NAME: return getName(); + case NotationPackage.DIAGRAM__MEASUREMENT_UNIT: + return getMeasurementUnit(); case NotationPackage.DIAGRAM__PERSISTED_EDGES: return getPersistedEdges(); case NotationPackage.DIAGRAM__TRANSIENT_EDGES: @@ -322,6 +366,9 @@ case NotationPackage.DIAGRAM__NAME: setName((String)newValue); return; + case NotationPackage.DIAGRAM__MEASUREMENT_UNIT: + setMeasurementUnit((MeasurementUnit)newValue); + return; case NotationPackage.DIAGRAM__PERSISTED_EDGES: getPersistedEdges().clear(); getPersistedEdges().addAll((Collection)newValue); @@ -374,6 +421,9 @@ case NotationPackage.DIAGRAM__NAME: setName(NAME_EDEFAULT); return; + case NotationPackage.DIAGRAM__MEASUREMENT_UNIT: + setMeasurementUnit(MEASUREMENT_UNIT_EDEFAULT); + return; case NotationPackage.DIAGRAM__PERSISTED_EDGES: getPersistedEdges().clear(); return; @@ -415,6 +465,8 @@ return transientChildren != null && !transientChildren.isEmpty(); case NotationPackage.DIAGRAM__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case NotationPackage.DIAGRAM__MEASUREMENT_UNIT: + return measurementUnit != MEASUREMENT_UNIT_EDEFAULT; case NotationPackage.DIAGRAM__PERSISTED_EDGES: return persistedEdges != null && !persistedEdges.isEmpty(); case NotationPackage.DIAGRAM__TRANSIENT_EDGES: @@ -434,6 +486,8 @@ StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); //$NON-NLS-1$ result.append(name); + result.append(", measurementUnit: "); //$NON-NLS-1$ + result.append(measurementUnit); result.append(')'); return result.toString(); } Index: src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java,v retrieving revision 1.5 diff -u -r1.5 NotationFactoryImpl.java --- src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java 17 Jan 2006 18:12:23 -0000 1.5 +++ src/org/eclipse/gmf/runtime/notation/impl/NotationFactoryImpl.java 24 Jan 2006 21:15:16 -0000 @@ -23,6 +23,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.impl.EFactoryImpl; +import org.eclipse.gmf.runtime.notation.*; + import org.eclipse.gmf.runtime.notation.Alignment; import org.eclipse.gmf.runtime.notation.Bounds; import org.eclipse.gmf.runtime.notation.CanonicalStyle; @@ -171,6 +173,11 @@ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return result; } + case NotationPackage.MEASUREMENT_UNIT: { + MeasurementUnit result = MeasurementUnit.get(initialValue); + if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + return result; + } case NotationPackage.RELATIVE_BENDPOINT_LIST: return createRelativeBendpointListFromString(eDataType, initialValue); case NotationPackage.FILTER_KEY_LIST: @@ -205,6 +212,8 @@ return instanceValue == null ? null : instanceValue.toString(); case NotationPackage.SORTING_DIRECTION: return instanceValue == null ? null : instanceValue.toString(); + case NotationPackage.MEASUREMENT_UNIT: + return instanceValue == null ? null : instanceValue.toString(); case NotationPackage.RELATIVE_BENDPOINT_LIST: return convertRelativeBendpointListToString(eDataType, instanceValue); case NotationPackage.FILTER_KEY_LIST: Index: rosemodel/org.eclipse.gmf.runtime.notation.Notation.cat =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/rosemodel/org.eclipse.gmf.runtime.notation.Notation.cat,v retrieving revision 1.2 diff -u -r1.2 org.eclipse.gmf.runtime.notation.Notation.cat --- rosemodel/org.eclipse.gmf.runtime.notation.Notation.cat 11 Jan 2006 17:01:22 -0000 1.2 +++ rosemodel/org.eclipse.gmf.runtime.notation.Notation.cat 24 Jan 2006 21:15:14 -0000 @@ -1,7 +1,7 @@ (object Petal - version 47 - _written "Rose 8.0.0303.1400" + version 50 + _written "Rose 8.5.0506.2811" charSet 0) (object Class_Category "notation" @@ -258,7 +258,7 @@ quid "4033E572020D" superclasses (list inheritance_relationship_list (object Inheritance_Relationship - quid "4033EB2203D8" + quid "43D14D33007C" supplier "Logical View::notation::LayoutConstraint" quidu "4033E463037F")) class_attributes (list class_attribute_list @@ -276,7 +276,7 @@ quid "4033E9C603B9" superclasses (list inheritance_relationship_list (object Inheritance_Relationship - quid "4033EB270064" + quid "43D14D370230" supplier "Logical View::notation::LayoutConstraint" quidu "4033E463037F")) class_attributes (list class_attribute_list @@ -616,6 +616,12 @@ initv |"" + exportControl "Public") + (object ClassAttribute "measurementUnit" + quid "43D14C6C030B" + type "MeasurementUnit" + quidu "43D015E002C0" + initv "Himetric" exportControl "Public"))) (object Class "Image" quid "405B34B802BF" @@ -894,6 +900,16 @@ quid "421DF6D20205" supplier "Logical View::notation::ImageStyle" quidu "421DF3290185"))) + (object Class "MeasurementUnit" + quid "43D015E002C0" + stereotype "enumeration" + class_attributes (list class_attribute_list + (object ClassAttribute "Himetric" + quid "43D015F60163" + exportControl "Public") + (object ClassAttribute "Pixel" + quid "43D015FD03B2" + exportControl "Public"))) (object Association "$UNNAMED$0" quid "3D418E7600BA" roles (list role_list @@ -1264,7 +1280,7 @@ max_height 28350 max_width 21600 origin_x 0 - origin_y 0 + origin_y 792 items (list diagram_item_list (object ClassView "Class" "Logical View::ecore::EModelElement" @1 ShowCompartmentStereotypes TRUE @@ -1311,17 +1327,35 @@ default_color TRUE) label (object ItemLabel Parent_View @2 - location (4854, 3323) + location (4903, 3323) fill_color 13434879 nlines 1 - max_width 660 + max_width 562 justify 0 label "FillStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D8C6002F" - width 678 + compartment (object Compartment + Parent_View @2 + location (4903, 3388) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 558 + justify 1) + width 580 height 194 annotation 8 autoResize TRUE) @@ -1341,17 +1375,35 @@ default_color TRUE) label (object ItemLabel Parent_View @3 - location (4872, 3067) + location (4923, 3067) fill_color 13434879 nlines 1 - max_width 688 + max_width 586 justify 0 label "LineStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D98502ED" - width 706 + compartment (object Compartment + Parent_View @3 + location (4923, 3132) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 583 + justify 1) + width 604 height 194 annotation 8 autoResize TRUE) @@ -1371,18 +1423,36 @@ default_color TRUE) label (object ItemLabel Parent_View @4 - location (4852, 2407) + location (4911, 2409) fill_color 13434879 nlines 1 - max_width 792 + max_width 674 justify 0 label "FontStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D9EA0313" - width 810 - height 524 + compartment (object Compartment + Parent_View @4 + location (4911, 2474) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 8 + max_width 671 + justify 1) + width 692 + height 518 annotation 8 autoResize TRUE) (object ClassView "Class" "Logical View::notation::TitleStyle" @5 @@ -1401,18 +1471,36 @@ default_color TRUE) label (object ItemLabel Parent_View @5 - location (4864, 2105) + location (4916, 2107) fill_color 13434879 nlines 1 - max_width 704 + max_width 600 justify 0 label "TitleStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033DE790338" - width 722 - height 200 + compartment (object Compartment + Parent_View @5 + location (4916, 2172) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 596 + justify 1) + width 618 + height 194 annotation 8 autoResize TRUE) (object ClassView "Class" "Logical View::notation::DescriptionStyle" @6 @@ -1431,17 +1519,35 @@ default_color TRUE) label (object ItemLabel Parent_View @6 - location (4831, 635) + location (4876, 635) fill_color 13434879 nlines 1 - max_width 610 + max_width 520 justify 0 label "DescriptionStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033E35B00CB" - width 628 + compartment (object Compartment + Parent_View @6 + location (4876, 700) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 517 + justify 1) + width 538 height 194 annotation 8 autoResize TRUE) @@ -1449,7 +1555,7 @@ ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (1168, 2592) + location (1168, 2720) font (object Font size 10 face "Arial" @@ -1461,25 +1567,43 @@ default_color TRUE) label (object ItemLabel Parent_View @7 - location (951, 2480) + location (983, 2609) fill_color 13434879 nlines 1 - max_width 434 + max_width 370 justify 0 label "Size") icon_style "Icon" line_color 3342489 fill_color 16711935 quidu "4033E572020D" - width 452 + compartment (object Compartment + Parent_View @7 + location (983, 2674) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 366 + justify 1) + width 388 height 248 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Bounds" @8 + (object ClassView "Class" "Logical View::notation::Ratio" @8 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (1488, 3008) + location (528, 2704) font (object Font size 10 face "Arial" @@ -1491,55 +1615,43 @@ default_color TRUE) label (object ItemLabel Parent_View @8 - location (1385, 2955) - fill_color 13434879 - nlines 1 - max_width 206 - justify 0 - label "Bounds") - icon_style "Icon" - line_color 3342489 - fill_color 16711935 - quidu "4033EA3A018F" - width 224 - height 130 - annotation 8 - autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Ratio" @9 - ShowCompartmentStereotypes TRUE - IncludeAttribute TRUE - IncludeOperation TRUE - location (528, 2560) - font (object Font - size 10 - face "Arial" - bold FALSE - italics FALSE - underline FALSE - strike FALSE - color 0 - default_color TRUE) - label (object ItemLabel - Parent_View @9 - location (269, 2475) + location (307, 2620) fill_color 13434879 nlines 1 - max_width 518 + max_width 442 justify 0 label "Ratio") icon_style "Icon" line_color 3342489 fill_color 16711935 quidu "4033EAA101AB" - width 536 + compartment (object Compartment + Parent_View @8 + location (307, 2685) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 438 + justify 1) + width 460 height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Location" @10 + (object ClassView "Class" "Logical View::notation::Location" @9 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (1760, 2592) + location (1760, 2720) font (object Font size 10 face "Arial" @@ -1550,22 +1662,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @10 - location (1611, 2480) + Parent_View @9 + location (1634, 2609) fill_color 13434879 nlines 1 - max_width 298 + max_width 252 justify 0 label "Location") icon_style "Icon" line_color 3342489 fill_color 16711935 quidu "4033E9C603B9" - width 316 + compartment (object Compartment + Parent_View @9 + location (1634, 2674) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 249 + justify 1) + width 270 height 248 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Sorting" @11 + (object ClassView "Class" "Logical View::notation::Sorting" @10 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1580,7 +1710,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @11 + Parent_View @10 location (208, 4806) fill_color 13434879 nlines 1 @@ -1588,7 +1718,7 @@ justify 0 label "Sorting") stereotype (object ItemLabel - Parent_View @11 + Parent_View @10 location (208, 4756) fill_color 13434879 anchor 10 @@ -1600,11 +1730,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F1B70395" + compartment (object Compartment + Parent_View @10 + location (208, 4871) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 4 + max_width 243 + justify 1) width 434 height 368 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Filtering" @12 + (object ClassView "Class" "Logical View::notation::Filtering" @11 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1619,7 +1767,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @12 + Parent_View @11 location (688, 4806) fill_color 13434879 nlines 1 @@ -1627,7 +1775,7 @@ justify 0 label "Filtering") stereotype (object ItemLabel - Parent_View @12 + Parent_View @11 location (688, 4756) fill_color 13434879 anchor 10 @@ -1639,11 +1787,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F3A302AC" + compartment (object Compartment + Parent_View @11 + location (688, 4871) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 4 + max_width 243 + justify 1) width 434 height 368 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::IdentityAnchor" @13 + (object ClassView "Class" "Logical View::notation::IdentityAnchor" @12 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1658,22 +1824,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @13 - location (3675, 2475) + Parent_View @12 + location (3714, 2475) fill_color 13434879 nlines 1 - max_width 522 + max_width 444 justify 0 label "IdentityAnchor") icon_style "Icon" line_color 3342489 fill_color 16711935 quidu "4033F4C9006A" - width 540 + compartment (object Compartment + Parent_View @12 + location (3714, 2540) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 441 + justify 1) + width 462 height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Routing" @14 + (object ClassView "Class" "Logical View::notation::Routing" @13 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1688,7 +1872,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @14 + Parent_View @13 location (1184, 4806) fill_color 13434879 nlines 1 @@ -1696,7 +1880,7 @@ justify 0 label "Routing") stereotype (object ItemLabel - Parent_View @14 + Parent_View @13 location (1184, 4756) fill_color 13434879 anchor 10 @@ -1708,11 +1892,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F64C01ED" + compartment (object Compartment + Parent_View @13 + location (1184, 4871) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 4 + max_width 250 + justify 1) width 434 height 368 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Smoothness" @15 + (object ClassView "Class" "Logical View::notation::Smoothness" @14 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1727,7 +1929,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @15 + Parent_View @14 location (1696, 4795) fill_color 13434879 nlines 1 @@ -1735,7 +1937,7 @@ justify 0 label "Smoothness") stereotype (object ItemLabel - Parent_View @15 + Parent_View @14 location (1696, 4745) fill_color 13434879 anchor 10 @@ -1747,11 +1949,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F7160111" + compartment (object Compartment + Parent_View @14 + location (1696, 4860) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 5 + max_width 187 + justify 1) width 434 height 422 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::JumpLinkStatus" @16 + (object ClassView "Class" "Logical View::notation::JumpLinkStatus" @15 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1766,7 +1986,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @16 + Parent_View @15 location (2208, 4795) fill_color 13434879 nlines 1 @@ -1774,7 +1994,7 @@ justify 0 label "JumpLinkStatus") stereotype (object ItemLabel - Parent_View @16 + Parent_View @15 location (2208, 4745) fill_color 13434879 anchor 10 @@ -1786,11 +2006,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F7BF0146" + compartment (object Compartment + Parent_View @15 + location (2208, 4860) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 5 + max_width 168 + justify 1) width 434 height 422 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::JumpLinkType" @17 + (object ClassView "Class" "Logical View::notation::JumpLinkType" @16 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1805,7 +2043,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @17 + Parent_View @16 location (2704, 4806) fill_color 13434879 nlines 1 @@ -1813,7 +2051,7 @@ justify 0 label "JumpLinkType") stereotype (object ItemLabel - Parent_View @17 + Parent_View @16 location (2704, 4756) fill_color 13434879 anchor 10 @@ -1825,11 +2063,29 @@ line_color 3342489 fill_color 13434879 quidu "4033F82B02BE" + compartment (object Compartment + Parent_View @16 + location (2704, 4871) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 4 + max_width 253 + justify 1) width 434 height 368 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::RoutingStyle" @18 + (object ClassView "Class" "Logical View::notation::RoutingStyle" @17 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1844,22 +2100,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @18 - location (4813, 23) + Parent_View @17 + location (4894, 25) fill_color 13434879 nlines 1 - max_width 1094 + max_width 932 justify 0 label "RoutingStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4034CBCA012F" - width 1112 - height 524 + compartment (object Compartment + Parent_View @17 + location (4894, 90) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 8 + max_width 929 + justify 1) + width 950 + height 518 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::RelativeBendpoints" @19 + (object ClassView "Class" "Logical View::notation::RelativeBendpoints" @18 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE location (2896, 2560) @@ -1873,22 +2147,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @19 - location (2511, 2475) + Parent_View @18 + location (2567, 2475) fill_color 13434879 nlines 1 - max_width 770 + max_width 658 justify 0 label "RelativeBendpoints") icon_style "Icon" line_color 3342489 fill_color 16711935 quidu "40395B1100D3" - width 788 + compartment (object Compartment + Parent_View @18 + location (2567, 2540) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 654 + justify 1) + width 676 height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::CanonicalStyle" @20 + (object ClassView "Class" "Logical View::notation::CanonicalStyle" @19 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1903,22 +2195,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @20 - location (4856, 3849) + Parent_View @19 + location (4907, 3851) fill_color 13434879 nlines 1 - max_width 688 + max_width 586 justify 0 label "CanonicalStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40A0D8C90004" - width 706 - height 200 + compartment (object Compartment + Parent_View @19 + location (4907, 3916) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 583 + justify 1) + width 604 + height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::ShapeStyle" @21 + (object ClassView "Class" "Logical View::notation::ShapeStyle" @20 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1933,22 +2243,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @21 - location (4928, 5722) + Parent_View @20 + location (4950, 5722) fill_color 13434879 nlines 1 - max_width 288 + max_width 244 justify 0 label "ShapeStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40B538340372" - width 306 + width 262 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::ConnectorStyle" @22 + (object ClassView "Class" "Logical View::notation::ConnectorStyle" @21 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -1963,22 +2273,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @22 - location (4920, 5066) + Parent_View @21 + location (4947, 5066) fill_color 13434879 nlines 1 - max_width 368 + max_width 314 justify 0 label "ConnectorStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40B5385000F2" - width 386 + width 332 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::FillStyle" @23 + (object ClassView "Class" "Logical View::notation::FillStyle" @22 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5648, 6080) @@ -1992,22 +2302,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @23 - location (5543, 6026) + Parent_View @22 + location (5559, 6026) fill_color 13434879 nlines 1 - max_width 210 + max_width 178 justify 0 label "FillStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D8C6002F" - width 228 + width 196 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::LineStyle" @24 + (object ClassView "Class" "Logical View::notation::LineStyle" @23 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5648, 5888) @@ -2021,22 +2331,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @24 - location (5524, 5834) + Parent_View @23 + location (5543, 5834) fill_color 13434879 nlines 1 - max_width 248 + max_width 210 justify 0 label "LineStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D98502ED" - width 266 + width 228 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::FontStyle" @25 + (object ClassView "Class" "Logical View::notation::FontStyle" @24 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5632, 5696) @@ -2050,22 +2360,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @25 - location (5506, 5642) + Parent_View @24 + location (5525, 5642) fill_color 13434879 nlines 1 - max_width 252 + max_width 214 justify 0 label "FontStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D9EA0313" - width 270 + width 232 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::RoutingStyle" @26 + (object ClassView "Class" "Logical View::notation::RoutingStyle" @25 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5680, 5232) @@ -2079,22 +2389,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @26 - location (5518, 5178) + Parent_View @25 + location (5542, 5178) fill_color 13434879 nlines 1 - max_width 324 + max_width 276 justify 0 label "RoutingStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4034CBCA012F" - width 342 + width 294 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::LineStyle" @27 + (object ClassView "Class" "Logical View::notation::LineStyle" @26 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5632, 5056) @@ -2108,22 +2418,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @27 - location (5508, 5002) + Parent_View @26 + location (5527, 5002) fill_color 13434879 nlines 1 - max_width 248 + max_width 210 justify 0 label "LineStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033D98502ED" - width 266 + width 228 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::DescriptionStyle" @28 + (object ClassView "Class" "Logical View::notation::DescriptionStyle" @27 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5664, 5504) @@ -2137,22 +2447,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @28 - location (5468, 5450) + Parent_View @27 + location (5498, 5450) fill_color 13434879 nlines 1 - max_width 392 + max_width 332 justify 0 label "DescriptionStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033E35B00CB" - width 410 + width 350 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::RelativeBendpointList" @29 + (object ClassView "Class" "Logical View::notation::RelativeBendpointList" @28 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2167,7 +2477,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @29 + Parent_View @28 location (1425, 4412) fill_color 13434879 nlines 1 @@ -2175,7 +2485,7 @@ justify 0 label "RelativeBendpointList") stereotype (object ItemLabel - Parent_View @29 + Parent_View @28 location (1425, 4362) fill_color 13434879 anchor 10 @@ -2187,39 +2497,29 @@ line_color 3342489 fill_color 13434879 quidu "40C9ABB702CF" + compartment (object Compartment + Parent_View @28 + location (1425, 4477) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 550 + justify 1) width 720 height 260 annotation 8 autoResize TRUE) - (object InheritView "" @30 - stereotype TRUE - line_color 3342489 - quidu "4033EB2F01F6" - client @8 - supplier @10 - vertices (list Points - (1491, 2943) - (1491, 2858) - (1800, 2858) - (1800, 2716)) - line_style 3 - origin_attachment (1491, 2943) - terminal_attachment (1800, 2716)) - (object InheritView "" @31 - stereotype TRUE - line_color 3342489 - quidu "4033EB2B0326" - client @8 - supplier @7 - vertices (list Points - (1487, 2943) - (1487, 2862) - (1204, 2862) - (1204, 2716)) - line_style 3 - origin_attachment (1487, 2943) - terminal_attachment (1204, 2716)) - (object ClassView "Class" "Logical View::notation::PageStyle" @32 + (object ClassView "Class" "Logical View::notation::PageStyle" @29 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2234,22 +2534,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @32 - location (4852, 4122) + Parent_View @29 + location (4896, 4122) fill_color 13434879 nlines 1 - max_width 600 + max_width 512 justify 0 label "PageStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40CDA75702C1" - width 618 + compartment (object Compartment + Parent_View @29 + location (4896, 4187) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 5 + max_width 508 + justify 1) + width 530 height 356 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::DrawerStyle" @33 + (object ClassView "Class" "Logical View::notation::DrawerStyle" @30 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2264,22 +2582,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @33 - location (4848, 1817) + Parent_View @30 + location (4900, 1819) fill_color 13434879 nlines 1 - max_width 704 + max_width 600 justify 0 label "DrawerStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40F45AA70294" - width 722 - height 200 + compartment (object Compartment + Parent_View @30 + location (4900, 1884) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 596 + justify 1) + width 618 + height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::GuideStyle" @34 + (object ClassView "Class" "Logical View::notation::GuideStyle" @31 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2294,22 +2630,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @34 - location (4861, 4592) + Parent_View @31 + location (4925, 4592) fill_color 13434879 nlines 1 - max_width 870 + max_width 742 justify 0 label "GuideStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40F53BCC01F1" - width 888 + compartment (object Compartment + Parent_View @31 + location (4925, 4657) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 738 + justify 1) + width 760 height 248 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Alignment" @35 + (object ClassView "Class" "Logical View::notation::Alignment" @32 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2324,7 +2678,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @35 + Parent_View @32 location (3184, 4800) fill_color 13434879 nlines 1 @@ -2332,7 +2686,7 @@ justify 0 label "Alignment") stereotype (object ItemLabel - Parent_View @35 + Parent_View @32 location (3184, 4750) fill_color 13434879 anchor 10 @@ -2344,53 +2698,89 @@ line_color 3342489 fill_color 13434879 quidu "40F548520137" + compartment (object Compartment + Parent_View @32 + location (3184, 4865) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 6 + max_width 190 + justify 1) width 434 height 476 annotation 8 autoResize TRUE) - (object InheritView "" @36 + (object InheritView "" @33 stereotype TRUE line_color 3342489 quidu "40B53BDF0295" - client @22 - supplier @27 + client @21 + supplier @26 + vertices (list Points + (5270, 5099) + (5517, 5069)) line_style 0) - (object InheritView "" @37 + (object InheritView "" @34 stereotype TRUE line_color 3342489 quidu "40B53BCE039E" - client @22 - supplier @26 + client @21 + supplier @25 + vertices (list Points + (5270, 5152) + (5532, 5203)) line_style 0) - (object InheritView "" @38 + (object InheritView "" @35 stereotype TRUE line_color 3342489 quidu "40B53A82030E" - client @21 - supplier @24 + client @20 + supplier @23 + vertices (list Points + (5203, 5801) + (5533, 5865)) line_style 0) - (object InheritView "" @39 + (object InheritView "" @36 stereotype TRUE line_color 3342489 quidu "40B53A780327" - client @21 - supplier @23 + client @20 + supplier @22 + vertices (list Points + (5198, 5842) + (5549, 6027)) line_style 0) - (object InheritView "" @40 + (object InheritView "" @37 stereotype TRUE line_color 3342489 quidu "40B53A93036D" - client @21 - supplier @25 + client @20 + supplier @24 + vertices (list Points + (5203, 5757) + (5515, 5712)) line_style 0) - (object InheritView "" @41 + (object InheritView "" @38 stereotype TRUE line_color 3342489 quidu "40CB44D302DF" - client @21 - supplier @28 + client @20 + supplier @27 + vertices (list Points + (5203, 5715) + (5518, 5570)) line_style 0) - (object ClassView "Class" "Logical View::notation::FilterKeyList" @42 + (object ClassView "Class" "Logical View::notation::FilterKeyList" @39 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2405,7 +2795,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @42 + Parent_View @39 location (2291, 4412) fill_color 13434879 nlines 1 @@ -2413,7 +2803,7 @@ justify 0 label "FilterKeyList") stereotype (object ItemLabel - Parent_View @42 + Parent_View @39 location (2291, 4362) fill_color 13434879 anchor 10 @@ -2425,11 +2815,29 @@ line_color 3342489 fill_color 13434879 quidu "40F5886C0220" + compartment (object Compartment + Parent_View @39 + location (2291, 4477) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 550 + justify 1) width 716 height 260 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::SortKeyMap" @43 + (object ClassView "Class" "Logical View::notation::SortKeyMap" @40 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2444,7 +2852,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @43 + Parent_View @40 location (3144, 4396) fill_color 13434879 nlines 1 @@ -2452,7 +2860,7 @@ justify 0 label "SortKeyMap") stereotype (object ItemLabel - Parent_View @43 + Parent_View @40 location (3144, 4346) fill_color 13434879 anchor 10 @@ -2464,11 +2872,29 @@ line_color 3342489 fill_color 13434879 quidu "40F588C0027E" + compartment (object Compartment + Parent_View @40 + location (3144, 4461) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 562 + justify 1) width 738 height 260 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::SortingDirection" @44 + (object ClassView "Class" "Logical View::notation::SortingDirection" @41 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2483,7 +2909,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @44 + Parent_View @41 location (3648, 4801) fill_color 13434879 nlines 1 @@ -2491,7 +2917,7 @@ justify 0 label "SortingDirection") stereotype (object ItemLabel - Parent_View @44 + Parent_View @41 location (3648, 4751) fill_color 13434879 anchor 10 @@ -2503,11 +2929,29 @@ line_color 3342489 fill_color 13434879 quidu "40F5895B035C" + compartment (object Compartment + Parent_View @41 + location (3648, 4866) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 271 + justify 1) width 434 height 314 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::SortingStyle" @45 + (object ClassView "Class" "Logical View::notation::SortingStyle" @42 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2522,22 +2966,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @45 - location (4913, 976) + Parent_View @42 + location (4963, 976) fill_color 13434879 nlines 1 - max_width 670 + max_width 570 justify 0 label "SortingStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "4033DEDB0197" - width 688 + compartment (object Compartment + Parent_View @42 + location (4963, 1041) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 567 + justify 1) + width 588 height 248 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::ecore::EObject" @46 + (object ClassView "Class" "Logical View::ecore::EObject" @43 ShowCompartmentStereotypes TRUE location (6320, 1264) font (object Font @@ -2550,23 +3012,23 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @46 - location (6210, 1186) + Parent_View @43 + location (6227, 1186) fill_color 13434879 nlines 1 - max_width 220 + max_width 186 justify 0 label "EObject") icon_style "Icon" line_color 3342489 fill_color 8421631 quidu "3C4F1C860123" - width 238 + width 204 height 180 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$22" @47 - location (5896, 1193) + (object AssociationViewNew "$UNNAMED$22" @44 + location (5879, 1190) font (object Font size 10 face "Arial" @@ -2580,9 +3042,9 @@ line_color 3342489 quidu "40F6D8720203" roleview_list (list RoleViews - (object RoleView "sortedObjects" @48 - Parent_View @47 - location (648, 105) + (object RoleView "sortedObjects" @45 + Parent_View @44 + location (631, 102) font (object Font size 10 face "Arial" @@ -2592,9 +3054,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @49 - Parent_View @48 - location (6098, 1097) + label (object SegLabel @46 + Parent_View @45 + location (6100, 1097) font (object Font size 10 face "Arial" @@ -2616,12 +3078,15 @@ stereotype TRUE line_color 3342489 quidu "40F6D8730092" - client @47 - supplier @46 + client @44 + supplier @43 + vertices (list Points + (5879, 1190) + (6217, 1246)) line_style 0 - label (object SegLabel @50 - Parent_View @48 - location (6145, 1179) + label (object SegLabel @47 + Parent_View @45 + location (6155, 1181) font (object Font size 10 face "Arial" @@ -2640,16 +3105,19 @@ pctDist 0.793333 height 55 orientation 0)) - (object RoleView "$UNNAMED$23" @51 - Parent_View @47 - location (648, 105) + (object RoleView "$UNNAMED$23" @48 + Parent_View @44 + location (631, 102) stereotype TRUE line_color 3342489 quidu "40F6D87300A6" - client @47 - supplier @45 + client @44 + supplier @42 + vertices (list Points + (5879, 1190) + (5542, 1135)) line_style 0))) - (object ClassView "Class" "Logical View::notation::FilteringStyle" @52 + (object ClassView "Class" "Logical View::notation::FilteringStyle" @49 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2664,23 +3132,41 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @52 - location (4917, 1376) + Parent_View @49 + location (4968, 1376) fill_color 13434879 nlines 1 - max_width 694 + max_width 592 justify 0 label "FilteringStyle") icon_style "Icon" line_color 3342489 fill_color 65280 quidu "40F54A610352" - width 712 + compartment (object Compartment + Parent_View @49 + location (4968, 1441) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 588 + justify 1) + width 610 height 248 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$24" @53 - location (5910, 1350) + (object AssociationViewNew "$UNNAMED$24" @50 + location (5893, 1354) font (object Font size 10 face "Arial" @@ -2694,9 +3180,9 @@ line_color 3342489 quidu "40F6D8B4021E" roleview_list (list RoleViews - (object RoleView "filteredObjects" @54 - Parent_View @53 - location (646, -138) + (object RoleView "filteredObjects" @51 + Parent_View @50 + location (629, -134) font (object Font size 10 face "Arial" @@ -2706,8 +3192,8 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @55 - Parent_View @54 + label (object SegLabel @52 + Parent_View @51 location (6090, 1436) font (object Font size 10 @@ -2730,12 +3216,15 @@ stereotype TRUE line_color 3342489 quidu "40F6D8B50247" - client @53 - supplier @46 + client @50 + supplier @43 + vertices (list Points + (5893, 1354) + (6217, 1285)) line_style 0 - label (object SegLabel @56 - Parent_View @54 - location (6132, 1350) + label (object SegLabel @53 + Parent_View @51 + location (6142, 1348) font (object Font size 10 face "Arial" @@ -2754,16 +3243,19 @@ pctDist 0.737754 height 46 orientation 1)) - (object RoleView "$UNNAMED$25" @57 - Parent_View @53 - location (646, -138) + (object RoleView "$UNNAMED$25" @54 + Parent_View @50 + location (629, -134) stereotype TRUE line_color 3342489 quidu "40F6D8B5025B" - client @53 - supplier @52 + client @50 + supplier @49 + vertices (list Points + (5893, 1354) + (5569, 1423)) line_style 0))) - (object ClassView "Class" "Logical View::notation::DiagramStyle" @58 + (object ClassView "Class" "Logical View::notation::DiagramStyle" @55 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2778,22 +3270,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @58 - location (4904, 6411) + Parent_View @55 + location (4929, 6411) fill_color 13434879 nlines 1 - max_width 336 + max_width 286 justify 0 label "DiagramStyle") icon_style "Icon" line_color 3342489 fill_color 4259584 quidu "419A47F800E2" - width 354 + width 304 height 130 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::PageStyle" @59 + (object ClassView "Class" "Logical View::notation::PageStyle" @56 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5616, 6288) @@ -2807,22 +3299,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @59 - location (5484, 6234) + Parent_View @56 + location (5504, 6234) fill_color 13434879 nlines 1 - max_width 264 + max_width 224 justify 0 label "PageStyle") icon_style "Icon" line_color 3342489 fill_color 4259584 quidu "40CDA75702C1" - width 282 + width 242 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::GuideStyle" @60 + (object ClassView "Class" "Logical View::notation::GuideStyle" @57 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5616, 6464) @@ -2836,22 +3328,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @60 - location (5479, 6411) + Parent_View @57 + location (5499, 6411) fill_color 13434879 nlines 1 - max_width 274 + max_width 234 justify 0 label "GuideStyle") icon_style "Icon" line_color 3342489 fill_color 4259584 quidu "40F53BCC01F1" - width 292 + width 252 height 130 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::DescriptionStyle" @61 + (object ClassView "Class" "Logical View::notation::DescriptionStyle" @58 ShowCompartmentStereotypes TRUE IncludeOperation TRUE location (5680, 6640) @@ -2865,43 +3357,52 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @61 - location (5484, 6586) + Parent_View @58 + location (5514, 6586) fill_color 13434879 nlines 1 - max_width 392 + max_width 332 justify 0 label "DescriptionStyle") icon_style "Icon" line_color 3342489 fill_color 4259584 quidu "4033E35B00CB" - width 410 + width 350 height 132 annotation 8 autoResize TRUE) - (object InheritView "" @62 + (object InheritView "" @59 stereotype TRUE line_color 3342489 quidu "419A48B202EC" - client @58 - supplier @59 + client @55 + supplier @56 + vertices (list Points + (5224, 6414) + (5494, 6326)) line_style 0) - (object InheritView "" @63 + (object InheritView "" @60 stereotype TRUE line_color 3342489 quidu "419A48B60111" - client @58 - supplier @60 + client @55 + supplier @57 + vertices (list Points + (5224, 6464) + (5489, 6464)) line_style 0) - (object InheritView "" @64 + (object InheritView "" @61 stereotype TRUE line_color 3342489 quidu "419A48B90210" - client @58 - supplier @61 + client @55 + supplier @58 + vertices (list Points + (5224, 6508) + (5504, 6588)) line_style 0) - (object ClassView "Class" "Logical View::notation::Guide" @65 + (object ClassView "Class" "Logical View::notation::Guide" @62 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2916,22 +3417,40 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @65 - location (397, 3340) + Parent_View @62 + location (431, 3337) fill_color 13434879 nlines 1 - max_width 454 + max_width 386 justify 0 label "Guide") icon_style "Icon" line_color 3342489 fill_color 13434879 quidu "40F5426703AF" - width 472 - height 194 + compartment (object Compartment + Parent_View @62 + location (431, 3402) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 383 + justify 1) + width 404 + height 200 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Node" @66 + (object ClassView "Class" "Logical View::notation::Node" @63 ShowCompartmentStereotypes TRUE location (1280, 3936) font (object Font @@ -2944,22 +3463,21 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @66 - location (1184, 3882) + Parent_View @63 + location (1199, 3882) fill_color 13434879 nlines 1 - max_width 192 + max_width 162 justify 0 label "Node") icon_style "Icon" line_color 3342489 fill_color 4227327 quidu "3C7540CF026C" - width 210 height 132 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::NodeEntry" @67 + (object ClassView "Class" "Logical View::notation::NodeEntry" @64 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -2974,7 +3492,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @67 + Parent_View @64 location (289, 3868) fill_color 13434879 nlines 1 @@ -2982,7 +3500,7 @@ justify 0 label "NodeEntry") stereotype (object ItemLabel - Parent_View @67 + Parent_View @64 location (289, 3818) fill_color 13434879 anchor 10 @@ -2994,12 +3512,30 @@ line_color 3342489 fill_color 13434879 quidu "40F545C0003D" + compartment (object Compartment + Parent_View @64 + location (289, 3933) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 537 + justify 1) width 720 height 260 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$20" @68 - location (624, 3663) + (object AssociationViewNew "$UNNAMED$20" @65 + location (624, 3665) font (object Font size 10 face "Arial" @@ -3013,9 +3549,9 @@ line_color 3342489 quidu "40F5468302C3" roleview_list (list RoleViews - (object RoleView "nodeMap" @69 - Parent_View @68 - location (128, 319) + (object RoleView "nodeMap" @66 + Parent_View @65 + location (128, 321) font (object Font size 10 face "Arial" @@ -3025,9 +3561,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @70 - Parent_View @69 - location (489, 3758) + label (object SegLabel @67 + Parent_View @66 + location (489, 3757) font (object Font size 10 face "Arial" @@ -3049,13 +3585,16 @@ stereotype TRUE line_color 3342489 quidu "40F546840396" - client @68 - supplier @67 + client @65 + supplier @64 + vertices (list Points + (624, 3665) + (624, 3806)) line_style 3 - origin_attachment (624, 3663) + origin_attachment (624, 3665) terminal_attachment (624, 3806) - label (object SegLabel @71 - Parent_View @69 + label (object SegLabel @68 + Parent_View @66 location (694, 3751) font (object Font size 10 @@ -3075,19 +3614,22 @@ pctDist 0.614173 height 70 orientation 0)) - (object RoleView "$UNNAMED$21" @72 - Parent_View @68 - location (128, 319) + (object RoleView "$UNNAMED$21" @69 + Parent_View @65 + location (128, 321) stereotype TRUE line_color 3342489 quidu "40F5468403A0" - client @68 - supplier @65 + client @65 + supplier @62 + vertices (list Points + (624, 3665) + (624, 3524)) line_style 3 - origin_attachment (624, 3663) - terminal_attachment (624, 3521)))) - (object AssociationViewNew "$UNNAMED$26" @73 - location (1087, 3936) + origin_attachment (624, 3665) + terminal_attachment (624, 3524)))) + (object AssociationViewNew "$UNNAMED$26" @70 + location (1094, 3936) font (object Font size 10 face "Arial" @@ -3101,9 +3643,9 @@ line_color 3342489 quidu "419BA0560172" roleview_list (list RoleViews - (object RoleView "key" @74 - Parent_View @73 - location (511, -560) + (object RoleView "key" @71 + Parent_View @70 + location (518, -560) font (object Font size 10 face "Arial" @@ -3113,9 +3655,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @75 - Parent_View @74 - location (1102, 3885) + label (object SegLabel @72 + Parent_View @71 + location (1110, 3886) font (object Font size 10 face "Arial" @@ -3137,12 +3679,15 @@ stereotype TRUE line_color 3342489 quidu "419BA05702FA" - client @73 - supplier @66 + client @70 + supplier @63 + vertices (list Points + (1094, 3936) + (1189, 3936)) line_style 0 - label (object SegLabel @76 - Parent_View @74 - location (1147, 3989) + label (object SegLabel @73 + Parent_View @71 + location (1159, 3989) font (object Font size 10 face "Arial" @@ -3161,9 +3706,9 @@ pctDist 0.685315 height 53 orientation 1)) - (object RoleView "$UNNAMED$27" @77 - Parent_View @73 - location (511, -560) + (object RoleView "$UNNAMED$27" @74 + Parent_View @70 + location (518, -560) font (object Font size 10 face "Arial" @@ -3173,9 +3718,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @78 - Parent_View @77 - location (1018, 3895) + label (object SegLabel @75 + Parent_View @74 + location (1019, 3895) font (object Font size 10 face "Arial" @@ -3198,14 +3743,17 @@ stereotype TRUE line_color 3342489 quidu "419BA05702FC" - client @73 - supplier @67 + client @70 + supplier @64 + vertices (list Points + (1094, 3936) + (1000, 3936)) line_style 0))) - (object ClassView "Class" "Logical View::notation::LayoutConstraint" @79 + (object ClassView "Class" "Logical View::notation::LayoutConstraint" @76 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (1168, 2160) + location (1072, 2176) font (object Font size 10 face "Arial" @@ -3216,16 +3764,16 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @79 - location (971, 2129) + Parent_View @76 + location (875, 2145) fill_color 13434879 nlines 1 max_width 394 justify 0 label "LayoutConstraint") stereotype (object ItemLabel - Parent_View @79 - location (971, 2075) + Parent_View @76 + location (875, 2091) fill_color 13434879 anchor 10 nlines 1 @@ -3241,45 +3789,7 @@ height 196 annotation 8 autoResize TRUE) - (object InheritTreeView "" @80 - location (1168, 2410) - line_color 3342489 - fill_color 13434879 - supplier @79 - vertices (list Points - (1168, 2410) - (1168, 2258))) - (object InheritView "" @81 - stereotype TRUE - line_color 3342489 - quidu "4033EB2203D8" - client @7 - supplier @79 - line_style 3 - origin_attachment (1159, 2467) - terminal_attachment (1159, 2410) - drawSupplier @80) - (object InheritView "" @82 - stereotype TRUE - line_color 3342489 - quidu "4033EB1F0171" - client @9 - supplier @79 - line_style 3 - origin_attachment (597, 2463) - terminal_attachment (597, 2410) - drawSupplier @80) - (object InheritView "" @83 - stereotype TRUE - line_color 3342489 - quidu "4033EB270064" - client @10 - supplier @79 - line_style 3 - origin_attachment (1760, 2468) - terminal_attachment (1760, 2410) - drawSupplier @80) - (object ClassView "Class" "Logical View::notation::Style" @84 + (object ClassView "Class" "Logical View::notation::Style" @77 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -3294,7 +3804,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @84 + Parent_View @77 location (4031, 1057) fill_color 13434879 nlines 1 @@ -3302,7 +3812,7 @@ justify 0 label "Style") stereotype (object ItemLabel - Parent_View @84 + Parent_View @77 location (4031, 1003) fill_color 13434879 anchor 10 @@ -3319,170 +3829,173 @@ height 196 annotation 8 autoResize TRUE) - (object InheritView "" @85 + (object InheritView "" @78 stereotype TRUE line_color 3342489 quidu "4034CC1C023C" - client @18 - supplier @84 + client @17 + supplier @77 vertices (list Points - (4804, 279) - (4647, 279) + (4885, 276) + (4647, 276) (4647, 1059) (4362, 1059)) line_style 3 - origin_attachment (4804, 279) + origin_attachment (4885, 276) terminal_attachment (4362, 1059)) - (object InheritView "" @86 + (object InheritView "" @79 stereotype TRUE line_color 3342489 quidu "4034CC42027D" client @6 - supplier @84 + supplier @77 vertices (list Points - (4822, 720) + (4867, 720) (4645, 720) (4645, 1059) (4362, 1059)) line_style 3 - origin_attachment (4822, 720) + origin_attachment (4867, 720) terminal_attachment (4362, 1059)) - (object InheritView "" @87 + (object InheritView "" @80 stereotype TRUE line_color 3342489 quidu "4039845602CD" client @5 - supplier @84 + supplier @77 vertices (list Points - (4855, 2192) + (4907, 2192) (4682, 2192) (4682, 1045) (4362, 1045)) line_style 3 - origin_attachment (4855, 2192) + origin_attachment (4907, 2192) terminal_attachment (4362, 1045)) - (object InheritView "" @88 + (object InheritView "" @81 stereotype TRUE line_color 3342489 quidu "4034CC3F0282" client @4 - supplier @84 + supplier @77 vertices (list Points - (4843, 2625) + (4902, 2625) (4679, 2625) (4679, 1046) (4362, 1046)) line_style 3 - origin_attachment (4843, 2625) + origin_attachment (4902, 2625) terminal_attachment (4362, 1046)) - (object InheritView "" @89 + (object InheritView "" @82 stereotype TRUE line_color 3342489 quidu "403984E802F9" client @3 - supplier @84 + supplier @77 vertices (list Points - (4863, 3128) - (4678, 3128) + (4914, 3126) + (4678, 3126) (4678, 1045) (4362, 1045)) line_style 3 - origin_attachment (4863, 3128) + origin_attachment (4914, 3126) terminal_attachment (4362, 1045)) - (object InheritView "" @90 + (object InheritView "" @83 stereotype TRUE line_color 3342489 quidu "4034CC390310" client @2 - supplier @84 + supplier @77 vertices (list Points - (4845, 3408) + (4894, 3408) (4682, 3408) (4682, 1045) (4362, 1045)) line_style 3 - origin_attachment (4845, 3408) + origin_attachment (4894, 3408) terminal_attachment (4362, 1045)) - (object InheritView "" @91 + (object InheritView "" @84 stereotype TRUE line_color 3342489 quidu "40A0D9610111" - client @20 - supplier @84 + client @19 + supplier @77 vertices (list Points - (4847, 3951) + (4898, 3951) (4682, 3951) (4682, 1045) (4362, 1045)) line_style 3 - origin_attachment (4847, 3951) + origin_attachment (4898, 3951) terminal_attachment (4362, 1045)) - (object InheritView "" @92 + (object InheritView "" @85 stereotype TRUE line_color 3342489 quidu "40CDA7BB00DC" - client @32 - supplier @84 + client @29 + supplier @77 vertices (list Points - (4843, 4296) + (4887, 4296) (4683, 4296) (4683, 1046) (4362, 1046)) line_style 3 - origin_attachment (4843, 4296) + origin_attachment (4887, 4296) terminal_attachment (4362, 1046)) - (object InheritView "" @93 + (object InheritView "" @86 stereotype TRUE line_color 3342489 quidu "40F4611702A9" - client @33 - supplier @84 + client @30 + supplier @77 vertices (list Points - (4839, 1904) + (4891, 1904) (4687, 1904) (4687, 1046) (4362, 1046)) line_style 3 - origin_attachment (4839, 1904) + origin_attachment (4891, 1904) terminal_attachment (4362, 1046)) - (object InheritView "" @94 + (object InheritView "" @87 stereotype TRUE line_color 3342489 quidu "40F542E50345" - client @34 - supplier @84 + client @31 + supplier @77 vertices (list Points - (4852, 4708) + (4916, 4708) (4682, 4708) (4682, 1041) (4362, 1041)) line_style 3 - origin_attachment (4852, 4708) + origin_attachment (4916, 4708) terminal_attachment (4362, 1041)) - (object InheritView "" @95 + (object InheritView "" @88 stereotype TRUE line_color 3342489 quidu "403983FF02B3" - client @45 - supplier @84 + client @42 + supplier @77 + vertices (list Points + (4954, 1046) + (4362, 1046)) line_style 3 - origin_attachment (4904, 1046) + origin_attachment (4954, 1046) terminal_attachment (4362, 1046)) - (object InheritView "" @96 + (object InheritView "" @89 stereotype TRUE line_color 3342489 quidu "40F54BAE0091" - client @52 - supplier @84 + client @49 + supplier @77 vertices (list Points - (4908, 1488) + (4959, 1488) (4685, 1488) (4685, 1054) (4362, 1054)) line_style 3 - origin_attachment (4908, 1488) + origin_attachment (4959, 1488) terminal_attachment (4362, 1054)) - (object ClassView "Class" "Logical View::ecore::EObject" @97 + (object ClassView "Class" "Logical View::ecore::EObject" @90 ShowCompartmentStereotypes TRUE location (2304, 432) font (object Font @@ -3495,7 +4008,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @97 + Parent_View @90 location (2194, 352) fill_color 13434879 nlines 1 @@ -3510,7 +4023,7 @@ height 186 annotation 8 autoResize TRUE) - (object InheritView "" @98 + (object InheritView "" @91 font (object Font size 10 face "Arial" @@ -3524,14 +4037,17 @@ line_color 3342489 quidu "3C4F1CC50336" client @1 - supplier @97 + supplier @90 + vertices (list Points + (2300, 705) + (2300, 525)) line_style 3 origin_attachment (2300, 705) terminal_attachment (2300, 525)) - (object ClassView "Class" "Logical View::notation::Node" @99 + (object ClassView "Class" "Logical View::notation::Node" @92 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE - location (1152, 1728) + location (1008, 1728) font (object Font size 10 face "Arial" @@ -3542,23 +4058,22 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @99 - location (1056, 1674) + Parent_View @92 + location (927, 1675) fill_color 13434879 nlines 1 - max_width 192 + max_width 162 justify 0 label "Node") icon_style "Icon" line_color 3342489 fill_color 4227327 quidu "3C7540CF026C" - width 210 height 132 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$6" @100 - location (1146, 1927) + (object AssociationViewNew "$UNNAMED$6" @93 + location (1008, 1936) font (object Font size 10 face "Arial" @@ -3572,9 +4087,9 @@ line_color 3342489 quidu "4033E4C3011D" roleview_list (list RoleViews - (object RoleView "layoutConstraint" @101 - Parent_View @100 - location (-445, 314) + (object RoleView "layoutConstraint" @94 + Parent_View @93 + location (-583, 323) font (object Font size 10 face "Arial" @@ -3584,9 +4099,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @102 - Parent_View @101 - location (917, 2022) + label (object SegLabel @95 + Parent_View @94 + location (779, 2036) font (object Font size 10 face "Arial" @@ -3608,14 +4123,17 @@ stereotype TRUE line_color 3342489 quidu "4033E4C50120" - client @100 - supplier @79 + client @93 + supplier @76 + vertices (list Points + (1008, 1936) + (1008, 2078)) line_style 3 - origin_attachment (1146, 1927) - terminal_attachment (1146, 2061) - label (object SegLabel @103 - Parent_View @101 - location (1232, 2022) + origin_attachment (1008, 1936) + terminal_attachment (1008, 2078) + label (object SegLabel @96 + Parent_View @94 + location (1094, 2038) font (object Font size 10 face "Arial" @@ -3634,18 +4152,21 @@ pctDist 0.717647 height 86 orientation 0)) - (object RoleView "$UNNAMED$7" @104 - Parent_View @100 - location (-445, 314) + (object RoleView "$UNNAMED$7" @97 + Parent_View @93 + location (-583, 323) stereotype TRUE line_color 3342489 quidu "4033E4C5012A" - client @100 - supplier @99 + client @93 + supplier @92 + vertices (list Points + (1008, 1936) + (1008, 1794)) line_style 3 - origin_attachment (1146, 1927) - terminal_attachment (1146, 1794)))) - (object ClassView "Class" "Logical View::notation::Bendpoints" @105 + origin_attachment (1008, 1936) + terminal_attachment (1008, 1794)))) + (object ClassView "Class" "Logical View::notation::Bendpoints" @98 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -3660,7 +4181,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @105 + Parent_View @98 location (2703, 2177) fill_color 13434879 nlines 1 @@ -3668,7 +4189,7 @@ justify 0 label "Bendpoints") stereotype (object ItemLabel - Parent_View @105 + Parent_View @98 location (2703, 2123) fill_color 13434879 anchor 10 @@ -3685,25 +4206,28 @@ height 196 annotation 8 autoResize TRUE) - (object InheritTreeView "" @106 + (object InheritTreeView "" @99 location (2864, 2470) line_color 3342489 fill_color 13434879 - supplier @105 + supplier @98 vertices (list Points (2864, 2470) (2864, 2306))) - (object InheritView "" @107 + (object InheritView "" @100 stereotype TRUE line_color 3342489 quidu "40395EF400D8" - client @19 - supplier @105 + client @18 + supplier @98 + vertices (list Points + (2868, 2462) + (2868, 2470)) line_style 3 origin_attachment (2868, 2462) terminal_attachment (2868, 2470) - drawSupplier @106) - (object ClassView "Class" "Logical View::notation::Anchor" @108 + drawSupplier @99) + (object ClassView "Class" "Logical View::notation::Anchor" @101 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE @@ -3718,7 +4242,7 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @108 + Parent_View @101 location (3743, 2177) fill_color 13434879 nlines 1 @@ -3726,7 +4250,7 @@ justify 0 label "Anchor") stereotype (object ItemLabel - Parent_View @108 + Parent_View @101 location (3743, 2123) fill_color 13434879 anchor 10 @@ -3743,25 +4267,28 @@ height 196 annotation 8 autoResize TRUE) - (object InheritTreeView "" @109 + (object InheritTreeView "" @102 location (3904, 2462) line_color 3342489 fill_color 13434879 - supplier @108 + supplier @101 vertices (list Points (3904, 2462) (3904, 2306))) - (object InheritView "" @110 + (object InheritView "" @103 stereotype TRUE line_color 3342489 quidu "4033F56A02C4" - client @13 - supplier @108 + client @12 + supplier @101 + vertices (list Points + (3904, 2463) + (3904, 2462)) line_style 3 origin_attachment (3904, 2463) terminal_attachment (3904, 2462) - drawSupplier @109) - (object ClassView "Class" "Logical View::notation::View" @111 + drawSupplier @102) + (object ClassView "Class" "Logical View::notation::View" @104 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE location (2288, 1264) @@ -3775,23 +4302,41 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @111 - location (1953, 1123) + Parent_View @104 + location (2001, 1125) fill_color 13434879 nlines 1 - max_width 670 + max_width 574 justify 0 label "View") icon_style "Icon" line_color 3342489 fill_color 4227327 quidu "4037B95B01CA" - width 688 - height 308 + compartment (object Compartment + Parent_View @104 + location (2001, 1190) + font (object Font + size 10 + face "Arial" + bold FALSE + italics TRUE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 4 + max_width 571 + justify 1) + width 592 + height 302 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$4" @112 - location (3170, 1021) + (object AssociationViewNew "$UNNAMED$4" @105 + location (3168, 1021) font (object Font size 10 face "Arial" @@ -3805,9 +4350,9 @@ line_color 3342489 quidu "4033D44501BB" roleview_list (list RoleViews - (object RoleView "styles" @113 - Parent_View @112 - location (1170, -211) + (object RoleView "styles" @106 + Parent_View @105 + location (1168, -211) font (object Font size 10 face "Arial" @@ -3817,9 +4362,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @114 - Parent_View @113 - location (3932, 980) + label (object SegLabel @107 + Parent_View @106 + location (3931, 980) font (object Font size 10 face "Arial" @@ -3841,14 +4386,17 @@ stereotype TRUE line_color 3342489 quidu "4033D4470331" - client @112 - supplier @84 + client @105 + supplier @77 + vertices (list Points + (3168, 1021) + (4022, 1021)) line_style 3 - origin_attachment (3170, 1021) + origin_attachment (3168, 1021) terminal_attachment (4022, 1021) - label (object SegLabel @115 - Parent_View @113 - location (3958, 1071) + label (object SegLabel @108 + Parent_View @106 + location (3957, 1071) font (object Font size 10 face "Arial" @@ -3867,40 +4415,35 @@ pctDist 0.924464 height 50 orientation 1)) - (object RoleView "$UNNAMED$5" @116 - Parent_View @112 - location (1170, -211) + (object RoleView "$UNNAMED$5" @109 + Parent_View @105 + location (1168, -211) stereotype TRUE line_color 3342489 quidu "4033D447033B" - client @112 - supplier @111 + client @105 + supplier @104 vertices (list Points - (3170, 1021) + (3168, 1021) (2406, 1021) - (2406, 1110)) + (2406, 1113)) line_style 3 - origin_attachment (3170, 1021) - terminal_attachment (2406, 1110)))) - (object InheritView "" @117 + origin_attachment (3168, 1021) + terminal_attachment (2406, 1113)))) + (object InheritView "" @110 stereotype TRUE line_color 3342489 quidu "4037B98401AC" - client @111 + client @104 supplier @1 + vertices (list Points + (2304, 1113) + (2304, 895)) line_style 3 - origin_attachment (2304, 1110) + origin_attachment (2304, 1113) terminal_attachment (2304, 895)) - (object InheritTreeView "" @118 - location (2288, 1535) - line_color 3342489 - fill_color 13434879 - supplier @111 - vertices (list Points - (2288, 1535) - (2288, 1418))) - (object AssociationViewNew "$UNNAMED$14" @119 - location (2541, 698) + (object AssociationViewNew "$UNNAMED$14" @111 + location (2541, 699) font (object Font size 10 face "Arial" @@ -3914,9 +4457,9 @@ line_color 3342489 quidu "403A6768039D" roleview_list (list RoleViews - (object RoleView "element" @120 - Parent_View @119 - location (1437, -230) + (object RoleView "element" @112 + Parent_View @111 + location (1437, -229) font (object Font size 10 face "Arial" @@ -3926,9 +4469,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @121 - Parent_View @120 - location (2665, 405) + label (object SegLabel @113 + Parent_View @112 + location (2665, 406) font (object Font size 10 face "Arial" @@ -3950,17 +4493,17 @@ stereotype TRUE line_color 3342489 quidu "403A67690290" - client @119 - supplier @97 + client @111 + supplier @90 vertices (list Points - (2541, 698) + (2541, 699) (2541, 404) (2423, 404)) line_style 3 - origin_attachment (2541, 698) + origin_attachment (2541, 699) terminal_attachment (2423, 404) - label (object SegLabel @122 - Parent_View @120 + label (object SegLabel @114 + Parent_View @112 location (2503, 351) font (object Font size 10 @@ -3980,29 +4523,22 @@ pctDist 0.808333 height 54 orientation 1)) - (object RoleView "$UNNAMED$15" @123 - Parent_View @119 - location (1437, -230) + (object RoleView "$UNNAMED$15" @115 + Parent_View @111 + location (1437, -229) stereotype TRUE line_color 3342489 quidu "403A6769029A" - client @119 - supplier @111 + client @111 + supplier @104 + vertices (list Points + (2541, 699) + (2541, 1112)) line_style 3 - origin_attachment (2541, 698) - terminal_attachment (2541, 1109)))) - (object InheritView "" @124 - stereotype TRUE - line_color 3342489 - quidu "4033D3D0019D" - client @99 - supplier @111 - line_style 3 - origin_attachment (1191, 1662) - terminal_attachment (1191, 1535) - drawSupplier @118) - (object AssociationViewNew "$UNNAMED$2" @125 - location (1309, 1202) + origin_attachment (2541, 699) + terminal_attachment (2541, 1112)))) + (object AssociationViewNew "$UNNAMED$2" @116 + location (1261, 1204) font (object Font size 10 face "Arial" @@ -4016,9 +4552,9 @@ line_color 3342489 quidu "4033CCBD03B5" roleview_list (list RoleViews - (object RoleView "persistedChildren" @126 - Parent_View @125 - location (-2131, 82) + (object RoleView "persistedChildren" @117 + Parent_View @116 + location (-2179, 84) font (object Font size 10 face "Arial" @@ -4028,9 +4564,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @127 - Parent_View @126 - location (930, 1608) + label (object SegLabel @118 + Parent_View @117 + location (784, 1599) font (object Font size 10 face "Arial" @@ -4052,18 +4588,18 @@ stereotype TRUE line_color 3342489 quidu "4033CCC30346" - client @125 - supplier @99 + client @116 + supplier @92 vertices (list Points - (1309, 1202) - (1133, 1202) - (1133, 1662)) + (1261, 1204) + (987, 1204) + (987, 1662)) line_style 3 - origin_attachment (1309, 1202) - terminal_attachment (1133, 1662) - label (object SegLabel @128 - Parent_View @126 - location (984, 1533) + origin_attachment (1261, 1204) + terminal_attachment (987, 1662) + label (object SegLabel @119 + Parent_View @117 + location (838, 1514) font (object Font size 10 face "Arial" @@ -4082,19 +4618,22 @@ pctDist 0.798305 height 150 orientation 1)) - (object RoleView "$UNNAMED$3" @129 - Parent_View @125 - location (-2131, 82) + (object RoleView "$UNNAMED$3" @120 + Parent_View @116 + location (-2179, 84) stereotype TRUE line_color 3342489 quidu "4033CCC3035A" - client @125 - supplier @111 + client @116 + supplier @104 + vertices (list Points + (1261, 1204) + (1992, 1204)) line_style 3 - origin_attachment (1309, 1202) - terminal_attachment (1944, 1202)))) - (object AssociationViewNew "$UNNAMED$28" @130 - location (944, 1004) + origin_attachment (1261, 1204) + terminal_attachment (1992, 1204)))) + (object AssociationViewNew "$UNNAMED$28" @121 + location (1011, 1004) font (object Font size 10 face "Arial" @@ -4108,9 +4647,9 @@ line_color 3342489 quidu "41E44AEC02CF" roleview_list (list RoleViews - (object RoleView "transientChildren" @131 - Parent_View @130 - location (-1344, -260) + (object RoleView "transientChildren" @122 + Parent_View @121 + location (-1277, -260) font (object Font size 10 face "Arial" @@ -4120,9 +4659,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @132 - Parent_View @131 - location (804, 1744) + label (object SegLabel @123 + Parent_View @122 + location (687, 1742) font (object Font size 10 face "Arial" @@ -4144,19 +4683,19 @@ stereotype TRUE line_color 3342489 quidu "41E44AEE0160" - client @130 - supplier @99 + client @121 + supplier @92 vertices (list Points - (944, 1004) + (1011, 1004) (654, 1004) - (654, 1717) - (1047, 1717)) + (654, 1715) + (918, 1715)) line_style 3 - origin_attachment (944, 1004) - terminal_attachment (1047, 1717) - label (object SegLabel @133 - Parent_View @131 - location (789, 1818) + origin_attachment (1011, 1004) + terminal_attachment (918, 1715) + label (object SegLabel @124 + Parent_View @122 + location (672, 1816) font (object Font size 10 face "Arial" @@ -4175,25 +4714,25 @@ pctDist 0.815089 height 101 orientation 1)) - (object RoleView "$UNNAMED$29" @134 - Parent_View @130 - location (-1344, -260) + (object RoleView "$UNNAMED$29" @125 + Parent_View @121 + location (-1277, -260) stereotype TRUE line_color 3342489 quidu "41E44AEE016A" - client @130 - supplier @111 + client @121 + supplier @104 vertices (list Points - (944, 1004) + (1011, 1004) (2233, 1004) - (2233, 1110)) + (2233, 1113)) line_style 3 - origin_attachment (944, 1004) - terminal_attachment (2233, 1110)))) - (object ClassView "Class" "Logical View::notation::Edge" @135 + origin_attachment (1011, 1004) + terminal_attachment (2233, 1113)))) + (object ClassView "Class" "Logical View::notation::Edge" @126 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE - location (2432, 1744) + location (2880, 1744) font (object Font size 10 face "Arial" @@ -4204,8 +4743,8 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @135 - location (2320, 1662) + Parent_View @126 + location (2768, 1662) fill_color 13434879 nlines 1 max_width 224 @@ -4219,8 +4758,8 @@ height 191 annotation 8 autoResize TRUE) - (object AssociationViewNew "$UNNAMED$8" @136 - location (2566, 2033) + (object AssociationViewNew "$UNNAMED$8" @127 + location (2845, 1974) font (object Font size 10 face "Arial" @@ -4234,9 +4773,9 @@ line_color 3342489 quidu "4033ED76019A" roleview_list (list RoleViews - (object RoleView "bendpoints" @137 - Parent_View @136 - location (-330, 225) + (object RoleView "bendpoints" @128 + Parent_View @127 + location (-51, 166) font (object Font size 10 face "Arial" @@ -4246,9 +4785,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @138 - Parent_View @137 - location (2705, 2070) + label (object SegLabel @129 + Parent_View @128 + location (2809, 2027) font (object Font size 10 face "Arial" @@ -4270,18 +4809,17 @@ stereotype TRUE line_color 3342489 quidu "4033ED78012F" - client @136 - supplier @105 + client @127 + supplier @98 vertices (list Points - (2566, 2033) - (2845, 2033) + (2845, 1974) (2845, 2110)) line_style 3 - origin_attachment (2566, 2033) + origin_attachment (2845, 1974) terminal_attachment (2845, 2110) - label (object SegLabel @139 - Parent_View @137 - location (2911, 2061) + label (object SegLabel @130 + Parent_View @128 + location (2911, 2090) font (object Font size 10 face "Arial" @@ -4300,23 +4838,22 @@ pctDist 0.863402 height 66 orientation 0)) - (object RoleView "$UNNAMED$9" @140 - Parent_View @136 - location (-330, 225) + (object RoleView "$UNNAMED$9" @131 + Parent_View @127 + location (-51, 166) stereotype TRUE line_color 3342489 quidu "4033ED780139" - client @136 - supplier @135 + client @127 + supplier @126 vertices (list Points - (2566, 2033) - (2404, 2033) - (2404, 1839)) + (2845, 1974) + (2845, 1839)) line_style 3 - origin_attachment (2566, 2033) - terminal_attachment (2404, 1839)))) - (object AssociationViewNew "$UNNAMED$10" @141 - location (3156, 1983) + origin_attachment (2845, 1974) + terminal_attachment (2845, 1839)))) + (object AssociationViewNew "$UNNAMED$10" @132 + location (3374, 1983) font (object Font size 10 face "Arial" @@ -4330,9 +4867,9 @@ line_color 3342489 quidu "4033EDEC0302" roleview_list (list RoleViews - (object RoleView "sourceAnchor" @142 - Parent_View @141 - location (260, 175) + (object RoleView "sourceAnchor" @133 + Parent_View @132 + location (478, 175) font (object Font size 10 face "Arial" @@ -4342,9 +4879,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @143 - Parent_View @142 - location (3683, 2022) + label (object SegLabel @134 + Parent_View @133 + location (3763, 2022) font (object Font size 10 face "Arial" @@ -4366,18 +4903,18 @@ stereotype TRUE line_color 3342489 quidu "4033EDED03B8" - client @141 - supplier @108 + client @132 + supplier @101 vertices (list Points - (3156, 1983) - (3862, 1983) - (3862, 2110)) + (3374, 1983) + (3861, 1983) + (3861, 2110)) line_style 3 - origin_attachment (3156, 1983) - terminal_attachment (3862, 2110) - label (object SegLabel @144 - Parent_View @142 - location (3769, 2075) + origin_attachment (3374, 1983) + terminal_attachment (3861, 2110) + label (object SegLabel @135 + Parent_View @133 + location (3768, 2083) font (object Font size 10 face "Arial" @@ -4396,23 +4933,23 @@ pctDist 0.957859 height 94 orientation 1)) - (object RoleView "$UNNAMED$11" @145 - Parent_View @141 - location (260, 175) + (object RoleView "$UNNAMED$11" @136 + Parent_View @132 + location (478, 175) stereotype TRUE line_color 3342489 quidu "4033EDED03C2" - client @141 - supplier @135 + client @132 + supplier @126 vertices (list Points - (3156, 1983) - (2466, 1983) - (2466, 1839)) + (3374, 1983) + (2903, 1983) + (2903, 1839)) line_style 3 - origin_attachment (3156, 1983) - terminal_attachment (2466, 1839)))) - (object AssociationViewNew "$UNNAMED$12" @146 - location (3304, 1912) + origin_attachment (3374, 1983) + terminal_attachment (2903, 1839)))) + (object AssociationViewNew "$UNNAMED$12" @137 + location (3522, 1912) font (object Font size 10 face "Arial" @@ -4426,9 +4963,9 @@ line_color 3342489 quidu "4033EE200176" roleview_list (list RoleViews - (object RoleView "targetAnchor" @147 - Parent_View @146 - location (408, 104) + (object RoleView "targetAnchor" @138 + Parent_View @137 + location (626, 104) font (object Font size 10 face "Arial" @@ -4438,9 +4975,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @148 - Parent_View @147 - location (4111, 2011) + label (object SegLabel @139 + Parent_View @138 + location (4111, 2035) font (object Font size 10 face "Arial" @@ -4462,18 +4999,18 @@ stereotype TRUE line_color 3342489 quidu "4033EE220332" - client @146 - supplier @108 + client @137 + supplier @101 vertices (list Points - (3304, 1912) + (3522, 1912) (3953, 1912) (3953, 2110)) line_style 3 - origin_attachment (3304, 1912) + origin_attachment (3522, 1912) terminal_attachment (3953, 2110) - label (object SegLabel @149 - Parent_View @147 - location (4038, 2066) + label (object SegLabel @140 + Parent_View @138 + location (4038, 2076) font (object Font size 10 face "Arial" @@ -4492,30 +5029,30 @@ pctDist 0.947661 height 85 orientation 0)) - (object RoleView "$UNNAMED$13" @150 - Parent_View @146 - location (408, 104) + (object RoleView "$UNNAMED$13" @141 + Parent_View @137 + location (626, 104) stereotype TRUE line_color 3342489 quidu "4033EE22033C" - client @146 - supplier @135 + client @137 + supplier @126 vertices (list Points - (3304, 1912) - (2529, 1912) - (2529, 1839)) + (3522, 1912) + (2966, 1912) + (2966, 1839)) line_style 3 - origin_attachment (3304, 1912) - terminal_attachment (2529, 1839)))) - (object AssociationViewNew "$UNNAMED$0" @151 - location (2870, 1525) + origin_attachment (3522, 1912) + terminal_attachment (2966, 1839)))) + (object AssociationViewNew "$UNNAMED$0" @142 + location (2856, 1316) stereotype TRUE line_color 3342489 quidu "3D418E7600BA" roleview_list (list RoleViews - (object RoleView "sourceEdges" @152 - Parent_View @151 - location (102, 1141) + (object RoleView "sourceEdges" @143 + Parent_View @142 + location (88, 932) font (object Font size 10 face "Arial" @@ -4525,9 +5062,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @153 - Parent_View @152 - location (2681, 1614) + label (object SegLabel @144 + Parent_View @143 + location (2749, 1472) font (object Font size 10 face "Arial" @@ -4543,24 +5080,24 @@ max_width 276 justify 0 label "+sourceEdges" - pctDist 0.711340 - height 40 + pctDist 0.549618 + height 167 orientation 1) stereotype TRUE line_color 3342489 quidu "3D418E7701F2" - client @151 - supplier @135 + client @142 + supplier @126 vertices (list Points - (2870, 1525) - (2870, 1653) - (2553, 1653)) + (2856, 1316) + (2916, 1316) + (2916, 1649)) line_style 3 - origin_attachment (2870, 1525) - terminal_attachment (2553, 1653) - label (object SegLabel @154 - Parent_View @152 - location (2606, 1553) + origin_attachment (2856, 1316) + terminal_attachment (2916, 1649) + label (object SegLabel @145 + Parent_View @143 + location (2816, 1603) font (object Font size 10 face "Arial" @@ -4579,9 +5116,9 @@ pctDist 0.882716 height 101 orientation 1)) - (object RoleView "source" @155 - Parent_View @151 - location (102, 1141) + (object RoleView "source" @146 + Parent_View @142 + location (88, 932) font (object Font size 10 face "Arial" @@ -4591,9 +5128,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @156 - Parent_View @155 - location (2712, 1365) + label (object SegLabel @147 + Parent_View @146 + location (2632, 1364) font (object Font size 10 face "Arial" @@ -4615,18 +5152,17 @@ stereotype TRUE line_color 3342489 quidu "3D418E7701E3" - client @151 - supplier @111 + client @142 + supplier @104 vertices (list Points - (2870, 1525) - (2870, 1317) - (2632, 1317)) + (2856, 1316) + (2584, 1316)) line_style 3 - origin_attachment (2870, 1525) - terminal_attachment (2632, 1317) - label (object SegLabel @157 - Parent_View @155 - location (2670, 1430) + origin_attachment (2856, 1316) + terminal_attachment (2584, 1316) + label (object SegLabel @148 + Parent_View @146 + location (2607, 1429) font (object Font size 10 face "Arial" @@ -4645,15 +5181,15 @@ pctDist 0.917526 height 113 orientation 0)))) - (object AssociationViewNew "$UNNAMED$1" @158 - location (2933, 1510) + (object AssociationViewNew "$UNNAMED$1" @149 + location (2978, 1250) stereotype TRUE line_color 3342489 quidu "3D418EA4030F" roleview_list (list RoleViews - (object RoleView "targetEdges" @159 - Parent_View @158 - location (168, 1123) + (object RoleView "targetEdges" @150 + Parent_View @149 + location (213, 863) font (object Font size 10 face "Arial" @@ -4663,9 +5199,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @160 - Parent_View @159 - location (2696, 1710) + label (object SegLabel @151 + Parent_View @150 + location (3134, 1493) font (object Font size 10 face "Arial" @@ -4681,24 +5217,23 @@ max_width 243 justify 0 label "+targetEdges" - pctDist 0.769841 - height 36 - orientation 1) + pctDist 0.609023 + height 156 + orientation 0) stereotype TRUE line_color 3342489 quidu "3D418EA5039B" - client @158 - supplier @135 + client @149 + supplier @126 vertices (list Points - (2933, 1510) - (2933, 1745) - (2553, 1745)) + (2978, 1250) + (2978, 1649)) line_style 3 - origin_attachment (2933, 1510) - terminal_attachment (2553, 1745) - label (object SegLabel @161 - Parent_View @159 - location (2615, 1804) + origin_attachment (2978, 1250) + terminal_attachment (2978, 1649) + label (object SegLabel @152 + Parent_View @150 + location (3037, 1609) font (object Font size 10 face "Arial" @@ -4717,9 +5252,9 @@ pctDist 0.899514 height 59 orientation 0)) - (object RoleView "target" @162 - Parent_View @158 - location (168, 1123) + (object RoleView "target" @153 + Parent_View @149 + location (213, 863) font (object Font size 10 face "Arial" @@ -4729,9 +5264,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @163 - Parent_View @162 - location (2713, 1232) + label (object SegLabel @154 + Parent_View @153 + location (2643, 1227) font (object Font size 10 face "Arial" @@ -4753,18 +5288,18 @@ stereotype TRUE line_color 3342489 quidu "3D418EA5038C" - client @158 - supplier @111 + client @149 + supplier @104 vertices (list Points - (2933, 1510) - (2933, 1195) - (2632, 1195)) + (2978, 1250) + (2978, 1190) + (2584, 1190)) line_style 3 - origin_attachment (2933, 1510) - terminal_attachment (2632, 1195) - label (object SegLabel @164 - Parent_View @162 - location (2675, 1152) + origin_attachment (2978, 1250) + terminal_attachment (2584, 1190) + label (object SegLabel @155 + Parent_View @153 + location (2617, 1147) font (object Font size 10 face "Arial" @@ -4783,20 +5318,10 @@ pctDist 0.930490 height 44 orientation 1)))) - (object InheritView "" @165 - stereotype TRUE - line_color 3342489 - quidu "3C7BA4ED039B" - client @135 - supplier @111 - line_style 3 - origin_attachment (2491, 1648) - terminal_attachment (2491, 1535) - drawSupplier @118) - (object ClassView "Class" "Logical View::notation::Diagram" @166 + (object ClassView "Class" "Logical View::notation::Diagram" @156 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE - location (1680, 1744) + location (1856, 1792) font (object Font size 10 face "Arial" @@ -4807,33 +5332,41 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @166 - location (1433, 1659) + Parent_View @156 + location (1351, 1678) fill_color 13434879 nlines 1 - max_width 494 + max_width 1010 justify 0 label "Diagram") icon_style "Icon" line_color 3342489 fill_color 33023 quidu "403A64600345" - width 512 - height 194 + compartment (object Compartment + Parent_View @156 + location (1351, 1743) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 1007 + justify 1) + width 1028 + height 254 annotation 8 autoResize TRUE) - (object InheritView "" @167 - stereotype TRUE - line_color 3342489 - quidu "403A64690252" - client @166 - supplier @111 - line_style 3 - origin_attachment (1691, 1647) - terminal_attachment (1691, 1535) - drawSupplier @118) - (object AssociationViewNew "$UNNAMED$18" @168 - location (1796, 1389) + (object AssociationViewNew "$UNNAMED$18" @157 + location (1639, 1273) font (object Font size 10 face "Arial" @@ -4847,9 +5380,9 @@ line_color 3342489 quidu "405B283E0075" roleview_list (list RoleViews - (object RoleView "diagram" @169 - Parent_View @168 - location (-1196, 125) + (object RoleView "diagram" @158 + Parent_View @157 + location (-1353, 9) font (object Font size 10 face "Arial" @@ -4859,9 +5392,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @170 - Parent_View @169 - location (1923, 1598) + label (object SegLabel @159 + Parent_View @158 + location (1689, 1593) font (object Font size 10 face "Arial" @@ -4877,20 +5410,24 @@ max_width 187 justify 0 label "+diagram" - pctDist 0.814516 - height 127 + pctDist 0.840708 + height 110 orientation 0) stereotype TRUE line_color 3342489 quidu "405B283F01B1" - client @168 - supplier @166 + client @157 + supplier @156 + vertices (list Points + (1639, 1273) + (1579, 1273) + (1579, 1665)) line_style 3 - origin_attachment (1796, 1389) - terminal_attachment (1796, 1647) - label (object SegLabel @171 - Parent_View @169 - location (1865, 1541) + origin_attachment (1639, 1273) + terminal_attachment (1579, 1665) + label (object SegLabel @160 + Parent_View @158 + location (1535, 1593) font (object Font size 10 face "Arial" @@ -4906,26 +5443,25 @@ max_width 15 justify 0 label "1" - pctDist 0.592742 - height 69 - orientation 0)) - (object RoleView "$UNNAMED$19" @172 - Parent_View @168 - location (-1196, 125) + pctDist 0.840708 + height 44 + orientation 1)) + (object RoleView "$UNNAMED$19" @161 + Parent_View @157 + location (-1353, 9) stereotype TRUE line_color 3342489 quidu "405B283F01BB" - client @168 - supplier @111 + client @157 + supplier @104 vertices (list Points - (1796, 1389) - (1796, 1279) - (1944, 1279)) + (1639, 1273) + (1992, 1273)) line_style 3 - origin_attachment (1796, 1389) - terminal_attachment (1944, 1279)))) - (object AssociationViewNew "$UNNAMED$16" @173 - location (2123, 1721) + origin_attachment (1639, 1273) + terminal_attachment (1992, 1273)))) + (object AssociationViewNew "$UNNAMED$16" @162 + location (2564, 1754) font (object Font size 10 face "Arial" @@ -4939,9 +5475,9 @@ line_color 3342489 quidu "405B279E0009" roleview_list (list RoleViews - (object RoleView "persistedEdges" @174 - Parent_View @173 - location (-277, -23) + (object RoleView "persistedEdges" @163 + Parent_View @162 + location (164, 10) font (object Font size 10 face "Arial" @@ -4951,9 +5487,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @175 - Parent_View @174 - location (2123, 1680) + label (object SegLabel @164 + Parent_View @163 + location (2564, 1713) font (object Font size 10 face "Arial" @@ -4975,14 +5511,17 @@ stereotype TRUE line_color 3342489 quidu "405B279F022C" - client @173 - supplier @135 + client @162 + supplier @126 + vertices (list Points + (2564, 1754) + (2759, 1754)) line_style 3 - origin_attachment (2123, 1721) - terminal_attachment (2311, 1721) - label (object SegLabel @176 - Parent_View @174 - location (2234, 1758) + origin_attachment (2564, 1754) + terminal_attachment (2759, 1754) + label (object SegLabel @165 + Parent_View @163 + location (2679, 1791) font (object Font size 10 face "Arial" @@ -5001,19 +5540,22 @@ pctDist 0.591398 height 37 orientation 1)) - (object RoleView "$UNNAMED$17" @177 - Parent_View @173 - location (-277, -23) + (object RoleView "$UNNAMED$17" @166 + Parent_View @162 + location (164, 10) stereotype TRUE line_color 3342489 quidu "405B279F022E" - client @173 - supplier @166 + client @162 + supplier @156 + vertices (list Points + (2564, 1754) + (2370, 1754)) line_style 3 - origin_attachment (2123, 1721) - terminal_attachment (1936, 1721)))) - (object AssociationViewNew "$UNNAMED$30" @178 - location (2018, 2021) + origin_attachment (2564, 1754) + terminal_attachment (2370, 1754)))) + (object AssociationViewNew "$UNNAMED$30" @167 + location (2362, 2020) font (object Font size 10 face "Arial" @@ -5027,9 +5569,9 @@ line_color 3342489 quidu "41EC3D6A0161" roleview_list (list RoleViews - (object RoleView "TransientEdges" @179 - Parent_View @178 - location (290, 277) + (object RoleView "TransientEdges" @168 + Parent_View @167 + location (634, 276) font (object Font size 10 face "Arial" @@ -5039,9 +5581,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @180 - Parent_View @179 - location (2096, 1907) + label (object SegLabel @169 + Parent_View @168 + location (2506, 1939) font (object Font size 10 face "Arial" @@ -5057,24 +5599,24 @@ max_width 374 justify 0 label "+TransientEdges" - pctDist 0.155319 - height 115 + pctDist 0.245509 + height 82 orientation 0) stereotype TRUE line_color 3342489 quidu "41EC3D7E0138" - client @178 - supplier @135 + client @167 + supplier @126 vertices (list Points - (2018, 2021) - (2337, 2021) - (2337, 1839)) + (2362, 2020) + (2773, 2020) + (2773, 1839)) line_style 3 - origin_attachment (2018, 2021) - terminal_attachment (2337, 1839) - label (object SegLabel @181 - Parent_View @179 - location (2246, 2078) + origin_attachment (2362, 2020) + terminal_attachment (2773, 1839) + label (object SegLabel @170 + Parent_View @168 + location (2687, 2043) font (object Font size 10 face "Arial" @@ -5090,29 +5632,29 @@ max_width 15 justify 0 label "0..*" - pctDist 0.457447 - height 57 + pctDist 0.548902 + height 23 orientation 1)) - (object RoleView "$UNNAMED$31" @182 - Parent_View @178 - location (290, 277) + (object RoleView "$UNNAMED$31" @171 + Parent_View @167 + location (634, 276) stereotype TRUE line_color 3342489 quidu "41EC3D7E013A" - client @178 - supplier @166 + client @167 + supplier @156 vertices (list Points - (2018, 2021) - (1696, 2021) - (1696, 1841)) + (2362, 2020) + (1870, 2020) + (1870, 1919)) line_style 3 - origin_attachment (2018, 2021) - terminal_attachment (1696, 1841)))) - (object ClassView "Class" "Logical View::notation::Style" @183 + origin_attachment (2362, 2020) + terminal_attachment (1870, 1919)))) + (object ClassView "Class" "Logical View::notation::Style" @172 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (2048, 3248) + location (2208, 3248) font (object Font size 10 face "Arial" @@ -5123,16 +5665,16 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @183 - location (1887, 3219) + Parent_View @172 + location (2047, 3219) fill_color 13434879 nlines 1 max_width 322 justify 0 label "Style") stereotype (object ItemLabel - Parent_View @183 - location (1887, 3165) + Parent_View @172 + location (2047, 3165) fill_color 13434879 anchor 10 nlines 1 @@ -5148,11 +5690,11 @@ height 192 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::Bounds" @184 + (object ClassView "Class" "Logical View::notation::Image" @173 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (3120, 3648) + location (3280, 4080) font (object Font size 10 face "Arial" @@ -5163,26 +5705,44 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @184 - location (3016, 3594) + Parent_View @173 + location (3074, 3996) fill_color 13434879 nlines 1 - max_width 208 + max_width 412 justify 0 - label "Bounds") + label "Image") icon_style "Icon" line_color 3342489 - fill_color 16711935 - quidu "4033EA3A018F" - width 226 - height 132 + fill_color 13434879 + quidu "405B34B802BF" + compartment (object Compartment + Parent_View @173 + location (3074, 4061) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 2 + max_width 409 + justify 1) + width 430 + height 194 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::ImageStyle" @185 + (object ClassView "Class" "Logical View::notation::ImageBufferStyle" @174 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (2064, 3648) + location (2208, 4080) font (object Font size 10 face "Arial" @@ -5193,32 +5753,23 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @185 - location (1591, 3534) + Parent_View @174 + location (2039, 4027) fill_color 13434879 nlines 1 - max_width 946 + max_width 338 justify 0 - label "ImageStyle") + label "ImageBufferStyle") icon_style "Icon" line_color 3342489 fill_color 65280 - quidu "421DF3290185" - width 964 - height 254 + quidu "421DF69802B5" + width 356 + height 130 annotation 8 autoResize TRUE) - (object InheritView "" @186 - stereotype TRUE - line_color 3342489 - quidu "421DF49302BC" - client @185 - supplier @183 - line_style 3 - origin_attachment (2048, 3521) - terminal_attachment (2048, 3344)) - (object AssociationViewNew "$UNNAMED$34" @187 - location (2776, 3648) + (object AssociationViewNew "$UNNAMED$36" @175 + location (2725, 4080) font (object Font size 10 face "Arial" @@ -5230,11 +5781,11 @@ default_color TRUE) stereotype TRUE line_color 3342489 - quidu "421DF6150112" + quidu "421DF75802B2" roleview_list (list RoleViews - (object RoleView "cropBound" @188 - Parent_View @187 - location (712, 0) + (object RoleView "imageBuffer" @176 + Parent_View @175 + location (677, 0) font (object Font size 10 face "Arial" @@ -5244,9 +5795,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @189 - Parent_View @188 - location (2865, 3593) + label (object SegLabel @177 + Parent_View @176 + location (2833, 4026) font (object Font size 10 face "Arial" @@ -5259,23 +5810,24 @@ anchor 1 anchor_loc 1 nlines 1 - max_width 276 + max_width 272 justify 0 - label "+cropBound" - pctDist 0.389344 - height 56 + label "+imageBuffer" + pctDist 0.317181 + height 55 orientation 0) stereotype TRUE line_color 3342489 - quidu "421DF61701B6" - client @187 - supplier @184 - line_style 3 - origin_attachment (2776, 3648) - terminal_attachment (3007, 3648) - label (object SegLabel @190 - Parent_View @188 - location (2983, 3702) + quidu "421DF75A035F" + client @175 + supplier @173 + vertices (list Points + (2725, 4080) + (3064, 4080)) + line_style 0 + label (object SegLabel @178 + Parent_View @176 + location (3029, 4134) font (object Font size 10 face "Arial" @@ -5294,9 +5846,9 @@ pctDist 0.900000 height 54 orientation 1)) - (object RoleView "$UNNAMED$35" @191 - Parent_View @187 - location (712, 0) + (object RoleView "$UNNAMED$37" @179 + Parent_View @175 + location (677, 0) font (object Font size 10 face "Arial" @@ -5308,15 +5860,16 @@ default_color TRUE) stereotype TRUE line_color 3342489 - quidu "421DF61701CA" - client @187 - supplier @185 - line_style 3 - origin_attachment (2776, 3648) - terminal_attachment (2546, 3648) - label (object SegLabel @192 - Parent_View @191 - location (2570, 3702) + quidu "421DF75A0369" + client @175 + supplier @174 + vertices (list Points + (2725, 4080) + (2386, 4080)) + line_style 0 + label (object SegLabel @180 + Parent_View @179 + location (2421, 4134) font (object Font size 10 face "Arial" @@ -5335,11 +5888,11 @@ pctDist 0.900000 height 54 orientation 0)))) - (object ClassView "Class" "Logical View::notation::Image" @193 + (object ClassView "Class" "Logical View::notation::MeasurementUnit" @181 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (3120, 4080) + location (656, 4432) font (object Font size 10 face "Arial" @@ -5350,26 +5903,53 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @193 - location (2878, 3996) + Parent_View @181 + location (480, 4337) fill_color 13434879 nlines 1 - max_width 484 + max_width 352 justify 0 - label "Image") + label "MeasurementUnit") + stereotype (object ItemLabel + Parent_View @181 + location (480, 4287) + fill_color 13434879 + anchor 10 + nlines 1 + max_width 350 + justify 0 + label "<>") icon_style "Icon" line_color 3342489 fill_color 13434879 - quidu "405B34B802BF" - width 502 - height 194 + quidu "43D015E002C0" + compartment (object Compartment + Parent_View @181 + location (480, 4402) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 13434879 + anchor 2 + nlines 3 + max_width 209 + justify 1) + width 370 + height 314 annotation 8 autoResize TRUE) - (object ClassView "Class" "Logical View::notation::ImageBufferStyle" @194 + (object ClassView "Class" "Logical View::notation::Bounds" @182 ShowCompartmentStereotypes TRUE IncludeAttribute TRUE IncludeOperation TRUE - location (2048, 4080) + location (3280, 3648) font (object Font size 10 face "Arial" @@ -5380,32 +5960,83 @@ color 0 default_color TRUE) label (object ItemLabel - Parent_View @194 - location (1849, 4027) + Parent_View @182 + location (3192, 3594) fill_color 13434879 nlines 1 - max_width 398 + max_width 176 justify 0 - label "ImageBufferStyle") + label "Bounds") + icon_style "Icon" + line_color 3342489 + fill_color 16711935 + quidu "4033EA3A018F" + width 194 + height 132 + annotation 8 + autoResize TRUE) + (object ClassView "Class" "Logical View::notation::ImageStyle" @183 + ShowCompartmentStereotypes TRUE + IncludeAttribute TRUE + IncludeOperation TRUE + location (2224, 3648) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + label (object ItemLabel + Parent_View @183 + location (1820, 3537) + fill_color 13434879 + nlines 1 + max_width 808 + justify 0 + label "ImageStyle") icon_style "Icon" line_color 3342489 fill_color 65280 - quidu "421DF69802B5" - width 416 - height 130 + quidu "421DF3290185" + compartment (object Compartment + Parent_View @183 + location (1820, 3602) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + icon_style "Icon" + fill_color 16777215 + anchor 2 + nlines 3 + max_width 804 + justify 1) + width 826 + height 248 annotation 8 autoResize TRUE) - (object InheritView "" @195 + (object InheritView "" @184 stereotype TRUE line_color 3342489 - quidu "421DF6D20205" - client @194 - supplier @185 + quidu "421DF49302BC" + client @183 + supplier @172 + vertices (list Points + (2208, 3524) + (2208, 3344)) line_style 3 - origin_attachment (2048, 4015) - terminal_attachment (2048, 3775)) - (object AssociationViewNew "$UNNAMED$36" @196 - location (2562, 4080) + origin_attachment (2208, 3524) + terminal_attachment (2208, 3344)) + (object AssociationViewNew "$UNNAMED$34" @185 + location (2910, 3648) font (object Font size 10 face "Arial" @@ -5417,11 +6048,11 @@ default_color TRUE) stereotype TRUE line_color 3342489 - quidu "421DF75802B2" + quidu "421DF6150112" roleview_list (list RoleViews - (object RoleView "imageBuffer" @197 - Parent_View @196 - location (514, 0) + (object RoleView "cropBound" @186 + Parent_View @185 + location (846, 0) font (object Font size 10 face "Arial" @@ -5431,9 +6062,9 @@ strike FALSE color 0 default_color TRUE) - label (object SegLabel @198 - Parent_View @197 - location (2659, 4026) + label (object SegLabel @187 + Parent_View @186 + location (3016, 3593) font (object Font size 10 face "Arial" @@ -5446,21 +6077,26 @@ anchor 1 anchor_loc 1 nlines 1 - max_width 272 + max_width 276 justify 0 - label "+imageBuffer" - pctDist 0.317181 - height 55 + label "+cropBound" + pctDist 0.389344 + height 56 orientation 0) stereotype TRUE line_color 3342489 - quidu "421DF75A035F" - client @196 - supplier @193 - line_style 0 - label (object SegLabel @199 - Parent_View @197 - location (2836, 4134) + quidu "421DF61701B6" + client @185 + supplier @182 + vertices (list Points + (2910, 3648) + (3183, 3648)) + line_style 3 + origin_attachment (2910, 3648) + terminal_attachment (3183, 3648) + label (object SegLabel @188 + Parent_View @186 + location (3156, 3702) font (object Font size 10 face "Arial" @@ -5479,9 +6115,9 @@ pctDist 0.900000 height 54 orientation 1)) - (object RoleView "$UNNAMED$37" @200 - Parent_View @196 - location (514, 0) + (object RoleView "$UNNAMED$35" @189 + Parent_View @185 + location (846, 0) font (object Font size 10 face "Arial" @@ -5493,13 +6129,131 @@ default_color TRUE) stereotype TRUE line_color 3342489 - quidu "421DF75A0369" - client @196 - supplier @194 + quidu "421DF61701CA" + client @185 + supplier @183 + vertices (list Points + (2910, 3648) + (2637, 3648)) + line_style 3 + origin_attachment (2910, 3648) + terminal_attachment (2637, 3648) + label (object SegLabel @190 + Parent_View @189 + location (2664, 3702) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + anchor 2 + anchor_loc 1 + nlines 1 + max_width 15 + justify 0 + label "1" + pctDist 0.900000 + height 54 + orientation 0)))) + (object InheritView "" @191 + stereotype TRUE + line_color 3342489 + quidu "421DF6D20205" + client @174 + supplier @183 + vertices (list Points + (2208, 4015) + (2208, 3772)) + line_style 3 + origin_attachment (2208, 4015) + terminal_attachment (2208, 3772)) + (object ClassView "Class" "Logical View::notation::Bounds" @192 + ShowCompartmentStereotypes TRUE + IncludeAttribute TRUE + IncludeOperation TRUE + location (1488, 3168) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + label (object ItemLabel + Parent_View @192 + location (1400, 3115) + fill_color 13434879 + nlines 1 + max_width 176 + justify 0 + label "Bounds") + icon_style "Icon" + line_color 3342489 + fill_color 16711935 + quidu "4033EA3A018F" + width 194 + height 130 + annotation 8 + autoResize TRUE) + (object AssociationViewNew "$UNNAMED$32" @193 + location (1483, 3586) + stereotype TRUE + line_color 3342489 + quidu "421DF5390058" + roleview_list (list RoleViews + (object RoleView "$UNNAMED$33" @194 + Parent_View @193 + location (-5, 578) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + label (object SegLabel @195 + Parent_View @194 + location (1733, 3688) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + hidden TRUE + anchor 1 + anchor_loc 1 + nlines 1 + max_width 450 + justify 0 + label "" + pctDist 0.800000 + height 42 + orientation 1) + stereotype TRUE + line_color 3342489 + quidu "421DF53A008B" + client @193 + supplier @183 + vertices (list Points + (1483, 3586) + (1483, 3646) + (1810, 3646)) line_style 0 - label (object SegLabel @201 - Parent_View @200 - location (2288, 4134) + label (object SegLabel @196 + Parent_View @194 + location (1771, 3593) font (object Font size 10 face "Arial" @@ -5517,4 +6271,189 @@ label "1" pctDist 0.900000 height 54 - orientation 0)))))))) + orientation 0)) + (object RoleView "cropBound" @197 + Parent_View @193 + location (-5, 578) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + label (object SegLabel @198 + Parent_View @197 + location (1444, 3304) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + anchor 1 + anchor_loc 1 + nlines 1 + max_width 276 + justify 0 + label "+cropBound" + pctDist 0.800000 + height 42 + orientation 0) + stereotype TRUE + line_color 3342489 + quidu "421DF53A0077" + client @193 + supplier @192 + vertices (list Points + (1483, 3586) + (1486, 3233)) + line_style 0 + label (object SegLabel @199 + Parent_View @197 + location (1540, 3268) + font (object Font + size 10 + face "Arial" + bold FALSE + italics FALSE + underline FALSE + strike FALSE + color 0 + default_color TRUE) + anchor 2 + anchor_loc 1 + nlines 1 + max_width 15 + justify 0 + label "n" + pctDist 0.900000 + height 54 + orientation 1)))) + (object InheritView "" @200 + stereotype TRUE + line_color 3342489 + quidu "4033EB2F01F6" + client @192 + supplier @9 + vertices (list Points + (1533, 3103) + (1533, 2988) + (1800, 2988) + (1800, 2844)) + line_style 3 + origin_attachment (1533, 3103) + terminal_attachment (1800, 2844)) + (object InheritView "" @201 + stereotype TRUE + line_color 3342489 + quidu "4033EB2B0326" + client @192 + supplier @7 + vertices (list Points + (1437, 3103) + (1437, 2992) + (1204, 2992) + (1204, 2844)) + line_style 3 + origin_attachment (1437, 3103) + terminal_attachment (1204, 2844)) + (object InheritTreeView "" @202 + location (2288, 1535) + line_color 3342489 + fill_color 13434879 + supplier @104 + vertices (list Points + (2288, 1535) + (2288, 1415))) + (object InheritView "" @203 + stereotype TRUE + line_color 3342489 + quidu "4033D3D0019D" + client @92 + supplier @104 + vertices (list Points + (1096, 1662) + (1096, 1535)) + line_style 3 + origin_attachment (1096, 1662) + terminal_attachment (1096, 1535) + drawSupplier @202) + (object InheritView "" @204 + stereotype TRUE + line_color 3342489 + quidu "403A64690252" + client @156 + supplier @104 + vertices (list Points + (1866, 1664) + (1866, 1535)) + line_style 3 + origin_attachment (1866, 1664) + terminal_attachment (1866, 1535) + drawSupplier @202) + (object InheritView "" @205 + stereotype TRUE + line_color 3342489 + quidu "3C7BA4ED039B" + client @126 + supplier @104 + vertices (list Points + (2768, 1648) + (2768, 1535)) + line_style 3 + origin_attachment (2768, 1648) + terminal_attachment (2768, 1535) + drawSupplier @202) + (object InheritTreeView "" @206 + location (1062, 2466) + line_color 3342489 + fill_color 13434879 + supplier @76 + vertices (list Points + (1062, 2466) + (1062, 2274))) + (object InheritView "" @207 + stereotype TRUE + line_color 3342489 + quidu "4033EB1F0171" + client @8 + supplier @76 + vertices (list Points + (587, 2606) + (587, 2466)) + line_style 3 + origin_attachment (587, 2606) + terminal_attachment (587, 2466) + drawSupplier @206) + (object InheritView "" @208 + stereotype TRUE + line_color 3342489 + quidu "43D14D33007C" + client @7 + supplier @76 + vertices (list Points + (1166, 2596) + (1166, 2466)) + line_style 3 + origin_attachment (1166, 2596) + terminal_attachment (1166, 2466) + drawSupplier @206) + (object InheritView "" @209 + stereotype TRUE + line_color 3342489 + quidu "43D14D370230" + client @9 + supplier @76 + vertices (list Points + (1758, 2596) + (1758, 2466)) + line_style 3 + origin_attachment (1758, 2596) + terminal_attachment (1758, 2466) + drawSupplier @206))))) Index: model/notation.ecore =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/model/notation.ecore,v retrieving revision 1.2 diff -u -r1.2 notation.ecore --- model/notation.ecore 11 Jan 2006 17:01:22 -0000 1.2 +++ model/notation.ecore 24 Jan 2006 21:15:11 -0000 @@ -183,6 +183,8 @@ + + eType="#//Guide" containment="true"/> + eType="#//Guide" containment="true"/> + + + + Index: model/notation.genmodel =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/model/notation.genmodel,v retrieving revision 1.1 diff -u -r1.1 notation.genmodel --- model/notation.genmodel 15 Dec 2005 14:54:19 -0000 1.1 +++ model/notation.genmodel 24 Jan 2006 21:15:11 -0000 @@ -54,6 +54,10 @@ + + + + @@ -159,6 +163,7 @@ + Index: src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java,v retrieving revision 1.5 diff -u -r1.5 NotationSwitch.java --- src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java 17 Jan 2006 18:12:23 -0000 1.5 +++ src/org/eclipse/gmf/runtime/notation/util/NotationSwitch.java 24 Jan 2006 21:15:17 -0000 @@ -18,6 +18,8 @@ import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.notation.*; + import org.eclipse.gmf.runtime.notation.Anchor; import org.eclipse.gmf.runtime.notation.Bendpoints; import org.eclipse.gmf.runtime.notation.Bounds; Index: src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java,v retrieving revision 1.5 diff -u -r1.5 NotationAdapterFactory.java --- src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java 17 Jan 2006 18:12:23 -0000 1.5 +++ src/org/eclipse/gmf/runtime/notation/util/NotationAdapterFactory.java 24 Jan 2006 21:15:17 -0000 @@ -19,6 +19,8 @@ import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.notation.*; + import org.eclipse.gmf.runtime.notation.Anchor; import org.eclipse.gmf.runtime.notation.Bendpoints; import org.eclipse.gmf.runtime.notation.Bounds; Index: src/org/eclipse/gmf/runtime/notation/NotationPackage.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/NotationPackage.java,v retrieving revision 1.3 diff -u -r1.3 NotationPackage.java --- src/org/eclipse/gmf/runtime/notation/NotationPackage.java 11 Jan 2006 17:01:22 -0000 1.3 +++ src/org/eclipse/gmf/runtime/notation/NotationPackage.java 24 Jan 2006 21:15:15 -0000 @@ -1205,13 +1205,22 @@ int DIAGRAM__NAME = VIEW_FEATURE_COUNT + 0; /** + * The feature id for the 'Measurement Unit' attribute. + * + * + * @generated + * @ordered + */ + int DIAGRAM__MEASUREMENT_UNIT = VIEW_FEATURE_COUNT + 1; + + /** * The feature id for the 'Persisted Edges' containment reference list. * * * @generated * @ordered */ - int DIAGRAM__PERSISTED_EDGES = VIEW_FEATURE_COUNT + 1; + int DIAGRAM__PERSISTED_EDGES = VIEW_FEATURE_COUNT + 2; /** * The feature id for the 'Transient Edges' containment reference list. @@ -1220,7 +1229,7 @@ * @generated * @ordered */ - int DIAGRAM__TRANSIENT_EDGES = VIEW_FEATURE_COUNT + 2; + int DIAGRAM__TRANSIENT_EDGES = VIEW_FEATURE_COUNT + 3; /** * The number of structural features of the the 'Diagram' class. @@ -1229,7 +1238,7 @@ * @generated * @ordered */ - int DIAGRAM_FEATURE_COUNT = VIEW_FEATURE_COUNT + 3; + int DIAGRAM_FEATURE_COUNT = VIEW_FEATURE_COUNT + 4; /** * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.impl.ImageImpl Image}' class. @@ -1991,6 +2000,16 @@ int SORTING_DIRECTION = 41; /** + * The meta object id for the '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit Measurement Unit}' enum. + * + * + * @see org.eclipse.gmf.runtime.notation.MeasurementUnit + * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getMeasurementUnit() + * @generated + */ + int MEASUREMENT_UNIT = 42; + + /** * The meta object id for the 'Relative Bendpoint List' data type. * * @@ -1998,7 +2017,7 @@ * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getRelativeBendpointList() * @generated */ - int RELATIVE_BENDPOINT_LIST = 42; + int RELATIVE_BENDPOINT_LIST = 43; /** * The meta object id for the 'Filter Key List' data type. @@ -2008,7 +2027,7 @@ * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getFilterKeyList() * @generated */ - int FILTER_KEY_LIST = 43; + int FILTER_KEY_LIST = 44; /** * The meta object id for the 'Sort Key Map' data type. @@ -2018,7 +2037,7 @@ * @see org.eclipse.gmf.runtime.notation.impl.NotationPackageImpl#getSortKeyMap() * @generated */ - int SORT_KEY_MAP = 44; + int SORT_KEY_MAP = 45; /** @@ -2727,6 +2746,17 @@ EAttribute getDiagram_Name(); /** + * Returns the meta object for the attribute '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit Measurement Unit}'. + * + * + * @return the meta object for the attribute 'Measurement Unit'. + * @see org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit() + * @see #getDiagram() + * @generated + */ + EAttribute getDiagram_MeasurementUnit(); + + /** * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.runtime.notation.Diagram#getPersistedEdges Persisted Edges}'. * * @@ -3182,6 +3212,16 @@ EEnum getSortingDirection(); /** + * Returns the meta object for enum '{@link org.eclipse.gmf.runtime.notation.MeasurementUnit Measurement Unit}'. + * + * + * @return the meta object for enum 'Measurement Unit'. + * @see org.eclipse.gmf.runtime.notation.MeasurementUnit + * @generated + */ + EEnum getMeasurementUnit(); + + /** * Returns the meta object for data type '{@link java.util.List Relative Bendpoint List}'. * * Index: src/org/eclipse/gmf/runtime/notation/GuideStyle.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/GuideStyle.java,v retrieving revision 1.3 diff -u -r1.3 GuideStyle.java --- src/org/eclipse/gmf/runtime/notation/GuideStyle.java 11 Jan 2006 17:01:22 -0000 1.3 +++ src/org/eclipse/gmf/runtime/notation/GuideStyle.java 24 Jan 2006 21:15:14 -0000 @@ -47,7 +47,7 @@ * * @return the value of the 'Horizontal Guides' containment reference list. * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuideStyle_HorizontalGuides() - * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true" resolveProxies="false" + * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true" * @generated */ EList getHorizontalGuides(); @@ -62,7 +62,7 @@ * * @return the value of the 'Vertical Guides' containment reference list. * @see org.eclipse.gmf.runtime.notation.NotationPackage#getGuideStyle_VerticalGuides() - * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true" resolveProxies="false" + * @model type="org.eclipse.gmf.runtime.notation.Guide" containment="true" * @generated */ EList getVerticalGuides(); Index: src/org/eclipse/gmf/runtime/notation/Diagram.java =================================================================== RCS file: /home/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.notation/src/org/eclipse/gmf/runtime/notation/Diagram.java,v retrieving revision 1.2 diff -u -r1.2 Diagram.java --- src/org/eclipse/gmf/runtime/notation/Diagram.java 12 Sep 2005 21:29:42 -0000 1.2 +++ src/org/eclipse/gmf/runtime/notation/Diagram.java 24 Jan 2006 21:15:14 -0000 @@ -63,6 +63,36 @@ void setName(String value); /** + * Returns the value of the 'Measurement Unit' attribute. + * The default value is "Himetric". + * The literals are from the enumeration {@link org.eclipse.gmf.runtime.notation.MeasurementUnit}. + * + *

+ * If the meaning of the 'Measurement Unit' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Measurement Unit' attribute. + * @see org.eclipse.gmf.runtime.notation.MeasurementUnit + * @see #setMeasurementUnit(MeasurementUnit) + * @see org.eclipse.gmf.runtime.notation.NotationPackage#getDiagram_MeasurementUnit() + * @model default="Himetric" + * @generated + */ + MeasurementUnit getMeasurementUnit(); + + /** + * Sets the value of the '{@link org.eclipse.gmf.runtime.notation.Diagram#getMeasurementUnit Measurement Unit}' attribute. + * + * + * @param value the new value of the 'Measurement Unit' attribute. + * @see org.eclipse.gmf.runtime.notation.MeasurementUnit + * @see #getMeasurementUnit() + * @generated + */ + void setMeasurementUnit(MeasurementUnit value); + + /** * Returns the value of the 'Edges' list. * The list contents are of type {@link org.eclipse.gmf.runtime.notation.Edge}. * Index: src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java =================================================================== RCS file: src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java diff -N src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/gmf/runtime/notation/MeasurementUnit.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,135 @@ +/** + * + * + * + * $Id$ + */ +package org.eclipse.gmf.runtime.notation; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.eclipse.emf.common.util.AbstractEnumerator; + +/** + * + * A representation of the literals of the enumeration 'Measurement Unit', + * and utility methods for working with them. + * + * @see org.eclipse.gmf.runtime.notation.NotationPackage#getMeasurementUnit() + * @model + * @generated + */ +public final class MeasurementUnit extends AbstractEnumerator { + /** + * The 'Himetric' literal value. + * + *

+ * If the meaning of 'Himetric' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #HIMETRIC_LITERAL + * @model name="Himetric" + * @generated + * @ordered + */ + public static final int HIMETRIC = 0; + + /** + * The 'Pixel' literal value. + * + *

+ * If the meaning of 'Pixel' literal object isn't clear, + * there really should be more of a description here... + *

+ * + * @see #PIXEL_LITERAL + * @model name="Pixel" + * @generated + * @ordered + */ + public static final int PIXEL = 1; + + /** + * The 'Himetric' literal object. + * + * + * @see #HIMETRIC + * @generated + * @ordered + */ + public static final MeasurementUnit HIMETRIC_LITERAL = new MeasurementUnit(HIMETRIC, "Himetric"); //$NON-NLS-1$ + + /** + * The 'Pixel' literal object. + * + * + * @see #PIXEL + * @generated + * @ordered + */ + public static final MeasurementUnit PIXEL_LITERAL = new MeasurementUnit(PIXEL, "Pixel"); //$NON-NLS-1$ + + /** + * An array of all the 'Measurement Unit' enumerators. + * + * + * @generated + */ + private static final MeasurementUnit[] VALUES_ARRAY = + new MeasurementUnit[] { + HIMETRIC_LITERAL, + PIXEL_LITERAL, + }; + + /** + * A public read-only list of all the 'Measurement Unit' enumerators. + * + * + * @generated + */ + public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + + /** + * Returns the 'Measurement Unit' literal with the specified name. + * + * + * @generated + */ + public static MeasurementUnit get(String name) { + for (int i = 0; i < VALUES_ARRAY.length; ++i) { + MeasurementUnit result = VALUES_ARRAY[i]; + if (result.toString().equals(name)) { + return result; + } + } + return null; + } + + /** + * Returns the 'Measurement Unit' literal with the specified value. + * + * + * @generated + */ + public static MeasurementUnit get(int value) { + switch (value) { + case HIMETRIC: return HIMETRIC_LITERAL; + case PIXEL: return PIXEL_LITERAL; + } + return null; + } + + /** + * Only this class can construct instances. + * + * + * @generated + */ + private MeasurementUnit(int value, String name) { + super(value, name); + } + +} //MeasurementUnit