extracted caching behaviour outside from the factory - moving towards support for different template engines, #114207

2 files changed, 11 insertions, 6 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 739d697ad..a1e46aed7 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
@@ -67,7 +67,9 @@ import org.eclipse.gmf.graphdef.codegen.templates.ShapeAttrGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.TopConnectionGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.TopFigureGenerator;
 import org.eclipse.gmf.graphdef.codegen.templates.TopGenerator;
+import org.eclipse.gmf.internal.codegen.dispatch.CachingEmitterFactory;
 import org.eclipse.gmf.internal.codegen.dispatch.EmitterFactory;
+import org.eclipse.gmf.internal.codegen.dispatch.EmitterFactoryImpl;
 import org.eclipse.gmf.internal.codegen.dispatch.HierarchyKeyMap;
 import org.eclipse.gmf.internal.codegen.dispatch.KeyChain;
 import org.eclipse.gmf.internal.codegen.dispatch.KeyMap;
@@ -104,9 +106,9 @@ public class FigureGenerator implements TextEmitter {
 
 		KeyMap keyMap = new ClassesOrStringsKeyMap();
 		String[] templatePath = new String[] {thisBundle.getEntry("/templates/").toString()};
-		EmitterFactory topFactory = new EmitterFactory(templatePath, fillTopLevel(), true, variables, true);
+		EmitterFactory topFactory = new CachingEmitterFactory(new EmitterFactoryImpl(templatePath, fillTopLevel(), true, variables));
 		myTopDispatcher = new GraphDefDispatcher(topFactory, keyMap, figureNameSwitch, mapModeStrategy);
-		EmitterFactory innerFactory = new EmitterFactory(templatePath, fillAttrs(), true, variables, true);
+		EmitterFactory innerFactory = new CachingEmitterFactory(new EmitterFactoryImpl(templatePath, fillAttrs(), true, variables));
 		myInnerDispatcher = new GraphDefDispatcher(innerFactory, keyMap, figureNameSwitch, mapModeStrategy);
 	}
 
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneEmitters.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneEmitters.java
index 215779bbf..0ec3981b5 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneEmitters.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneEmitters.java
@@ -17,17 +17,20 @@ import org.eclipse.gmf.graphdef.codegen.standalone.templates.BuildPropertiesGene
 import org.eclipse.gmf.graphdef.codegen.standalone.templates.ManifestMFGenerator;
 import org.eclipse.gmf.graphdef.codegen.standalone.templates.PluginActivatorGenerator;
 import org.eclipse.gmf.graphdef.codegen.standalone.templates.PluginPropertiesGenerator;
+import org.eclipse.gmf.internal.codegen.dispatch.CachingEmitterFactory;
 import org.eclipse.gmf.internal.codegen.dispatch.EmitterFactory;
+import org.eclipse.gmf.internal.codegen.dispatch.EmitterFactoryImpl;
 import org.eclipse.gmf.internal.codegen.dispatch.NoSuchTemplateException;
 import org.eclipse.gmf.internal.codegen.dispatch.StaticTemplateRegistry;
 import org.eclipse.gmf.internal.codegen.dispatch.TemplateRegistry;
 import org.eclipse.gmf.internal.common.codegen.JETEmitterAdapter;
 import org.eclipse.gmf.internal.common.codegen.TextEmitter;
 
-public class StandaloneEmitters extends EmitterFactory {
-	
+public class StandaloneEmitters {
+	private final EmitterFactory myFactory;
+
 	public StandaloneEmitters(){
-		super(getTemplatePath(), createTemplateRegistry());
+		myFactory = new CachingEmitterFactory(new EmitterFactoryImpl(getTemplatePath(), createTemplateRegistry()));
 	}
 	
 	public TextEmitter getBuildPropertiesEmitter() throws UnexpectedBehaviourException {
@@ -48,7 +51,7 @@ public class StandaloneEmitters extends EmitterFactory {
 
 	private TextEmitter getRegistered(Class key) throws UnexpectedBehaviourException {
 		try {
-			return new JETEmitterAdapter(acquireEmitter(key));
+			return new JETEmitterAdapter(myFactory.acquireEmitter(key));
 		} catch (NoSuchTemplateException ex) {
 			throw new UnexpectedBehaviourException(ex.getMessage(), ex);
 		}