Fix package visibilities
diff --git a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
index bdb6aeb..3f84444 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -15,26 +15,12 @@
org.eclipse.emf.ecp.core.exceptions;version="1.0.0",
org.eclipse.emf.ecp.core.util;version="1.0.0",
org.eclipse.emf.ecp.core.util.observer;version="1.0.0",
- org.eclipse.emf.ecp.internal.core;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.properties;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.core;version="1.0.0";
- x-friends:="org.eclipse.emf.ecp.cdo.core,
- org.eclipse.emf.ecp.cdo.ui,
- org.eclipse.emf.ecp.emfstore.core,
- org.eclipse.emf.ecp.emfstore.ui,
- org.eclipse.emf.ecp.ui,
- org.eclipse.emf.ecp.workspace.core,
- org.eclipse.emf.ecp.workspace.ui",
- org.eclipse.emf.ecp.spi.core.util;version="1.0.0";
- x-friends:="org.eclipse.emf.ecp.cdo.core,
- org.eclipse.emf.ecp.cdo.ui,
- org.eclipse.emf.ecp.emfstore.core,
- org.eclipse.emf.ecp.emfstore.ui,
- org.eclipse.emf.ecp.ui,
- org.eclipse.emf.ecp.workspace.core,
- org.eclipse.emf.ecp.workspace.ui"
+ org.eclipse.emf.ecp.internal.core;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui,org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.core.properties;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui,org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.core.util;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui,org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui,org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.spi.core;version="1.0.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.0.0"
Service-Component: OSGI-INF/ecpProviderRegistry.xml,OSGI-INF/ecpRepositoryManager.xml,OSGI-INF/ecpProjectManager.xml
Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index 0b52458..f720543 100644
--- a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
@@ -9,18 +9,18 @@
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.composites;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.model;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.util;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.wizards;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.wizards.page;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.ui;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.common;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.common.dnd;version="1.0.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.util;version="1.0.0",
- org.eclipse.emf.ecp.ui;version="1.0.0"
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.ui.messages;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.wizards;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.0.0";x-friends:="org.eclipse.emf.ecp.ui.e3",
+ org.eclipse.emf.ecp.spi.ui;version="1.0.0",
+ org.eclipse.emf.ecp.ui.common;version="1.0.0",
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.0.0",
+ org.eclipse.emf.ecp.ui.util;version="1.0.0"
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.action;version="0.0.0",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AbstractFilteredSelectionComposite.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AbstractFilteredSelectionComposite.java
index 2603168..fd813c7 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AbstractFilteredSelectionComposite.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AbstractFilteredSelectionComposite.java
@@ -13,7 +13,7 @@
package org.eclipse.emf.ecp.internal.ui.composites;
import org.eclipse.emf.ecp.internal.ui.ECPViewerFilter;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.CompositeProvider;
import org.eclipse.jface.layout.GridDataFactory;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AddRepositoryCompositeImpl.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AddRepositoryCompositeImpl.java
index b667af6..9e0323d 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AddRepositoryCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/AddRepositoryCompositeImpl.java
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.core.util.ECPUtil;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.ui.model.ProvidersContentProvider;
import org.eclipse.emf.ecp.internal.ui.model.ProvidersLabelProvider;
import org.eclipse.emf.ecp.spi.ui.UIProvider;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckedSelectModelClassCompositeImpl.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckedSelectModelClassCompositeImpl.java
index 97bd119..cd94ecd 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckedSelectModelClassCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckedSelectModelClassCompositeImpl.java
@@ -14,7 +14,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.CheckedModelClassComposite;
import org.eclipse.jface.layout.GridDataFactory;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckoutProjectCompositeImpl.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckoutProjectCompositeImpl.java
index de6beef..b4323da 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckoutProjectCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CheckoutProjectCompositeImpl.java
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecp.core.util.ECPCheckoutSource;
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.core.util.ECPUtil;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.spi.ui.UIProvider;
import org.eclipse.emf.ecp.spi.ui.UIProviderRegistry;
import org.eclipse.emf.ecp.ui.common.CheckoutProjectComposite;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CreateProjectCompositeImpl.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CreateProjectCompositeImpl.java
index 9b92f43..c76a8a3 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CreateProjectCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/CreateProjectCompositeImpl.java
@@ -15,7 +15,7 @@
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.core.util.ECPUtil;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.ui.model.ProvidersLabelProvider;
import org.eclipse.emf.ecp.spi.ui.UIProvider;
import org.eclipse.emf.ecp.spi.ui.UIProviderRegistry;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/PropertiesComposite.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/PropertiesComposite.java
index ff809e1..766b01e 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/PropertiesComposite.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/composites/PropertiesComposite.java
@@ -12,8 +12,8 @@
package org.eclipse.emf.ecp.internal.ui.composites;
import org.eclipse.emf.ecp.core.util.ECPProperties;
-import org.eclipse.emf.ecp.internal.ui.Messages;
import org.eclipse.emf.ecp.internal.ui.dialogs.PropertyDialog;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.ui.model.PropertiesContentProvider;
import org.eclipse.emf.ecp.internal.ui.model.PropertiesLabelProvider;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/DeleteDialog.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/DeleteDialog.java
index 1c3e961..c8a19be 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/DeleteDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/DeleteDialog.java
@@ -13,7 +13,7 @@
import org.eclipse.emf.ecp.core.util.ECPContainer;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/ProjectPropertiesDialog.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/ProjectPropertiesDialog.java
index 2f56063..cbcd87b 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/ProjectPropertiesDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/ProjectPropertiesDialog.java
@@ -12,7 +12,7 @@
package org.eclipse.emf.ecp.internal.ui.dialogs;
import org.eclipse.emf.ecp.core.ECPProject;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertiesDialog.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertiesDialog.java
index 4baba5b..4ce1629 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertiesDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertiesDialog.java
@@ -13,8 +13,8 @@
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
import org.eclipse.emf.ecp.internal.ui.composites.PropertiesComposite;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertyDialog.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertyDialog.java
index 008ac3f..8d45a1e 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertyDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/PropertyDialog.java
@@ -11,7 +11,7 @@
********************************************************************************/
package org.eclipse.emf.ecp.internal.ui.dialogs;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.swt.SWT;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/RepositoryPropertiesDialog.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/RepositoryPropertiesDialog.java
index 1977b3f..ad72303 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/RepositoryPropertiesDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/dialogs/RepositoryPropertiesDialog.java
@@ -12,7 +12,7 @@
package org.eclipse.emf.ecp.internal.ui.dialogs;
import org.eclipse.emf.ecp.core.ECPRepository;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridLayout;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/Messages.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/messages/Messages.java
similarity index 98%
rename from bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/Messages.java
rename to bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/messages/Messages.java
index 8783b26..fec3f99 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/Messages.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/messages/Messages.java
@@ -11,7 +11,7 @@
*
*******************************************************************************/
-package org.eclipse.emf.ecp.internal.ui;
+package org.eclipse.emf.ecp.internal.ui.messages;
import org.eclipse.osgi.util.NLS;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/messages.properties b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/messages/messages.properties
similarity index 100%
rename from bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/messages.properties
rename to bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/messages/messages.properties
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/TreeContentProvider.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/TreeContentProvider.java
index 7515bad..500b8ea 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/TreeContentProvider.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/TreeContentProvider.java
@@ -15,7 +15,7 @@
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.internal.core.util.ChildrenListImpl;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.spi.core.util.InternalChildrenList;
import org.eclipse.jface.viewers.ITreeContentProvider;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
index f753623..fda4f76 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
@@ -26,10 +26,10 @@
import org.eclipse.emf.ecp.core.util.ECPProperties;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
import org.eclipse.emf.ecp.internal.ui.dialogs.DeleteDialog;
import org.eclipse.emf.ecp.internal.ui.dialogs.ProjectPropertiesDialog;
import org.eclipse.emf.ecp.internal.ui.dialogs.RepositoryPropertiesDialog;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.wizards.AddRepositoryWizard;
import org.eclipse.emf.ecp.internal.wizards.CheckoutProjectWizard;
import org.eclipse.emf.ecp.internal.wizards.CreateProjectWizard;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/AddRepositoryWizard.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/AddRepositoryWizard.java
index 123f4da..f7103b4 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/AddRepositoryWizard.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/AddRepositoryWizard.java
@@ -13,7 +13,7 @@
package org.eclipse.emf.ecp.internal.wizards;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.wizards.page.AddRepositoryPage;
import org.eclipse.emf.ecp.ui.common.AddRepositoryComposite;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CheckoutProjectWizard.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CheckoutProjectWizard.java
index dc92a2d..9791ff4 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CheckoutProjectWizard.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CheckoutProjectWizard.java
@@ -17,7 +17,7 @@
import org.eclipse.emf.ecp.core.util.ECPCheckoutSource;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.CheckoutProjectComposite;
import org.eclipse.emf.ecp.ui.common.CheckoutProjectComposite.CheckoutProjectChangeListener;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CreateProjectWizard.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CreateProjectWizard.java
index 8d96813..81f105e 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CreateProjectWizard.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/CreateProjectWizard.java
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.util.ECPUtil;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.CreateProjectComposite;
import org.eclipse.emf.ecp.ui.common.CreateProjectComposite.CreateProjectChangeListener;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/FilterModelElementWizard.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/FilterModelElementWizard.java
index 2b8b701..1f8da992 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/FilterModelElementWizard.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/FilterModelElementWizard.java
@@ -13,7 +13,7 @@
package org.eclipse.emf.ecp.internal.wizards;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.CheckedModelClassComposite;
import org.eclipse.jface.wizard.WizardPage;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/ShareWizard.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/ShareWizard.java
index 7cd1a9f..3162d3b 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/ShareWizard.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/ShareWizard.java
@@ -16,7 +16,7 @@
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.ECPRepository;
import org.eclipse.emf.ecp.core.util.ECPUtil;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.wizards.page.AddRepositoryPage;
import org.eclipse.emf.ecp.internal.wizards.page.SelectOrCreateRepositoryPage;
import org.eclipse.emf.ecp.internal.wizards.page.SelectRepositoryPage;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/AddRepositoryPage.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/AddRepositoryPage.java
index 2ff085d..40840db 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/AddRepositoryPage.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/AddRepositoryPage.java
@@ -15,7 +15,7 @@
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.internal.ui.Activator;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.ui.common.AddRepositoryComposite;
import org.eclipse.emf.ecp.ui.common.AddRepositoryComposite.AddRepositoryChangeListener;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectOrCreateRepositoryPage.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectOrCreateRepositoryPage.java
index 39b0a61..a23f49b 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectOrCreateRepositoryPage.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectOrCreateRepositoryPage.java
@@ -13,7 +13,7 @@
package org.eclipse.emf.ecp.internal.wizards.page;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.wizards.ShareWizard;
import org.eclipse.jface.wizard.IWizardPage;
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectRepositoryPage.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectRepositoryPage.java
index 1eedd4b..0acdb87 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectRepositoryPage.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/wizards/page/SelectRepositoryPage.java
@@ -15,7 +15,7 @@
import org.eclipse.emf.ecp.core.ECPRepository;
import org.eclipse.emf.ecp.core.util.ECPUtil;
-import org.eclipse.emf.ecp.internal.ui.Messages;
+import org.eclipse.emf.ecp.internal.ui.messages.Messages;
import org.eclipse.emf.ecp.internal.ui.model.RepositoriesContentProvider;
import org.eclipse.emf.ecp.internal.ui.model.RepositoriesLabelProvider;
import org.eclipse.emf.ecp.internal.wizards.ShareWizard;
