[458349] Consolidate UI

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

7 files changed, 40 insertions, 34 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerElement.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerElement.java
index ec7adafc6c..d05ad2a628 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerElement.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerElement.java
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.IAdaptable;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.landmark
  */
 public interface CDOExplorerElement extends INotifier, IAdaptable, Adapter
 {
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
index 19ca489296..9cad008893 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/checkouts/CDOCheckout.java
@@ -12,6 +12,9 @@ package org.eclipse.emf.cdo.explorer.checkouts;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
+import org.eclipse.emf.cdo.eresource.CDOFileResource;
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.explorer.CDOExplorerElement;
 import org.eclipse.emf.cdo.explorer.repositories.CDORepository;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -23,7 +26,6 @@ import org.eclipse.emf.ecore.EObject;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.landmark
  */
 public interface CDOCheckout extends CDOExplorerElement, CDOTimeProvider
 {
@@ -57,7 +59,7 @@ public interface CDOCheckout extends CDOExplorerElement, CDOTimeProvider
 
   public EObject getRootObject();
 
-  public RootType getRootType();
+  public ObjectType getRootType();
 
   public String getEditorID(CDOID objectID);
 
@@ -74,8 +76,38 @@ public interface CDOCheckout extends CDOExplorerElement, CDOTimeProvider
   /**
    * @author Eike Stepper
    */
-  public enum RootType
+  public enum ObjectType
   {
-    Root, Folder, Resource, Object
+    Root, Folder, File, Resource, Object;
+
+    public static ObjectType valueFor(Object rootObject)
+    {
+      if (rootObject instanceof CDOResourceFolder)
+      {
+        return ObjectType.Folder;
+      }
+
+      if (rootObject instanceof CDOResource)
+      {
+        if (((CDOResource)rootObject).isRoot())
+        {
+          return ObjectType.Root;
+        }
+
+        return ObjectType.Resource;
+      }
+
+      if (rootObject instanceof CDOFileResource)
+      {
+        return ObjectType.File;
+      }
+
+      if (rootObject != null)
+      {
+        return ObjectType.Object;
+      }
+
+      return null;
+    }
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
index ba9c755d8b..1035662850 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java
@@ -23,7 +23,6 @@ import org.eclipse.net4j.util.container.IContainer;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.landmark
  */
 public interface CDORepository extends CDOExplorerElement, IContainer<CDOBranch>, CDONameProvider, CDOSessionProvider
 {
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryElement.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryElement.java
index 14ee787976..8855082ccf 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryElement.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepositoryElement.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.common.util.CDOTimeProvider;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.landmark
  */
 public interface CDORepositoryElement extends CDOTimeProvider
 {
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 43fe7afb01..685e6110a9 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
@@ -21,7 +21,6 @@ import java.util.Properties;
  *
  * @author Eike Stepper
  * @since 4.4
- * @apiviz.landmark
  * @apiviz.composedOf {@link CDORepository}
  */
 public interface CDORepositoryManager extends CDOExplorerManager<CDORepository>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index e7e9c1edb2..1a7f2ab5fa 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -12,8 +12,6 @@ package org.eclipse.emf.cdo.internal.explorer.checkouts;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDUtil;
-import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
 import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
 import org.eclipse.emf.cdo.explorer.repositories.CDORepository;
 import org.eclipse.emf.cdo.internal.explorer.AbstractElement;
@@ -246,29 +244,9 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
     return rootObject;
   }
 
-  public final RootType getRootType()
+  public final ObjectType getRootType()
   {
-    if (rootObject instanceof CDOResourceFolder)
-    {
-      return RootType.Folder;
-    }
-
-    if (rootObject instanceof CDOResource)
-    {
-      if (((CDOResource)rootObject).isRoot())
-      {
-        return RootType.Root;
-      }
-
-      return RootType.Resource;
-    }
-
-    if (rootObject != null)
-    {
-      return RootType.Object;
-    }
-
-    return null;
+    return ObjectType.valueFor(rootObject);
   }
 
   public String getEditorID(CDOID objectID)
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
index 1fffb2d0c4..f171c1d5d5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.internal.explorer.checkouts;
 
 import org.eclipse.emf.cdo.common.util.CDOCommonUtil;
 import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout;
-import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout.RootType;
+import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout.ObjectType;
 import org.eclipse.emf.cdo.internal.explorer.AbstractElement;
 import org.eclipse.emf.cdo.internal.explorer.repositories.CDORepositoryProperties;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -85,7 +85,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       @Override
       protected Object eval(CDOCheckout checkout)
       {
-        RootType rootType = checkout.getRootType();
+        ObjectType rootType = checkout.getRootType();
         if (rootType != null)
         {
           switch (rootType)