(OCD)

dslmeinte · Aug 24, 2012 · ce31f67 · ce31f67
1 parent 6f0cd4f
commit ce31f67
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/nl.dslmeinte.xtext.xsd.ui/.classpath b/nl.dslmeinte.xtext.xsd.ui/.classpath
@@ -3,6 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/nl.dslmeinte.xtext.xsd/.classpath b/nl.dslmeinte.xtext.xsd/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry excluding=".gitignore" kind="src" path="src-gen"/>
 	<classpathentry excluding=".gitignore" kind="src" path="xtend-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/GenerateXsdLanguage.mwe2 b/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/GenerateXsdLanguage.mwe2
@@ -15,15 +15,15 @@ Workflow {
             scanClassPath = true
             platformUri = "${runtimeProject}/.."
         }
-    
+
         component = DirectoryCleaner {
-            directory = "${runtimeProject}/src-gen"
+            directory = "${runtimeProject}/src-gen/nl"
         }
 
         component = DirectoryCleaner {
-            directory = "${runtimeProject}.ui/src-gen"
+            directory = "${runtimeProject}.ui/src-gen/nl"
         }
-    
+
         component = Generator {
 
             pathRtProject = runtimeProject

diff --git a/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/XsdExtensions.xtend b/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/XsdExtensions.xtend
@@ -67,11 +67,11 @@ class XsdExtensions {
 	/**
 	 * Resolves the given schema import.
 	 */
-	def resolveImport (Import importElt) {
+	def resolveImport(Import importElt) {
 		resolveImport(importElt.eResource, importElt.importURI)
 	}
 
-	def resolveImport (Resource resource, String uri) {
+	def resolveImport(Resource resource, String uri) {
 		val importResource = EcoreUtil2::getResource(resource, uri)
 		importResource.contents.head as Schema
 	}
@@ -84,7 +84,7 @@ class XsdExtensions {
 	 * @param prefix
 	 *            - the name space prefix
 	 */
-	def schema (EObject eObject, String prefix) {
+	def schema(EObject eObject, String prefix) {
 		val thisSchema = EcoreUtil::getRootContainer(eObject) as Schema
 		for( Import importElt : thisSchema.getImports() ) {
 			if( importElt.nsPrefix == prefix ) {

diff --git a/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/XsdLanguage.xtext b/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/XsdLanguage.xtext
@@ -3,9 +3,8 @@ grammar nl.dslmeinte.xtext.xsd.XsdLanguage with org.eclipse.xtext.common.Termina
 generate xsdLanguage "http://www.dslmeinte.nl/xtext/xsd/XsdLanguage"
 
 
-// root:
 Schema:
-    "schema" name=ID                // name is mainly used for file generation
+    "schema" name=ID                // name is mainly used for file generation (not for referencing)
         "namespace" nsURI=STRING    // URI
     ( imports += Import )*
     ( definitions += TopLevelDefinition )*

diff --git a/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/validation/XsdLanguageXtendValidator.xtend b/nl.dslmeinte.xtext.xsd/src/nl/dslmeinte/xtext/xsd/validation/XsdLanguageXtendValidator.xtend
@@ -10,7 +10,7 @@ class XsdLanguageXtendValidator extends AbstractXsdLanguageJavaValidator {
 
 	@Inject extension XsdExtensions
 
-	private XsdLanguagePackage ePackage = XsdLanguagePackage::eINSTANCE
+	val ePackage = XsdLanguagePackage::eINSTANCE
 
 
 	@Check