[182692] Prime the import manager with imports from the existing target.

36 files changed, 176 insertions, 131 deletions

diff --git a/plugins/org.eclipse.emf.ant/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ant/META-INF/MANIFEST.MF
index fffc0dc1a..2c64c6f43 100644
--- a/plugins/org.eclipse.emf.ant/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ant/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ant; singleton:=true
-Bundle-Version: 2.7.0.qualifier
+Bundle-Version: 2.8.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ant.EMFAntPlugin
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.ant/tasks/org/eclipse/emf/ant/taskdefs/codegen/ecore/GeneratorTask.java b/plugins/org.eclipse.emf.ant/tasks/org/eclipse/emf/ant/taskdefs/codegen/ecore/GeneratorTask.java
index 8d8f34905..550781ffe 100644
--- a/plugins/org.eclipse.emf.ant/tasks/org/eclipse/emf/ant/taskdefs/codegen/ecore/GeneratorTask.java
+++ b/plugins/org.eclipse.emf.ant/tasks/org/eclipse/emf/ant/taskdefs/codegen/ecore/GeneratorTask.java
@@ -113,6 +113,10 @@ import org.eclipse.emf.common.util.URI;
  *    &quot;6.0&quot; are valid values.</td>
  * </tr>
  * <tr>
+ *    <td valign="top">importOrganizing</td>
+ *    <td>Boolean value indicating whether the imports should be organized to remove unused imports.</td>
+* </tr>
+ * <tr>
  *    <td valign="top">validateModel</td>
  *    <td>Boolean value indicating whether the Ecore model should be validated before
  *    generating the code.</td>
@@ -180,7 +184,8 @@ public abstract class GeneratorTask extends EMFTask
   protected String modelProjectFragmentPath;
   protected File templatePath;
   protected String copyright;
-  protected boolean sdo = false;
+  protected boolean sdo;
+  protected boolean importOrganizing;
   protected String jdkLevel;
   protected String validateModel;
 
@@ -334,6 +339,11 @@ public abstract class GeneratorTask extends EMFTask
     return GenJDKLevel.get(jdkLevel);
   }
 
+  public void setImportOrganzing(boolean importOrganizing)
+  {
+    this.importOrganizing = importOrganizing;
+  }
+
   protected Commandline getCommandline()
   {
     if (commandline == null)
@@ -485,6 +495,12 @@ public abstract class GeneratorTask extends EMFTask
     {
       getCommandline().createArgument().setValue("-sdo");
     }
+    
+
+    if (importOrganizing)
+    {
+      getCommandline().createArgument().setValue("-importOrganizing");
+    }
   }
 
   protected void adjustEditAndEditorProjects()
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java
index 280164203..3f891c2b7 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/generator/AbstractGeneratorAdapter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2006-2007 IBM Corporation and others.
+ * Copyright (c) 2006-2012 IBM Corporation and others.
  * 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
@@ -79,6 +79,9 @@ import org.eclipse.emf.codegen.jet.JETEmitter;
 import org.eclipse.emf.codegen.jet.JETException;
 import org.eclipse.emf.codegen.merge.java.JControlModel;
 import org.eclipse.emf.codegen.merge.java.JMerger;
+import org.eclipse.emf.codegen.merge.java.facade.JCompilationUnit;
+import org.eclipse.emf.codegen.merge.java.facade.JImport;
+import org.eclipse.emf.codegen.merge.java.facade.JNode;
 import org.eclipse.emf.codegen.merge.properties.PropertyMerger;
 import org.eclipse.emf.codegen.util.CodeGenUtil;
 import org.eclipse.emf.codegen.util.GIFEmitter;
@@ -1725,22 +1728,45 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
       {
         arguments = new Object[] { generatingObject };
       }
+
+      JControlModel jControlModel = getGenerator().getJControlModel();      
+      JMerger jMerger = null;
+      if (jControlModel.canMerge())
+      {
+        jMerger = new JMerger(jControlModel);
+      }
+
       createImportManager(packageName, className);
-      setLineDelimiter(getLineDelimiter(targetFile, getEncoding(targetFile)));
-      String emitterResult = jetEmitter.generate(createMonitor(monitor, 1), arguments, getLineDelimiter());
+      String targetFileContents = null;
+      String targetFileEncoding = getEncoding(targetFile);
+      if (exists(targetFile) && jMerger != null)
+      {
+        // Prime the import manager with the existing imports of the target.
+        //
+        jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(createInputStream(targetFile), targetFileEncoding));
+        JCompilationUnit targetCompilationUnit = jMerger.getTargetCompilationUnit();
+        ImportManager importManager = getImportManager();
+        for (JNode node : targetCompilationUnit.getChildren())
+        {
+          if (node instanceof JImport)
+          {
+            JImport jImport = (JImport)node;
+            String qualifiedName = jImport.getQualifiedName();
+            importManager.addImport(qualifiedName);
+          }
+        }
+        targetFileContents = jMerger.getTargetCompilationUnitContents();
+      }
 
+      setLineDelimiter(getLineDelimiter(targetFile, targetFileEncoding));
+      String emitterResult = jetEmitter.generate(createMonitor(monitor, 1), arguments, getLineDelimiter());
       boolean changed = true;
       String newContents = emitterResult;
-      boolean targetExists = exists(targetFile);
 
-      JControlModel jControlModel = getGenerator().getJControlModel();      
-      boolean mergeSuccessful = jControlModel.canMerge();
-      
       Options options = getGenerator().getOptions();
 
-      if (mergeSuccessful)
+      if (jMerger != null)
       {
-        JMerger jMerger = new JMerger(jControlModel);
         jMerger.setFixInterfaceBrace(jControlModel.getFacadeHelper().fixInterfaceBrace());
         
         try
@@ -1749,28 +1775,26 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
         }
         catch (RuntimeException runtimeException)
         {
-          if (targetExists)
+          if (targetFileContents != null)
           {
             throw runtimeException;
           }
           else
           {
-            mergeSuccessful = false;
+            jMerger = null;
           }
         }
 
-        if (mergeSuccessful)
+        if (jMerger != null)
         {
           // Create a code formatter for this compilation unit, if needed.
           //
           Object codeFormatter = options.codeFormatting ?
             createCodeFormatter(options.codeFormatterOptions, targetFile) : null;
   
-          if (targetExists)
+          if (targetFileContents != null)
           {
             monitor.subTask(CodeGenEcorePlugin.INSTANCE.getString("_UI_ExaminingOld_message", new Object[] { targetFile }));
-            jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(createInputStream(targetFile), getEncoding(targetFile)));
-            String oldContents = jMerger.getTargetCompilationUnitContents();
   
             monitor.subTask(CodeGenEcorePlugin.INSTANCE.getString("_UI_PreparingNew_message", new Object[] { targetFile }));
             jMerger.merge();
@@ -1780,13 +1804,13 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
             {
               newContents = organizeImports(targetFile.toString(), newContents);
             }
-            changed = !oldContents.equals(newContents);
+            changed = !targetFileContents.equals(newContents);
   
             // If the target is read-only, we can ask the platform to release it, and it may be updated in the process.
             //
             if (changed && isReadOnly(targetFile) && validateEdit(targetFile, createMonitor(monitor, 1)))
             {
-              jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(createInputStream(targetFile), getEncoding(targetFile)));
+              jMerger.setTargetCompilationUnit(jMerger.createCompilationUnitForInputStream(createInputStream(targetFile), targetFileEncoding));
               jMerger.remerge();
               newContents = formatCode(jMerger.getTargetCompilationUnitContents(), codeFormatter, options.commentFormatting);
               if (options.importOrganizing)
@@ -1799,7 +1823,7 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
           {
             changed = true;
             monitor.subTask(CodeGenEcorePlugin.INSTANCE.getString("_UI_PreparingNew_message", new Object[] { targetFile }));
-            
+
             jMerger.merge();
             newContents = formatCode(jMerger.getTargetCompilationUnitContents(), codeFormatter, options.commentFormatting);
           }
@@ -1810,16 +1834,15 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
           }
         }
       }
-      
-      if (!mergeSuccessful)
+
+      if (jMerger == null)
       {
         newContents = 
           CodeGenUtil.convertFormat(jControlModel.getLeadingTabReplacement(), jControlModel.convertToStandardBraceStyle(), emitterResult);
-        if (targetExists)
+        if (targetFileContents != null)
         {
           monitor.subTask(CodeGenEcorePlugin.INSTANCE.getString("_UI_ExaminingOld_message", new Object[] { targetFile }));
-          String oldContents = getContents(targetFile, null); 
-          changed = !oldContents.equals(newContents);
+          changed = !targetFileContents.equals(newContents);
         }
         else
         {
@@ -1830,7 +1853,7 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
 
       if (changed)
       {
-        String encoding = getEncoding(targetFile);
+        String encoding = targetFileEncoding;
         byte[] bytes = encoding == null ? newContents.getBytes() : newContents.getBytes(encoding);
 
         // Apply a redirection pattern, if specified.
@@ -2628,17 +2651,31 @@ public abstract class AbstractGeneratorAdapter extends SingletonAdapterImpl impl
                              //
                              unusedImports.remove(((ITypeBinding)binding).getErasure().getQualifiedName());
                            }
+                           else if (binding == null)
+                           {
+                             // If we can't resolve it at all, better assume it should resolve to an import...
+                             //
+                             String suffix = "." + node.getIdentifier();
+                             for (String unusedImport : unusedImports)
+                             {
+                               if (unusedImport.endsWith(suffix))
+                               {
+                                 unusedImports.remove(unusedImport);
+                                 break;
+                               }
+                             }
+                           }
                            return false;
                          }
                        });
 
                     // If there are imports that aren't resolvable, we have to be careful that we don't just remove them as if they are unused because they might be needed somewhere.
-                    // So we look for errors about unresolved types and remove the corresponding unused import.
+                    // So we look for errors about unresolved types and unresolved variables and remove the corresponding unused import, if there is one.
                     //
                     for (IProblem problem : problems)
                     {
                       int id = problem.getID();
-                      if (id == IProblem.UndefinedType)
+                      if (id == IProblem.UndefinedType || id == IProblem.UnresolvedVariable)
                       {
                         String suffix = "." + problem.getArguments()[0];
                         for (String unusedImport : unusedImports)
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/ImportManager.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/ImportManager.java
index 20b2a9257..10e7d5292 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/ImportManager.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/util/ImportManager.java
@@ -531,7 +531,11 @@ public class ImportManager
     }
     else
     {
-      shortNameToImportMap.put(shortName, importName);
+      String oldImportName = shortNameToImportMap.put(shortName, importName);
+      if (oldImportName != null)
+      {
+        imports.remove(oldImportName);
+      }
     }
   }
 
diff --git a/plugins/org.eclipse.emf.importer.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.importer.ecore/META-INF/MANIFEST.MF
index c26a04009..9633e8103 100644
--- a/plugins/org.eclipse.emf.importer.ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.importer.ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.importer.ecore; singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.importer.ecore.EcoreImporterPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.importer.ecore/src/org/eclipse/emf/importer/ecore/EcoreImporterApplication.java b/plugins/org.eclipse.emf.importer.ecore/src/org/eclipse/emf/importer/ecore/EcoreImporterApplication.java
index 74ffee31f..ec5831ca4 100644
--- a/plugins/org.eclipse.emf.importer.ecore/src/org/eclipse/emf/importer/ecore/EcoreImporterApplication.java
+++ b/plugins/org.eclipse.emf.importer.ecore/src/org/eclipse/emf/importer/ecore/EcoreImporterApplication.java
@@ -48,25 +48,26 @@ public class EcoreImporterApplication extends ModelImporterApplication
   {
     StringBuffer result = new StringBuffer();
     appendLine(result, "Usage: { <model.ecore> }+ [ <model.genmodel> [ -reload ] ] <OPTION>");
-    appendLine(result, "<OPTION>          ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
-    appendLine(result, "                      { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
-    appendLine(result, "                      [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
-    appendLine(result, "                      [ <SDO> ] [ <QUIET> ]");
-    appendLine(result, "<PROJECT-OPTION>  ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
-    appendLine(result, "                      [ <TESTS-PROJECT> ]");
-    appendLine(result, "<MODEL-PROJECT>   ::= -modelProject <model-directory> <fragment-path>");
-    appendLine(result, "<EDIT-PROJECT>    ::= -editProject <edit-directory> <fragment-path>");
-    appendLine(result, "<EDITOR-PROJECT>  ::= -editorProject <editor-directory> <fragment-path>");
-    appendLine(result, "<TESTS-PROJECT>   ::= -testsProject <tests-directory> <fragment-path>");
-    appendLine(result, "<PACKAGE>         ::= -package <nsURI> [ <base> <prefix> ]");
-    appendLine(result, "<REF-GEN-MODEL>   ::= -refGenModel <model.genmodel> { <nsURI> }+");
-    appendLine(result, "<TEMPLATE-PATH>   ::= -templatePath <template-directory>");
-    appendLine(result, "<MODEL-PLUGIN-ID> ::= -modelPluginID <plugin-ID>");    
-    appendLine(result, "<COPYRIGHT>       ::= -copyright <copyright-string>");
-    appendLine(result, "<JDK-LEVEL>       ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");    
-    appendLine(result, "<VALIDATE-MODEL>  ::= -validateModel <true|false>");
-    appendLine(result, "<SDO>             ::= -sdo");
-    appendLine(result, "<QUIET>           ::= -quiet");
+    appendLine(result, "<OPTION>            ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
+    appendLine(result, "                        { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
+    appendLine(result, "                        [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
+    appendLine(result, "                        [ <SDO> ] [ <QUIET> ]");
+    appendLine(result, "<PROJECT-OPTION>    ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
+    appendLine(result, "                        [ <TESTS-PROJECT> ]");
+    appendLine(result, "<MODEL-PROJECT>     ::= -modelProject <model-directory> <fragment-path>");
+    appendLine(result, "<EDIT-PROJECT>      ::= -editProject <edit-directory> <fragment-path>");
+    appendLine(result, "<EDITOR-PROJECT>    ::= -editorProject <editor-directory> <fragment-path>");
+    appendLine(result, "<TESTS-PROJECT>     ::= -testsProject <tests-directory> <fragment-path>");
+    appendLine(result, "<PACKAGE>           ::= -package <nsURI> [ <base> <prefix> ]");
+    appendLine(result, "<REF-GEN-MODEL>     ::= -refGenModel <model.genmodel> { <nsURI> }+");
+    appendLine(result, "<TEMPLATE-PATH>     ::= -templatePath <template-directory>");
+    appendLine(result, "<MODEL-PLUGIN-ID>   ::= -modelPluginID <plugin-ID>");    
+    appendLine(result, "<COPYRIGHT>         ::= -copyright <copyright-string>");
+    appendLine(result, "<JDK-LEVEL>         ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");    
+    appendLine(result, "<IMPORT-ORGANIZING> ::= -importOrganizing");
+    appendLine(result, "<VALIDATE-MODEL>    ::= -validateModel <true|false>");
+    appendLine(result, "<SDO>               ::= -sdo");
+    appendLine(result, "<QUIET>             ::= -quiet");
     appendLine(result, "");
     appendLine(result, "For example:");
     appendLine(result, "");
diff --git a/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/JavaImporterApplication.java b/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/JavaImporterApplication.java
index a288c325c..8fff818c9 100644
--- a/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/JavaImporterApplication.java
+++ b/plugins/org.eclipse.emf.importer.java/src/org/eclipse/emf/importer/java/JavaImporterApplication.java
@@ -61,25 +61,26 @@ public class JavaImporterApplication extends ModelImporterApplication
   {
     StringBuffer result = new StringBuffer();
     appendLine(result, "Usage: <workspace absolute path of model.genmodel> [ -reload ] <OPTION>");
-    appendLine(result, "<OPTION>          ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
-    appendLine(result, "                      { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
-    appendLine(result, "                      [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
-    appendLine(result, "                      [ <SDO> ] [ <QUIET> ]");
-    appendLine(result, "<PROJECT-OPTION>  ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
-    appendLine(result, "                      [ <TESTS-PROJECT> ]");
-    appendLine(result, "<MODEL-PROJECT>   ::= -modelProject <model-directory>");
-    appendLine(result, "<EDIT-PROJECT>    ::= -editProject <edit-directory> <fragment-path>");
-    appendLine(result, "<EDITOR-PROJECT>  ::= -editorProject <editor-directory> <fragment-path>");
-    appendLine(result, "<TESTS-PROJECT>   ::= -testsProject <tests-directory> <fragment-path>");
-    appendLine(result, "<PACKAGE>         ::= -package <nsURI> [ <base> <prefix> ]");
-    appendLine(result, "<REF-GEN-MODEL>   ::= -refGenModel <model.genmodel> { <nsURI> }+");
-    appendLine(result, "<TEMPLATE-PATH>   ::= -templatePath <template-directory>");
-    appendLine(result, "<MODEL-PLUGIN-ID> ::= -modelPluginID <plugin-ID>");    
-    appendLine(result, "<COPYRIGHT>       ::= -copyright <copyright-string>");
-    appendLine(result, "<JDK-LEVEL>       ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");    
-    appendLine(result, "<VALIDATE-MODEL>  ::= -validateModel <true|false>");
-    appendLine(result, "<SDO>             ::= -sdo");
-    appendLine(result, "<QUIET>           ::= -quiet");
+    appendLine(result, "<OPTION>            ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
+    appendLine(result, "                        { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
+    appendLine(result, "                        [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
+    appendLine(result, "                        [ <SDO> ] [ <QUIET> ]");
+    appendLine(result, "<PROJECT-OPTION>    ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
+    appendLine(result, "                        [ <TESTS-PROJECT> ]");
+    appendLine(result, "<MODEL-PROJECT>     ::= -modelProject <model-directory>");
+    appendLine(result, "<EDIT-PROJECT>      ::= -editProject <edit-directory> <fragment-path>");
+    appendLine(result, "<EDITOR-PROJECT>    ::= -editorProject <editor-directory> <fragment-path>");
+    appendLine(result, "<TESTS-PROJECT>     ::= -testsProject <tests-directory> <fragment-path>");
+    appendLine(result, "<PACKAGE>           ::= -package <nsURI> [ <base> <prefix> ]");
+    appendLine(result, "<REF-GEN-MODEL>     ::= -refGenModel <model.genmodel> { <nsURI> }+");
+    appendLine(result, "<TEMPLATE-PATH>     ::= -templatePath <template-directory>");
+    appendLine(result, "<MODEL-PLUGIN-ID>   ::= -modelPluginID <plugin-ID>");    
+    appendLine(result, "<COPYRIGHT>         ::= -copyright <copyright-string>");
+    appendLine(result, "<JDK-LEVEL>         ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");    
+    appendLine(result, "<IMPORT-ORGANIZING> ::= -importOrganizing");
+    appendLine(result, "<VALIDATE-MODEL>    ::= -validateModel <true|false>");
+    appendLine(result, "<SDO>               ::= -sdo");
+    appendLine(result, "<QUIET>             ::= -quiet");
     appendLine(result, "");
     appendLine(result, "For example:");
     appendLine(result, "");
diff --git a/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
index c0f71df3e..7d519d930 100644
--- a/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.importer.rose/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.importer.rose; singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.importer.rose.RoseImporterPlugin$Implementation
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/RoseImporterApplication.java b/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/RoseImporterApplication.java
index ea5bdad52..d7f9a760d 100644
--- a/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/RoseImporterApplication.java
+++ b/plugins/org.eclipse.emf.importer.rose/src/org/eclipse/emf/importer/rose/RoseImporterApplication.java
@@ -54,27 +54,28 @@ public class RoseImporterApplication extends ModelImporterApplication
   {
     StringBuffer result = new StringBuffer();
     appendLine(result, "Usage: <model.mdl> [ <model.genmodel> [ -reload ] ] <OPTION>");
-    appendLine(result, "<OPTION>          ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
-    appendLine(result, "                      { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
-    appendLine(result, "                      [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
-    appendLine(result, "                      [ <SDO> ] [ <QUIET> ]");
-    appendLine(result, "<PROJECT-OPTION>  ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
-    appendLine(result, "                      [ <TESTS-PROJECT> ]");
-    appendLine(result, "<MODEL-PROJECT>   ::= -modelProject <model-directory> <fragment-path>");
-    appendLine(result, "<EDIT-PROJECT>    ::= -editProject <edit-directory> <fragment-path>");
-    appendLine(result, "<EDITOR-PROJECT>  ::= -editorProject <editor-directory> <fragment-path>");
-    appendLine(result, "<TESTS-PROJECT>   ::= -testsProject <tests-directory> <fragment-path>");
-    appendLine(result, "<PATHMAP>         ::= -pathMap { <symbol> <directory> }+");
-    appendLine(result, "<PACKAGE>         ::= -package <name> [ <nsPrefix> <nsURI> <base> <prefix> ]");
-    appendLine(result, "<REF-PACKAGE>     ::= <deprecated - use -refGenModel instead> -refPackage <name> [ <nsPrefix> <nsURI> <base> <prefix> ]");
-    appendLine(result, "<REF-GEN-MODEL>   ::= -refGenModel <model.genmodel> { <nsURI> }+");
-    appendLine(result, "<TEMPLATE-PATH>   ::= -templatePath <template-directory>");
-    appendLine(result, "<MODEL-PLUGIN-ID> ::= -modelPluginID <plugin-ID>");    
-    appendLine(result, "<COPYRIGHT>       ::= -copyright <copyright-string>");
-    appendLine(result, "<JDK-LEVEL>       ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");
-    appendLine(result, "<VALIDATE-MODEL>  ::= -validateModel <true|false>");
-    appendLine(result, "<SDO>             ::= -sdo");
-    appendLine(result, "<QUIET>           ::= -quiet");
+    appendLine(result, "<OPTION>            ::= [ <PROJECT-OPTION> ]  [ <PATHMAP> ]");
+    appendLine(result, "                        { <PACKAGE> }+  { <REF-PACKAGE> }* { <REF-GEN-MODEL> }*");
+    appendLine(result, "                        [ <TEMPLATE-PATH> ] [ <MODEL-PLUGIN-ID> ] [ <COPYRIGHT> ]");
+    appendLine(result, "                        [ <SDO> ] [ <QUIET> ]");
+    appendLine(result, "<PROJECT-OPTION>    ::= <MODEL-PROJECT> [ <EDIT-PROJECT> ] [ <EDITOR-PROJECT> ]");
+    appendLine(result, "                        [ <TESTS-PROJECT> ]");
+    appendLine(result, "<MODEL-PROJECT>     ::= -modelProject <model-directory> <fragment-path>");
+    appendLine(result, "<EDIT-PROJECT>      ::= -editProject <edit-directory> <fragment-path>");
+    appendLine(result, "<EDITOR-PROJECT>    ::= -editorProject <editor-directory> <fragment-path>");
+    appendLine(result, "<TESTS-PROJECT>     ::= -testsProject <tests-directory> <fragment-path>");
+    appendLine(result, "<PATHMAP>           ::= -pathMap { <symbol> <directory> }+");
+    appendLine(result, "<PACKAGE>           ::= -package <name> [ <nsPrefix> <nsURI> <base> <prefix> ]");
+    appendLine(result, "<REF-PACKAGE>       ::= <deprecated - use -refGenModel instead> -refPackage <name> [ <nsPrefix> <nsURI> <base> <prefix> ]");
+    appendLine(result, "<REF-GEN-MODEL>     ::= -refGenModel <model.genmodel> { <nsURI> }+");
+    appendLine(result, "<TEMPLATE-PATH>     ::= -templatePath <template-directory>");
+    appendLine(result, "<MODEL-PLUGIN-ID>   ::= -modelPluginID <plugin-ID>");    
+    appendLine(result, "<COPYRIGHT>         ::= -copyright <copyright-string>");
+    appendLine(result, "<JDK-LEVEL>         ::= -jdkLevel <jdk level: 1.4 5.0 6.0>");
+    appendLine(result, "<IMPORT-ORGANIZING> ::= -importOrganizing");
+    appendLine(result, "<VALIDATE-MODEL>    ::= -validateModel <true|false>");
+    appendLine(result, "<SDO>               ::= -sdo");
+    appendLine(result, "<QUIET>             ::= -quiet");
     appendLine(result, "");
     appendLine(result, "For example:");
     appendLine(result, "");
diff --git a/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java b/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
index de9f0ea54..8c457924a 100644
--- a/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
+++ b/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
@@ -76,6 +76,7 @@ public abstract class ModelImporterApplication implements IApplication, Deprecat
   protected String modelPluginID;
   protected String validateModel;
   protected GenJDKLevel genJDKLevel;
+  protected boolean importOrganizing;
 
   protected List<EPackage> referencedEPackages;
   protected Map<URI, Set<String>> referencedGenModelURIToEPackageNSURIs;
@@ -333,6 +334,10 @@ public abstract class ModelImporterApplication implements IApplication, Deprecat
     {
       genJDKLevel = GenJDKLevel.get(arguments[++index]);
     }
+    else if (arguments[index].equalsIgnoreCase("-importOrganizing"))
+    {
+      importOrganizing = true;
+    }
     else if (arguments[index].equalsIgnoreCase("-validateModel"))
     {
       validateModel = arguments[++index];
@@ -573,6 +578,10 @@ public abstract class ModelImporterApplication implements IApplication, Deprecat
       {
         genModel.setComplianceLevel(genJDKLevel);
       }
+      if (importOrganizing)
+      {
+        genModel.setImportOrganizing(true);
+      }
       if (validateModel != null)
       {
         genModel.setValidateModel(Boolean.parseBoolean(validateModel));
@@ -612,7 +621,7 @@ public abstract class ModelImporterApplication implements IApplication, Deprecat
     {
       genModel.setComplianceLevel(genJDKLevel);
     }
-    genModel.setImportOrganizing(false);
+    genModel.setImportOrganizing(importOrganizing);
     genModel.setOperationReflection(false);
     genModel.setRootExtendsClass("org.eclipse.emf.ecore.impl.EObjectImpl");
     // Subclasses may overwrite
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/Writer.java
index c0a982da9..786d5c9f6 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.ecore/src/org/examples/library/Writer.java
@@ -5,8 +5,8 @@ package org.examples.library;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.examples.hr.Person;
 import org.eclipse.emf.ecore.EObject;
+import org.examples.hr.Person;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/Writer.java
index c0a982da9..786d5c9f6 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.rose/src/org/examples/library/Writer.java
@@ -5,8 +5,8 @@ package org.examples.library;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.examples.hr.Person;
 import org.eclipse.emf.ecore.EObject;
+import org.examples.hr.Person;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/Writer.java
index 83f49203a..8cd2ff659 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/Writer.java
@@ -5,8 +5,8 @@ package org.examples.library.elements;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.examples.library.hr.Person;
 import org.eclipse.emf.ecore.EObject;
+import org.examples.library.hr.Person;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index c91f0bab3..906155589 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -12,12 +12,12 @@ import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/build/reload.xml b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/build/reload.xml
index 80c875a82..da3f55021 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/build/reload.xml
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/build/reload.xml
@@ -12,6 +12,7 @@
 			reconcileGenModel="reload">
 			<model file="${main.directory}/model/library.ecore"/>
 			<model file="${main.directory}/model/hr.ecore"/>
+			<arg line="-importOrganizing"/>
 			<arg line="-package http:///library.ecore org.examples Library"/>
 			<arg line="-package hr.xmi org.examples HR"/>
 		</emf.Ecore2Java>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/emf/library.genmodel b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/emf/library.genmodel
index ef8e64f86..b8d2040ce 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/emf/library.genmodel
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/emf/library.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="This is my code." modelDirectory="@TEST_TOKEN@0/./src/."
     modelPluginID="library.model" modelName="Library" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false">
+    complianceLevel="5.0" copyrightFields="false" importOrganizing="true">
   <foreignModel>../model/library.ecore</foreignModel>
   <foreignModel>../model/hr.ecore</foreignModel>
   <genPackages prefix="Library" basePackage="org.examples" disposableProviderFactory="true"
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/Writer.java
index fc7cf3276..cb5de3635 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/Writer.java
@@ -6,7 +6,6 @@ package org.examples.library;
 import org.eclipse.emf.common.util.EList;
 
 import org.examples.hr.Person;
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
index 73dbe63cc..22c493941 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/impl/WriterImpl.java
@@ -5,7 +5,6 @@ package org.examples.library.impl;
 
 import java.util.Collection;
 
-import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -13,8 +12,6 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
index d90f3a2b0..0fddc602f 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.ecore/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-import java.util.List;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/build/reload.xml b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/build/reload.xml
index a1244aaf8..11b4e0c58 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/build/reload.xml
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/build/reload.xml
@@ -11,6 +11,7 @@
 			model="${main.directory}/model/library.mdl"
 			genModel="${genModel}"
 			reconcileGenModel="reload">
+			<arg line="-importOrganizing"/>
 			<arg line="-package library library library.xmi org.examples Library"/>
 			<arg line="-package hr hr hr.xmi org.examples HR"/>
 		</emf.Rose2Java>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/emf/library.genmodel b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/emf/library.genmodel
index b784602a9..f06ae92d5 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/emf/library.genmodel
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/emf/library.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="This is my code." modelDirectory="@TEST_TOKEN@0/./src/."
     modelPluginID="library.model" modelName="Library" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.rose"
-    complianceLevel="5.0" copyrightFields="false">
+    complianceLevel="5.0" copyrightFields="false" importOrganizing="true">
   <foreignModel>..@TEST_TOKEN@1model@TEST_TOKEN@1library.mdl</foreignModel>
   <genPackages prefix="Library" basePackage="org.examples" disposableProviderFactory="true"
       ecorePackage="library.ecore#/">
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/Writer.java
index fc7cf3276..cb5de3635 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/Writer.java
@@ -6,7 +6,6 @@ package org.examples.library;
 import org.eclipse.emf.common.util.EList;
 
 import org.examples.hr.Person;
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
index 73dbe63cc..22c493941 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/impl/WriterImpl.java
@@ -5,7 +5,6 @@ package org.examples.library.impl;
 
 import java.util.Collection;
 
-import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
@@ -13,8 +12,6 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
 
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
index d90f3a2b0..0fddc602f 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.rose/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-import java.util.List;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/build/reload.xml b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/build/reload.xml
index aac36b07a..4ea0421e4 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/build/reload.xml
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/build/reload.xml
@@ -12,6 +12,7 @@
 			genModel="${genModel}"
 			reconcileGenModel="reload"
 			autoBuild="false">
+			<arg line="-importOrganizing"/>
 			<arg line="-packages http://www.example.eclipse.org/Library"/>
 			<arg line="-packageMap http://www.example.eclipse.org/Library org.examples.library"/>			
 		</emf.XSD2Java>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/emf/library.genmodel b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/emf/library.genmodel
index 656f1bf1e..fba2387e8 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/emf/library.genmodel
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/emf/library.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="This is my code." modelDirectory="@TEST_TOKEN@0/./src/."
     modelPluginID="library.xsd.1.4_5.0" modelName="Library" nonNLSMarkers="true" importerID="org.eclipse.xsd.ecore.importer"
-    complianceLevel="5.0" copyrightFields="false">
+    complianceLevel="5.0" copyrightFields="false" importOrganizing="true">
   <foreignModel>../model/library.xsd</foreignModel>
   <genPackages prefix="Library" basePackage="org.examples" resource="XML" disposableProviderFactory="true"
       ecorePackage="library.ecore#/">
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
index f27844896..aaa3e87ee 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsd/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-import java.util.List;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/build/reload.xml b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/build/reload.xml
index 3cfb439ca..7a10c715e 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/build/reload.xml
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/build/reload.xml
@@ -14,6 +14,7 @@
 			<model file="${main.directory}/model/libraryPart1.xsd"/>
 			<model file="${main.directory}/model/libraryPart2.xsd"/>
 			<model file="${main.directory}/model/libraryPart3.xsd"/>
+			<arg line="-importOrganizing"/>
 			<arg line="-packages http://www.example.eclipse.org/Library1"/>
 			<arg line="-packages http://www.example.eclipse.org/Library2"/>
 			<arg line="-packages http://www.example.eclipse.org/Library3"/>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/emf/library.genmodel b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/emf/library.genmodel
index 95d6c8f2a..478090a01 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/emf/library.genmodel
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/emf/library.genmodel
@@ -2,7 +2,7 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="This is my code." modelDirectory="@TEST_TOKEN@0/./src/."
     modelPluginID="library.model" modelName="Library" nonNLSMarkers="true" importerID="org.eclipse.xsd.ecore.importer"
-    complianceLevel="5.0" copyrightFields="false">
+    complianceLevel="5.0" copyrightFields="false" importOrganizing="true">
   <foreignModel>../model/libraryPart1.xsd</foreignModel>
   <foreignModel>../model/libraryPart2.xsd</foreignModel>
   <foreignModel>../model/libraryPart3.xsd</foreignModel>
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
index f0b13c455..e727123dc 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/BookImpl.java
@@ -4,7 +4,6 @@
 package org.examples.library.elements.impl;
 
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -16,7 +15,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.examples.library.elements.Book;
 import org.examples.library.elements.BookCategory;
 import org.examples.library.elements.ElementsPackage;
-import org.examples.library.elements.Writer;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 42c79549e..d4a88717f 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -5,23 +5,15 @@ package org.examples.library.elements.impl;
 
 import java.util.Collection;
 
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
 
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
-import org.examples.library.elements.Book;
 import org.examples.library.elements.ElementsPackage;
 import org.examples.library.elements.Writer;
 import org.examples.library.hr.impl.PersonImpl;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
index 9e8fdfaf4..3e7104f88 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/elements/util/ElementsSwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.elements.util;
 
-import java.util.List;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
index e957fb46e..cd76ed2c5 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/1.4_5.0/reload/library.xsds/src/org/examples/library/util/LibrarySwitch.java
@@ -3,9 +3,7 @@
  */
 package org.examples.library.util;
 
-import java.util.List;
 
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/Writer.java
index fc7cf3276..182a4c5da 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.ecore/src/org/examples/library/Writer.java
@@ -5,8 +5,8 @@ package org.examples.library;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.examples.hr.Person;
 import org.eclipse.emf.ecore.EObject;
+import org.examples.hr.Person;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/Writer.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/Writer.java
index fc7cf3276..182a4c5da 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/Writer.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.rose/src/org/examples/library/Writer.java
@@ -5,8 +5,8 @@ package org.examples.library;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.examples.hr.Person;
 import org.eclipse.emf.ecore.EObject;
+import org.examples.hr.Person;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
index 42c79549e..d2c74538b 100644
--- a/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.test.tools/data/ant.expected/models/5.0/reload/library.xsds/src/org/examples/library/elements/impl/WriterImpl.java
@@ -12,12 +12,12 @@ import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;