Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Renamed derived feature support #359

  • Loading branch information...
commit 04cbdf6815dd89edaddc106ea4e933ae3a20f707 1 parent 9502c5f
András Ökrös okrosa authored
Showing with 102 additions and 104 deletions.
  1. 0  ...org.eclipse.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.runtime}/.classpath
  2. +1 −1  .../{org.eclipse.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.runtime}/.project
  3. 0  ...erator.derived → org.eclipse.incquery.querybasedfeatures.runtime}/.settings/org.eclipse.jdt.core.prefs
  4. +2 −2 ...e.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.runtime}/META-INF/MANIFEST.MF
  5. 0  ...2.emf.incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.runtime}/about.html
  6. 0  ...lipse.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.runtime}/build.properties
  7. 0  ...s/{org.eclipse.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.runtime}/pom.xml
  8. +1 −1  ....querybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/DerivedFeatureAdapter.java
  9. +1 −1  ...rybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/IQueryBasedFeatureHandler.java
  10. +1 −1  ...rybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/InvertableQueryBasedEList.java
  11. +9 −9 ...erybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/QueryBasedFeatureHandler.java
  12. +1 −1  ...uerybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/QueryBasedFeatureHelper.java
  13. +1 −1  ...rybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/QueryBasedFeatureInverter.java
  14. +1 −1  ....querybasedfeatures.runtime/src/org/eclipse/incquery/querybasedfeatures/runtime}/QueryBasedFeatureKind.java
  15. 0  ...2.emf.incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/.classpath
  16. +35 −35 ...ra2.emf.incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/.project
  17. 0  ....derived → org.eclipse.incquery.querybasedfeatures.tooling}/.settings/org.eclipse.core.resources.prefs
  18. 0  ...cquery.derived → org.eclipse.incquery.querybasedfeatures.tooling}/.settings/org.eclipse.jdt.core.prefs
  19. 0  ...enerator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/.settings/org.eclipse.jdt.ui.prefs
  20. 0  ....derived → org.eclipse.incquery.querybasedfeatures.tooling}/.settings/org.sonar.ide.eclipse.core.prefs
  21. +3 −3 ...uery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/META-INF/MANIFEST.MF
  22. 0  ...org.eclipse.viatra2.emf.incquery.derived → org.eclipse.incquery.querybasedfeatures.tooling}/about.html
  23. 0  ...incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/build.properties
  24. +3 −3 ...2.emf.incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/plugin.xml
  25. 0  ...tra2.emf.incquery.tooling.generator.derived → org.eclipse.incquery.querybasedfeatures.tooling}/pom.xml
  26. +23 −25 ...erybasedfeatures.tooling/src/org/eclipse/incquery/querybasedfeatures/tooling}/DerivedFeatureGenerator.xtend
  27. +9 −9 ...sedfeatures.tooling/src/org/eclipse/incquery/querybasedfeatures/tooling}/DerivedFeatureSourceCodeUtil.xtend
  28. +1 −1  ...ncquery.querybasedfeatures.tooling/src/org/eclipse/incquery/querybasedfeatures/tooling}/ProjectLocator.java
  29. +3 −3 plugins/org.eclipse.incquery.tooling.core/schema/generatorFragment.exsd
  30. +1 −1  tests/org.eclipse.viatra2.emf.incquery.snapshot/META-INF/MANIFEST.MF
  31. +3 −3 ...2.emf.incquery.snapshot/src/org/eclipse/viatra2/emf/incquery/snapshot/EIQSnapshot/impl/MatchRecordImpl.java
  32. +3 −3 ...ry.snapshot/src/org/eclipse/viatra2/emf/incquery/snapshot/EIQSnapshot/impl/MatchSubstitutionRecordImpl.java
0  ...g.eclipse.viatra2.emf.incquery.derived/.classpath → ...se.incquery.querybasedfeatures.runtime/.classpath
View
File renamed without changes
2  ...org.eclipse.viatra2.emf.incquery.derived/.project → ...ipse.incquery.querybasedfeatures.runtime/.project
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.viatra2.emf.incquery.derived</name>
+ <name>org.eclipse.incquery.querybasedfeatures.runtime</name>
<comment></comment>
<projects>
</projects>
0  ...ator.derived/.settings/org.eclipse.jdt.core.prefs → ...ures.runtime/.settings/org.eclipse.jdt.core.prefs
View
File renamed without changes
4 ...viatra2.emf.incquery.derived/META-INF/MANIFEST.MF → ...y.querybasedfeatures.runtime/META-INF/MANIFEST.MF
View
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EMF-IncQuery backed derived features
-Bundle-SymbolicName: org.eclipse.viatra2.emf.incquery.derived
+Bundle-SymbolicName: org.eclipse.incquery.querybasedfeatures.runtime
Bundle-Version: 0.7.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.incquery.runtime;bundle-version="0.6.5"
-Export-Package: org.eclipse.viatra2.emf.incquery.runtime.derived
+Export-Package: org.eclipse.incquery.querybasedfeatures.runtime
0  ...emf.incquery.tooling.generator.derived/about.html → ...se.incquery.querybasedfeatures.runtime/about.html
View
File renamed without changes
0  ...pse.viatra2.emf.incquery.derived/build.properties → ...query.querybasedfeatures.runtime/build.properties
View
File renamed without changes
0  .../org.eclipse.viatra2.emf.incquery.derived/pom.xml → ...lipse.incquery.querybasedfeatures.runtime/pom.xml
View
File renamed without changes
2  ...cquery/runtime/derived/DerivedFeatureAdapter.java → ...ybasedfeatures/runtime/DerivedFeatureAdapter.java
View
@@ -9,7 +9,7 @@
* pvmellor - original code (http://wiki.eclipse.org/EMF/Recipes#Recipe:_Derived_Attribute_Notifier)
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
import java.util.ArrayList;
import java.util.Collection;
2  ...ry/runtime/derived/IQueryBasedFeatureHandler.java → ...edfeatures/runtime/IQueryBasedFeatureHandler.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
import java.util.List;
2  ...ry/runtime/derived/InvertableQueryBasedEList.java → ...edfeatures/runtime/InvertableQueryBasedEList.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
import java.util.Collection;
import java.util.List;
18 ...ery/runtime/derived/QueryBasedFeatureHandler.java → ...sedfeatures/runtime/QueryBasedFeatureHandler.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,13 +24,13 @@
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.incquery.gtasm.patternmatcher.incremental.rete.misc.DeltaMonitor;
import org.eclipse.incquery.runtime.api.IMatchProcessor;
import org.eclipse.incquery.runtime.api.IPatternMatch;
import org.eclipse.incquery.runtime.api.IncQueryEngine;
import org.eclipse.incquery.runtime.api.IncQueryMatcher;
import org.eclipse.incquery.runtime.exception.IncQueryException;
import org.eclipse.incquery.runtime.extensibility.MatcherFactoryRegistry;
+import org.eclipse.incquery.runtime.rete.misc.DeltaMonitor;
/**
* @author Abel Hegedus
@@ -95,9 +95,9 @@ public void run() {
private String targetParamName;
private QueryBasedFeatureKind kind;
- private Map<InternalEObject, Object> updateMemory = new HashMap<InternalEObject, Object>();
- private Map<InternalEObject, Integer> counterMemory = new HashMap<InternalEObject, Integer>();
- private Map<InternalEObject, Object> singleRefMemory = new HashMap<InternalEObject, Object>();
+ private final Map<InternalEObject, Object> updateMemory = new HashMap<InternalEObject, Object>();
+ private final Map<InternalEObject, Integer> counterMemory = new HashMap<InternalEObject, Integer>();
+ private final Map<InternalEObject, Object> singleRefMemory = new HashMap<InternalEObject, Object>();
private boolean keepCache = true;
private boolean initialized = false;
@@ -351,7 +351,7 @@ public EList getManyReferenceValueAsEList(Object source) {
} else {
if (feature.isMany()) {
notifications.add(new ENotificationImpl(source, Notification.ADD, feature, null, target));
- addToManyRefMemory(source, (Object) target);
+ addToManyRefMemory(source, target);
} else {
if (updateMemory.get(source) != null) {
matcher.getEngine()
@@ -359,7 +359,7 @@ public EList getManyReferenceValueAsEList(Object source) {
.error("[IncqueryFeatureHandler] Space-time continuum breached (should never happen): update memory already set for given source");
} else {
// must handle later (either in lost matches or after that)
- updateMemory.put(source, (Object) target);
+ updateMemory.put(source, target);
}
}
}
@@ -407,13 +407,13 @@ private void increaseCounter(InternalEObject source, int delta) throws IncQueryE
if (feature.isMany()) {
notifications
.add(new ENotificationImpl(source, Notification.REMOVE, feature, target, null));
- removeFromManyRefMemory(source, (Object) target);
+ removeFromManyRefMemory(source, target);
} else {
Object updateValue = updateMemory.get(source);
if (updateValue != null) {
notifications.add(new ENotificationImpl(source, Notification.SET, feature, target,
updateValue));
- setSingleRefMemory(source, (Object) updateValue);
+ setSingleRefMemory(source, updateValue);
updateMemory.remove(source);
} else {
notifications
2  ...uery/runtime/derived/QueryBasedFeatureHelper.java → ...asedfeatures/runtime/QueryBasedFeatureHelper.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
import java.lang.ref.WeakReference;
import java.util.HashMap;
2  ...ry/runtime/derived/QueryBasedFeatureInverter.java → ...edfeatures/runtime/QueryBasedFeatureInverter.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
public interface QueryBasedFeatureInverter<ComputedType, StorageType> {
/**
2  ...cquery/runtime/derived/QueryBasedFeatureKind.java → ...ybasedfeatures/runtime/QueryBasedFeatureKind.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.runtime.derived;
+package org.eclipse.incquery.querybasedfeatures.runtime;
public enum QueryBasedFeatureKind{
SUM, COUNTER, SINGLE_REFERENCE, MANY_REFERENCE, ITERATION
0  ...emf.incquery.tooling.generator.derived/.classpath → ...se.incquery.querybasedfeatures.tooling/.classpath
View
File renamed without changes
70 ...2.emf.incquery.tooling.generator.derived/.project → ...ipse.incquery.querybasedfeatures.tooling/.project
View
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.viatra2.emf.incquery.tooling.generator.derived</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.incquery.querybasedfeatures.tooling</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.sonar.ide.eclipse.core.sonarNature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ </natures>
+</projectDescription>
0  ...erived/.settings/org.eclipse.core.resources.prefs → ...ooling/.settings/org.eclipse.core.resources.prefs
View
File renamed without changes
0  ...uery.derived/.settings/org.eclipse.jdt.core.prefs → ...ures.tooling/.settings/org.eclipse.jdt.core.prefs
View
File renamed without changes
0  ...erator.derived/.settings/org.eclipse.jdt.ui.prefs → ...atures.tooling/.settings/org.eclipse.jdt.ui.prefs
View
File renamed without changes
0  ...erived/.settings/org.sonar.ide.eclipse.core.prefs → ...ooling/.settings/org.sonar.ide.eclipse.core.prefs
View
File renamed without changes
6 ...ry.tooling.generator.derived/META-INF/MANIFEST.MF → ...y.querybasedfeatures.tooling/META-INF/MANIFEST.MF
View
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Derived Feature Code Generation
-Bundle-SymbolicName: org.eclipse.viatra2.emf.incquery.tooling.generator.derived;singleton:=true
+Bundle-SymbolicName: org.eclipse.incquery.querybasedfeatures.tooling;singleton:=true
Bundle-Version: 0.7.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.incquery.tooling.core;bundle-version="0.6.0",
org.eclipse.incquery.tooling.generator.model,
org.eclipse.core.resources;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.viatra2.emf.incquery.derived;bundle-version="0.6.5"
-Export-Package: org.eclipse.viatra2.emf.incquery.tooling.generator.derived
+ org.eclipse.incquery.querybasedfeatures.runtime;bundle-version="0.6.5"
+Export-Package: org.eclipse.incquery.querybasedfeatures.tooling
0  ...g.eclipse.viatra2.emf.incquery.derived/about.html → ...se.incquery.querybasedfeatures.tooling/about.html
View
File renamed without changes
0  ...cquery.tooling.generator.derived/build.properties → ...query.querybasedfeatures.tooling/build.properties
View
File renamed without changes
6 ...emf.incquery.tooling.generator.derived/plugin.xml → ...se.incquery.querybasedfeatures.tooling/plugin.xml
View
@@ -2,14 +2,14 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.viatra2.emf.incquery.tooling.generator.generatorFragment">
+ point="org.eclipse.incquery.tooling.core.generatorFragment">
<fragment
annotation="QueryBasedFeature"
- fragment="org.eclipse.viatra2.emf.incquery.tooling.generator.derived.DerivedFeatureGenerator">
+ fragment="org.eclipse.incquery.querybasedfeatures.tooling.DerivedFeatureGenerator">
</fragment>
</extension>
<extension
- point="org.eclipse.viatra2.patternlanguage.core.annotation">
+ point="org.eclipse.incquery.patternlanguage.annotation">
<annotation
description="This annotation is used to mark a pattern as a query definition for a query-based feature."
name="QueryBasedFeature">
0  ...a2.emf.incquery.tooling.generator.derived/pom.xml → ...lipse.incquery.querybasedfeatures.tooling/pom.xml
View
File renamed without changes
48 ...g/generator/derived/DerivedFeatureGenerator.xtend → ...sedfeatures/tooling/DerivedFeatureGenerator.xtend
View
@@ -9,7 +9,7 @@
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.tooling.generator.derived
+package org.eclipse.incquery.querybasedfeatures.tooling
import com.google.inject.Inject
import java.util.HashMap
@@ -41,28 +41,26 @@ import org.eclipse.jdt.core.dom.VariableDeclarationFragment
import org.eclipse.jdt.core.dom.rewrite.ASTRewrite
import org.eclipse.jdt.core.dom.rewrite.ListRewrite
import org.eclipse.jface.text.Document
-import org.eclipse.viatra2.emf.incquery.tooling.generator.ExtensionGenerator
-import org.eclipse.viatra2.emf.incquery.tooling.generator.fragments.IGenerationFragment
-import org.eclipse.viatra2.emf.incquery.tooling.generator.genmodel.IEiqGenmodelProvider
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.BoolValue
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.Pattern
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.StringValue
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.VariableValue
-import org.eclipse.viatra2.patternlanguage.eMFPatternLanguage.ClassType
+import org.eclipse.incquery.tooling.core.generator.ExtensionGenerator
+import org.eclipse.incquery.tooling.core.generator.fragments.IGenerationFragment
+import org.eclipse.incquery.tooling.core.generator.genmodel.IEiqGenmodelProvider
+import org.eclipse.incquery.patternlanguage.patternLanguage.BoolValue
+import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern
+import org.eclipse.incquery.patternlanguage.patternLanguage.StringValue
+import org.eclipse.incquery.patternlanguage.patternLanguage.VariableValue
+import org.eclipse.incquery.patternlanguage.emf.eMFPatternLanguage.ClassType
import org.eclipse.xtext.generator.IFileSystemAccess
import org.eclipse.xtext.xbase.lib.Pair
-import org.eclipse.viatra2.emf.incquery.tooling.generator.builder.IErrorFeedback
+import org.eclipse.incquery.tooling.core.generator.builder.IErrorFeedback
import org.eclipse.xtext.diagnostics.Severity
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.Annotation
+import org.eclipse.incquery.patternlanguage.patternLanguage.Annotation
import org.eclipse.emf.ecore.EcoreFactory
import org.eclipse.emf.ecore.EcorePackage
import org.eclipse.emf.common.util.BasicEMap
import java.util.ArrayList
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureKind
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureKind
-import static org.eclipse.viatra2.emf.incquery.tooling.generator.derived.DerivedFeatureGenerator.*
-
-import static extension org.eclipse.viatra2.patternlanguage.core.helper.CorePatternLanguageHelper.*
+import static extension org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper.*
class DerivedFeatureGenerator implements IGenerationFragment {
@@ -94,11 +92,11 @@ class DerivedFeatureGenerator implements IGenerationFragment {
private static String DERIVED_EXTENSION_PREFIX = "extension.derived."
private static Map<String,QueryBasedFeatureKind> kinds = newHashMap(
- Pair::of("single",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SINGLE_REFERENCE),
- Pair::of("many",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::MANY_REFERENCE),
- Pair::of("counter",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::COUNTER),
- Pair::of("sum",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SUM),
- Pair::of("iteration",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::ITERATION)
+ Pair::of("single", QueryBasedFeatureKind::SINGLE_REFERENCE),
+ Pair::of("many", QueryBasedFeatureKind::MANY_REFERENCE),
+ Pair::of("counter", QueryBasedFeatureKind::COUNTER),
+ Pair::of("sum", QueryBasedFeatureKind::SUM),
+ Pair::of("iteration", QueryBasedFeatureKind::ITERATION)
)
@@ -728,11 +726,11 @@ class DerivedFeatureGenerator implements IGenerationFragment {
}
if(kinds.empty){
- kinds.put("single",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SINGLE_REFERENCE)
- kinds.put("many",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::MANY_REFERENCE)
- kinds.put("counter",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::COUNTER)
- kinds.put("sum",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SUM)
- kinds.put("iteration",org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::ITERATION)
+ kinds.put("single", QueryBasedFeatureKind::SINGLE_REFERENCE)
+ kinds.put("many", QueryBasedFeatureKind::MANY_REFERENCE)
+ kinds.put("counter", QueryBasedFeatureKind::COUNTER)
+ kinds.put("sum", QueryBasedFeatureKind::SUM)
+ kinds.put("iteration", QueryBasedFeatureKind::ITERATION)
}
if(!kinds.keySet.contains(kindTmp)){
18 ...erator/derived/DerivedFeatureSourceCodeUtil.xtend → ...atures/tooling/DerivedFeatureSourceCodeUtil.xtend
View
@@ -9,14 +9,14 @@
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.tooling.generator.derived
+package org.eclipse.incquery.querybasedfeatures.tooling
import org.eclipse.emf.codegen.ecore.genmodel.GenClass
import org.eclipse.emf.codegen.ecore.genmodel.GenFeature
-import org.eclipse.viatra2.patternlanguage.core.patternLanguage.Pattern
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureKind
+import org.eclipse.incquery.patternlanguage.patternLanguage.Pattern
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureKind
-import static extension org.eclipse.viatra2.patternlanguage.core.helper.CorePatternLanguageHelper.*
+import static extension org.eclipse.incquery.patternlanguage.helper.CorePatternLanguageHelper.*
class DerivedFeatureSourceCodeUtil {
@@ -24,15 +24,15 @@ class DerivedFeatureSourceCodeUtil {
def methodBody(GenClass source, GenFeature feature,
Pattern pattern, String sourceParamName, String targetParamName, QueryBasedFeatureKind kind, boolean keepCache){
switch(kind){
- case org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SINGLE_REFERENCE:
+ case QueryBasedFeatureKind::SINGLE_REFERENCE:
singleRefGetMethod(source,feature,pattern,sourceParamName,targetParamName,keepCache)
- case org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::MANY_REFERENCE:
+ case QueryBasedFeatureKind::MANY_REFERENCE:
manyRefGetMethod(source,feature,pattern,sourceParamName,targetParamName,keepCache)
- case org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::COUNTER:
+ case QueryBasedFeatureKind::COUNTER:
counterGetMethod(source,feature,pattern,sourceParamName,targetParamName)
- case org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::SUM:
+ case QueryBasedFeatureKind::SUM:
sumGetMethod(source,feature,pattern,sourceParamName,targetParamName)
- case org::eclipse::viatra2::emf::incquery::runtime::derived::QueryBasedFeatureKind::ITERATION:
+ case QueryBasedFeatureKind::ITERATION:
iterationGetMethod(source,feature,pattern,sourceParamName,targetParamName)
}
}
2  ...ery/tooling/generator/derived/ProjectLocator.java → ...ry/querybasedfeatures/tooling/ProjectLocator.java
View
@@ -8,7 +8,7 @@
* Contributors:
* Abel Hegedus - initial API and implementation
*******************************************************************************/
-package org.eclipse.viatra2.emf.incquery.tooling.generator.derived;
+package org.eclipse.incquery.querybasedfeatures.tooling;
import java.util.ArrayList;
6 plugins/org.eclipse.incquery.tooling.core/schema/generatorFragment.exsd
View
@@ -3,7 +3,7 @@
<schema targetNamespace="org.eclipse.viatra2.emf.incquery.tooling.generator" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
<appinfo>
- <meta.schema plugin="org.eclipse.viatra2.emf.incquery.tooling.generator" id="generatorFragment" name="EMF-IncQuery Code Generation Fragment"/>
+ <meta.schema plugin="org.eclipse.incquery.tooling.core" id="generatorFragment" name="EMF-IncQuery Code Generation Fragment"/>
</appinfo>
<documentation>
A code generation fragment for a specific annotation.
@@ -55,7 +55,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="identifier" basedOn="org.eclipse.viatra2.patternlanguage.core.annotation/annotation/@name"/>
+ <meta.attribute kind="identifier" basedOn="org.eclipse.incquery.patternlanguage.annotation/annotation/@name"/>
</appinfo>
</annotation>
</attribute>
@@ -65,7 +65,7 @@
</documentation>
<appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.viatra2.emf.incquery.tooling.generator.fragments.IGenerationFragment"/>
+ <meta.attribute kind="java" basedOn=":org.eclipse.incquery.tooling.core.fragments.IGenerationFragment"/>
</appinfo>
</annotation>
</attribute>
2  tests/org.eclipse.viatra2.emf.incquery.snapshot/META-INF/MANIFEST.MF
View
@@ -12,6 +12,6 @@ Export-Package: org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.incquery.runtime;bundle-version="0.6.0",
- org.eclipse.viatra2.emf.incquery.derived
+ org.eclipse.incquery.querybasedfeatures.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
6 ...mf.incquery.snapshot/src/org/eclipse/viatra2/emf/incquery/snapshot/EIQSnapshot/impl/MatchRecordImpl.java
View
@@ -26,9 +26,9 @@
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.IQueryBasedFeatureHandler;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureHelper;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureKind;
+import org.eclipse.incquery.querybasedfeatures.runtime.IQueryBasedFeatureHandler;
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureHelper;
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureKind;
import org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot.EIQSnapshotPackage;
import org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot.MatchRecord;
import org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot.MatchSubstitutionRecord;
6 ...snapshot/src/org/eclipse/viatra2/emf/incquery/snapshot/EIQSnapshot/impl/MatchSubstitutionRecordImpl.java
View
@@ -21,9 +21,9 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.IQueryBasedFeatureHandler;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureHelper;
-import org.eclipse.viatra2.emf.incquery.runtime.derived.QueryBasedFeatureKind;
+import org.eclipse.incquery.querybasedfeatures.runtime.IQueryBasedFeatureHandler;
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureHelper;
+import org.eclipse.incquery.querybasedfeatures.runtime.QueryBasedFeatureKind;
import org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot.EIQSnapshotPackage;
import org.eclipse.viatra2.emf.incquery.snapshot.EIQSnapshot.MatchSubstitutionRecord;
Please sign in to comment.
Something went wrong with that request. Please try again.