Attachment 127348 Details for Bug 264587 – proposed patch for 2.2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch for 2.2

Bug_264587 (text/plain), 60.41 KB, created by Alex Boyko

on 2009-03-03 12:50:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2009-03-03 12:50:13 EST

Size: 60.41 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.diagram.ui
>Index: .settings/.api_filters
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/.settings/.api_filters,v
>retrieving revision 1.4
>diff -u -r1.4 .api_filters
>--- .settings/.api_filters	23 Jan 2009 16:09:53 -0000	1.4
>+++ .settings/.api_filters	3 Mar 2009 17:45:28 -0000
>@@ -1,55 +1,56 @@
>-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
>-<component id="org.eclipse.gmf.runtime.diagram.ui" version="2">
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GraphicalNodeEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy$PromptAndCreateConnectionCommand">
>-        <filter id="337682486">
>+<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.gmf.runtime.diagram.ui" version="2">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java" type="org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy.PromptAndCreateConnectionCommand"/>
>+                <message_argument value="SuppressibleUIRequest"/>
>+                <message_argument value="CreateConnectionViewAndElementRequest"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy">
>-        <filter id="576720909">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="ConnectionBendpointEditPolicy"/>
>-                <message_argument value="ConnectionBendpointEditPolicy"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest"/>
>             </message_arguments>
>         </filter>
>-        <filter id="643850349">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart">
>+        <filter id="404791350">
>             <message_arguments>
>-                <message_argument value="LineMode"/>
>-                <message_argument value="ConnectionBendpointEditPolicy"/>
>-                <message_argument value="ConnectionBendpointEditPolicy(LineMode)"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="338849923">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IGraphicalEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
>-        <filter id="576720909">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="IEditableEditPart"/>
>-                <message_argument value="IGraphicalEditPart"/>
>+                <message_argument value="IExpandableFigure"/>
>+                <message_argument value="BorderedNodeFigure"/>
>             </message_arguments>
>         </filter>
>-        <filter id="404791350">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>     <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/AbstractEditPartProvider.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider">
>-        <filter id="576725006">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="Properties"/>
>-                <message_argument value="AbstractEditPartProvider"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider"/>
>             </message_arguments>
>         </filter>
>-        <filter id="337682486">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.AbstractEditPartProvider"/>
>+                <message_argument value="Properties"/>
>+                <message_argument value="AbstractEditPartProvider"/>
>             </message_arguments>
>         </filter>
>         <filter id="576725006">
>@@ -59,23 +60,25 @@
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart">
>-        <filter id="643842064">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="PageBreakEditPart"/>
>-                <message_argument value="DiagramRootEditPart"/>
>-                <message_argument value="getPageBreakEditPart()"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand"/>
>             </message_arguments>
>         </filter>
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart">
>         <filter id="576725006">
>             <message_arguments>
>                 <message_argument value="ZoomableEditPart"/>
>                 <message_argument value="DiagramRootEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="337682486">
>+        <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart"/>
>+                <message_argument value="DiagramRuler"/>
>+                <message_argument value="DiagramRootEditPart"/>
>+                <message_argument value="getVerticalRuler()"/>
>             </message_arguments>
>         </filter>
>         <filter id="643842064">
>@@ -85,20 +88,20 @@
>                 <message_argument value="getHorizontalRuler()"/>
>             </message_arguments>
>         </filter>
>+        <filter id="337682486">
>+            <message_arguments>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart"/>
>+            </message_arguments>
>+        </filter>
>         <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="DiagramRuler"/>
>+                <message_argument value="PageBreakEditPart"/>
>                 <message_argument value="DiagramRootEditPart"/>
>-                <message_argument value="getVerticalRuler()"/>
>+                <message_argument value="getPageBreakEditPart()"/>
>             </message_arguments>
>         </filter>
>     </resource>
>     <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramRootEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart$DiagramScalableFreeformLayeredPane">
>-        <filter id="337682486">
>-            <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart.DiagramScalableFreeformLayeredPane"/>
>-            </message_arguments>
>-        </filter>
>         <filter id="576720909">
>             <message_arguments>
>                 <message_argument value="ScalableFreeformLayeredPane"/>
>@@ -110,222 +113,207 @@
>                 <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart.DiagramScalableFreeformLayeredPane"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart">
>-        <filter id="404791350">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart.DiagramScalableFreeformLayeredPane"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation">
>-        <filter id="576720909">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="EditPartOperation"/>
>-                <message_argument value="CreateRootEditPartOperation"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="338849923">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderedShapeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java" type="org.eclipse.gmf.runtime.diagram.ui.handles.CompartmentCollapseHandle">
>-        <filter id="627060751">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ConnectionBendpointEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="CollapseFigure"/>
>-                <message_argument value="CompartmentCollapseHandle"/>
>-                <message_argument value="collapseFigure"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConnectionBendpointEditPolicy"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ResizableCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart">
>-        <filter id="337682486">
>+        <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart"/>
>+                <message_argument value="ConnectionBendpointEditPolicy"/>
>+                <message_argument value="ConnectionBendpointEditPolicy"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart">
>-        <filter id="337682486">
>+        <filter id="643850349">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart"/>
>+                <message_argument value="LineMode"/>
>+                <message_argument value="ConnectionBendpointEditPolicy"/>
>+                <message_argument value="ConnectionBendpointEditPolicy(LineMode)"/>
>             </message_arguments>
>         </filter>
>-        <filter id="576725006">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/LabelEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="IContainedEditPart"/>
>-                <message_argument value="ConnectionEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation">
>         <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="GraphicalEditPolicyEx"/>
>-                <message_argument value="DecorationEditPolicy"/>
>+                <message_argument value="EditPartOperation"/>
>+                <message_argument value="CreateGraphicEditPartOperation"/>
>             </message_arguments>
>         </filter>
>         <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IResizableCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart">
>-        <filter id="404791350">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/NestableListItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.NestableListItemEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.NestableListItemEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy">
>-        <filter id="643846161">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="ChangeBoundsDeferredRequest"/>
>-                <message_argument value="ResizableShapeEditPolicy"/>
>-                <message_argument value="getMoveDeferredCommand(ChangeBoundsDeferredRequest)"/>
>+                <message_argument value="ISurfaceEditPart"/>
>+                <message_argument value="DiagramEditPart"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderedShapeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart"/>
>-            </message_arguments>
>-        </filter>
>-        <filter id="576725006">
>-            <message_arguments>
>-                <message_argument value="IContainedEditPart"/>
>-                <message_argument value="CompartmentEditPart"/>
>-            </message_arguments>
>-        </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure">
>-        <filter id="643842064">
>-            <message_arguments>
>-                <message_argument value="AnimatableScrollPane"/>
>-                <message_argument value="ShapeCompartmentFigure"/>
>-                <message_argument value="createScrollpane(IMapMode)"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$EndLabelProvider">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand$LabelProvider">
>         <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.EndLabelProvider"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand.LabelProvider"/>
>             </message_arguments>
>         </filter>
>         <filter id="576720909">
>             <message_arguments>
>                 <message_argument value="ElementTypeLabelProvider"/>
>-                <message_argument value="EndLabelProvider"/>
>+                <message_argument value="LabelProvider"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionAndEndLabelProvider">
>-        <filter id="338849923">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.ConnectionAndEndLabelProvider"/>
>+                <message_argument value="IContainedEditPart"/>
>+                <message_argument value="TopGraphicEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="576720909">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="ElementTypeLabelProvider"/>
>-                <message_argument value="ConnectionAndEndLabelProvider"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeNodeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionLabelProvider">
>-        <filter id="338849923">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/NoteEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.ConnectionLabelProvider"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="576720909">
>+    </resource>
>+    <resource path="META-INF/MANIFEST.MF">
>+        <filter id="924844039">
>             <message_arguments>
>-                <message_argument value="ElementTypeLabelProvider"/>
>-                <message_argument value="ConnectionLabelProvider"/>
>+                <message_argument value="1.2.0.qualifier"/>
>+                <message_argument value="1.2.0.v20081119-1650"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/CompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand">
>-        <filter id="338849923">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand"/>
>+                <message_argument value="IContainedEditPart"/>
>+                <message_argument value="CompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateRootEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation">
>         <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="ClipboardCommand"/>
>-                <message_argument value="PasteCommand"/>
>+                <message_argument value="EditPartOperation"/>
>+                <message_argument value="CreateRootEditPartOperation"/>
>             </message_arguments>
>         </filter>
>-        <filter id="337682486">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateRootEditPartOperation"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionNodeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java" type="org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/requests/CreateConnectionViewAndElementRequest.java" type="org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest">
>-        <filter id="337682486">
>+        <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest"/>
>+                <message_argument value="PropertyChangeAction"/>
>+                <message_argument value="CheckedPropertyAction"/>
>             </message_arguments>
>         </filter>
>-        <filter id="576725006">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/SemanticCreateCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="SuppressibleUIRequest"/>
>-                <message_argument value="CreateConnectionViewAndElementRequest"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure">
>+        <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure"/>
>+                <message_argument value="AnimatableScrollPane"/>
>+                <message_argument value="ResizableCompartmentFigure"/>
>+                <message_argument value="createScrollpane()"/>
>             </message_arguments>
>         </filter>
>-        <filter id="576725006">
>+        <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="IExpandableFigure"/>
>-                <message_argument value="BorderedNodeFigure"/>
>+                <message_argument value="AnimatableScrollPane"/>
>+                <message_argument value="ResizableCompartmentFigure"/>
>+                <message_argument value="createScrollpane(IMapMode)"/>
>             </message_arguments>
>         </filter>
>     </resource>
>@@ -336,105 +324,94 @@
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/NestableListItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.NestableListItemEditPart">
>-        <filter id="337682486">
>-            <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.NestableListItemEditPart"/>
>-            </message_arguments>
>-        </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/DiagramEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
>-        <filter id="576725006">
>-            <message_arguments>
>-                <message_argument value="ISurfaceEditPart"/>
>-                <message_argument value="DiagramEditPart"/>
>-            </message_arguments>
>-        </filter>
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PasteCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/SetBoundsCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PasteCommand"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/actions/CheckedPropertyAction.java" type="org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction">
>         <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="PropertyChangeAction"/>
>-                <message_argument value="CheckedPropertyAction"/>
>+                <message_argument value="ClipboardCommand"/>
>+                <message_argument value="PasteCommand"/>
>             </message_arguments>
>         </filter>
>-        <filter id="338849923">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/ResizableShapeEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy">
>+        <filter id="643846161">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.actions.CheckedPropertyAction"/>
>+                <message_argument value="ChangeBoundsDeferredRequest"/>
>+                <message_argument value="ResizableShapeEditPolicy"/>
>+                <message_argument value="getMoveDeferredCommand(ChangeBoundsDeferredRequest)"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand$LabelProvider">
>-        <filter id="576720909">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/AbstractBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="ElementTypeLabelProvider"/>
>-                <message_argument value="LabelProvider"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart"/>
>             </message_arguments>
>         </filter>
>-        <filter id="338849923">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/handles/CompartmentCollapseHandle.java" type="org.eclipse.gmf.runtime.diagram.ui.handles.CompartmentCollapseHandle">
>+        <filter id="627060751">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand.LabelProvider"/>
>+                <message_argument value="CollapseFigure"/>
>+                <message_argument value="CompartmentCollapseHandle"/>
>+                <message_argument value="collapseFigure"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateOrSelectElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateOrSelectElementCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/BorderedBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/LabelEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart">
>-        <filter id="337682486">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart"/>
>+                <message_argument value="ISurfaceEditPart"/>
>+                <message_argument value="ShapeCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/SemanticListCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewAndElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewAndElementCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewAndElementCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionNodeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ListItemEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/SemanticCreateCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IResizableCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart">
>+        <filter id="404791350">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.SemanticCreateCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IResizableCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CreateCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/GraphicalNodeEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy$PromptAndCreateConnectionCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy.PromptAndCreateConnectionCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>@@ -445,120 +422,110 @@
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService">
>+        <filter id="576725006">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewCommand"/>
>+                <message_argument value="IEditPartProvider"/>
>+                <message_argument value="EditPartService"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/TopGraphicEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.TopGraphicEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService"/>
>             </message_arguments>
>         </filter>
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ConnectionEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart">
>         <filter id="576725006">
>             <message_arguments>
>                 <message_argument value="IContainedEditPart"/>
>-                <message_argument value="TopGraphicEditPart"/>
>+                <message_argument value="ConnectionEditPart"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandProxy.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/TextCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/SemanticListCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.TextCompartmentEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.SemanticListCompartmentEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart">
>-        <filter id="576725006">
>-            <message_arguments>
>-                <message_argument value="ISurfaceEditPart"/>
>-                <message_argument value="ShapeCompartmentEditPart"/>
>-            </message_arguments>
>-        </filter>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/internal/commands/ClipboardCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.internal.commands.ClipboardCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredCreateConnectionViewAndElementCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewAndElementCommand">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredCreateConnectionViewAndElementCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java" type="org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator">
>-        <filter id="643842064">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionLabelProvider">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="Decoration"/>
>-                <message_argument value="AbstractDecorator"/>
>-                <message_argument value="getDecoration()"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.ConnectionLabelProvider"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ShapeNodeEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart">
>-        <filter id="337682486">
>+        <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart"/>
>+                <message_argument value="ElementTypeLabelProvider"/>
>+                <message_argument value="ConnectionLabelProvider"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredLayoutCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$EndLabelProvider">
>+        <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand"/>
>+                <message_argument value="ElementTypeLabelProvider"/>
>+                <message_argument value="EndLabelProvider"/>
>             </message_arguments>
>         </filter>
>-    </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PopupMenuCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand">
>-        <filter id="337682486">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.EndLabelProvider"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/CreateGraphicEditPartOperation.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PromptForConnectionAndEndCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand$ConnectionAndEndLabelProvider">
>         <filter id="576720909">
>             <message_arguments>
>-                <message_argument value="EditPartOperation"/>
>-                <message_argument value="CreateGraphicEditPartOperation"/>
>+                <message_argument value="ElementTypeLabelProvider"/>
>+                <message_argument value="ConnectionAndEndLabelProvider"/>
>             </message_arguments>
>         </filter>
>         <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PromptForConnectionAndEndCommand.ConnectionAndEndLabelProvider"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/GraphicalEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/SetBoundsCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java" type="org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService">
>-        <filter id="576725006">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/CommandProxy.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="IEditPartProvider"/>
>-                <message_argument value="EditPartService"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy"/>
>             </message_arguments>
>         </filter>
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/OpenDiagramCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.OpenDiagramCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.OpenDiagramCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>@@ -569,49 +536,69 @@
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/OpenDiagramCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.OpenDiagramCommand">
>-        <filter id="337682486">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ShapeCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ShapeCompartmentFigure">
>+        <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.OpenDiagramCommand"/>
>+                <message_argument value="AnimatableScrollPane"/>
>+                <message_argument value="ShapeCompartmentFigure"/>
>+                <message_argument value="createScrollpane(IMapMode)"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="META-INF/MANIFEST.MF">
>-        <filter id="924844039">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editpolicies/DecorationEditPolicy.java" type="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy">
>+        <filter id="338849923">
>             <message_arguments>
>-                <message_argument value="1.2.0.qualifier"/>
>-                <message_argument value="1.2.0.v20081119-1650"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editpolicies.DecorationEditPolicy"/>
>+            </message_arguments>
>+        </filter>
>+        <filter id="576720909">
>+            <message_arguments>
>+                <message_argument value="GraphicalEditPolicyEx"/>
>+                <message_argument value="DecorationEditPolicy"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/ListCompartmentEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/DeferredLayoutCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/NoteEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/IGraphicalEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
>+        <filter id="576720909">
>+            <message_arguments>
>+                <message_argument value="IEditableEditPart"/>
>+                <message_argument value="IGraphicalEditPart"/>
>+            </message_arguments>
>+        </filter>
>+        <filter id="404791350">
>+            <message_arguments>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart"/>
>+            </message_arguments>
>+        </filter>
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/editparts/BorderedBorderItemEditPart.java" type="org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart">
>         <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.NoteEditPart"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/figures/ResizableCompartmentFigure.java" type="org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure">
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/services/decorator/AbstractDecorator.java" type="org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator">
>         <filter id="643842064">
>             <message_arguments>
>-                <message_argument value="AnimatableScrollPane"/>
>-                <message_argument value="ResizableCompartmentFigure"/>
>-                <message_argument value="createScrollpane()"/>
>+                <message_argument value="Decoration"/>
>+                <message_argument value="AbstractDecorator"/>
>+                <message_argument value="getDecoration()"/>
>             </message_arguments>
>         </filter>
>-        <filter id="643842064">
>+    </resource>
>+    <resource path="src/org/eclipse/gmf/runtime/diagram/ui/commands/PopupMenuCommand.java" type="org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand">
>+        <filter id="337682486">
>             <message_arguments>
>-                <message_argument value="AnimatableScrollPane"/>
>-                <message_argument value="ResizableCompartmentFigure"/>
>-                <message_argument value="createScrollpane(IMapMode)"/>
>+                <message_argument value="org.eclipse.gmf.runtime.diagram.ui.commands.PopupMenuCommand"/>
>             </message_arguments>
>         </filter>
>     </resource>
>-</component>
>+</component>
>\ No newline at end of file
>Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java,v
>retrieving revision 1.8
>diff -u -r1.8 BorderItemContainerFigure.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java	23 Jul 2008 20:51:02 -0000	1.8
>+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java	3 Mar 2009 17:45:28 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2003, 2008 IBM Corporation and others.
>+ * Copyright (c) 2003, 2009 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
>@@ -11,15 +11,17 @@
> 
> package org.eclipse.gmf.runtime.diagram.ui.internal.figures;
> 
>-import java.util.Iterator;
>+import java.util.List;
> import java.util.ListIterator;
> 
>-import org.eclipse.draw2d.Figure;
>+import org.eclipse.core.runtime.Assert;
> import org.eclipse.draw2d.FigureListener;
> import org.eclipse.draw2d.Graphics;
>+import org.eclipse.draw2d.GraphicsSource;
> import org.eclipse.draw2d.IFigure;
> import org.eclipse.draw2d.ScalableFreeformLayeredPane;
> import org.eclipse.draw2d.TreeSearch;
>+import org.eclipse.draw2d.UpdateManager;
> import org.eclipse.draw2d.Viewport;
> import org.eclipse.draw2d.geometry.Point;
> import org.eclipse.draw2d.geometry.Rectangle;
>@@ -313,11 +315,7 @@
> 	}
> 
> 	public void erase() {
>-		if (getChildren().isEmpty()) {
>-			super.erase();
>-		} else {
>-			if (getParent() == null || !isVisible())
>-				return;
>+		if (getParent() != null && isVisible()) {
> 			repaint();
> 		}
> 	}
>@@ -326,17 +324,7 @@
> 	 * Refresh adornments
> 	 */
> 	public void repaint() {
>-		if (getChildren().isEmpty()) {
>-			super.repaint();
>-		} else {
>-			if (getParent() == null || !isVisible())
>-				return;
>-			Rectangle rectBounds = getExtendedBounds();
>-			getParent().getParent().repaint(rectBounds);
>-			if (getViewport() != null) {
>-				getViewport().repaint(rectBounds);
>-			}
>-		}
>+		repaint(getExtendedBounds());
> 	}
>     
>     public void invalidate() {
>@@ -350,6 +338,15 @@
>         super.validate();
>     }
>     
>+	@Override
>+	public UpdateManager getUpdateManager() {
>+		UpdateManager updateManager = super.getUpdateManager();
>+		if (updateManager != null && getParent() != null) {
>+			updateManager = new BorderedItemContainerUpdateManagerWrapper(updateManager, getParent());
>+		}
>+		return updateManager;
>+	}
>+
>     /**
>      * Gets the extended bounds of the figure which includes the bounds of all
>      * the border item figures.
>@@ -359,9 +356,7 @@
>     public Rectangle getExtendedBounds() {
>         if (extendedBounds == null) {
>             extendedBounds = getParent().getBounds().getCopy();
>-            Iterator iterator = getChildren().iterator();
>-            while (iterator.hasNext()) {
>-                Figure childFigure = (Figure) iterator.next();
>+            for (IFigure childFigure : (List<IFigure>) getChildren()) {
>                 Rectangle childBounds = (childFigure instanceof IExpandableFigure) ? ((IExpandableFigure) childFigure)
>                     .getExtendedBounds()
>                     : childFigure.getBounds(); 
>@@ -430,4 +425,69 @@
>     	
>     }
>     
>+    private class BorderedItemContainerUpdateManagerWrapper extends UpdateManager {
>+    	
>+    	private UpdateManager updateManager;
>+    	private IFigure borderedNode;
>+    	
>+    	public BorderedItemContainerUpdateManagerWrapper(UpdateManager updateManager, IFigure fig) {
>+    		Assert.isNotNull(fig);
>+    		Assert.isNotNull(updateManager);
>+    		this.updateManager = updateManager;
>+    		this.borderedNode = fig;
>+    	}
>+
>+		@Override
>+		public void setGraphicsSource(GraphicsSource gs) {
>+			updateManager.setGraphicsSource(gs);
>+		}
>+
>+		@Override
>+		public synchronized void addDirtyRegion(IFigure figure, int x, int y,
>+				int w, int h) {
>+			Rectangle r = new Rectangle(x, y, w, h);
>+			IFigure walker = figure.getParent();
>+			for (; walker != null && walker != borderedNode.getParent(); walker = walker.getParent()) {
>+				walker.translateToParent(r);
>+			}
>+			if (walker != null) {
>+				walker.translateToParent(r);
>+			} else {
>+				walker = borderedNode;
>+			}
>+			updateManager.addDirtyRegion(walker, r.x, r.y, r.width, r.height);
>+		}
>+
>+		@Override
>+		public synchronized void addInvalidFigure(IFigure f) {
>+			updateManager.addInvalidFigure(f);
>+		}
>+
>+		@Override
>+		public synchronized void performUpdate() {
>+			updateManager.performUpdate();
>+		}
>+
>+		@Override
>+		public synchronized void performUpdate(Rectangle exposed) {
>+			updateManager.performUpdate(exposed);
>+		}
>+
>+		@Override
>+		public void performValidation() {
>+			updateManager.performValidation();
>+		}
>+
>+		@Override
>+		public synchronized void runWithUpdate(Runnable runnable) {
>+			updateManager.runWithUpdate(runnable);
>+		}
>+
>+		@Override
>+		public void setRoot(IFigure figure) {
>+			updateManager.setRoot(figure);
>+		}
>+
>+    }
>+
> }

Actions: View | Diff

Attachments on bug 264587: 127348 | 127665