Quellcode durchsuchen

#899 removed Xpand from core dependencies

Andreas Muelder vor 9 Jahren
Ursprung
Commit
e5c50346c2

+ 1 - 3
plugins/org.yakindu.sct.generator.builder/src/org/yakindu/sct/generator/builder/efs/EFSResourceFileSystemAccess.java

@@ -35,7 +35,6 @@ import org.eclipse.xtext.util.RuntimeIOException;
 import org.eclipse.xtext.util.StringInputStream;
 import org.yakindu.sct.generator.core.features.ICoreFeatureConstants;
 import org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess;
-import org.yakindu.sct.generator.core.impl.AbstractXpandBasedCodeGenerator;
 import org.yakindu.sct.generator.core.library.IOutletFeatureHelper;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 
@@ -78,8 +77,7 @@ public class EFSResourceFileSystemAccess extends AbstractFileSystemAccess2 imple
 			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(stringValue);
 			return project;
 		} else
-			throw new IllegalStateException("The " + AbstractXpandBasedCodeGenerator.class.getSimpleName()
-					+ " needs a running eclipse.Platform");
+			throw new IllegalStateException("Eclipse Platform not running.");
 	}
 
 	/**

+ 1 - 7
plugins/org.yakindu.sct.generator.core/META-INF/MANIFEST.MF

@@ -8,24 +8,18 @@ Bundle-Vendor: statecharts.org
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime;visibility:=reexport,
  org.yakindu.sct.model.sexec;visibility:=reexport,
- org.eclipse.xpand;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.xtend;visibility:=reexport,
- org.eclipse.xtend.typesystem.emf;visibility:=reexport,
  org.yakindu.sct.model.stext,
  org.eclipse.jdt.core,
  org.eclipse.jdt.launching,
- org.eclipse.ui.console,
  org.eclipse.xtext.xbase,
  org.yakindu.sct.model.sgen,
  org.eclipse.core.expressions,
  org.yakindu.base.types,
- org.eclipse.xtext.builder,
  org.yakindu.sct.commons,
  org.yakindu.sct.domain,
  com.google.guava,
- org.eclipse.emf.workspace,
- org.eclipse.xtext.generator
+ org.eclipse.emf.workspace
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: org.yakindu.sct.generator.core,

+ 2 - 1
plugins/org.yakindu.sct.generator.csharp/META-INF/MANIFEST.MF

@@ -6,7 +6,8 @@ Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.yakindu.sct.model.stext,
  org.yakindu.sct.generator.core,
  org.yakindu.sct.generator.genmodel,
- org.yakindu.sct.model.resource
+ org.yakindu.sct.model.resource,
+ org.eclipse.xpand
 Bundle-Vendor: statecharts.org
 Export-Package: org.yakindu.sct.generator.csharp,
  org.yakindu.sct.generator.csharp.features

+ 2 - 1
plugins/org.yakindu.sct.generator.java/META-INF/MANIFEST.MF

@@ -6,7 +6,8 @@ Bundle-Version: 2.7.1.qualifier
 Require-Bundle: org.yakindu.sct.model.stext,
  org.yakindu.sct.generator.core,
  org.yakindu.sct.generator.genmodel,
- org.yakindu.sct.model.resource
+ org.yakindu.sct.model.resource,
+ org.eclipse.xpand
 Bundle-Vendor: statecharts.org
 Export-Package: org.yakindu.sct.generator.java,
  org.yakindu.sct.generator.java.features,

+ 5 - 1
plugins/org.yakindu.sct.generator.xpand/META-INF/MANIFEST.MF

@@ -7,4 +7,8 @@ Bundle-Vendor: statecharts.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.yakindu.sct.generator.core,
  org.yakindu.sct.generator.genmodel,
- org.yakindu.sct.commons
+ org.yakindu.sct.commons,
+ org.eclipse.xtend.typesystem.emf,
+ org.eclipse.xtend,
+ org.yakindu.sct.model.stext,
+ org.eclipse.xpand

+ 2 - 1
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/impl/AbstractXpandBasedCodeGenerator.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     committers of YAKINDU - initial API and implementation
  */
-package org.yakindu.sct.generator.core.impl;
+package org.yakindu.sct.generator.xpand;
 
 import java.util.Collections;
 import java.util.Set;
@@ -27,6 +27,7 @@ import org.eclipse.xtend.typesystem.Type;
 import org.eclipse.xtend.typesystem.emf.EmfRegistryMetaModel;
 import org.yakindu.base.base.BasePackage;
 import org.yakindu.base.types.TypesPackage;
+import org.yakindu.sct.generator.core.impl.AbstractSExecModelGenerator;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.SexecPackage;
 import org.yakindu.sct.model.sgen.GeneratorEntry;