Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2009-03-11 18:12:40 +0000
committeratikhomirov2009-03-11 18:12:40 +0000
commit553fb23cb934717e45c4e4edb277867c0155e566 (patch)
tree779864001940cfebef260e233b94e15d071ce1b4 /plugins/org.eclipse.gmf.graphdef.codegen
parentbc70181bbecb3d6b875d8ec26b2e4db9262a693e (diff)
downloadorg.eclipse.gmf-tooling-553fb23cb934717e45c4e4edb277867c0155e566.tar.gz
org.eclipse.gmf-tooling-553fb23cb934717e45c4e4edb277867c0155e566.tar.xz
org.eclipse.gmf-tooling-553fb23cb934717e45c4e4edb277867c0155e566.zip
ClassLoadContext is no longer used, and related code was cleaned not to drag all the stuff
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/FigureGenerator.java4
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/src/org/eclipse/gmf/graphdef/codegen/StandaloneEmitters.java12
2 files changed, 8 insertions, 8 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 3a328b0bf..7d974d1a0 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
@@ -27,8 +27,8 @@ import org.eclipse.gmf.internal.xpand.ResourceManager;
import org.eclipse.gmf.internal.xpand.XpandFacade;
import org.eclipse.gmf.internal.xpand.model.AmbiguousDefinitionException;
import org.eclipse.gmf.internal.xpand.model.EvaluationException;
+import org.eclipse.gmf.internal.xpand.model.Scope;
import org.eclipse.gmf.internal.xpand.model.Variable;
-import org.eclipse.gmf.internal.xpand.util.ContextFactory;
public class FigureGenerator implements TextEmitter {
@@ -110,7 +110,7 @@ public class FigureGenerator implements TextEmitter {
result.setLength(0);
BufferOutput bufferOutput = new BufferOutput(result);
- return new XpandFacade(ContextFactory.createXpandContext(resourceManager, bufferOutput, globals));
+ return new XpandFacade(new Scope(resourceManager, globals, bufferOutput));
}
public String generate(IProgressMonitor monitor, Object[] arguments) throws InterruptedException, InvocationTargetException, UnexpectedBehaviourException {
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 d3ef1940a..9e3fadf75 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
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2007 Borland Software Corporation
+ * Copyright (c) 2006, 2009 Borland Software Corporation
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -33,11 +33,11 @@ class StandaloneEmitters {
}
public TextEmitter getBuildPropertiesEmitter() throws UnexpectedBehaviourException {
- return new XpandTextEmitter(myResourceManager, "plugin::BuildProperties::Init", getClass().getClassLoader());
+ return new XpandTextEmitter(myResourceManager, "plugin::BuildProperties::Init");
}
public TextEmitter getPluginPropertiesEmitter() throws UnexpectedBehaviourException {
- return new XpandTextEmitter(myResourceManager, "plugin::PluginProperties::Init", getClass().getClassLoader()) {
+ return new XpandTextEmitter(myResourceManager, "plugin::PluginProperties::Init") {
@Override
protected Object[] extractArguments(Object[] arguments) {
assert arguments != null && arguments.length > 0 && arguments[0] instanceof Config;
@@ -51,7 +51,7 @@ class StandaloneEmitters {
}
public TextEmitter getManifestMFEmitter() throws UnexpectedBehaviourException {
- return new XpandTextEmitter(myResourceManager, "plugin::Manifest::Init", getClass().getClassLoader()) {
+ return new XpandTextEmitter(myResourceManager, "plugin::Manifest::Init") {
@Override
protected Object[] extractArguments(Object[] arguments) {
assert arguments != null && arguments.length > 1 && arguments[0] instanceof Config && arguments[1] instanceof String[];
@@ -69,11 +69,11 @@ class StandaloneEmitters {
}
public TextEmitter getPluginActivatorEmitter() throws UnexpectedBehaviourException {
- return new XpandTextEmitter(myResourceManager, "plugin::Activator::Init", getClass().getClassLoader()) {
+ return new XpandTextEmitter(myResourceManager, "plugin::Activator::Init") {
@Override
protected Object extractTarget(Object[] arguments) {
assert arguments != null && arguments.length >= 2;
- assert arguments[2] instanceof List;
+ assert arguments[2] instanceof List<?>;
return arguments[2];
}
@Override

Back to the top