Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2006-09-01 16:03:16 +0000
committeratikhomirov2006-09-01 16:03:16 +0000
commitbfc17b4b7b2a5f55b1d65f9c3dabef6e382ac327 (patch)
tree1144954c93d387df15eceacd630c47ebc778b722 /plugins/org.eclipse.gmf.graphdef.codegen
parentea95ae2ad329fb65bce945c36241716f5562ced4 (diff)
downloadorg.eclipse.gmf-tooling-bfc17b4b7b2a5f55b1d65f9c3dabef6e382ac327.tar.gz
org.eclipse.gmf-tooling-bfc17b4b7b2a5f55b1d65f9c3dabef6e382ac327.tar.xz
org.eclipse.gmf-tooling-bfc17b4b7b2a5f55b1d65f9c3dabef6e382ac327.zip
refactoring: abstract use of JMerge for merging away from generator services (GeneratorBase)
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneGenerator.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneGenerator.java b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneGenerator.java
index 74fe79487..7ecaa2ad9 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneGenerator.java
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneGenerator.java
@@ -11,17 +11,18 @@
*/
package org.eclipse.gmf.graphdef.codegen;
-import java.net.URL;
-
import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.codegen.merge.java.JControlModel;
import org.eclipse.emf.codegen.util.CodeGenUtil;
import org.eclipse.gmf.common.UnexpectedBehaviourException;
import org.eclipse.gmf.common.codegen.ImportAssistant;
import org.eclipse.gmf.gmfgraph.Figure;
import org.eclipse.gmf.gmfgraph.util.FigureQualifiedNameSwitch;
+import org.eclipse.gmf.internal.common.codegen.DefaultTextMerger;
import org.eclipse.gmf.internal.common.codegen.DelegateImportManager;
import org.eclipse.gmf.internal.common.codegen.GeneratorBase;
import org.eclipse.gmf.internal.common.codegen.ImportUtil;
+import org.eclipse.gmf.internal.common.codegen.TextMerger;
public class StandaloneGenerator extends GeneratorBase {
private final Config myArgs;
@@ -145,8 +146,10 @@ public class StandaloneGenerator extends GeneratorBase {
//setupProgressMonitor("Generating GMFGraph plugin", 100);
}
- protected URL getJMergeControlFile() {
- return null;
+ @Override
+ protected TextMerger createMergeService() {
+ // jcontrol model that is not initialized can't merge, hence java merging won't happen
+ return new DefaultTextMerger(new JControlModel());
}
protected void customRun() throws InterruptedException, UnexpectedBehaviourException {

Back to the top