Attachment #49937 for bug #155707

View | Details | Raw Unified | Return to bug 155707
Collapse All | Expand All




  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 = ".";
  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 = ".horizontalSpan = ";
  protected final String TEXT_20 = ";" + NL + "\t\t\t";
  protected final String TEXT_21 = ".verticalSpan = ";
  protected final String TEXT_22 = ";" + NL + "\t\t\t";
  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)
  {

    stringBuffer.append(TEXT_4);
    stringBuffer.append(layoutConstraintVarName);
    stringBuffer.append(TEXT_5);
    stringBuffer.append(layoutImplClassName);
    stringBuffer.append(TEXT_6);
    stringBuffer.append(gmfLayoutData.getVerticalAlignment().getName());
    stringBuffer.append(TEXT_7);
    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.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.getHorizontalIndent());
    stringBuffer.append(TEXT_18);
    stringBuffer.append(layoutConstraintVarName);
    stringBuffer.append(TEXT_19);
    stringBuffer.append(gmfLayoutData.getHorizontalSpan());
    stringBuffer.append(TEXT_20);
    stringBuffer.append(layoutConstraintVarName);
    stringBuffer.append(TEXT_21);
    stringBuffer.append(gmfLayoutData.getVerticalSpan());
    stringBuffer.append(TEXT_22);
    stringBuffer.append(layoutConstraintVarName);
    stringBuffer.append(TEXT_23);
    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();
  }
}

Lines 10-17 Link Here

(-)templates/layoutData/GridLayoutData.javajet (-2 / +2 lines)
10	final String layoutImplClassName = dispatcher.getFQNSwitch().get(gmfLayoutData, dispatcher.getImportManager());	10	final String layoutImplClassName = dispatcher.getFQNSwitch().get(gmfLayoutData, dispatcher.getImportManager());
11	%>	11	%>
12	<%=layoutImplClassName%> <%=layoutConstraintVarName%> = new <%=layoutImplClassName%>();	12	<%=layoutImplClassName%> <%=layoutConstraintVarName%> = new <%=layoutImplClassName%>();
13	<%=layoutConstraintVarName%>.verticalAlignment = <%=gmfLayoutData.getVerticalAlignment().getValue()%>;	13	<%=layoutConstraintVarName%>.verticalAlignment = <%=layoutImplClassName%>.<%=gmfLayoutData.getVerticalAlignment().getName()%>;
14	<%=layoutConstraintVarName%>.horizontalAlignment = <%=gmfLayoutData.getHorizontalAlignment().getValue()%>;	14	<%=layoutConstraintVarName%>.horizontalAlignment = <%=layoutImplClassName%>.<%=gmfLayoutData.getHorizontalAlignment().getName()%>;
15	<%	15	<%
16	Dimension sizeHint = gmfLayoutData.getSizeHint();	16	Dimension sizeHint = gmfLayoutData.getSizeHint();
17	if (sizeHint != null){	17	if (sizeHint != null){

Return to bug 155707

Lines 20-45 Link Here

(-)src/org/eclipse/gmf/graphdef/codegen/templates/InitGridLayoutDataGenerator.java (-33 / +39 lines)
20	protected final String TEXT_3 = " = new ";	20	protected final String TEXT_3 = " = new ";
21	protected final String TEXT_4 = "();" + NL + "\t\t\t";	21	protected final String TEXT_4 = "();" + NL + "\t\t\t";
22	protected final String TEXT_5 = ".verticalAlignment = ";	22	protected final String TEXT_5 = ".verticalAlignment = ";
23	protected final String TEXT_6 = ";" + NL + "\t\t\t";	23	protected final String TEXT_6 = ".";
24	protected final String TEXT_7 = ".horizontalAlignment = ";	24	protected final String TEXT_7 = ";" + NL + "\t\t\t";
25	protected final String TEXT_8 = ";";	25	protected final String TEXT_8 = ".horizontalAlignment = ";
26	protected final String TEXT_9 = NL + "\t\t\t";	26	protected final String TEXT_9 = ".";
27	protected final String TEXT_10 = ".widthHint = ";	27	protected final String TEXT_10 = ";";
28	protected final String TEXT_11 = ";" + NL + "\t\t\t";	28	protected final String TEXT_11 = NL + "\t\t\t";
29	protected final String TEXT_12 = ".heightHint = ";	29	protected final String TEXT_12 = ".widthHint = ";
30	protected final String TEXT_13 = ";";	30	protected final String TEXT_13 = ";" + NL + "\t\t\t";
31	protected final String TEXT_14 = NL + "\t\t\t";	31	protected final String TEXT_14 = ".heightHint = ";
32	protected final String TEXT_15 = ".horizontalIndent = ";	32	protected final String TEXT_15 = ";";
33	protected final String TEXT_16 = ";" + NL + "\t\t\t";	33	protected final String TEXT_16 = NL + "\t\t\t";
34	protected final String TEXT_17 = ".horizontalSpan = ";	34	protected final String TEXT_17 = ".horizontalIndent = ";
35	protected final String TEXT_18 = ";" + NL + "\t\t\t";	35	protected final String TEXT_18 = ";" + NL + "\t\t\t";
36	protected final String TEXT_19 = ".verticalSpan = ";	36	protected final String TEXT_19 = ".horizontalSpan = ";
37	protected final String TEXT_20 = ";" + NL + "\t\t\t";	37	protected final String TEXT_20 = ";" + NL + "\t\t\t";
38	protected final String TEXT_21 = ".grabExcessHorizontalSpace = ";	38	protected final String TEXT_21 = ".verticalSpan = ";
39	protected final String TEXT_22 = ";" + NL + "\t\t\t";	39	protected final String TEXT_22 = ";" + NL + "\t\t\t";
40	protected final String TEXT_23 = ".grabExcessVerticalSpace = ";	40	protected final String TEXT_23 = ".grabExcessHorizontalSpace = ";
41	protected final String TEXT_24 = ";" + NL;	41	protected final String TEXT_24 = ";" + NL + "\t\t\t";
42	protected final String TEXT_25 = NL;	42	protected final String TEXT_25 = ".grabExcessVerticalSpace = ";
		43	protected final String TEXT_26 = ";" + NL;
		44	protected final String TEXT_27 = NL;
43		45
44	public String generate(Object argument)	46	public String generate(Object argument)
45	{	47	{
Lines 61-110 Link Here
61	stringBuffer.append(TEXT_4);	63	stringBuffer.append(TEXT_4);
62	stringBuffer.append(layoutConstraintVarName);	64	stringBuffer.append(layoutConstraintVarName);
63	stringBuffer.append(TEXT_5);	65	stringBuffer.append(TEXT_5);
64	stringBuffer.append(gmfLayoutData.getVerticalAlignment().getValue());	66	stringBuffer.append(layoutImplClassName);
65	stringBuffer.append(TEXT_6);	67	stringBuffer.append(TEXT_6);
66	stringBuffer.append(layoutConstraintVarName);	68	stringBuffer.append(gmfLayoutData.getVerticalAlignment().getName());
67	stringBuffer.append(TEXT_7);	69	stringBuffer.append(TEXT_7);
68	stringBuffer.append(gmfLayoutData.getHorizontalAlignment().getValue());	70	stringBuffer.append(layoutConstraintVarName);
69	stringBuffer.append(TEXT_8);	71	stringBuffer.append(TEXT_8);
		72	stringBuffer.append(layoutImplClassName);
		73	stringBuffer.append(TEXT_9);
		74	stringBuffer.append(gmfLayoutData.getHorizontalAlignment().getName());
		75	stringBuffer.append(TEXT_10);
70		76
71	Dimension sizeHint = gmfLayoutData.getSizeHint();	77	Dimension sizeHint = gmfLayoutData.getSizeHint();
72	if (sizeHint != null){	78	if (sizeHint != null){
73		79
74	stringBuffer.append(TEXT_9);
75	stringBuffer.append(layoutConstraintVarName);
76	stringBuffer.append(TEXT_10);
77	stringBuffer.append(sizeHint.getDx());
78	stringBuffer.append(TEXT_11);	80	stringBuffer.append(TEXT_11);
79	stringBuffer.append(layoutConstraintVarName);	81	stringBuffer.append(layoutConstraintVarName);
80	stringBuffer.append(TEXT_12);	82	stringBuffer.append(TEXT_12);
81	stringBuffer.append(sizeHint.getDy());	83	stringBuffer.append(sizeHint.getDx());
82	stringBuffer.append(TEXT_13);	84	stringBuffer.append(TEXT_13);
		85	stringBuffer.append(layoutConstraintVarName);
		86	stringBuffer.append(TEXT_14);
		87	stringBuffer.append(sizeHint.getDy());
		88	stringBuffer.append(TEXT_15);
83		89
84	}	90	}
85		91
86	stringBuffer.append(TEXT_14);
87	stringBuffer.append(layoutConstraintVarName);
88	stringBuffer.append(TEXT_15);
89	stringBuffer.append(gmfLayoutData.getHorizontalIndent());
90	stringBuffer.append(TEXT_16);	92	stringBuffer.append(TEXT_16);
91	stringBuffer.append(layoutConstraintVarName);	93	stringBuffer.append(layoutConstraintVarName);
92	stringBuffer.append(TEXT_17);	94	stringBuffer.append(TEXT_17);
93	stringBuffer.append(gmfLayoutData.getHorizontalSpan());	95	stringBuffer.append(gmfLayoutData.getHorizontalIndent());
94	stringBuffer.append(TEXT_18);	96	stringBuffer.append(TEXT_18);
95	stringBuffer.append(layoutConstraintVarName);	97	stringBuffer.append(layoutConstraintVarName);
96	stringBuffer.append(TEXT_19);	98	stringBuffer.append(TEXT_19);
97	stringBuffer.append(gmfLayoutData.getVerticalSpan());	99	stringBuffer.append(gmfLayoutData.getHorizontalSpan());
98	stringBuffer.append(TEXT_20);	100	stringBuffer.append(TEXT_20);
99	stringBuffer.append(layoutConstraintVarName);	101	stringBuffer.append(layoutConstraintVarName);
100	stringBuffer.append(TEXT_21);	102	stringBuffer.append(TEXT_21);
101	stringBuffer.append(gmfLayoutData.isGrabExcessHorizontalSpace());	103	stringBuffer.append(gmfLayoutData.getVerticalSpan());
102	stringBuffer.append(TEXT_22);	104	stringBuffer.append(TEXT_22);
103	stringBuffer.append(layoutConstraintVarName);	105	stringBuffer.append(layoutConstraintVarName);
104	stringBuffer.append(TEXT_23);	106	stringBuffer.append(TEXT_23);
105	stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());	107	stringBuffer.append(gmfLayoutData.isGrabExcessHorizontalSpace());
106	stringBuffer.append(TEXT_24);	108	stringBuffer.append(TEXT_24);
		109	stringBuffer.append(layoutConstraintVarName);
107	stringBuffer.append(TEXT_25);	110	stringBuffer.append(TEXT_25);
		111	stringBuffer.append(gmfLayoutData.isGrabExcessVerticalSpace());
		112	stringBuffer.append(TEXT_26);
		113	stringBuffer.append(TEXT_27);
108	return stringBuffer.toString();	114	return stringBuffer.toString();
109	}	115	}
110	}	116	}