Просмотр исходного кода

Move non-parser functionality into the util package.

Timur Sağlam 4 лет назад
Родитель
Сommit
62fdfda237

+ 1 - 1
jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/parser/DynamicEcoreParser.java

@@ -5,8 +5,8 @@ import org.eclipse.emf.ecore.EObject;
 import de.jplag.emf.MetamodelToken;
 import de.jplag.emf.MetamodelToken;
 import de.jplag.emf.dynamic.DynamicMetamodelToken;
 import de.jplag.emf.dynamic.DynamicMetamodelToken;
 import de.jplag.emf.dynamic.Language;
 import de.jplag.emf.dynamic.Language;
-import de.jplag.emf.parser.AbstractMetamodelVisitor;
 import de.jplag.emf.parser.EcoreParser;
 import de.jplag.emf.parser.EcoreParser;
+import de.jplag.emf.util.AbstractMetamodelVisitor;
 
 
 /**
 /**
  * Parser for EMF metamodels based on dynamically created tokens.
  * Parser for EMF metamodels based on dynamically created tokens.

+ 1 - 1
jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/parser/DynamicMetamodelTokenGenerator.java

@@ -3,7 +3,7 @@ package de.jplag.emf.dynamic.parser;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EObject;
 
 
 import de.jplag.emf.dynamic.DynamicMetamodelTokenConstants;
 import de.jplag.emf.dynamic.DynamicMetamodelTokenConstants;
-import de.jplag.emf.parser.AbstractMetamodelVisitor;
+import de.jplag.emf.util.AbstractMetamodelVisitor;
 
 
 /**
 /**
  * Visits a metamodel containment tree and extracts the relevant token based on a dynamically created token set.
  * Visits a metamodel containment tree and extracts the relevant token based on a dynamically created token set.

+ 2 - 0
jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/parser/EcoreParser.java

@@ -10,7 +10,9 @@ import de.jplag.TokenConstants;
 import de.jplag.TokenList;
 import de.jplag.TokenList;
 import de.jplag.emf.Language;
 import de.jplag.emf.Language;
 import de.jplag.emf.MetamodelToken;
 import de.jplag.emf.MetamodelToken;
+import de.jplag.emf.util.AbstractMetamodelVisitor;
 import de.jplag.emf.util.EMFUtil;
 import de.jplag.emf.util.EMFUtil;
+import de.jplag.emf.util.MetamodelTreeView;
 
 
 /**
 /**
  * Parser for EMF metamodels.
  * Parser for EMF metamodels.

+ 2 - 0
jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/parser/MetamodelTokenGenerator.java

@@ -32,6 +32,8 @@ import org.eclipse.emf.ecore.EParameter;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.ETypeParameter;
 import org.eclipse.emf.ecore.ETypeParameter;
 
 
+import de.jplag.emf.util.AbstractMetamodelVisitor;
+
 /**
 /**
  * Visits a metamodel containment tree and extracts the relevant token.
  * Visits a metamodel containment tree and extracts the relevant token.
  * @author Timur Saglam
  * @author Timur Saglam

+ 1 - 1
jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/parser/AbstractMetamodelVisitor.java → jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/util/AbstractMetamodelVisitor.java

@@ -1,4 +1,4 @@
-package de.jplag.emf.parser;
+package de.jplag.emf.util;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 
 

+ 1 - 1
jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/parser/MetamodelTreeView.java → jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java

@@ -1,4 +1,4 @@
-package de.jplag.emf.parser;
+package de.jplag.emf.util;
 
 
 import java.io.BufferedWriter;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.File;