packaging improved
diff --git a/org.eclipse.emf.refactor.metrics.generator/plugin.xml b/org.eclipse.emf.refactor.metrics.generator/plugin.xml
index bdbc9c5..0912b62 100644
--- a/org.eclipse.emf.refactor.metrics.generator/plugin.xml
+++ b/org.eclipse.emf.refactor.metrics.generator/plugin.xml
@@ -5,14 +5,14 @@
point="org.eclipse.ui.newWizards">
<wizard
category="org.eclipse.emf.refactor.newwizards.category"
- class="org.eclipse.emf.refactor.metrics.generator.NewMetricWizardJava"
+ class="org.eclipse.emf.refactor.metrics.generator.ui.NewMetricWizardJava"
icon="icons/newmetric.PNG"
id="org.eclipse.emf.refactor.metrics.newwizard"
name="Metric (specified in Java)">
</wizard>
<wizard
category="org.eclipse.emf.refactor.newwizards.category"
- class="org.eclipse.emf.refactor.metrics.generator.NewMetricWizardComposite"
+ class="org.eclipse.emf.refactor.metrics.generator.ui.NewMetricWizardComposite"
icon="icons/newmetric.PNG"
id="org.eclipse.emf.refactor.metrics.newwizard"
name="Metric (compositional)">
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/Activator.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/Activator.java
index b11cc96..4afbfdb 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/Activator.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/Activator.java
@@ -1,5 +1,6 @@
package org.eclipse.emf.refactor.metrics.generator;
+import org.eclipse.emf.refactor.metrics.generator.managers.GenerationManager;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeMetricInfo.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/CompositeMetricInfo.java
similarity index 97%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeMetricInfo.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/CompositeMetricInfo.java
index 75b0401..662d6b8 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeMetricInfo.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/CompositeMetricInfo.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.core;
import org.eclipse.emf.refactor.metrics.core.Metric;
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricCreator.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricCreator.java
similarity index 96%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricCreator.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricCreator.java
index c8b932e..87b299b 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricCreator.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricCreator.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.core;
import java.util.LinkedList;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricInfo.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricInfo.java
similarity index 97%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricInfo.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricInfo.java
index b180b10..69e2955 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricInfo.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/core/MetricInfo.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.core;
/**
* This class provides a container for the information needed to generate a new metric.
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/INewMetricWizard.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/interfaces/INewMetricWizard.java
similarity index 89%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/INewMetricWizard.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/interfaces/INewMetricWizard.java
index 05379d1..8de1fd3 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/INewMetricWizard.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/interfaces/INewMetricWizard.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.interfaces;
import java.util.LinkedList;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/DependenciesManager.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/DependenciesManager.java
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/DependenciesManager.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/DependenciesManager.java
index 630feb7..c9e5169 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/DependenciesManager.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/DependenciesManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.managers;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -10,6 +10,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.emf.refactor.metrics.generator.core.MetricInfo;
public class DependenciesManager {
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/GenerationManager.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/GenerationManager.java
similarity index 95%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/GenerationManager.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/GenerationManager.java
index 7beb8a0..79c0d07 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/GenerationManager.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/GenerationManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.managers;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -19,6 +19,9 @@
import org.eclipse.emf.codegen.jet.JETEmitter;
import org.eclipse.emf.codegen.jet.JETException;
import org.eclipse.emf.codegen.util.CodeGenUtil;
+import org.eclipse.emf.refactor.metrics.generator.Activator;
+import org.eclipse.emf.refactor.metrics.generator.core.CompositeMetricInfo;
+import org.eclipse.emf.refactor.metrics.generator.core.MetricInfo;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
import org.osgi.framework.Bundle;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/XMLPluginFileManager.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/XMLPluginFileManager.java
similarity index 97%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/XMLPluginFileManager.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/XMLPluginFileManager.java
index 54751c9..8d27edf 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/XMLPluginFileManager.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/managers/XMLPluginFileManager.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.managers;
import java.io.File;
import java.io.IOException;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeDataWizardPage.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/CompositeDataWizardPage.java
similarity index 99%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeDataWizardPage.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/CompositeDataWizardPage.java
index b5f6ee6..bd262ec 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/CompositeDataWizardPage.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/CompositeDataWizardPage.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.ui;
import java.util.LinkedList;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricBasicDataWizardPage.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
similarity index 98%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricBasicDataWizardPage.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
index d4b82f2..bc8a64a 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/MetricBasicDataWizardPage.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/MetricBasicDataWizardPage.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.ui;
import java.util.Arrays;
@@ -6,6 +6,7 @@
import org.eclipse.emf.ecore.ENamedElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.refactor.metrics.generator.interfaces.INewMetricWizard;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardComposite.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardComposite.java
similarity index 93%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardComposite.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardComposite.java
index c13e24e..81ae69f 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardComposite.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardComposite.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.ui;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
@@ -9,6 +9,9 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.refactor.metrics.core.Metric;
+import org.eclipse.emf.refactor.metrics.generator.core.CompositeMetricInfo;
+import org.eclipse.emf.refactor.metrics.generator.interfaces.INewMetricWizard;
+import org.eclipse.emf.refactor.metrics.generator.managers.GenerationManager;
import org.eclipse.emf.refactor.metrics.interfaces.IOperation;
import org.eclipse.emf.refactor.metrics.managers.MetricManager;
import org.eclipse.jface.operation.IRunnableWithProgress;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardJava.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardJava.java
similarity index 92%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardJava.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardJava.java
index 680de99..b86bf79 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/NewMetricWizardJava.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/NewMetricWizardJava.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.ui;
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
@@ -8,6 +8,9 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.refactor.metrics.generator.core.MetricInfo;
+import org.eclipse.emf.refactor.metrics.generator.interfaces.INewMetricWizard;
+import org.eclipse.emf.refactor.metrics.generator.managers.GenerationManager;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
diff --git a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/TableItemsMapping.java b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/TableItemsMapping.java
similarity index 96%
rename from org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/TableItemsMapping.java
rename to org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/TableItemsMapping.java
index 83eaa3a..3674a32 100644
--- a/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/TableItemsMapping.java
+++ b/org.eclipse.emf.refactor.metrics.generator/src/org/eclipse/emf/refactor/metrics/generator/ui/TableItemsMapping.java
@@ -1,4 +1,4 @@
-package org.eclipse.emf.refactor.metrics.generator;
+package org.eclipse.emf.refactor.metrics.generator.ui;
import java.util.LinkedList;
