Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java21
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet4
2 files changed, 12 insertions, 13 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java
index 5151b1d4b..0ea64e276 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/templates/FigureChildrenGenerator.java
@@ -17,12 +17,11 @@ public class FigureChildrenGenerator
protected final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl;
protected final String TEXT_1 = "";
- protected final String TEXT_2 = NL + "\t\t// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?" + NL + "\t\t";
+ protected final String TEXT_2 = NL + "\t\t";
protected final String TEXT_3 = NL + "\t\t";
- protected final String TEXT_4 = NL + "\t\t";
- protected final String TEXT_5 = ".add(";
- protected final String TEXT_6 = ");" + NL + "\t\t";
- protected final String TEXT_7 = NL;
+ protected final String TEXT_4 = ".add(";
+ protected final String TEXT_5 = ");" + NL + "\t\t";
+ protected final String TEXT_6 = NL;
public String generate(Object argument)
{
@@ -54,15 +53,15 @@ while (!l.isEmpty()) {
final String layoutManagerVarName = "layouter" + figureCount;
final String layoutDataVarName = "layData" + figureCount;
figureCount++;
+ // FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
+ GraphDefDispatcher.LayoutArgs nextLevelArgs = dispatcher.createLayoutArgs((Figure) figureMarker, figureVarName, layoutManagerVarName, layoutDataVarName);
stringBuffer.append(TEXT_2);
- GraphDefDispatcher.LayoutArgs nextLevelArgs = dispatcher.createLayoutArgs((Figure) figureMarker, figureVarName, layoutManagerVarName, layoutDataVarName);
- stringBuffer.append(TEXT_3);
stringBuffer.append(dispatcher.dispatch("instantiate", nextLevelArgs));
- stringBuffer.append(TEXT_4);
+ stringBuffer.append(TEXT_3);
stringBuffer.append(parentArgs.getVariableName());
- stringBuffer.append(TEXT_5);
+ stringBuffer.append(TEXT_4);
stringBuffer.append(figureVarName);
- stringBuffer.append(TEXT_6);
+ stringBuffer.append(TEXT_5);
stringBuffer.append(dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(nextLevelArgs, parentArgs.getManagerVariableName(), layoutDataVarName)));
if (_nxt instanceof Figure && !((Figure) _nxt).getChildren().isEmpty()) {
@@ -73,7 +72,7 @@ if (_nxt instanceof Figure && !((Figure) _nxt).getChildren().isEmpty()) {
} // if
} // while
- stringBuffer.append(TEXT_7);
+ stringBuffer.append(TEXT_6);
return stringBuffer.toString();
}
}
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet b/plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet
index c18bf989e..7b67ccbdc 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/children/Figure.javajet
@@ -26,9 +26,9 @@ while (!l.isEmpty()) {
final String figureVarName = "fig_" + figureCount;
final String layoutManagerVarName = "layouter" + figureCount;
final String layoutDataVarName = "layData" + figureCount;
- figureCount++;%>
+ figureCount++;
// FIXME instantiate - FigureRef - dispatch to 'instantiate' template?
- <%GraphDefDispatcher.LayoutArgs nextLevelArgs = dispatcher.createLayoutArgs((Figure) figureMarker, figureVarName, layoutManagerVarName, layoutDataVarName);%>
+ GraphDefDispatcher.LayoutArgs nextLevelArgs = dispatcher.createLayoutArgs((Figure) figureMarker, figureVarName, layoutManagerVarName, layoutDataVarName);%>
<%=dispatcher.dispatch("instantiate", nextLevelArgs)%>
<%=parentArgs.getVariableName()%>.add(<%=figureVarName%>);
<%=dispatcher.dispatch("createLayoutData", dispatcher.createLayoutArgs(nextLevelArgs, parentArgs.getManagerVariableName(), layoutDataVarName))%>

Back to the top