Attachment 49937 Details for Bug 155707 – Fixes the subj

[patch] Fixes the subj

patch_155707.txt (text/plain), 7.20 KB, created by Michael Golubev

on 2006-09-12 10:32:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Golubev

Created: 2006-09-12 10:32:42 EDT

Size: 7.20 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.graphdef.codegen
>Index: src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java,v
>retrieving revision 1.6
>diff -u -r1.6 InitGridLayoutDataGenerator.java
>--- src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java	2 May 2006 15:05:35 -0000	1.6
>+++ src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java	12 Sep 2006 13:41:48 -0000
>@@ -20,26 +20,28 @@
>   protected final String TEXT_3 = " = new ";
>   protected final String TEXT_4 = "();" + NL + "\t\t\t";
>   protected final String TEXT_5 = ".verticalAlignment = ";
>-  protected final String TEXT_6 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_7 = ".horizontalAlignment = ";
>-  protected final String TEXT_8 = ";";
>-  protected final String TEXT_9 = NL + "\t\t\t";
>-  protected final String TEXT_10 = ".widthHint = ";
>-  protected final String TEXT_11 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_12 = ".heightHint = ";
>-  protected final String TEXT_13 = ";";
>-  protected final String TEXT_14 = NL + "\t\t\t";
>-  protected final String TEXT_15 = ".horizontalIndent = ";
>-  protected final String TEXT_16 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_17 = ".horizontalSpan = ";
>+  protected final String TEXT_6 = ".";
>+  protected final String TEXT_7 = ";" + NL + "\t\t\t";
>+  protected final String TEXT_8 = ".horizontalAlignment = ";
>+  protected final String TEXT_9 = ".";
>+  protected final String TEXT_10 = ";";
>+  protected final String TEXT_11 = NL + "\t\t\t";
>+  protected final String TEXT_12 = ".widthHint = ";
>+  protected final String TEXT_13 = ";" + NL + "\t\t\t";
>+  protected final String TEXT_14 = ".heightHint = ";
>+  protected final String TEXT_15 = ";";
>+  protected final String TEXT_16 = NL + "\t\t\t";
>+  protected final String TEXT_17 = ".horizontalIndent = ";
>   protected final String TEXT_18 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_19 = ".verticalSpan = ";
>+  protected final String TEXT_19 = ".horizontalSpan = ";
>   protected final String TEXT_20 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_21 = ".grabExcessHorizontalSpace = ";
>+  protected final String TEXT_21 = ".verticalSpan = ";
>   protected final String TEXT_22 = ";" + NL + "\t\t\t";
>-  protected final String TEXT_23 = ".grabExcessVerticalSpace = ";
>-  protected final String TEXT_24 = ";" + NL;
>-  protected final String TEXT_25 = NL;
>+  protected final String TEXT_23 = ".grabExcessHorizontalSpace = ";
>+  protected final String TEXT_24 = ";" + NL + "\t\t\t";
>+  protected final String TEXT_25 = ".grabExcessVerticalSpace = ";
>+  protected final String TEXT_26 = ";" + NL;
>+  protected final String TEXT_27 = NL;
> 
>   public String generate(Object argument)
>   {
>@@ -61,50 +63,54 @@
>     stringBuffer.append(TEXT_4);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_5);
>-    stringBuffer.append(gmfLayoutData.getVerticalAlignment().getValue());
>+    stringBuffer.append(layoutImplClassName);
>     stringBuffer.append(TEXT_6);
>-    stringBuffer.append(layoutConstraintVarName);
>+    stringBuffer.append(gmfLayoutData.getVerticalAlignment().getName());
>     stringBuffer.append(TEXT_7);
>-    stringBuffer.append(gmfLayoutData.getHorizontalAlignment().getValue());
>+    stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_8);
>+    stringBuffer.append(layoutImplClassName);
>+    stringBuffer.append(TEXT_9);
>+    stringBuffer.append(gmfLayoutData.getHorizontalAlignment().getName());
>+    stringBuffer.append(TEXT_10);
>     
> Dimension sizeHint = gmfLayoutData.getSizeHint();
> if (sizeHint != null){
> 
>-    stringBuffer.append(TEXT_9);
>-    stringBuffer.append(layoutConstraintVarName);
>-    stringBuffer.append(TEXT_10);
>-    stringBuffer.append(sizeHint.getDx());
>     stringBuffer.append(TEXT_11);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_12);
>-    stringBuffer.append(sizeHint.getDy());
>+    stringBuffer.append(sizeHint.getDx());
>     stringBuffer.append(TEXT_13);
>+    stringBuffer.append(layoutConstraintVarName);
>+    stringBuffer.append(TEXT_14);
>+    stringBuffer.append(sizeHint.getDy());
>+    stringBuffer.append(TEXT_15);
>     
> }
> 
>-    stringBuffer.append(TEXT_14);
>-    stringBuffer.append(layoutConstraintVarName);
>-    stringBuffer.append(TEXT_15);
>-    stringBuffer.append(gmfLayoutData.getHorizontalIndent());
>     stringBuffer.append(TEXT_16);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_17);
>-    stringBuffer.append(gmfLayoutData.getHorizontalSpan());
>+    stringBuffer.append(gmfLayoutData.getHorizontalIndent());
>     stringBuffer.append(TEXT_18);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_19);
>-    stringBuffer.append(gmfLayoutData.getVerticalSpan());
>+    stringBuffer.append(gmfLayoutData.getHorizontalSpan());
>     stringBuffer.append(TEXT_20);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_21);
>-    stringBuffer.append(gmfLayoutData.isGrabExcessHorizontalSpace());
>+    stringBuffer.append(gmfLayoutData.getVerticalSpan());
>     stringBuffer.append(TEXT_22);
>     stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_23);
>-    stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());
>+    stringBuffer.append(gmfLayoutData.isGrabExcessHorizontalSpace());
>     stringBuffer.append(TEXT_24);
>+    stringBuffer.append(layoutConstraintVarName);
>     stringBuffer.append(TEXT_25);
>+    stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());
>+    stringBuffer.append(TEXT_26);
>+    stringBuffer.append(TEXT_27);
>     return stringBuffer.toString();
>   }
> }
>Index: templates/layoutData/GridLayoutData.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef.codegen/templates/layoutData/GridLayoutData.javajet,v
>retrieving revision 1.5
>diff -u -r1.5 GridLayoutData.javajet
>--- templates/layoutData/GridLayoutData.javajet	2 May 2006 15:05:35 -0000	1.5
>+++ templates/layoutData/GridLayoutData.javajet	12 Sep 2006 13:41:48 -0000
>@@ -10,8 +10,8 @@
> final String layoutImplClassName = dispatcher.getFQNSwitch().get(gmfLayoutData, dispatcher.getImportManager());
> %>
> 			<%=layoutImplClassName%> <%=layoutConstraintVarName%> = new <%=layoutImplClassName%>();
>-			<%=layoutConstraintVarName%>.verticalAlignment = <%=gmfLayoutData.getVerticalAlignment().getValue()%>;
>-			<%=layoutConstraintVarName%>.horizontalAlignment = <%=gmfLayoutData.getHorizontalAlignment().getValue()%>;
>+			<%=layoutConstraintVarName%>.verticalAlignment = <%=layoutImplClassName%>.<%=gmfLayoutData.getVerticalAlignment().getName()%>;
>+			<%=layoutConstraintVarName%>.horizontalAlignment = <%=layoutImplClassName%>.<%=gmfLayoutData.getHorizontalAlignment().getName()%>;
> <%
> Dimension sizeHint = gmfLayoutData.getSizeHint();
> if (sizeHint != null){

Actions: View | Diff

Attachments on bug 155707: 49937