Skip to content

Commit e5ed2ed

Browse files
HansMartinAHansMartinA
committed
Renamed all Java packages, and unified them to tools.mdsd.jamopp.
1 parent 2c75d36 commit e5ed2ed

File tree

223 files changed

+3693
-3665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+3693
-3665
lines changed

jamopp.model/src/main/java/org/emftext/language/java/JavaClasspath.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaClasspath.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* - Extension for loading the standard library in Java 9+
1818
******************************************************************************/
1919

20-
package org.emftext.language.java;
20+
package tools.mdsd.jamopp.model.java;
2121

2222
import java.io.File;
2323
import java.io.IOException;
@@ -38,11 +38,11 @@
3838
import org.eclipse.emf.ecore.resource.Resource;
3939
import org.eclipse.emf.ecore.resource.ResourceSet;
4040
import org.eclipse.emf.ecore.resource.URIConverter;
41-
import org.emftext.language.java.classifiers.ClassifiersFactory;
42-
import org.emftext.language.java.classifiers.ConcreteClassifier;
43-
import org.emftext.language.java.containers.CompilationUnit;
44-
import org.emftext.language.java.containers.JavaRoot;
45-
import org.emftext.language.java.members.Member;
41+
import tools.mdsd.jamopp.model.java.classifiers.ClassifiersFactory;
42+
import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier;
43+
import tools.mdsd.jamopp.model.java.containers.CompilationUnit;
44+
import tools.mdsd.jamopp.model.java.containers.JavaRoot;
45+
import tools.mdsd.jamopp.model.java.members.Member;
4646
import org.eclipse.emf.ecore.EObject;
4747
import org.eclipse.emf.ecore.InternalEObject;
4848

@@ -133,14 +133,14 @@ public void clear() {
133133
public void registerJavaRoot(JavaRoot root, URI physicalUri) {
134134
if (root instanceof CompilationUnit) {
135135
registerClassifier((CompilationUnit) root, physicalUri);
136-
} else if (root instanceof org.emftext.language.java.containers.Package) {
137-
registerPackage((org.emftext.language.java.containers.Package) root, physicalUri);
138-
} else if (root instanceof org.emftext.language.java.containers.Module) {
139-
registerModule((org.emftext.language.java.containers.Module) root, physicalUri);
136+
} else if (root instanceof tools.mdsd.jamopp.model.java.containers.Package) {
137+
registerPackage((tools.mdsd.jamopp.model.java.containers.Package) root, physicalUri);
138+
} else if (root instanceof tools.mdsd.jamopp.model.java.containers.Module) {
139+
registerModule((tools.mdsd.jamopp.model.java.containers.Module) root, physicalUri);
140140
}
141141
}
142142

143-
public void registerPackage(org.emftext.language.java.containers.Package pack,
143+
public void registerPackage(tools.mdsd.jamopp.model.java.containers.Package pack,
144144
URI physicalUri) {
145145
URI logicalURI = LogicalJavaURIGenerator.getPackageURI(pack.getNamespacesAsString());
146146
updateMapping(logicalURI, physicalUri);
@@ -163,7 +163,7 @@ private void registerPackages(String[] packages) {
163163
}
164164
}
165165

166-
public void registerModule(org.emftext.language.java.containers.Module module,
166+
public void registerModule(tools.mdsd.jamopp.model.java.containers.Module module,
167167
URI physicalUri) {
168168
URI logicalURI = LogicalJavaURIGenerator.getModuleURI(module.getNamespacesAsString());
169169
updateMapping(logicalURI, physicalUri);
@@ -173,11 +173,11 @@ public void registerModule(String moduleName, URI physicalUri) {
173173
updateMapping(LogicalJavaURIGenerator.getModuleURI(moduleName), physicalUri);
174174
}
175175

176-
public org.emftext.language.java.containers.Package getPackage(String packageName) {
176+
public tools.mdsd.jamopp.model.java.containers.Package getPackage(String packageName) {
177177
return null;
178178
}
179179

180-
public org.emftext.language.java.containers.Module getModule(String moduleName) {
180+
public tools.mdsd.jamopp.model.java.containers.Module getModule(String moduleName) {
181181
return null;
182182
}
183183

@@ -233,7 +233,7 @@ private Collection<ConcreteClassifier> getProxyConcreteClassifiers(String fullQu
233233
innerClass = outerPack.substring(dollarIdx + 1)
234234
+ LogicalJavaURIGenerator.CLASSIFIER_SEPARATOR + innerClass;
235235
outerPack = outerPack.substring(0, dollarIdx);
236-
org.emftext.language.java.classifiers.Class proxy =
236+
tools.mdsd.jamopp.model.java.classifiers.Class proxy =
237237
ClassifiersFactory.eINSTANCE.createClass();
238238
((InternalEObject) proxy).eSetProxyURI(logURI);
239239
proxy.setName(innerClass);

jamopp.model/src/main/java/org/emftext/language/java/JavaFactory.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java;
16+
package tools.mdsd.jamopp.model.java;
1717

1818
import org.eclipse.emf.ecore.EFactory;
1919

@@ -22,7 +22,7 @@
2222
* The <b>Factory</b> for the model.
2323
* It provides a create method for each non-abstract class of the model.
2424
* <!-- end-user-doc -->
25-
* @see org.emftext.language.java.JavaPackage
25+
* @see tools.mdsd.jamopp.model.java.JavaPackage
2626
* @generated
2727
*/
2828
public interface JavaFactory extends EFactory {
@@ -32,7 +32,7 @@ public interface JavaFactory extends EFactory {
3232
* <!-- end-user-doc -->
3333
* @generated
3434
*/
35-
JavaFactory eINSTANCE = org.emftext.language.java.impl.JavaFactoryImpl.init();
35+
JavaFactory eINSTANCE = tools.mdsd.jamopp.model.java.impl.JavaFactoryImpl.init();
3636

3737
/**
3838
* Returns the package supported by this factory.

jamopp.model/src/main/java/org/emftext/language/java/JavaPackage.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/JavaPackage.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java;
16+
package tools.mdsd.jamopp.model.java;
1717

1818
import org.eclipse.emf.ecore.EPackage;
1919

@@ -28,7 +28,7 @@
2828
* <li>and each data type</li>
2929
* </ul>
3030
* <!-- end-user-doc -->
31-
* @see org.emftext.language.java.JavaFactory
31+
* @see tools.mdsd.jamopp.model.java.JavaFactory
3232
* @model kind="package"
3333
* @generated
3434
*/
@@ -63,7 +63,7 @@ public interface JavaPackage extends EPackage {
6363
* <!-- end-user-doc -->
6464
* @generated
6565
*/
66-
JavaPackage eINSTANCE = org.emftext.language.java.impl.JavaPackageImpl.init();
66+
JavaPackage eINSTANCE = tools.mdsd.jamopp.model.java.impl.JavaPackageImpl.init();
6767

6868
/**
6969
* Returns the factory that creates the instances of the model.

jamopp.model/src/main/java/org/emftext/language/java/LogicalJavaURIGenerator.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/LogicalJavaURIGenerator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
* Martin Armbruster
1616
* - Adaptation and extension for Java 7+
1717
******************************************************************************/
18-
package org.emftext.language.java;
18+
package tools.mdsd.jamopp.model.java;
1919

2020
import java.util.regex.Pattern;
2121
import org.eclipse.emf.common.util.URI;
22-
import org.emftext.language.java.commons.NamespaceAwareElement;
22+
23+
import tools.mdsd.jamopp.model.java.commons.NamespaceAwareElement;
2324

2425
/**
2526
* This class provides functionality to construct unique logical URIs

jamopp.model/src/main/java/org/emftext/language/java/extensions/arrays/ArrayTypeableExtension.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/arrays/ArrayTypeableExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
* - Initial implementation
1212
******************************************************************************/
1313

14-
package org.emftext.language.java.extensions.arrays;
14+
package tools.mdsd.jamopp.model.java.extensions.arrays;
1515

16-
import org.emftext.language.java.arrays.ArrayTypeable;
17-
import org.emftext.language.java.parameters.VariableLengthParameter;
16+
import tools.mdsd.jamopp.model.java.arrays.ArrayTypeable;
17+
import tools.mdsd.jamopp.model.java.parameters.VariableLengthParameter;
1818

1919
public class ArrayTypeableExtension {
2020

jamopp.model/src/main/java/org/emftext/language/java/extensions/arrays/package-info.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/arrays/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
/**
1414
* Extension classes for the Arrays package.
1515
*/
16-
package org.emftext.language.java.extensions.arrays;
16+
package tools.mdsd.jamopp.model.java.extensions.arrays;

jamopp.model/src/main/java/org/emftext/language/java/extensions/classifiers/AnnotationExtension.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/classifiers/AnnotationExtension.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java.extensions.classifiers;
16+
package tools.mdsd.jamopp.model.java.extensions.classifiers;
1717

1818
import org.eclipse.emf.common.util.EList;
1919
import org.eclipse.emf.common.util.UniqueEList;
20-
import org.emftext.language.java.classifiers.Annotation;
21-
import org.emftext.language.java.classifiers.ConcreteClassifier;
20+
21+
import tools.mdsd.jamopp.model.java.classifiers.Annotation;
22+
import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier;
2223

2324
public class AnnotationExtension {
2425

jamopp.model/src/main/java/org/emftext/language/java/extensions/classifiers/AnonymousClassExtension.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/classifiers/AnonymousClassExtension.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,23 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java.extensions.classifiers;
16+
package tools.mdsd.jamopp.model.java.extensions.classifiers;
1717

1818
import org.eclipse.emf.common.util.EList;
1919
import org.eclipse.emf.common.util.UniqueEList;
2020
import org.eclipse.emf.ecore.EObject;
2121
import org.eclipse.emf.ecore.util.EcoreUtil;
22-
import org.emftext.language.java.classifiers.AnonymousClass;
23-
import org.emftext.language.java.classifiers.ConcreteClassifier;
24-
import org.emftext.language.java.classifiers.Enumeration;
25-
import org.emftext.language.java.commons.Commentable;
26-
import org.emftext.language.java.instantiations.NewConstructorCall;
27-
import org.emftext.language.java.members.EnumConstant;
28-
import org.emftext.language.java.members.Member;
29-
import org.emftext.language.java.modifiers.AnnotableAndModifiable;
30-
import org.emftext.language.java.types.Type;
31-
import org.emftext.language.java.types.TypeReference;
22+
23+
import tools.mdsd.jamopp.model.java.classifiers.AnonymousClass;
24+
import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier;
25+
import tools.mdsd.jamopp.model.java.classifiers.Enumeration;
26+
import tools.mdsd.jamopp.model.java.commons.Commentable;
27+
import tools.mdsd.jamopp.model.java.instantiations.NewConstructorCall;
28+
import tools.mdsd.jamopp.model.java.members.EnumConstant;
29+
import tools.mdsd.jamopp.model.java.members.Member;
30+
import tools.mdsd.jamopp.model.java.modifiers.AnnotableAndModifiable;
31+
import tools.mdsd.jamopp.model.java.types.Type;
32+
import tools.mdsd.jamopp.model.java.types.TypeReference;
3233

3334
public class AnonymousClassExtension {
3435

jamopp.model/src/main/java/org/emftext/language/java/extensions/classifiers/ClassExtension.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/classifiers/ClassExtension.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java.extensions.classifiers;
16+
package tools.mdsd.jamopp.model.java.extensions.classifiers;
1717

1818
import org.eclipse.emf.common.util.EList;
1919
import org.eclipse.emf.common.util.UniqueEList;
2020
import org.eclipse.emf.ecore.InternalEObject;
21-
import org.emftext.language.java.classifiers.ConcreteClassifier;
22-
import org.emftext.language.java.classifiers.Interface;
23-
import org.emftext.language.java.types.PrimitiveType;
24-
import org.emftext.language.java.types.Type;
25-
import org.emftext.language.java.types.TypeReference;
26-
import org.emftext.language.java.types.TypesFactory;
21+
22+
import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier;
23+
import tools.mdsd.jamopp.model.java.classifiers.Interface;
24+
import tools.mdsd.jamopp.model.java.types.PrimitiveType;
25+
import tools.mdsd.jamopp.model.java.types.Type;
26+
import tools.mdsd.jamopp.model.java.types.TypeReference;
27+
import tools.mdsd.jamopp.model.java.types.TypesFactory;
2728

2829
public class ClassExtension {
2930

@@ -34,12 +35,12 @@ public class ClassExtension {
3435
* @param me the given class.
3536
* @return the collected super types.
3637
*/
37-
public static EList<ConcreteClassifier> getAllSuperClassifiers(org.emftext.language.java.classifiers.Class me) {
38+
public static EList<ConcreteClassifier> getAllSuperClassifiers(tools.mdsd.jamopp.model.java.classifiers.Class me) {
3839

3940
EList<ConcreteClassifier> result = new UniqueEList<ConcreteClassifier>();
4041

4142
// Collects all super classes first
42-
org.emftext.language.java.classifiers.Class superClass = me;
43+
tools.mdsd.jamopp.model.java.classifiers.Class superClass = me;
4344
while (superClass != null && !superClass.eIsProxy() && !me.isJavaLangObject(superClass)) {
4445
superClass = superClass.getSuperClass();
4546
if (superClass != null) {
@@ -71,8 +72,8 @@ public static EList<ConcreteClassifier> getAllSuperClassifiers(org.emftext.langu
7172
* @param me the given class.
7273
* @return the direct super class
7374
*/
74-
public static org.emftext.language.java.classifiers.Class getSuperClass(
75-
org.emftext.language.java.classifiers.Class me) {
75+
public static tools.mdsd.jamopp.model.java.classifiers.Class getSuperClass(
76+
tools.mdsd.jamopp.model.java.classifiers.Class me) {
7677

7778
TypeReference superClassReference = me.getExtends();
7879
if (superClassReference == null) {
@@ -84,8 +85,8 @@ public static org.emftext.language.java.classifiers.Class getSuperClass(
8485
}
8586

8687
Type result = superClassReference.getTarget();
87-
if (result instanceof org.emftext.language.java.classifiers.Class) {
88-
return (org.emftext.language.java.classifiers.Class) result;
88+
if (result instanceof tools.mdsd.jamopp.model.java.classifiers.Class) {
89+
return (tools.mdsd.jamopp.model.java.classifiers.Class) result;
8990
}
9091
return null;
9192
}
@@ -94,7 +95,7 @@ public static org.emftext.language.java.classifiers.Class getSuperClass(
9495
* @param me the given class.
9596
* @return primitive type, if the class can be wrapped
9697
*/
97-
public static PrimitiveType unWrapPrimitiveType(org.emftext.language.java.classifiers.Class me) {
98+
public static PrimitiveType unWrapPrimitiveType(tools.mdsd.jamopp.model.java.classifiers.Class me) {
9899

99100
String type = me.eIsProxy() ? ((InternalEObject) me).eProxyURI().toString() : me.getQualifiedName();
100101

jamopp.model/src/main/java/org/emftext/language/java/extensions/classifiers/ClassifierExtension.java renamed to jamopp.model/src/main/java/tools/mdsd/jamopp/model/java/extensions/classifiers/ClassifierExtension.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
* DevBoost GmbH - Berlin, Germany
1414
* - initial API and implementation
1515
******************************************************************************/
16-
package org.emftext.language.java.extensions.classifiers;
16+
package tools.mdsd.jamopp.model.java.extensions.classifiers;
1717

1818
import org.eclipse.emf.common.util.EList;
19-
import org.emftext.language.java.classifiers.Classifier;
20-
import org.emftext.language.java.classifiers.ConcreteClassifier;
21-
import org.emftext.language.java.containers.CompilationUnit;
19+
20+
import tools.mdsd.jamopp.model.java.classifiers.Classifier;
21+
import tools.mdsd.jamopp.model.java.classifiers.ConcreteClassifier;
22+
import tools.mdsd.jamopp.model.java.containers.CompilationUnit;
2223

2324
public class ClassifierExtension {
2425

0 commit comments

Comments
 (0)