### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.codegen
Index: templates/xpt/diagram/editpolicies/TextFeedback.xpt
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt,v
retrieving revision 1.4
diff -u -r1.4 TextFeedback.xpt
--- templates/xpt/diagram/editpolicies/TextFeedback.xpt	18 May 2007 21:17:18 -0000	1.4
+++ templates/xpt/diagram/editpolicies/TextFeedback.xpt	12 Dec 2007 17:38:30 -0000
@@ -53,9 +53,9 @@
 
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setSelected(true);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(true);
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			showSelection();
 			showFocus();
@@ -64,9 +64,9 @@
 
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void showSelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setSelected(true);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(true);
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
 			hideSelection();
 			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
@@ -77,9 +77,9 @@
 
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void hideSelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setSelected(false);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(false);
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
 			if (selectionFeedbackFigure != null) {
 				removeFeedback(selectionFeedbackFigure);
@@ -91,8 +91,8 @@
 
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void showFocus() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setFocus(true);
+		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(true);
 		} else {
 			hideFocus();
 			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
@@ -102,8 +102,8 @@
 
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void hideFocus() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getHostFigure()).setFocus(false);
+		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
 		} else {
 			if (focusFeedbackFigure != null) {
 				removeFeedback(focusFeedbackFigure);
Index: templates/xpt/diagram/editparts/EditPartFactory.xpt
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt,v
retrieving revision 1.6
diff -u -r1.6 EditPartFactory.xpt
--- templates/xpt/diagram/editparts/EditPartFactory.xpt	18 May 2007 21:17:18 -0000	1.6
+++ templates/xpt/diagram/editparts/EditPartFactory.xpt	12 Dec 2007 17:38:30 -0000
@@ -55,8 +55,8 @@
 	«EXPAND xpt::Common::generatedMemberComment»
 	public static org.eclipse.gef.tools.CellEditorLocator getTextCellEditorLocator(
 			org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart source) {
-        if (source.getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel)
-            return new TextCellEditorLocator((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) source.getFigure());
+        if (source.getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel)
+            return new TextCellEditorLocator((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) source.getFigure());
         else {
             return new LabelCellEditorLocator((org.eclipse.draw2d.Label) source.getFigure());
         }
@@ -66,24 +66,24 @@
 	static private class TextCellEditorLocator implements org.eclipse.gef.tools.CellEditorLocator {
 
 		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel wrapLabel;
+		private org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel wrappingLabel;
 
 		«EXPAND xpt::Common::generatedMemberComment»
-		public TextCellEditorLocator(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel wrapLabel) {
-			this.wrapLabel = wrapLabel;
+		public TextCellEditorLocator(org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel wrappingLabel) {
+			this.wrappingLabel = wrappingLabel;
 		}
 
 		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getWrapLabel() {
-			return wrapLabel;
+		public org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel getWrappingLabel() {
+			return wrappingLabel;
 		}
 
 		«EXPAND xpt::Common::generatedMemberComment»
 		public void relocate(org.eclipse.jface.viewers.CellEditor celleditor) {
 			org.eclipse.swt.widgets.Text text = (org.eclipse.swt.widgets.Text) celleditor.getControl();
-			org.eclipse.draw2d.geometry.Rectangle rect = getWrapLabel().getTextBounds().getCopy();
-			getWrapLabel().translateToAbsolute(rect);
-			if (getWrapLabel().isTextWrapped() && getWrapLabel().getText().length() > 0) {
+			org.eclipse.draw2d.geometry.Rectangle rect = getWrappingLabel().getTextBounds().getCopy();
+			getWrappingLabel().translateToAbsolute(rect);
+			if (getWrappingLabel().isTextWrapOn() && getWrappingLabel().getText().length() > 0) {
 				rect.setSize(new org.eclipse.draw2d.geometry.Dimension(
 					text.computeSize(rect.width, org.eclipse.swt.SWT.DEFAULT)));
 			} else {
Index: templates/impl/diagram/editparts/TextAware.xpt
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt,v
retrieving revision 1.2
diff -u -r1.2 TextAware.xpt
--- templates/impl/diagram/editparts/TextAware.xpt	9 Nov 2007 19:24:20 -0000	1.2
+++ templates/impl/diagram/editparts/TextAware.xpt	12 Dec 2007 17:38:29 -0000
@@ -107,8 +107,8 @@
 «DEFINE getLabelTextHelper FOR gmfgen::GenCommonBase-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected String getLabelTextHelper(org.eclipse.draw2d.IFigure figure) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) figure).getText();
+		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).getText();
 		} else {
 			return ((org.eclipse.draw2d.Label) figure).getText();
 		}
@@ -118,8 +118,8 @@
 «DEFINE setLabelTextHelper FOR gmfgen::GenCommonBase-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void setLabelTextHelper(org.eclipse.draw2d.IFigure figure, String text) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) figure).setText(text);
+		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).setText(text);
 		} else {
 			((org.eclipse.draw2d.Label) figure).setText(text);
 		}
@@ -129,8 +129,8 @@
 «DEFINE getLabelIconHelper FOR gmfgen::GenCommonBase-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected org.eclipse.swt.graphics.Image getLabelIconHelper(org.eclipse.draw2d.IFigure figure) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) figure).getIcon();
+		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).getIcon();
 		} else {
 			return ((org.eclipse.draw2d.Label) figure).getIcon();
 		}
@@ -140,8 +140,8 @@
 «DEFINE setLabelIconHelper FOR gmfgen::GenCommonBase-»
 	«EXPAND xpt::Common::generatedMemberComment»
 	protected void setLabelIconHelper(org.eclipse.draw2d.IFigure figure, org.eclipse.swt.graphics.Image icon) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) figure).setIcon(icon);
+		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).setIcon(icon);
 		} else {
 			((org.eclipse.draw2d.Label) figure).setIcon(icon);
 		}
@@ -449,8 +449,8 @@
 		org.eclipse.gmf.runtime.notation.FontStyle style =
 			(org.eclipse.gmf.runtime.notation.FontStyle) getFontStyleOwnerView().getStyle(
 				org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getFigure()).setTextUnderline(style.isUnderline());
+		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
 		}
 	}
 «ENDDEFINE»
@@ -461,8 +461,8 @@
 		org.eclipse.gmf.runtime.notation.FontStyle style =
 			(org.eclipse.gmf.runtime.notation.FontStyle) getFontStyleOwnerView().getStyle(
 				org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
+		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
+			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
 		}
 	}
 «ENDDEFINE»
#P org.eclipse.gmf.graphdef.codegen
Index: templates/Runtime.xpt
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/Runtime.xpt,v
retrieving revision 1.2
diff -u -r1.2 Runtime.xpt
--- templates/Runtime.xpt	28 May 2007 13:33:47 -0000	1.2
+++ templates/Runtime.xpt	12 Dec 2007 17:38:31 -0000
@@ -51,7 +51,7 @@
 
 ////////////////////////
 «DEFINE fqn FOR FigureRef»«EXPAND fqn FOR figure»«ENDDEFINE»
-«DEFINE fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»«ENDDEFINE»
+«DEFINE fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»«ENDDEFINE»
 «DEFINE fqn FOR LabeledContainer»org.eclipse.draw2d.LabeledContainer«ENDDEFINE»
 «DEFINE fqn FOR Rectangle»org.eclipse.draw2d.RectangleFigure«ENDDEFINE»
 «DEFINE fqn FOR RoundedRectangle»org.eclipse.draw2d.RoundedRectangle«ENDDEFINE»
@@ -69,5 +69,5 @@
 // Full GMF Runtime
 ////////////////////////
 «AROUND fqn FOR PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
-«AROUND fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
+«AROUND fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
 «ENDREM»
\ No newline at end of file
#P org.eclipse.gmf.graphdef
Index: src/org/eclipse/gmf/gmfgraph/util/RuntimeFQNSwitch.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/gmfgraph/util/RuntimeFQNSwitch.java,v
retrieving revision 1.7
diff -u -r1.7 RuntimeFQNSwitch.java
--- src/org/eclipse/gmf/gmfgraph/util/RuntimeFQNSwitch.java	21 Jun 2007 14:22:08 -0000	1.7
+++ src/org/eclipse/gmf/gmfgraph/util/RuntimeFQNSwitch.java	12 Dec 2007 17:38:32 -0000
@@ -53,6 +53,6 @@
 	}
 
 	public String caseLabel(Label object) {
-		return "org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel"; //$NON-NLS-1$
+		return "org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"; //$NON-NLS-1$
 	}
 }