Updating with latest templates.

21 files changed, 92 insertions, 52 deletions

diff --git a/plugins/org.eclipse.gmf.graphdef.editor/models/graphdef.gmfgen b/plugins/org.eclipse.gmf.graphdef.editor/models/graphdef.gmfgen
index aed657421..39d993c76 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/models/graphdef.gmfgen
+++ b/plugins/org.eclipse.gmf.graphdef.editor/models/graphdef.gmfgen
@@ -326,7 +326,8 @@
           visualID="5001"
           editPartClassName="Compartment_nameEditPart"
           itemSemanticEditPolicyClassName="Compartment_nameItemSemanticEditPolicy"
-          notationViewFactoryClassName="Compartment_nameViewFactory">
+          notationViewFactoryClassName="Compartment_nameViewFactory"
+          elementIcon="true">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
@@ -371,7 +372,8 @@
           visualID="5002"
           editPartClassName="Node_nameEditPart"
           itemSemanticEditPolicyClassName="Node_nameItemSemanticEditPolicy"
-          notationViewFactoryClassName="Node_nameViewFactory">
+          notationViewFactoryClassName="Node_nameViewFactory"
+          elementIcon="true">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
@@ -416,7 +418,8 @@
           visualID="5003"
           editPartClassName="Connection_nameEditPart"
           itemSemanticEditPolicyClassName="Connection_nameItemSemanticEditPolicy"
-          notationViewFactoryClassName="Connection_nameViewFactory">
+          notationViewFactoryClassName="Connection_nameViewFactory"
+          elementIcon="true">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
@@ -461,7 +464,8 @@
           visualID="5004"
           editPartClassName="FigureGallery_nameEditPart"
           itemSemanticEditPolicyClassName="FigureGallery_nameItemSemanticEditPolicy"
-          notationViewFactoryClassName="FigureGallery_nameViewFactory">
+          notationViewFactoryClassName="FigureGallery_nameViewFactory"
+          elementIcon="true">
         <diagramRunTimeClass
             href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <viewmap
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/plugin.xml b/plugins/org.eclipse.gmf.graphdef.editor/plugin.xml
index 6dffc8bb0..d7c93d4f9 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/plugin.xml
+++ b/plugins/org.eclipse.gmf.graphdef.editor/plugin.xml
@@ -272,7 +272,7 @@
                id="org.eclipse.gmf.graphdef.editor.Canvas_1000"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Canvas"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Canvas_1000EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.CanvasDiagramEditHelper">
             <param name="semanticHint" value="1000"/>
          </metamodelType>
       </metamodel>
@@ -282,7 +282,7 @@
                id="org.eclipse.gmf.graphdef.editor.Rectangle_3001"
                name="Rectangle"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.Rectangle_3001EditHelperAdvice">
+               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.RectangleChildNodeEditHelperAdvice">
             <specializes id="org.eclipse.gmf.graphdef.editor.Rectangle_3002"/>
             <param name="semanticHint" value="3001"/>
          </specializationType>
@@ -294,7 +294,7 @@
                name="Rectangle"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Rectangle"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Rectangle_3002EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.RectangleChildNodeEditHelper">
             <param name="semanticHint" value="3002"/>
          </metamodelType>
       </metamodel>
@@ -305,7 +305,7 @@
                name="Ellipse"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Ellipse"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Ellipse_3003EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.EllipseChildNodeEditHelper">
             <param name="semanticHint" value="3003"/>
          </metamodelType>
       </metamodel>
@@ -316,7 +316,7 @@
                name="Rounded Rectangle"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="RoundedRectangle"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.RoundedRectangle_3004EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.RoundedRectangleChildNodeEditHelper">
             <param name="semanticHint" value="3004"/>
          </metamodelType>
       </metamodel>
@@ -327,7 +327,7 @@
                name="Polyline"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Polyline"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Polyline_3005EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.PolylineChildNodeEditHelper">
             <param name="semanticHint" value="3005"/>
          </metamodelType>
       </metamodel>
@@ -337,7 +337,7 @@
                id="org.eclipse.gmf.graphdef.editor.Ellipse_3006"
                name="Ellipse"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.Ellipse_3006EditHelperAdvice">
+               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.EllipseChildNodeEditHelperAdvice">
             <specializes id="org.eclipse.gmf.graphdef.editor.Ellipse_3003"/>
             <param name="semanticHint" value="3006"/>
          </specializationType>
@@ -348,7 +348,7 @@
                id="org.eclipse.gmf.graphdef.editor.RoundedRectangle_3007"
                name="Rounded Rectangle"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.RoundedRectangle_3007EditHelperAdvice">
+               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.RoundedRectangleChildNodeEditHelperAdvice">
             <specializes id="org.eclipse.gmf.graphdef.editor.RoundedRectangle_3004"/>
             <param name="semanticHint" value="3007"/>
          </specializationType>
@@ -359,7 +359,7 @@
                id="org.eclipse.gmf.graphdef.editor.Polyline_3008"
                name="Polyline"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.Polyline_3008EditHelperAdvice">
+               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.PolylineChildNodeEditHelperAdvice">
             <specializes id="org.eclipse.gmf.graphdef.editor.Polyline_3005"/>
             <param name="semanticHint" value="3008"/>
          </specializationType>
@@ -371,7 +371,7 @@
                name="Compartment"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Compartment"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Compartment_2001EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.CompartmentNodeEditHelper">
             <param name="semanticHint" value="2001"/>
          </metamodelType>
       </metamodel>
@@ -382,7 +382,7 @@
                name="Node"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Node"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Node_2002EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.NodeNodeEditHelper">
             <param name="semanticHint" value="2002"/>
          </metamodelType>
       </metamodel>
@@ -393,7 +393,7 @@
                name="Connection"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Connection"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.Connection_2003EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.ConnectionNodeEditHelper">
             <param name="semanticHint" value="2003"/>
          </metamodelType>
       </metamodel>
@@ -404,7 +404,7 @@
                name="FigureGallery"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="FigureGallery"
-               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.FigureGallery_2004EditHelper">
+               edithelper="org.eclipse.gmf.graphdef.editor.edit.helpers.FigureGalleryNodeEditHelper">
             <param name="semanticHint" value="2004"/>
          </metamodelType>
       </metamodel>
@@ -414,7 +414,7 @@
                id="org.eclipse.gmf.graphdef.editor.DiagramElementFigure_4001"
                name="Figure Link"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.DiagramElementFigure_4001EditHelperAdvice">
+               edithelperadvice="org.eclipse.gmf.graphdef.editor.edit.helpers.DiagramElementFigureLinkEditHelperAdvice">
             <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
             <param name="semanticHint" value="4001"/>
          </specializationType>
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Polyline_3005EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/CanvasDiagramEditHelper.java
index 30b1bf5fd..0a1521e4b 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Polyline_3005EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/CanvasDiagramEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Polyline_3005EditHelper extends GMFGraphBaseEditHelper {
+public class CanvasDiagramEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Connection_2003EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/CompartmentNodeEditHelper.java
index 7d0ab25b2..39233b302 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Connection_2003EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/CompartmentNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Connection_2003EditHelper extends GMFGraphBaseEditHelper {
+public class CompartmentNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Rectangle_3002EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/ConnectionNodeEditHelper.java
index c23ad45cc..7c0787267 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Rectangle_3002EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/ConnectionNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Rectangle_3002EditHelper extends GMFGraphBaseEditHelper {
+public class ConnectionNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangle_3007EditHelperAdvice.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/DiagramElementFigureLinkEditHelperAdvice.java
index dd3dbc624..77ce15acd 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangle_3007EditHelperAdvice.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/DiagramElementFigureLinkEditHelperAdvice.java
@@ -15,5 +15,5 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 /**
  * @generated
  */
-public class RoundedRectangle_3007EditHelperAdvice extends AbstractEditHelperAdvice {
+public class DiagramElementFigureLinkEditHelperAdvice extends AbstractEditHelperAdvice {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Compartment_2001EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/EllipseChildNodeEditHelper.java
index 7543f5a0e..f28c041f8 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Compartment_2001EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/EllipseChildNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Compartment_2001EditHelper extends GMFGraphBaseEditHelper {
+public class EllipseChildNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Ellipse_3006EditHelperAdvice.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/EllipseChildNodeEditHelperAdvice.java
index 7bd3d3c6f..970961556 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Ellipse_3006EditHelperAdvice.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/EllipseChildNodeEditHelperAdvice.java
@@ -15,5 +15,5 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 /**
  * @generated
  */
-public class Ellipse_3006EditHelperAdvice extends AbstractEditHelperAdvice {
+public class EllipseChildNodeEditHelperAdvice extends AbstractEditHelperAdvice {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Canvas_1000EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/FigureGalleryNodeEditHelper.java
index 5e351f91c..3129824d0 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Canvas_1000EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/FigureGalleryNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Canvas_1000EditHelper extends GMFGraphBaseEditHelper {
+public class FigureGalleryNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Node_2002EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/NodeNodeEditHelper.java
index 666665d80..5c8b74ab8 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Node_2002EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/NodeNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Node_2002EditHelper extends GMFGraphBaseEditHelper {
+public class NodeNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Ellipse_3003EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/PolylineChildNodeEditHelper.java
index 33ce142e8..9d4c7043c 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Ellipse_3003EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/PolylineChildNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class Ellipse_3003EditHelper extends GMFGraphBaseEditHelper {
+public class PolylineChildNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Polyline_3008EditHelperAdvice.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/PolylineChildNodeEditHelperAdvice.java
index ac1ccfebf..5515dcf5d 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Polyline_3008EditHelperAdvice.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/PolylineChildNodeEditHelperAdvice.java
@@ -15,5 +15,5 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 /**
  * @generated
  */
-public class Polyline_3008EditHelperAdvice extends AbstractEditHelperAdvice {
+public class PolylineChildNodeEditHelperAdvice extends AbstractEditHelperAdvice {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/FigureGallery_2004EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RectangleChildNodeEditHelper.java
index 46382d830..f97436cdb 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/FigureGallery_2004EditHelper.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RectangleChildNodeEditHelper.java
@@ -13,5 +13,5 @@ package org.eclipse.gmf.graphdef.editor.edit.helpers;
 /**
  * @generated
  */
-public class FigureGallery_2004EditHelper extends GMFGraphBaseEditHelper {
+public class RectangleChildNodeEditHelper extends GMFGraphBaseEditHelper {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Rectangle_3001EditHelperAdvice.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RectangleChildNodeEditHelperAdvice.java
index 337c31e90..13f5e0074 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/Rectangle_3001EditHelperAdvice.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RectangleChildNodeEditHelperAdvice.java
@@ -15,5 +15,5 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 /**
  * @generated
  */
-public class Rectangle_3001EditHelperAdvice extends AbstractEditHelperAdvice {
+public class RectangleChildNodeEditHelperAdvice extends AbstractEditHelperAdvice {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangleChildNodeEditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangleChildNodeEditHelper.java
new file mode 100644
index 000000000..bdb5de582
--- /dev/null
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangleChildNodeEditHelper.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2006 Borland Software 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:
+ *     Borland Software Corporation - initial API and implementation
+ */
+package org.eclipse.gmf.graphdef.editor.edit.helpers;
+
+/**
+ * @generated
+ */
+public class RoundedRectangleChildNodeEditHelper extends GMFGraphBaseEditHelper {
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/DiagramElementFigure_4001EditHelperAdvice.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangleChildNodeEditHelperAdvice.java
index d994abe73..9fa1cca8f 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/DiagramElementFigure_4001EditHelperAdvice.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangleChildNodeEditHelperAdvice.java
@@ -15,5 +15,5 @@ import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice
 /**
  * @generated
  */
-public class DiagramElementFigure_4001EditHelperAdvice extends AbstractEditHelperAdvice {
+public class RoundedRectangleChildNodeEditHelperAdvice extends AbstractEditHelperAdvice {
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangle_3004EditHelper.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangle_3004EditHelper.java
deleted file mode 100644
index baaa3b99b..000000000
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/helpers/RoundedRectangle_3004EditHelper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2006 Borland Software 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:
- *     Borland Software Corporation - initial API and implementation
- */
-package org.eclipse.gmf.graphdef.editor.edit.helpers;
-
-/**
- * @generated
- */
-public class RoundedRectangle_3004EditHelper extends GMFGraphBaseEditHelper {
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Compartment_nameEditPart.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Compartment_nameEditPart.java
index 58a07c9d3..3cee35b77 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Compartment_nameEditPart.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Compartment_nameEditPart.java
@@ -37,6 +37,8 @@ import org.eclipse.gef.tools.DirectEditManager;
 
 import org.eclipse.gmf.graphdef.editor.edit.policies.GMFGraphTextSelectionEditPolicy;
 
+import org.eclipse.gmf.graphdef.editor.part.GMFGraphDiagramEditorPlugin;
+
 import org.eclipse.gmf.graphdef.editor.providers.GMFGraphElementTypes;
 
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -71,6 +73,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 
 import org.eclipse.jface.viewers.ICellEditorValidator;
@@ -201,7 +205,12 @@ public class Compartment_nameEditPart extends CompartmentEditPart implements ITe
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
-		return null;
+		EObject element = resolveSemanticElement();
+		ImageDescriptor descriptor = GMFGraphDiagramEditorPlugin.getInstance().getItemImageDescriptor(element);
+		if (descriptor == null) {
+			descriptor = ImageDescriptor.getMissingImageDescriptor();
+		}
+		return descriptor.createImage();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Connection_nameEditPart.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Connection_nameEditPart.java
index 07ef31bce..02347a1ca 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Connection_nameEditPart.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Connection_nameEditPart.java
@@ -37,6 +37,8 @@ import org.eclipse.gef.tools.DirectEditManager;
 
 import org.eclipse.gmf.graphdef.editor.edit.policies.GMFGraphTextSelectionEditPolicy;
 
+import org.eclipse.gmf.graphdef.editor.part.GMFGraphDiagramEditorPlugin;
+
 import org.eclipse.gmf.graphdef.editor.providers.GMFGraphElementTypes;
 
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -71,6 +73,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 
 import org.eclipse.jface.viewers.ICellEditorValidator;
@@ -201,7 +205,12 @@ public class Connection_nameEditPart extends CompartmentEditPart implements ITex
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
-		return null;
+		EObject element = resolveSemanticElement();
+		ImageDescriptor descriptor = GMFGraphDiagramEditorPlugin.getInstance().getItemImageDescriptor(element);
+		if (descriptor == null) {
+			descriptor = ImageDescriptor.getMissingImageDescriptor();
+		}
+		return descriptor.createImage();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/FigureGallery_nameEditPart.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/FigureGallery_nameEditPart.java
index 860335b78..be74ece2a 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/FigureGallery_nameEditPart.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/FigureGallery_nameEditPart.java
@@ -37,6 +37,8 @@ import org.eclipse.gef.tools.DirectEditManager;
 
 import org.eclipse.gmf.graphdef.editor.edit.policies.GMFGraphTextSelectionEditPolicy;
 
+import org.eclipse.gmf.graphdef.editor.part.GMFGraphDiagramEditorPlugin;
+
 import org.eclipse.gmf.graphdef.editor.providers.GMFGraphElementTypes;
 
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -71,6 +73,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 
 import org.eclipse.jface.viewers.ICellEditorValidator;
@@ -201,7 +205,12 @@ public class FigureGallery_nameEditPart extends CompartmentEditPart implements I
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
-		return null;
+		EObject element = resolveSemanticElement();
+		ImageDescriptor descriptor = GMFGraphDiagramEditorPlugin.getInstance().getItemImageDescriptor(element);
+		if (descriptor == null) {
+			descriptor = ImageDescriptor.getMissingImageDescriptor();
+		}
+		return descriptor.createImage();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Node_nameEditPart.java b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Node_nameEditPart.java
index cb0358790..1b27c3163 100644
--- a/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Node_nameEditPart.java
+++ b/plugins/org.eclipse.gmf.graphdef.editor/src/org/eclipse/gmf/graphdef/editor/edit/parts/Node_nameEditPart.java
@@ -37,6 +37,8 @@ import org.eclipse.gef.tools.DirectEditManager;
 
 import org.eclipse.gmf.graphdef.editor.edit.policies.GMFGraphTextSelectionEditPolicy;
 
+import org.eclipse.gmf.graphdef.editor.part.GMFGraphDiagramEditorPlugin;
+
 import org.eclipse.gmf.graphdef.editor.providers.GMFGraphElementTypes;
 
 import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
@@ -71,6 +73,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 
+import org.eclipse.jface.resource.ImageDescriptor;
+
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 
 import org.eclipse.jface.viewers.ICellEditorValidator;
@@ -201,7 +205,12 @@ public class Node_nameEditPart extends CompartmentEditPart implements ITextAware
 	 * @generated
 	 */
 	protected Image getLabelIcon() {
-		return null;
+		EObject element = resolveSemanticElement();
+		ImageDescriptor descriptor = GMFGraphDiagramEditorPlugin.getInstance().getItemImageDescriptor(element);
+		if (descriptor == null) {
+			descriptor = ImageDescriptor.getMissingImageDescriptor();
+		}
+		return descriptor.createImage();
 	}
 
 	/**