Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2006-03-01 20:18:28 +0000
committeratikhomirov2006-03-01 20:18:28 +0000
commit5ad9700fde18d0e988a24a1687af70047bdb23d7 (patch)
tree343e44d85f9b88d78a5a994f4656041b0343c046 /plugins/org.eclipse.gmf.graphdef.codegen/src
parentaaa1a40287cf8ba60c6ee52b989a5252d30c587b (diff)
downloadorg.eclipse.gmf-tooling-5ad9700fde18d0e988a24a1687af70047bdb23d7.tar.gz
org.eclipse.gmf-tooling-5ad9700fde18d0e988a24a1687af70047bdb23d7.tar.xz
org.eclipse.gmf-tooling-5ad9700fde18d0e988a24a1687af70047bdb23d7.zip
Split FQNSwitch into interface and rt-specific implementation
New requirement on the switch - to provide additional requiremens
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen/src')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java10
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java8
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java
index e06d959a6..1d6f5cf17 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java
@@ -32,7 +32,7 @@ import org.eclipse.gmf.gmfgraph.RoundedRectangle;
import org.eclipse.gmf.gmfgraph.Shape;
import org.eclipse.gmf.gmfgraph.XYLayoutData;
import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
-import org.eclipse.gmf.gmfgraph.util.GMFGraphSwitch;
+import org.eclipse.gmf.gmfgraph.util.RuntimeFQNSwitch;
import org.eclipse.gmf.graphdef.codegen.templates.CustomClassAttributesGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.FigureAttrGenerator;
import org.eclipse.gmf.graphdef.codegen.templates.FigureChildrenGenerator;
@@ -74,14 +74,14 @@ public class FigureGenerator {
private GraphDefDispatcher myInnerDispatcher;
public FigureGenerator() {
- this(null, new NullImportAssistant(), new FigureQualifiedNameSwitch());
+ this(null, new NullImportAssistant(), new RuntimeFQNSwitch());
}
- public FigureGenerator(String aPackageName, ImportAssistant importManager, GMFGraphSwitch figureNameSwitch) {
+ public FigureGenerator(String aPackageName, ImportAssistant importManager, FigureQualifiedNameSwitch figureNameSwitch) {
this(aPackageName, importManager, figureNameSwitch, new MapModeCodeGenStrategy.RuntimeUnspecifiedMapMode(importManager));
}
- public FigureGenerator(String aPackageName, ImportAssistant importManager, GMFGraphSwitch figureNameSwitch, MapModeCodeGenStrategy mapModeStrategy) {
+ public FigureGenerator(String aPackageName, ImportAssistant importManager, FigureQualifiedNameSwitch figureNameSwitch, MapModeCodeGenStrategy mapModeStrategy) {
packageName = aPackageName;
final Bundle thisBundle = Platform.getBundle("org.eclipse.gmf.graphdef.codegen");
final String[] variables = new String[] {
@@ -120,7 +120,7 @@ public class FigureGenerator {
private static TemplateRegistry fillTopLevel() {
StaticTemplateRegistry tr = new StaticTemplateRegistry(FigureGenerator.class.getClassLoader());
- tr.put(PolylineConnection.class, "/PolylineConnection.javajet", TopConnectionGenerator.class);
+ tr.put(PolylineConnection.class, "/top/PolylineConnection.javajet", TopConnectionGenerator.class);
tr.put(Shape.class, "/top/Shape.javajet", TopShapeGenerator.class);
tr.put(Figure.class, "/top/Figure.javajet", TopFigureGenerator.class);
return tr;
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java
index b319430a8..d4a6b28c1 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/GraphDefDispatcher.java
@@ -15,7 +15,7 @@ import org.eclipse.gmf.common.codegen.ImportAssistant;
import org.eclipse.gmf.gmfgraph.Figure;
import org.eclipse.gmf.gmfgraph.Layout;
import org.eclipse.gmf.gmfgraph.LayoutData;
-import org.eclipse.gmf.gmfgraph.util.GMFGraphSwitch;
+import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
import org.eclipse.gmf.internal.codegen.dispatch.DispatcherImpl;
import org.eclipse.gmf.internal.codegen.dispatch.EmitterFactory;
import org.eclipse.gmf.internal.codegen.dispatch.KeyMap;
@@ -25,10 +25,10 @@ import org.eclipse.gmf.internal.codegen.dispatch.KeyMap;
*/
public class GraphDefDispatcher extends DispatcherImpl {
private final ImportAssistant myImportManager;
- private final GMFGraphSwitch myFqnSwitch;
+ private final FigureQualifiedNameSwitch myFqnSwitch;
private final MapModeCodeGenStrategy myMapModeStrategy;
- public GraphDefDispatcher(EmitterFactory factory, KeyMap keyMap, ImportAssistant importManager, GMFGraphSwitch fqnSwitch, MapModeCodeGenStrategy mapModeStrategy) {
+ public GraphDefDispatcher(EmitterFactory factory, KeyMap keyMap, ImportAssistant importManager, FigureQualifiedNameSwitch fqnSwitch, MapModeCodeGenStrategy mapModeStrategy) {
super(factory, keyMap);
assert mapModeStrategy != null;
myImportManager = importManager;
@@ -48,7 +48,7 @@ public class GraphDefDispatcher extends DispatcherImpl {
return myImportManager;
}
- public GMFGraphSwitch getFQNSwitch() {
+ public FigureQualifiedNameSwitch getFQNSwitch() {
return myFqnSwitch;
}

Back to the top