[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

4 files changed, 20 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index a803f5d5a9..3df4f3e844 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.4.0.qualifier
+Bundle-Version: 4.5.0.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -23,11 +23,11 @@ Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional,
  org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.explorer;version="4.4.0",
- org.eclipse.emf.cdo.explorer.checkouts;version="4.4.0",
- org.eclipse.emf.cdo.explorer.repositories;version="4.4.0",
- org.eclipse.emf.cdo.internal.explorer;version="4.4.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.4.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.4.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.repositories;version="4.4.0";x-friends:="org.eclipse.emf.cdo.explorer.ui"
+Export-Package: org.eclipse.emf.cdo.explorer;version="4.5.0",
+ org.eclipse.emf.cdo.explorer.checkouts;version="4.5.0",
+ org.eclipse.emf.cdo.explorer.repositories;version="4.5.0",
+ org.eclipse.emf.cdo.internal.explorer;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.5.0";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.repositories;version="4.5.0";x-friends:="org.eclipse.emf.cdo.explorer.ui"
 Eclipse-BuddyPolicy: registered
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
index 3fadd248d8..6299906de9 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryManager.java
@@ -32,6 +32,11 @@ public interface CDORepositoryManager extends CDOExplorerManager<CDORepository>
 
   public CDORepository getRepository(CDOSession session);
 
+  /**
+   * @since 4.5
+   */
+  public CDORepository getRepositoryByLabel(String label);
+
   public CDORepository[] getRepositories();
 
   public CDORepository addRepository(Properties properties);
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractElement.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractElement.java
index 50aa6f2367..ef3970d082 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractElement.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractElement.java
@@ -151,15 +151,9 @@ public abstract class AbstractElement extends Notifier implements CDOExplorerEle
     }
 
     AbstractManager<?> manager = getManager();
-    if (manager != null)
+    if (manager != null && manager.getElementByLabel(label) != null)
     {
-      for (CDOExplorerElement element : manager.getElements())
-      {
-        if (ObjectUtil.equals(element.getLabel(), label))
-        {
-          return "Label is not unique.";
-        }
-      }
+      return "Label is not unique.";
     }
 
     return null;
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
index e368078207..3eaeb6e794 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java
@@ -54,6 +54,11 @@ public class CDORepositoryManagerImpl extends AbstractManager<CDORepository>impl
     return sessionMap.get(session);
   }
 
+  public CDORepository getRepositoryByLabel(String label)
+  {
+    return getElementByLabel(label);
+  }
+
   public CDORepository[] getRepositories()
   {
     return getElements();