Attachment 42546 Details for Bug 143666 – Actually fixes the subj

[patch] Actually fixes the subj

patch_constraint_toolbar_layout___actual_fix.txt (text/plain), 7.50 KB, created by Michael Golubev

on 2006-05-25 03:18:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Golubev

Created: 2006-05-25 03:18:46 EDT

Size: 7.50 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.codegen
>Index: templates/parts/CompartmentEditPart.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/parts/CompartmentEditPart.javajet,v
>retrieving revision 1.20
>diff -u -r1.20 CompartmentEditPart.javajet
>--- templates/parts/CompartmentEditPart.javajet	18 May 2006 13:58:29 -0000	1.20
>+++ templates/parts/CompartmentEditPart.javajet	25 May 2006 05:39:15 -0000
>@@ -16,7 +16,9 @@
> /**
>  * @generated
>  */
>-public class <%=genCompartment.getEditPartClassName()%> extends <%=genCompartment.isListLayout() ? importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart") : importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart")%> {
>+public class <%=genCompartment.getEditPartClassName()%> extends <%=genCompartment.isListLayout() ? 
>+		importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart") : 
>+		importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart")%> {
> <%{
> GenCommonBase genCommonBase = genCompartment;%>
> <%@ include file="visualID.jetinc"%>
>@@ -72,12 +74,6 @@
> 	/**
> 	 * @generated
> 	 */
>-	protected void refreshRatio() {
>-	}
>-
>-	/**
>-	 * @generated
>-	 */
> 	protected void refreshVisuals() {
> 		super.refreshVisuals();
> 		refreshBounds();
>@@ -109,6 +105,28 @@
> 		<%=importManager.getImportedName("org.eclipse.draw2d.geometry.Point")%> loc = new <%=importManager.getImportedName("org.eclipse.draw2d.geometry.Point")%>(x, y);
> 		((<%=importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")%>) getParent()).setLayoutConstraint(this, getFigure(), new <%=importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle")%>(loc, size));
> 	}
>-<%}%>
>+<%
>+} // helper.isStoring
>+%>
>+
>+	/**
>+	 * @generated
>+	 */
>+	protected void setRatio(Double ratio) {
>+<%
>+if (ViewmapLayoutType.UNKNOWN_LITERAL.equals(genCompartment.getNode().getLayoutType())) {
>+%>
>+		if (getFigure().getParent().getLayoutManager() instanceof <%=importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout")%>) {
>+			super.setRatio(ratio);
>+		}
>+<%
>+} else {
>+%>
>+		// nothing to do -- parent layout does not accept Double constraints as ratio
>+		// super.setRatio(ratio); 
>+<%
>+}
>+%>
>+	}
> }
> <%importManager.emitSortedImports();%>
>Index: src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java,v
>retrieving revision 1.29
>diff -u -r1.29 CompartmentEditPartGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java	18 May 2006 13:58:29 -0000	1.29
>+++ src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java	25 May 2006 05:39:15 -0000
>@@ -42,7 +42,7 @@
>   protected final String TEXT_23 = "\t" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\t//public ";
>   protected final String TEXT_24 = " createFigure() {" + NL + "\t//\t";
>   protected final String TEXT_25 = " result = super.createFigure();" + NL + "\t//\tresult.setBorder(new ";
>-  protected final String TEXT_26 = "());" + NL + "\t//\treturn result;" + NL + "\t//}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshRatio() {" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshBounds();" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent(";
>+  protected final String TEXT_26 = "());" + NL + "\t//\treturn result;" + NL + "\t//}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshBounds();" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent(";
>   protected final String TEXT_27 = " notification) {" + NL + "\t\tsuper.handleNotificationEvent(notification);" + NL + "\t\tObject feature = notification.getFeature();" + NL + "\t\tif (";
>   protected final String TEXT_28 = ".eINSTANCE.getSize_Width().equals(feature)" + NL + "\t\t\t|| ";
>   protected final String TEXT_29 = ".eINSTANCE.getSize_Height().equals(feature)" + NL + "\t\t\t|| ";
>@@ -58,8 +58,12 @@
>   protected final String TEXT_39 = "(x, y);" + NL + "\t\t((";
>   protected final String TEXT_40 = ") getParent()).setLayoutConstraint(this, getFigure(), new ";
>   protected final String TEXT_41 = "(loc, size));" + NL + "\t}";
>-  protected final String TEXT_42 = NL + "}";
>-  protected final String TEXT_43 = NL;
>+  protected final String TEXT_42 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setRatio(Double ratio) {";
>+  protected final String TEXT_43 = NL + "\t\tif (getFigure().getParent().getLayoutManager() instanceof ";
>+  protected final String TEXT_44 = ") {" + NL + "\t\t\tsuper.setRatio(ratio);" + NL + "\t\t}";
>+  protected final String TEXT_45 = NL + "\t\t// nothing to do -- parent layout does not accept Double constraints as ratio" + NL + "\t\t// super.setRatio(ratio); ";
>+  protected final String TEXT_46 = NL + "\t}" + NL + "}";
>+  protected final String TEXT_47 = NL;
> 
> 	protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) {
> 		StringBuffer result = new StringBuffer();
>@@ -180,7 +184,9 @@
>     stringBuffer.append(TEXT_5);
>     stringBuffer.append(genCompartment.getEditPartClassName());
>     stringBuffer.append(TEXT_6);
>-    stringBuffer.append(genCompartment.isListLayout() ? importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart") : importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart"));
>+    stringBuffer.append(genCompartment.isListLayout() ? 
>+		importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart") : 
>+		importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart"));
>     stringBuffer.append(TEXT_7);
>     {
> GenCommonBase genCommonBase = genCompartment;
>@@ -251,10 +257,26 @@
>     stringBuffer.append(TEXT_40);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
>     stringBuffer.append(TEXT_41);
>-    }
>+    
>+} // helper.isStoring
>+
>     stringBuffer.append(TEXT_42);
>-    importManager.emitSortedImports();
>+    
>+if (ViewmapLayoutType.UNKNOWN_LITERAL.equals(genCompartment.getNode().getLayoutType())) {
>+
>     stringBuffer.append(TEXT_43);
>+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout"));
>+    stringBuffer.append(TEXT_44);
>+    
>+} else {
>+
>+    stringBuffer.append(TEXT_45);
>+    
>+}
>+
>+    stringBuffer.append(TEXT_46);
>+    importManager.emitSortedImports();
>+    stringBuffer.append(TEXT_47);
>     return stringBuffer.toString();
>   }
> }
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 143666: 42545 | 42546