bug fixed
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
index 5b68014..206f25a 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
@@ -81,11 +81,17 @@
if (nsURI != null && ! nsURI.isEmpty()) {
EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
if (ePackage != null) {
- importPackage = ePackage.getClass().getPackage().getName();
+ importPackage = ePackage.getClass().getPackage().getName();
+ System.out.println("nsURI: " + nsURI);
+ System.out.println("ePackage: " + ePackage);
if (importPackage.endsWith(".impl")) {
int length = importPackage.length();
importPackage = importPackage.substring(0, length-5);
}
+ if (importPackage.endsWith(".internal")) {
+ int length = importPackage.length();
+ importPackage = importPackage.substring(0, length-9);
+ }
System.out.println("importPackage: " + importPackage);
File jarFile;
try {
@@ -237,6 +243,10 @@
int length = importPackage.length();
importPackage = importPackage.substring(0, length-5);
}
+ if (importPackage.endsWith(".internal")) {
+ int length = importPackage.length();
+ importPackage = importPackage.substring(0, length-9);
+ }
System.out.println("importPackage: " + importPackage);
File jarFile;
try {
diff --git a/org.eclipse.emf.refactor.metrics.generator/templates/CalculateClassTemplate.javajet b/org.eclipse.emf.refactor.metrics.generator/templates/CalculateClassTemplate.javajet
index 8f8786a..5a1f262 100644
--- a/org.eclipse.emf.refactor.metrics.generator/templates/CalculateClassTemplate.javajet
+++ b/org.eclipse.emf.refactor.metrics.generator/templates/CalculateClassTemplate.javajet
@@ -6,7 +6,6 @@
import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.refactor.metrics.interfaces.IMetricCalculator;
-import <%=info.getImportPackage()%>.*;
public final class <%=info.getClassName()%> implements IMetricCalculator {
@@ -19,7 +18,7 @@
@Override
public double calculate() {
- <%=info.getContext()%> in = (<%=info.getContext()%>) context.get(0);
+ <%=info.getImportPackage()%>.<%=info.getContext()%> in = (<%=info.getImportPackage()%>.<%=info.getContext()%>) context.get(0);
double ret = 0.0;
// TODO fill 'ret'
