bug fixed
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/BasicDataWizardPage.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/BasicDataWizardPage.java index e92a2b5..71e23c5 100644 --- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/BasicDataWizardPage.java +++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/BasicDataWizardPage.java
@@ -242,6 +242,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.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/NewRefactoringWizardJava.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/NewRefactoringWizardJava.java index 519932b..724caad 100644 --- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/NewRefactoringWizardJava.java +++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/NewRefactoringWizardJava.java
@@ -66,6 +66,8 @@ private String jar; private String importPackage; + + private final String WINDOW_TITLE = "New Refactoring"; /** * Default constructor that initializes its wizard pages. @@ -73,9 +75,8 @@ * generation process of the model refactoring. */ public NewRefactoringWizardJava(){ - super(); - setWindowTitle("EMF Refactor - Specify EMF Model Refactoring"); - this.addPages(); +// super(); +// this.addPages(); } // /** @@ -95,15 +96,16 @@ // } public NewRefactoringWizardJava(String metamodel, String contextType) { - super(); - setWindowTitle("EMF Refactor - Specify EMF Model Refactoring"); +// super(); +// setWindowTitle("EMF Refactor - Specify EMF Model Refactoring"); this.namespaceUri = metamodel; this.className = contextType; - this.addPages(); +// this.addPages(); } @Override public void addPages() { + setWindowTitle(WINDOW_TITLE); this.basicWizardPage = new BasicDataWizardPage(); this.parameterWizardPage = new ParameterWizardPage(); this.testWizardPage = new TestWizardPage(); @@ -149,6 +151,11 @@ return true; } + @Override + public boolean canFinish() { + return basicWizardPage.isPageComplete(); + } + /** * Triggers the model refactoring generation activity. Collects data * from its wizard pages and starts the refactoring generator.