diff options
| author | Ed Willink | 2014-08-08 08:21:51 +0000 |
|---|---|---|
| committer | Ed Willink | 2014-08-08 08:29:59 +0000 |
| commit | 19b97425757dcf985c137bb55bcd265aac3a5daf (patch) | |
| tree | e12c66bb7bed0ebdb5361d6e3091482bde83012f | |
| parent | 1c31bbc037e5bf12045b6c2a6a821a72dbd36f21 (diff) | |
| download | org.eclipse.ocl-19b97425757dcf985c137bb55bcd265aac3a5daf.tar.gz org.eclipse.ocl-19b97425757dcf985c137bb55bcd265aac3a5daf.tar.xz org.eclipse.ocl-19b97425757dcf985c137bb55bcd265aac3a5daf.zip | |
[unrelated] Use metaData prefix to place xxxTables
3 files changed, 5 insertions, 5 deletions
diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java index 7c24c5f287..7a714259fe 100644 --- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java +++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreGenModelGeneratorAdapter.java @@ -216,7 +216,7 @@ public class OCLinEcoreGenModelGeneratorAdapter extends GenBaseGeneratorAdapter for (@SuppressWarnings("null")@NonNull GenPackage genPackage : genPackages) { OCLinEcoreTables generateTables = new OCLinEcoreTables(genPackage); String tablesClass = generateTables.getTablesClassName(); - String dir = genPackage.getQualifiedPackageName().replace(".", "/"); + String dir = genPackage.getReflectionPackageName().replace(".", "/"); generateTables.generateTablesClass(constantsTexts.get(genPackage)); String str = generateTables.toString(); File tablesFolder = new File(projectFolder, dir); diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java index 86f133e981..0813f2bc90 100644 --- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java +++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTables.java @@ -1052,7 +1052,7 @@ public class OCLinEcoreTables extends OCLinEcoreTablesUtils s1.append(" *******************************************************************************/\n"); s1.append("package "); - s1.append(genPackage.getQualifiedPackageName()); + s1.append(genPackage.getReflectionPackageName()); s1.append(";\n"); s1.append("\n"); diff --git a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java index 856314945a..7c84d7a69b 100644 --- a/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java +++ b/examples/org.eclipse.ocl.examples.codegen/src/org/eclipse/ocl/examples/codegen/oclinecore/OCLinEcoreTablesUtils.java @@ -915,7 +915,7 @@ public class OCLinEcoreTablesUtils protected @NonNull String getQualifiedTablesClassName(@NonNull Type type) { GenPackage genPackage = getGenPackage(type); if (genPackage != null) { - return genPackage.getInterfacePackageName() + "." + getTablesClassName(genPackage); + return genPackage.getReflectionPackageName() + "." + getTablesClassName(genPackage); } else { return "UnknownMetaModelTables"; @@ -925,7 +925,7 @@ public class OCLinEcoreTablesUtils protected @NonNull String getQualifiedTablesClassName(@NonNull org.eclipse.ocl.examples.pivot.Package pPackage) { GenPackage genPackage = getGenPackage(pPackage); if (genPackage != null) { - return genPackage.getInterfacePackageName() + "." + getTablesClassName(genPackage); + return genPackage.getReflectionPackageName() + "." + getTablesClassName(genPackage); } else { return "UnknownMetaModelTables"; @@ -940,7 +940,7 @@ public class OCLinEcoreTablesUtils if (libraryPackage != null) { GenPackage gPackage = getGenPackage(libraryPackage); if (gPackage != null) { - return gPackage.getInterfacePackageName() + "." + gPackage.getPrefix() + AbstractGenModelHelper.TABLES_CLASS_SUFFIX; + return gPackage.getReflectionPackageName() + "." + gPackage.getPrefix() + AbstractGenModelHelper.TABLES_CLASS_SUFFIX; } } } |