Fixes of compile errors in renamed projects #359

viatra · Nov 28, 2012 · a33b8a4 · a33b8a4
1 parent 03801d2
commit a33b8a4
Show file tree

Hide file tree

Showing 43 changed files with 109 additions and 870 deletions.
diff --git a/plugins/org.eclipse.incquery.patternlanguage.emf.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.incquery.patternlanguage.emf.ui/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.incquery.patternlanguage.emf;visibility:=reexport,
 Import-Package: org.apache.log4j,
  org.apache.commons.logging
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.incquery.patternlanguage.ui,
- org.eclipse.incquery.patternlanguage.ui.contentassist,
- org.eclipse.viatra2.patternlanguage.ui.contentassist.antlr,
- org.eclipse.viatra2.patternlanguage.ui.internal
-Bundle-Activator: org.eclipse.incquery.patternlanguage.ui.EMFPatternLanguageUIActivator
+Export-Package: org.eclipse.incquery.patternlanguage.emf.ui,
+ org.eclipse.incquery.patternlanguage.emf.ui.contentassist,
+ org.eclipse.incquery.patternlanguage.emf.ui.internal
+Bundle-Activator: org.eclipse.incquery.patternlanguage.emf.ui.EMFPatternLanguageUIActivator
diff --git a/plugins/org.eclipse.incquery.patternlanguage.emf.ui/plugin.xml b/plugins/org.eclipse.incquery.patternlanguage.emf.ui/plugin.xml
@@ -421,7 +421,7 @@
     </provider>
   </extension>
   <extension
-        point="org.eclipse.viatra2.emf.incquery.runtime.injectorprovider">
+        point="org.eclipse.incquery.runtime.injectorprovider">
      <injector
            injector="org.eclipse.incquery.patternlanguage.ui.UiPluginInjectorProvider">
      </injector>

diff --git a/...age/ui/EMFPatternLanguageUIActivator.java → ...emf/ui/EMFPatternLanguageUIActivator.java b/...age/ui/EMFPatternLanguageUIActivator.java → ...emf/ui/EMFPatternLanguageUIActivator.java
@@ -9,9 +9,9 @@
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.patternlanguage.ui;
+package org.eclipse.incquery.patternlanguage.emf.ui;
 
-import org.eclipse.incquery.patternlanguage.ui.internal.EMFPatternLanguageActivator;
+import org.eclipse.incquery.patternlanguage.emf.ui.internal.EMFPatternLanguageActivator;
 import org.eclipse.incquery.tooling.core.generator.IncQueryGeneratorPlugin;
 
 import com.google.inject.Module;
@@ -20,7 +20,7 @@ public class EMFPatternLanguageUIActivator extends EMFPatternLanguageActivator {
 
 	@Override
 	protected Module getRuntimeModule(String grammar) {
-		if (ORG_ECLIPSE_VIATRA2_PATTERNLANGUAGE_EMFPATTERNLANGUAGE.equals(grammar)) {
+		if (ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE.equals(grammar)) {
 			return IncQueryGeneratorPlugin.INSTANCE.getRuntimeModule();
 		}
 

diff --git a/...nguage/ui/EMFPatternLanguageUiModule.java → ...ge/emf/ui/EMFPatternLanguageUiModule.java b/...nguage/ui/EMFPatternLanguageUiModule.java → ...ge/emf/ui/EMFPatternLanguageUiModule.java
@@ -8,25 +8,26 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui;
+package org.eclipse.incquery.patternlanguage.emf.ui;
 
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Logger;
 import org.eclipse.incquery.patternlanguage.emf.scoping.IMetamodelProvider;
+import org.eclipse.incquery.patternlanguage.emf.ui.AbstractEMFPatternLanguageUiModule;
+import org.eclipse.incquery.patternlanguage.emf.ui.feedback.GeneratorMarkerFeedback;
+import org.eclipse.incquery.patternlanguage.emf.ui.highlight.EMFPatternLanguageHighlightingCalculator;
+import org.eclipse.incquery.patternlanguage.emf.ui.highlight.EMFPatternLanguageHighlightingConfiguration;
+import org.eclipse.incquery.patternlanguage.emf.ui.labeling.EMFPatternLanguageHoverDocumentationProvider;
+import org.eclipse.incquery.patternlanguage.emf.ui.validation.GenmodelBasedEMFPatternLanguageJavaValidator;
 import org.eclipse.incquery.patternlanguage.emf.validation.EMFPatternLanguageJavaValidator;
-import org.eclipse.incquery.patternlanguage.ui.feedback.GeneratorMarkerFeedback;
-import org.eclipse.incquery.patternlanguage.ui.highlight.EMFPatternLanguageHighlightingCalculator;
-import org.eclipse.incquery.patternlanguage.ui.highlight.EMFPatternLanguageHighlightingConfiguration;
-import org.eclipse.incquery.patternlanguage.ui.labeling.EMFPatternLanguageHoverDocumentationProvider;
-import org.eclipse.incquery.patternlanguage.ui.validation.GenmodelBasedEMFPatternLanguageJavaValidator;
 import org.eclipse.incquery.tooling.core.generator.builder.EMFPatternLanguageBuilderParticipant;
 import org.eclipse.incquery.tooling.core.generator.builder.IErrorFeedback;
 import org.eclipse.incquery.tooling.core.generator.genmodel.GenModelMetamodelProviderService;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
 import org.eclipse.incquery.tooling.core.generator.jvmmodel.EMFPatternJvmModelAssociator;
+import org.eclipse.incquery.tooling.core.generator.jvmmodel.EMFPatternLanguageJvmModelInferrer;
 import org.eclipse.incquery.tooling.core.generator.types.GenModelBasedTypeProvider;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.viatra2.emf.incquery.tooling.generator.jvmmodel.EMFPatternLanguageJvmModelInferrer;
 import org.eclipse.xtext.builder.IXtextBuilderParticipant;
 import org.eclipse.xtext.service.SingletonBinding;
 import org.eclipse.xtext.ui.editor.contentassist.XtextContentAssistProcessor;
@@ -46,7 +47,7 @@
 /**
  * Use this class to register components to be used within the IDE.
  */
-public class EMFPatternLanguageUiModule extends org.eclipse.viatra2.patternlanguage.ui.AbstractEMFPatternLanguageUiModule {
+public class EMFPatternLanguageUiModule extends AbstractEMFPatternLanguageUiModule {
 	private static final String loggerRoot = "org.eclipse.viatra2.emf.incquery";
 
 	public EMFPatternLanguageUiModule(AbstractUIPlugin plugin) {

diff --git a/...atternlanguage/ui/EclipseLogAppender.java → ...rnlanguage/emf/ui/EclipseLogAppender.java b/...atternlanguage/ui/EclipseLogAppender.java → ...rnlanguage/emf/ui/EclipseLogAppender.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui;
+package org.eclipse.incquery.patternlanguage.emf.ui;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.Level;

diff --git a/...language/ui/UiPluginInjectorProvider.java → ...uage/emf/ui/UiPluginInjectorProvider.java b/...language/ui/UiPluginInjectorProvider.java → ...uage/emf/ui/UiPluginInjectorProvider.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.patternlanguage.ui;
+package org.eclipse.incquery.patternlanguage.emf.ui;
 
 import org.eclipse.incquery.runtime.extensibility.IInjectorProvider;
 
@@ -19,7 +19,7 @@ public class UiPluginInjectorProvider implements IInjectorProvider {
 
 	@Override
 	public Injector getInjector() {
-		return EMFPatternLanguageUIActivator.getInstance().getInjector(EMFPatternLanguageUIActivator.ORG_ECLIPSE_VIATRA2_PATTERNLANGUAGE_EMFPATTERNLANGUAGE);
+		return EMFPatternLanguageUIActivator.getInstance().getInjector(EMFPatternLanguageUIActivator.ORG_ECLIPSE_INCQUERY_PATTERNLANGUAGE_EMF_EMFPATTERNLANGUAGE);
 	}
 
 }
diff --git a/...t/EMFPatternLanguageProposalProvider.java → ...t/EMFPatternLanguageProposalProvider.java b/...t/EMFPatternLanguageProposalProvider.java → ...t/EMFPatternLanguageProposalProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui.contentassist;
+package org.eclipse.incquery.patternlanguage.emf.ui.contentassist;
 
 import static org.eclipse.emf.ecore.util.EcoreUtil.getRootContainer;
 
@@ -22,17 +22,18 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.incquery.patternlanguage.emf.EMFPatternLanguageScopeHelper;
 import org.eclipse.incquery.patternlanguage.emf.ResolutionException;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionElement;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionHead;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Pattern;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternBody;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Variable;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ClassType;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.EMFPatternLanguagePackage;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PackageImport;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PatternModel;
+import org.eclipse.incquery.patternlanguage.emf.ui.contentassist.AbstractEMFPatternLanguageProposalProvider;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionElement;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionHead;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternBody;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Variable;
 import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ClassType;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.EMFPatternLanguagePackage;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PackageImport;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PatternModel;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.EnumRule;
 import org.eclipse.xtext.Keyword;
@@ -68,9 +69,9 @@ public class EMFPatternLanguageProposalProvider extends AbstractEMFPatternLangua
 	ReferenceProposalCreator crossReferenceProposalCreator;
 
 	public static class ClassifierPrefixMatcher extends PrefixMatcher {
-		private PrefixMatcher delegate;
+		private final PrefixMatcher delegate;
 
-		private IQualifiedNameConverter qualifiedNameConverter;
+		private final IQualifiedNameConverter qualifiedNameConverter;
 
 
 		public ClassifierPrefixMatcher(PrefixMatcher delegate, IQualifiedNameConverter qualifiedNameConverter) {

diff --git a/.../ui/feedback/GeneratorMarkerFeedback.java → .../ui/feedback/GeneratorMarkerFeedback.java b/.../ui/feedback/GeneratorMarkerFeedback.java → .../ui/feedback/GeneratorMarkerFeedback.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.patternlanguage.ui.feedback;
+package org.eclipse.incquery.patternlanguage.emf.ui.feedback;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;

diff --git a/...atternLanguageHighlightingCalculator.java → ...atternLanguageHighlightingCalculator.java b/...atternLanguageHighlightingCalculator.java → ...atternLanguageHighlightingCalculator.java
@@ -9,15 +9,15 @@
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.patternlanguage.ui.highlight;
+package org.eclipse.incquery.patternlanguage.emf.ui.highlight;
 
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.incquery.patternlanguage.annotations.PatternAnnotationProvider;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Annotation;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.AnnotationParameter;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ClassType;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ReferenceType;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ClassType;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ReferenceType;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Annotation;
+import org.eclipse.incquery.patternlanguage.patternLanguage.AnnotationParameter;
 import org.eclipse.xtext.nodemodel.ICompositeNode;
 import org.eclipse.xtext.nodemodel.ILeafNode;
 import org.eclipse.xtext.nodemodel.INode;

diff --git a/...ernLanguageHighlightingConfiguration.java → ...ernLanguageHighlightingConfiguration.java b/...ernLanguageHighlightingConfiguration.java → ...ernLanguageHighlightingConfiguration.java
@@ -9,7 +9,7 @@
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.incquery.patternlanguage.ui.highlight;
+package org.eclipse.incquery.patternlanguage.emf.ui.highlight;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;

diff --git a/...ternLanguageDescriptionLabelProvider.java → ...ternLanguageDescriptionLabelProvider.java b/...ternLanguageDescriptionLabelProvider.java → ...ternLanguageDescriptionLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui.labeling;
+package org.eclipse.incquery.patternlanguage.emf.ui.labeling;
 
 import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider;
 

diff --git a/...rnLanguageHoverDocumentationProvider.java → ...rnLanguageHoverDocumentationProvider.java b/...rnLanguageHoverDocumentationProvider.java → ...rnLanguageHoverDocumentationProvider.java
@@ -8,19 +8,19 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui.labeling;
+package org.eclipse.incquery.patternlanguage.emf.ui.labeling;
 
 import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.incquery.patternlanguage.annotations.PatternAnnotationProvider;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Annotation;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.AnnotationParameter;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Variable;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.VariableReference;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PackageImport;
 import org.eclipse.incquery.patternlanguage.emf.types.IEMFTypeProvider;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Annotation;
+import org.eclipse.incquery.patternlanguage.patternLanguage.AnnotationParameter;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Variable;
+import org.eclipse.incquery.patternlanguage.patternLanguage.VariableReference;
 import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PackageImport;
 import org.eclipse.xtext.common.types.JvmTypeReference;
 import org.eclipse.xtext.xbase.typing.ITypeProvider;
 import org.eclipse.xtext.xbase.ui.hover.XbaseHoverDocumentationProvider;

diff --git a/...ling/EMFPatternLanguageLabelProvider.java → ...ling/EMFPatternLanguageLabelProvider.java b/...ling/EMFPatternLanguageLabelProvider.java → ...ling/EMFPatternLanguageLabelProvider.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui.labeling;
+package org.eclipse.incquery.patternlanguage.emf.ui.labeling;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,32 +17,32 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.incquery.patternlanguage.emf.EMFPatternLanguageScopeHelper;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.AggregatedValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.AggregatorExpression;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.BoolValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.CheckConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.CompareConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.CompareFeature;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.CountAggregator;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.DoubleValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.IntValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.ListValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionHead;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionTail;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Pattern;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternBody;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternCall;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternCompositionConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.StringValue;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.ValueReference;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.VariableValue;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ClassType;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.EClassifierConstraint;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.EnumValue;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PackageImport;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PatternModel;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ReferenceType;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ClassType;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.EClassifierConstraint;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.EnumValue;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PackageImport;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PatternModel;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ReferenceType;
+import org.eclipse.incquery.patternlanguage.patternLanguage.AggregatedValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.AggregatorExpression;
+import org.eclipse.incquery.patternlanguage.patternLanguage.BoolValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.CheckConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.CompareConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.CompareFeature;
+import org.eclipse.incquery.patternlanguage.patternLanguage.CountAggregator;
+import org.eclipse.incquery.patternlanguage.patternLanguage.DoubleValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.IntValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.ListValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionHead;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionTail;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternBody;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternCall;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternCompositionConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.StringValue;
+import org.eclipse.incquery.patternlanguage.patternLanguage.ValueReference;
+import org.eclipse.incquery.patternlanguage.patternLanguage.VariableValue;
 import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;
 import org.eclipse.xtext.util.Strings;
 

diff --git a/...MFPatternLanguageOutlineTreeProvider.java → ...MFPatternLanguageOutlineTreeProvider.java b/...MFPatternLanguageOutlineTreeProvider.java → ...MFPatternLanguageOutlineTreeProvider.java
@@ -8,21 +8,21 @@
  * Contributors:
  *   Zoltan Ujhelyi - initial API and implementation
  *******************************************************************************/
-package org.eclipse.incquery.patternlanguage.ui.outline;
+package org.eclipse.incquery.patternlanguage.emf.ui.outline;
 
 import java.util.Iterator;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionHead;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PathExpressionTail;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Pattern;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternBody;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.PatternCompositionConstraint;
-import org.eclipse.incquery.patternlanguage.emf.core.patternLanguage.Variable;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.EClassifierConstraint;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.EMFPatternLanguagePackage;
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.PatternModel;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.EClassifierConstraint;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.EMFPatternLanguagePackage;
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.PatternModel;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionHead;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PathExpressionTail;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternBody;
+import org.eclipse.incquery.patternlanguage.patternLanguage.PatternCompositionConstraint;
+import org.eclipse.incquery.patternlanguage.patternLanguage.Variable;
 import org.eclipse.xtext.ui.editor.outline.IOutlineNode;
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
 import org.eclipse.xtext.ui.editor.outline.impl.DocumentRootNode;