generation implemented
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/generator/action/RefactoringGeneratorAction.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/generator/action/RefactoringGeneratorAction.java
deleted file mode 100644
index 3e2992d..0000000
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/generator/action/RefactoringGeneratorAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) Philipps University of Marburg. All rights reserved.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Philipps University of Marburg - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.refactor.generator.action;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.refactor.refactoring.generator.ui.NewRefactoringWizardJava;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * Class for triggering the model refactoring generation process.
- * @generated NOT
- * @author Thorsten Arendt
- */
-public class RefactoringGeneratorAction implements IObjectActionDelegate {
-
- /**
- * Selected elements on the active part.
- */
- private ISelection selection;
-
- /**
- * Active part of the workbench.
- */
- private IWorkbenchPart targetPart;
-
- /**
- * Default constructor.
- */
- public RefactoringGeneratorAction() {}
-
- /**
- * @see org.eclipse.ui.IActionDelegate#run
- * (org.eclipse.jface.action.IAction)
- */
- @Override
- public void run(IAction action) {
- StructuredSelection ss = (StructuredSelection) selection;
- EObject selectedEObject = (EObject) ss.getFirstElement();
- Shell shell = targetPart.getSite().getShell();
- WizardDialog wizard = new WizardDialog
- (shell, new NewRefactoringWizardJava(selectedEObject));
- wizard.open();
- }
-
- /**
- * @see org.eclipse.ui.IActionDelegate#selectionChanged
- * (org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- @Override
- public void selectionChanged(IAction action, ISelection selection) {
- this.selection = selection;
- }
-
- /**
- * @see org.eclipse.ui.IObjectActionDelegate#setActivePart
- * (org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
- */
- @Override
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- this.targetPart = targetPart;
- }
-
-}
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/Activator.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/Activator.java
index f84461e..3ba4665 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/Activator.java
+++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/Activator.java
@@ -22,7 +22,7 @@
/**
* @generated
*/
- public static final String PLUGIN_ID = "org.eclipse.emf.refactor.generator";
+ public static final String PLUGIN_ID = "org.eclipse.emf.refactor.refactoring.generator";
/**
* @generated
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/core/RefactoringInfo.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/core/RefactoringInfo.java
index fa78e5e..dd0acd5 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/core/RefactoringInfo.java
+++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/core/RefactoringInfo.java
@@ -330,7 +330,7 @@
* has to be generated for.
*/
public void setMetaModelName(String metaModelName) {
- this.metaModelName = buildMetaModelName(metaModelName);
+ this.metaModelName = metaModelName;
}
/**
@@ -355,4 +355,19 @@
public int getNumberOfTests(){
return numberOfTests;
}
+
+ @Override
+ public String toString() {
+ return "RefactoringInfo [projectName=" + projectName
+ + ", refactoringId=" + refactoringId + ", menuLabel="
+ + menuLabel + ", namespaceUri=" + namespaceUri
+ + ", selectedEObjectClass=" + selectedEObjectClass
+ + ", selectedEObjectJar=" + selectedEObjectJar
+ + ", controller=" + controller + ", guiHandler=" + guiHandler
+ + ", parameters=" + parameters + ", packageName=" + packageName
+ + ", namespacePrefix=" + namespacePrefix + ", metaModelName="
+ + metaModelName + ", numberOfTests=" + numberOfTests + "]";
+ }
+
+
}
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/interfaces/INewRefactoringWizard.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/interfaces/INewRefactoringWizard.java
index 1a22b86..093d5ff 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/interfaces/INewRefactoringWizard.java
+++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/interfaces/INewRefactoringWizard.java
@@ -1,5 +1,32 @@
package org.eclipse.emf.refactor.refactoring.generator.interfaces;
+import java.util.LinkedList;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.wizard.WizardPage;
+
public interface INewRefactoringWizard {
+ public LinkedList<IProject> getProjects();
+
+ public int getPageNumbers();
+
+ public void updateSecondPage();
+
+ public WizardPage getSecondPage();
+
+ public void setTargetProject(String text);
+
+ public void setName(String text);
+
+ public void setId(String text);
+
+ public void setMetamodel(String text);
+
+ public void setContext(String text);
+
+ public void setJar(String jar);
+
+ public void setImportPackage(String importPackage);
+
}
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 0db1f4a..e92a2b5 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
@@ -1,393 +1,328 @@
-/*******************************************************************************
- * Copyright (c) Philipps University of Marburg. All rights reserved.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Philipps University of Marburg - initial API and implementation
- *******************************************************************************/
package org.eclipse.emf.refactor.refactoring.generator.ui;
-import java.util.List;
+import java.io.File;
+import java.net.URISyntaxException;
+import java.util.Arrays;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.ecore.ENamedElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.refactor.refactoring.generator.core.RefactoringInfo;
-import org.eclipse.emf.refactor.refactoring.generator.managers.XMLPluginFileManager;
+import org.eclipse.emf.refactor.refactoring.generator.interfaces.INewRefactoringWizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;
-/**
- * Wizard page for configurating model refactoring data (basics).
- * @generated NOT
- * @author Thorsten Arendt
- */
public class BasicDataWizardPage extends WizardPage implements Listener {
-
- private Text idText;
- private Text menuText;
- private Text nsUriText;
- private Text classText;
- private Text jarText;
- private Combo projectCombo;
-
- /**
- * Id of the model refactoring to be generated.
- */
- private String id = "";
-
- /**
- * Inserted id of the model refactoring to be generated.
- */
- private String originalId = "";
-
- /**
- * Menu Label of the model refactoring to be generated.
- */
- private String menuLabel = "";
-
- /**
- * Name of the project the model refactoring code has to be
- * generated to.
- */
- private String projectName = "";
-
- /**
- * Namespace for the model refactoring to be generated.
- */
- private String nsUri = "";
-
- /**
- * Name of the class the model refactoring shall be executed on.
- */
- private String className = "";
-
- /**
- * Name of the jar file that owns the class specified in 'className'.
- */
+
+ private static final String PAGE_NAME = "org.eclipse.emf.refactor.refactoring.generator.BasicDataWizardPage";
+ private static final String PAGE_TITLE = "New Refactoring: Basic Data";
+ private static final String PAGE_DESCRIPTION = "Please specify basic refactoring data. " +
+ "Required fields are denoted by \"(*)\".";
+ private Text nameTextField, idTextField;
+// private Text descriptionTextField; TODO
+ private Combo projectCombo, metamodelCombo, contextCombo;
private String jar = "";
+ private String importPackage, metaModel, contextType;
- /**
- * The selected EObject when starting the generation process of
- * the model refactoring.
- */
- private EObject selectedEObject;
-
- /**
- * Namespace prefix for the model refactoring to be generated.
- */
- private String nsPrefix = "";
-
- /**
- * Name of the meta model for the model refactoring to be generated.
- */
- private String metaModelName = "";
-
- /**
- * Default constructor.
- * @param pageName Name of the wizard page.
- * @param selectedEObject Selected EObject when starting the
- * generation process of the model refactoring.
- */
- protected BasicDataWizardPage(String pageName, EObject selectedEObject) {
- super(pageName);
- this.selectedEObject = selectedEObject;
- }
-
- /**
- * Gets the id of the model refactoring to be generated.
- * @return Id of the model refactoring to be generated.
- */
- public String getRefactoringId(){
- return id;
- }
-
- /**
- * Gets the menu Label of the model refactoring to be generated.
- * @return Menu Label of the model refactoring to be generated.
- */
- public String getMenuLabel(){
- if (menuLabel.isEmpty()){
- return originalId;
- } else {
- return menuLabel;
- }
- }
-
- /**
- * Gets the namespace for the model refactoring to be generated.
- * @return Namespace for the model refactoring to be generated.
- */
- public String getNsUri(){
- return nsUri;
- }
-
- /**
- * Gets the name of the class the model refactoring shall be
- * executed on.
- * @return Name of the class the model refactoring shall be
- * executed on.
- */
- public String getClassName(){
- return className;
- }
-
- /**
- * Gets the name of the jar file that owns the class
- * specified in 'className'.
- * @return Name of the jar file that owns the class
- * specified in 'className'.
- */
- public String getJar(){
- return jar;
- }
-
- /**
- * Gets the name of the project the model refactoring code
- * has to be generated to.
- * @return Name of the project the model refactoring code
- * has to be generated to.
- */
- public String getProjectName(){
- return projectName;
- }
-
- /**
- * Gets the namespace prefix for the model refactoring to be generated.
- * @return Namespace prefix for the model refactoring to be generated.
- */
- public String getNsPrefix(){
- return nsPrefix;
- }
-
- /**
- * Gets the name of the meta model for the model refactoring to be generated.
- * @return Name of the meta model for the model refactoring to be generated.
- */
- public String getMetaModelName(){
- return metaModelName;
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl
- * (org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- FillLayout fillLayout = new FillLayout();
- fillLayout.spacing = 5;
- fillLayout.type = SWT.VERTICAL;
- composite.setLayout(fillLayout);
- createTextComposite(composite);
- createSelectedEObjectComposite(composite);
- createProjectComposite(composite);
- checkIsPageComplete();
- setControl(composite);
+ Composite container = new Composite(parent, SWT.NULL);
+ final GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ container.setLayout(layout);
+ createTextFields(container);
+ initProjectsAndMetamodels();
+ System.out.println("vorher");
+ if (metaModel != null && ! metaModel.isEmpty()
+ && contextType != null && ! contextType.isEmpty()) {
+ System.out.println("drin");
+ setFixedMetamodel(metaModel);
+ setFixedContext(contextType);
+ }
+ System.out.println("nachher");
+ setControl(container);
+ this.setPageComplete(false);
+ }
+
+ @Override
+ public boolean canFlipToNextPage() {
+ if (((INewRefactoringWizard) getWizard()).getPageNumbers() > 1) {
+ if (this.isPageComplete()) {
+ ((INewRefactoringWizard) getWizard()).updateSecondPage();
+ return true;
+ }
+ }
+ return false;
}
- /**
- * Creates a composite for editing id and menu label of the
- * model refactoring to be generated.
- * @param parent Parent composite.
- */
- private void createTextComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.BORDER);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- composite.setLayout(gl);
- Label idLabel = new Label(composite, SWT.NONE);
- idLabel.setText("Name of the new EMF Model Refactoring (Id): ");
- idLabel.setEnabled(true);
- idText = new Text(composite, SWT.BORDER);
- idText.setToolTipText("Refactoring-Id");
- idText.setEnabled(true);
- idText.setLayoutData(gd);
- idText.addListener(SWT.Modify, this);
- Label menuLabel = new Label(composite, SWT.NONE);
- menuLabel.setText("Text to be shown in menu (menu label): ");
- menuLabel.setEnabled(true);
- menuText = new Text(composite, SWT.BORDER);
- menuText.setToolTipText("Menu Label Text");
- menuText.setEnabled(true);
- menuText.setLayoutData(gd);
- menuText.addListener(SWT.Modify, this);
+ public WizardPage getNextPage() {
+ if (((INewRefactoringWizard) getWizard()).getPageNumbers() > 1) {
+ return ((INewRefactoringWizard) getWizard()).getSecondPage();
+ } else {
+ return null;
+ }
}
- /**
- * Creates a composite for displaying the namespace, the selected class,
- * and the owning jar file of the model refactoring to be generated.
- * @param parent Parent composite.
- */
- private void createSelectedEObjectComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.BORDER);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- composite.setLayout(gl);
- Label nsUriLabel = new Label(composite, SWT.NONE);
- nsUriLabel.setText("Namespace-Uri: ");
- nsUriLabel.setEnabled(true);
- nsUriText = new Text(composite, SWT.BORDER);
- nsUri = ((EPackage)selectedEObject.eClass().eContainer())
- .getNsURI();
- nsUriText.setText(nsUri);
- nsUriText.setEnabled(false);
- nsUriText.setLayoutData(gd);
- Label classLabel = new Label(composite, SWT.NONE);
- classLabel.setText("Class of selected EObject (context): ");
- classLabel.setEnabled(true);
- classText = new Text(composite, SWT.BORDER);
- className = selectedEObject.eClass().getInstanceClassName();
- classText.setText(className);
- classText.setEnabled(false);
- classText.setLayoutData(gd);
- Label jarLabel = new Label(composite, SWT.NONE);
- jarLabel.setText("jar-File to be included (required bundle): ");
- jarLabel.setEnabled(true);
- jarText = new Text(composite, SWT.BORDER);
- jar = selectedEObject.eClass().getInstanceClass().getPackage()
- .getName();
- jarText.setText(jar);
- jarText.setEnabled(false);
- jarText.setLayoutData(gd);
-
- nsPrefix = ((EPackage)selectedEObject.eClass().eContainer())
- .getNsPrefix();
- metaModelName = selectedEObject.eClass().eContainer()
- .getClass().getName();
+ @Override
+ public void handleEvent(Event event) {
+ if (event.widget == projectCombo) {
+ ((INewRefactoringWizard) getWizard()).setTargetProject(projectCombo.getText());
+ }
+ if (event.widget == metamodelCombo) {
+ String nsURI = metamodelCombo.getText();
+ if (nsURI != null && ! nsURI.isEmpty()) {
+ EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
+ if (ePackage != null) {
+ importPackage = ePackage.getClass().getPackage().getName();
+ 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 {
+ jarFile = new File
+ (ePackage.getClass().getProtectionDomain()
+ .getCodeSource().getLocation().toURI());
+ String jarName = jarFile.getName();
+ int index = jarName.indexOf("_");
+ jar = jarName.substring(0, index);
+ System.out.println("Jar5: " + jar);
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ } finally {
+ contextCombo.removeAll();
+ Object[] eObjectNames = new Object[ePackage.eContents().size()];
+ for (int i = 0; i < eObjectNames.length; i++) {
+ EObject eObject = ePackage.eContents().get(i);
+ if (eObject instanceof ENamedElement) {
+ eObjectNames[i] = ((ENamedElement) ePackage.eContents().get(i)).getName();
+ }
+ }
+ Arrays.sort(eObjectNames);
+ for(Object object : eObjectNames){
+ contextCombo.add((String)object);
+ }
+ }
+ }
+ } else {
+ jar = "";
+ contextCombo.removeAll();
+ }
+ }
+ updatePageComplete();
+ getWizard().getContainer().updateButtons();
+ }
+
+ public BasicDataWizardPage() {
+ super(PAGE_NAME);
+ setTitle(PAGE_TITLE);
+ setDescription(PAGE_DESCRIPTION);
}
- /**
- * Creates a composite for choosing the project the model refactoring
- * code has to be generated to.
- * @param parent Parent composite.
- */
- private void createProjectComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.BORDER);
- GridLayout gl = new GridLayout();
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gl.numColumns = 2;
- composite.setLayout(gl);
- Label projectLabel = new Label(composite, SWT.NONE);
- projectLabel.setText("Plugin-Project that will contain the code: ");
- projectLabel.setEnabled(true);
- projectCombo = new Combo (composite, SWT.READ_ONLY);
- projectCombo.setLayoutData(gd);
+ private void createTextFields(Composite container) {
+ Label label;
+ GridData gridData;
+ Group group;
+ GridLayout layout;
+ // - Project -
+ group = new Group(container, SWT.NONE);
+ group.setText("Project Data");
+ layout = new GridLayout();
+ layout.numColumns = 2;
+ group.setLayout(layout);
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
+ group.setLayoutData(gridData);
+ // col:1
+ label = new Label(group, SWT.NONE);
+ label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+ label.setText("Target project (*):");
+ // col:2
+ projectCombo = new Combo(group, SWT.READ_ONLY);
+ final GridData projectComboData = new GridData(GridData.FILL_HORIZONTAL);
+ projectCombo.setLayoutData(projectComboData);
+ //projectCombo.setText("Select Project");
projectCombo.addListener(SWT.Selection, this);
- addProjectsToCombo(projectCombo);
+ // - Refactoring Data -
+ group = new Group(container, SWT.NONE);
+ group.setText("Refactoring Data");
+ layout = new GridLayout();
+ layout.numColumns = 2;
+ group.setLayout(layout);
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
+ group.setLayoutData(gridData);
+ // - Name -
+ // col:1
+ label = new Label(group, SWT.NONE);
+ label.setText("Name (*):");
+ label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+ // col:2
+ nameTextField = new Text(group, SWT.BORDER);
+ nameTextField.addListener(SWT.Modify, this);
+ nameTextField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ // - Id -
+ // col:1
+ label = new Label(group, SWT.NONE);
+ label.setText("Refactoring ID (*):");
+ label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+ // col:2
+ idTextField = new Text(group, SWT.BORDER);
+ idTextField.addListener(SWT.Modify, this);
+ idTextField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+// // - Description - TODO
+// // col:1
+// label = new Label(group, SWT.NONE);
+// label.setText("Description:");
+// label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+// // col:2
+// descriptionTextField = new Text(group, SWT.BORDER);
+// descriptionTextField.addListener(SWT.Modify, this);
+// descriptionTextField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ // - Source -
+ group = new Group(container, SWT.NONE);
+ group.setText("Meta Model and Context Type");
+ layout = new GridLayout();
+ layout.numColumns = 2;
+ group.setLayout(layout);
+ gridData = new GridData(GridData.FILL_HORIZONTAL);
+ group.setLayoutData(gridData);
+ // - Metamodel -
+ // col:1
+ label = new Label(group, SWT.NONE);
+ label.setText("Meta model (*):");
+ label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+ // col:2
+ metamodelCombo = new Combo(group, SWT.BORDER);
+ metamodelCombo.addListener(SWT.Selection, this);
+ // - Context -
+ // col:1
+ label = new Label(group, SWT.NONE);
+ label.setText("Context type (*):");
+ label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
+ // col:2
+ contextCombo = new Combo(group, SWT.BORDER);
+ contextCombo.addListener(SWT.Selection, this);
}
- /**
- * Adds the plugin-projects of the workspace to the given combo.
- * @param projectCombo Combo the projects have to be inserted to.
- */
- private void addProjectsToCombo(Combo projectCombo) {
- IProject[] projects =
- ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (IProject project : projects){
- if (project.isOpen()){
- IProjectNature nature = null;
+ private void initProjectsAndMetamodels(){
+ for (IProject project : ((INewRefactoringWizard) getWizard()).getProjects()) {
+ projectCombo.add(project.getName());
+ }
+ Object [] metamodelObjects =
+ EPackage.Registry.INSTANCE.keySet().toArray(new Object[EPackage.Registry.INSTANCE.size()]);
+ Arrays.sort(metamodelObjects);
+ for(Object object : metamodelObjects){
+ metamodelCombo.add(object.toString());
+ }
+ }
+
+ private void setFixedMetamodel(String metaModel) {
+ for (String mm : metamodelCombo.getItems()) {
+ if (mm.equals(metaModel)) {
+ metamodelCombo.removeAll();
+ metamodelCombo.setItems(new String[] {metaModel});
+ metamodelCombo.select(0);
+ metamodelCombo.setEnabled(false);
+ EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(metaModel);
+ importPackage = ePackage.getClass().getPackage().getName();
+ if (importPackage.endsWith(".impl")) {
+ int length = importPackage.length();
+ importPackage = importPackage.substring(0, length-5);
+ }
+ System.out.println("importPackage: " + importPackage);
+ File jarFile;
try {
- nature = project.getNature("org.eclipse.pde.PluginNature");
- } catch (CoreException e) {
+ jarFile = new File
+ (ePackage.getClass().getProtectionDomain()
+ .getCodeSource().getLocation().toURI());
+ String jarName = jarFile.getName();
+ int index = jarName.indexOf("_");
+ jar = jarName.substring(0, index);
+ System.out.println("Jar5: " + jar);
+ } catch (URISyntaxException e) {
e.printStackTrace();
}
- if (null != nature){
- projectCombo.add(project.getName());
- }
+ break;
}
}
}
- /**
- * Checks whether the edited data are complete and sets
- * the corresponding message to the top of the wizard page.
- */
- private void checkIsPageComplete() {
- if (projectCombo.getItemCount() == 0){
- setErrorMessage("EMF Refactor cannot generate code without an " +
- "open plugin-project in the actual workspace.");
- setPageComplete(false);
- return;
- }
- if (id.isEmpty()){
- setMessage("Please insert a name.", SWT.ERROR);
- setPageComplete(false);
- } else {
- if (projectName.isEmpty()){
- setMessage("Please select a plugin-project to generate " +
- " your code in.", SWT.ERROR);
- setPageComplete(false);
- } else {
- if (! XMLPluginFileManager.pluginXmlExists(projectName)){
- XMLPluginFileManager.createPluginXml(projectName);
- }
- List<RefactoringInfo> refactoringConfig =
- XMLPluginFileManager.getRefactoringConfig(projectName);
- boolean exists = false;
- for (RefactoringInfo refCon : refactoringConfig){
- if (refCon.getRefactoringId().equals(id)){
- exists = true;
- break;
- }
- }
- if (exists){
- setMessage("There is already a refactoring with id '" +
- id + "' in project '" + projectName + "'!");
- setPageComplete(false);
- } else {
- if (menuLabel.isEmpty()){
- setMessage("Please insert a text to be shown in " +
- "menu (menu label). Otherwise, EMF Refactor " +
- "will show the refactoring name.", SWT.ERROR);
- } else {
- setMessage("", SWT.NONE);
- }
- setPageComplete(true);
- }
- }
- }
+ private void setFixedContext(String context) {
+ contextCombo.removeAll();
+ contextCombo.setItems(new String[] {context});
+ contextCombo.select(0);
+ contextCombo.setEnabled(false);
}
/**
- * @see org.eclipse.swt.widgets.Listener#handleEvent
- * (org.eclipse.swt.widgets.Event)
+ * Wird jedes mal ausgeführ wenn sich der Inhalt eines Textfeldes im Wizard
+ * verändert. Überprüft die inhalte der Textfelder und erzeugt
+ * entschprechende Meldungen im Wizardfenster.
*/
- @Override
- public void handleEvent(Event event) {
- if (event.widget == idText){
- id = idText.getText().trim().replaceAll(" ", "");
- originalId = idText.getText().trim();
+ private void updatePageComplete() {
+ if(nameTextField.getText().isEmpty()){
+ this.setMessage("Refactoring name is not specified.", ERROR);
+ this.setPageComplete(false);
+ }else
+ if(idTextField.getText().isEmpty()){
+ this.setMessage("Refactoring ID is not specified.", ERROR);
+ this.setPageComplete(false);
+ }else
+ if(metamodelCombo.getText().isEmpty()){
+ this.setMessage("Refactoring meta model is not specified.", ERROR);
+ this.setPageComplete(false);
+ }else
+ if( contextCombo.getText().isEmpty()){
+ this.setMessage("Refactoring context is not specified.", ERROR);
+ this.setPageComplete(false);
+ }else
+ if(!checkProject()){
+ this.setMessage("Target project for the new refactoring is not specified.", ERROR);
+ this.setPageComplete(false);
+ }else{
+ this.setMessage("");
+ this.setPageComplete(true);
+ saveTextFieldValues();
}
- if (event.widget == menuText){
- menuLabel = menuText.getText().trim();
- }
- if (event.widget == projectCombo){
- int index = projectCombo.getSelectionIndex();
- if (index == -1){
- projectName = "";
- } else {
- projectName = projectCombo.getItem(index);
- }
- }
- checkIsPageComplete();
+ }
+
+ private boolean checkProject(){
+ if(!projectCombo.getText().isEmpty())
+ return true;
+ return false;
+ }
+
+ private void saveTextFieldValues(){
+ ((INewRefactoringWizard) getWizard()).setName(this.nameTextField.getText());
+ ((INewRefactoringWizard) getWizard()).setId(this.idTextField.getText());
+// ((INewRefactoringWizard) getWizard()).setDescription(this.descriptionTextField.getText()); TODO
+ ((INewRefactoringWizard) getWizard()).setMetamodel(this.metamodelCombo.getText());
+ ((INewRefactoringWizard) getWizard()).setContext(this.contextCombo.getText());
+ ((INewRefactoringWizard) getWizard()).setJar(jar);
+ ((INewRefactoringWizard) getWizard()).setImportPackage(importPackage);
+ }
+
+ public void setMetamodel(String metaModel) {
+ this.metaModel = metaModel;
+ }
+
+ public void setContextType(String contextType) {
+ this.contextType = contextType;
}
}
+
+
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 222b2cb..6ed39c9 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
@@ -11,13 +11,24 @@
package org.eclipse.emf.refactor.refactoring.generator.ui;
import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectNature;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.refactor.refactoring.generator.core.RefactoringInfo;
import org.eclipse.emf.refactor.refactoring.generator.interfaces.INewRefactoringWizard;
import org.eclipse.emf.refactor.refactoring.generator.managers.GeneratioManager;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
/**
@@ -25,7 +36,7 @@
* @generated NOT
* @author Thorsten Arendt
*/
-public class NewRefactoringWizardJava extends Wizard implements INewRefactoringWizard {
+public class NewRefactoringWizardJava extends Wizard implements INewWizard, INewRefactoringWizard {
/**
* Wizard page for configurating model refactoring data (basics).
@@ -41,22 +52,54 @@
* Wizard page for configurating model test parameters.
*/
private TestWizardPage testWizardPage;
-
- /**
- * Default constructor that initializes its wizard pages.
- * @param selectedEObject The selected EObject when starting the
- * generation process of the model refactoring.
- */
- public NewRefactoringWizardJava(EObject selectedEObject){
+
+ private LinkedList<IProject> projects;
+
+ private String projectName;
+
+ private String menuLabel;
+
+ private String id;
+
+ private String namespaceUri;
+
+ private String className;
+
+ private String jar;
+
+ private String importPackage;
+
+ /**
+ * Default constructor that initializes its wizard pages.
+ * @param selectedEObject The selected EObject when starting the
+ * generation process of the model refactoring.
+ */
+ public NewRefactoringWizardJava(){
super();
setWindowTitle("EMF Refactor - Specify EMF Model Refactoring");
- this.basicWizardPage = new BasicDataWizardPage("EMF Refactor", selectedEObject);
- this.parameterWizardPage = new ParameterWizardPage("EMF Refactor");
- this.testWizardPage = new TestWizardPage("EMF Refactor");
+ this.basicWizardPage = new BasicDataWizardPage();
+ this.parameterWizardPage = new ParameterWizardPage();
+ this.testWizardPage = new TestWizardPage();
this.addPage(basicWizardPage);
this.addPage(parameterWizardPage);
this.addPage(testWizardPage);
}
+
+// /**
+// * Default constructor that initializes its wizard pages.
+// * @param selectedEObject The selected EObject when starting the
+// * generation process of the model refactoring.
+// */
+// public NewRefactoringWizardJava(EObject selectedEObject){
+// super();
+// setWindowTitle("EMF Refactor - Specify EMF Model Refactoring");
+// this.basicWizardPage = new BasicDataWizardPage("EMF Refactor", selectedEObject);
+// this.parameterWizardPage = new ParameterWizardPage("EMF Refactor");
+// this.testWizardPage = new TestWizardPage("EMF Refactor");
+// this.addPage(basicWizardPage);
+// this.addPage(parameterWizardPage);
+// this.addPage(testWizardPage);
+// }
/**
* @see org.eclipse.jface.wizard.Wizard#performFinish()
@@ -93,24 +136,113 @@
* generation activity.
*/
protected void createRefactoring(IProgressMonitor monitor) {
- String projectName = basicWizardPage.getProjectName();
- String id = basicWizardPage.getRefactoringId();
- String menuLabel = basicWizardPage.getMenuLabel();
- String namespaceUri = basicWizardPage.getNsUri();
- String namespacePrefix = basicWizardPage.getNsPrefix();
- String metaModelName = basicWizardPage.getMetaModelName();
- String className = basicWizardPage.getClassName();
- String jar = basicWizardPage.getJar();
+// String projectName = basicWizardPage.getProjectName();
+// String id = basicWizardPage.getRefactoringId();
+// String menuLabel = basicWizardPage.getMenuLabel();
+// String namespaceUri = basicWizardPage.getNsUri();
+// String namespacePrefix = basicWizardPage.getNsPrefix();
+// String metaModelName = basicWizardPage.getMetaModelName();
+// String className = basicWizardPage.getClassName();
+// String jar = basicWizardPage.getJar();
int numberOfTests = testWizardPage.getNumberOfTests();
+ String nsPrefix = getNsPrefix();
+ String metaModelName = getMetaModelName();
RefactoringInfo refactoringConfig =
new RefactoringInfo(projectName, id, menuLabel, namespaceUri,
- namespacePrefix, numberOfTests);
+ nsPrefix, numberOfTests);
refactoringConfig.setSelectedEObjectJar(jar);
- refactoringConfig.setSelectedEObjectClass(className);
+ refactoringConfig.setSelectedEObjectClass(importPackage + "." + className);
refactoringConfig.setMetaModelName(metaModelName);
refactoringConfig.setParameters(parameterWizardPage.getParameters());
- GeneratioManager rg = new GeneratioManager(refactoringConfig);
+ System.out.println(refactoringConfig);
+ GeneratioManager rg = new GeneratioManager(refactoringConfig);
rg.run(monitor);
}
+ private String getMetaModelName() {
+ EPackage mm =
+ EPackage.Registry.INSTANCE.getEPackage(namespaceUri);
+ return mm.getName();
+ }
+
+ private String getNsPrefix() {
+ EPackage mm =
+ EPackage.Registry.INSTANCE.getEPackage(namespaceUri);
+ return mm.getNsPrefix();
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ initProjects();
+ }
+
+ private void initProjects(){
+ this.projects = new LinkedList<IProject>();
+ IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ for (IProject project : allProjects) {
+ if (project.isOpen()) {
+ IProjectNature nature = null;
+ try {
+ nature = project.getNature("org.eclipse.pde.PluginNature");
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ if (null != nature)
+ this.projects.add(project);
+ }
+ }
+ }
+
+ public LinkedList<IProject> getProjects() {
+ return projects;
+ }
+
+ @Override
+ public int getPageNumbers() {
+ return 3;
+ }
+
+ @Override
+ public void updateSecondPage() { }
+
+ @Override
+ public WizardPage getSecondPage() {
+ return parameterWizardPage;
+ }
+
+ @Override
+ public void setTargetProject(String projectName) {
+ this.projectName = projectName;
+ }
+
+ @Override
+ public void setName(String name) {
+ this.menuLabel = name;
+ }
+
+ @Override
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public void setMetamodel(String metamodel) {
+ this.namespaceUri = metamodel;
+ }
+
+ @Override
+ public void setContext(String context) {
+ this.className = context;
+ }
+
+ @Override
+ public void setJar(String jar) {
+ this.jar = jar;
+ }
+
+ @Override
+ public void setImportPackage(String importPackage) {
+ this.importPackage = importPackage;
+ }
+
}
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/ParameterWizardPage.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/ParameterWizardPage.java
index 941d0fb..4d9e3aa 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/ParameterWizardPage.java
+++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/ParameterWizardPage.java
@@ -36,6 +36,11 @@
*/
public class ParameterWizardPage extends WizardPage implements Listener {
+ private static final String PAGE_NAME = "org.eclipse.emf.refactor.refactoring.generator.ParameterWizardPage";
+ private static final String PAGE_TITLE = "New Refactoring: Parameter Data";
+ private static final String PAGE_DESCRIPTION = "Please specify the parameter of the refactoring. " +
+ "Required fields are denoted by \"(*)\".";
+
private Button addButton;
private Button removeButton;
private List parameterList;
@@ -51,10 +56,11 @@
/**
* Default constructor.
- * @param pageName Name of the wizard page.
*/
- protected ParameterWizardPage(String pageName) {
- super(pageName);
+ protected ParameterWizardPage() {
+ super(PAGE_NAME);
+ setTitle(PAGE_TITLE);
+ setDescription(PAGE_DESCRIPTION);
parameters = new ArrayList<ParameterInfo>();
}
diff --git a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/TestWizardPage.java b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/TestWizardPage.java
index a3dbf2f..6835991 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/TestWizardPage.java
+++ b/org.eclipse.emf.refactor.refactoring.generator/src/org/eclipse/emf/refactor/refactoring/generator/ui/TestWizardPage.java
@@ -29,15 +29,21 @@
*/
public class TestWizardPage extends WizardPage implements Listener {
+ private static final String PAGE_NAME = "org.eclipse.emf.refactor.refactoring.generator.TestWizardPage";
+ private static final String PAGE_TITLE = "New Refactoring: Test Data";
+ private static final String PAGE_DESCRIPTION = "Please specify the number of test cases to be generated. " +
+ "Required fields are denoted by \"(*)\".";
+
private Text numberText;
private Combo numberCombo;
/**
* Default constructor.
- * @param pageName Name of the wizard page.
*/
- protected TestWizardPage(String pageName) {
- super(pageName);
+ protected TestWizardPage() {
+ super(PAGE_NAME);
+ setTitle(PAGE_TITLE);
+ setDescription(PAGE_DESCRIPTION);
}
/**
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/Config.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/Config.javajet
index 6a09a44..7058ac1 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/Config.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/Config.javajet
@@ -1,5 +1,5 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringController"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
<?xml version="1.0" encoding="UTF-8"?>
<config>
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringController.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringController.javajet
index d8d93b6..7d745c0 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringController.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringController.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringController"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringController.javajet,v 1.1 2012/10/16 11:53:05 tarendt Exp $
+ * $Id: RefactoringController.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
@@ -124,7 +124,7 @@
<%=info.getSelectedEObjectClass()%> selectedEObject =
(<%=info.getSelectedEObjectClass()%>) dataManagement.
getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();<%/*
- */%><%for (ParameterConfig pC : info.getParameters()) { %>
+ */%><%for (ParameterInfo pC : info.getParameters()) { %>
String <%=pC.getName()%> =
(String) dataManagement.getInPortByName("<%=pC.getName()%>").getValue();<%}%>
// TODO: implement model transformation
@@ -176,7 +176,7 @@
<%=info.getSelectedEObjectClass()%> selectedEObject =
(<%=info.getSelectedEObjectClass()%>) dataManagement.
getInPortByName(dataManagement.SELECTEDEOBJECT).getValue();<%/*
- */%><%for (ParameterConfig pC : info.getParameters()) {%>
+ */%><%for (ParameterInfo pC : info.getParameters()) {%>
String <%=pC.getName()%> =
(String) dataManagement.getInPortByName("<%=pC.getName()%>").getValue();<%}%>
// TODO: implement final check
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringDataManagement.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringDataManagement.javajet
index 1bf372b..8acc39f 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringDataManagement.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringDataManagement.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringDataManagement"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringDataManagement.javajet,v 1.1 2012/10/16 11:53:05 tarendt Exp $
+ * $Id: RefactoringDataManagement.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringGuiHandler.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringGuiHandler.javajet
index 2a3a5fd..eea7214 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringGuiHandler.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringGuiHandler.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringGuiHandler"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringGuiHandler.javajet,v 1.1 2012/10/16 11:53:04 tarendt Exp $
+ * $Id: RefactoringGuiHandler.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringTest.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringTest.javajet
index 601cf1a..3fcaabc 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringTest.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringTest.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringTest"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringTest.javajet,v 1.1 2012/10/16 11:53:05 tarendt Exp $
+ * $Id: RefactoringTest.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
@@ -22,7 +22,6 @@
import <%=info.getPackageName()%>.RefactoringController;
import <%=info.getPackageName()%>.RefactoringGuiHandler;
import org.eclipse.emf.refactor.refactoring.runtime.test.JUnitTestCaseAdapter;
-import <%=info.getJar()%>.<%=info.getMetaModelName()%>Package;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -52,7 +51,7 @@
"<%=info.getNamespacePrefix()%>",
new File(".").getCanonicalPath(),
new Refactoring(null, "", "<%=info.getNamespaceUri()%>", new RefactoringGuiHandler(), new RefactoringController()));
- register(<%=info.getMetaModelName()%>Package.eINSTANCE);
+ //register(info.getMetaModelName()Package.eINSTANCE);
this.number = number;
}
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizard.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizard.javajet
index 5aa2229..94e9e93 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizard.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizard.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringWizard"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringWizard.javajet,v 1.1 2012/10/16 11:53:05 tarendt Exp $
+ * $Id: RefactoringWizard.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
diff --git a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizardPage.javajet b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizardPage.javajet
index 57e9b86..2b5306a 100644
--- a/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizardPage.javajet
+++ b/org.eclipse.emf.refactor.refactoring.generator/templates/RefactoringWizardPage.javajet
@@ -1,11 +1,11 @@
<%@ jet package="org.eclipse.emf.refactor.refactoring" class="RefactoringWizardPage"
-imports="org.eclipse.emf.refactor.refactoring.generator.core"%>
+imports="org.eclipse.emf.refactor.refactoring.generator.core.*"%>
<%RefactoringInfo info = (RefactoringInfo) argument; %>
/**
* <copyright>
* </copyright>
*
- * $Id: RefactoringWizardPage.javajet,v 1.1 2012/10/16 11:53:05 tarendt Exp $
+ * $Id: RefactoringWizardPage.javajet,v 1.2 2012/10/16 21:03:02 tarendt Exp $
*/
package <%=info.getPackageName()%>;
