[458349] Consolidate UI

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

3 files changed, 70 insertions, 4 deletions

diff --git a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
index 4a9e6ce968..723c6599f5 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/plugin.xml
@@ -27,13 +27,13 @@
          id="org.eclipse.emf.cdo.explorer.repository.properties"
          type="org.eclipse.emf.cdo.explorer.repositories.CDORepository"
          namespace="org.eclipse.emf.cdo.explorer.repository"
-         properties="state,connected,type,id,folder,uri"
+         properties="state,connected,type,id,label,folder,uri"
          class="org.eclipse.emf.cdo.internal.explorer.repositories.CDORepositoryProperties$Tester"/>
       <propertyTester
          id="org.eclipse.emf.cdo.explorer.checkout.properties"
          type="org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout"
          namespace="org.eclipse.emf.cdo.explorer.checkout"
-         properties="state,open,type,id,folder,rootType,canContainResources,branchID,branch,timeStamp,readOnly,rootID,dirty,repositoryID,repositoryFolder,repositoryURI"
+         properties="state,open,type,id,label,folder,rootType,canContainResources,branchID,branch,timeStamp,readOnly,rootID,dirty,repositoryConnected,repositoryType,repositoryID,repositoryLabel,repositoryFolder,repositoryURI"
          class="org.eclipse.emf.cdo.internal.explorer.checkouts.CDOCheckoutProperties$Tester"/>
    </extension>
 
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 5e58bd7523..de1dbe1aba 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
@@ -44,7 +44,7 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
-    add(new Property<CDOCheckout>("open", "Open", "Whether this checkout is open or not", CATEGORY_CHECKOUT)
+    add(new Property<CDOCheckout>("open", "Open", "Whether this checkout is open", CATEGORY_CHECKOUT)
     {
       @Override
       protected Object eval(CDOCheckout checkout)
@@ -70,6 +70,15 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
+    add(new Property<CDOCheckout>("label", "Label", "The label of this checkout", CATEGORY_CHECKOUT)
+    {
+      @Override
+      protected Object eval(CDOCheckout checkout)
+      {
+        return checkout.getLabel();
+      }
+    });
+
     add(new Property<CDOCheckout>("folder", "Folder", "The folder of this checkout", CATEGORY_CHECKOUT)
     {
       @Override
@@ -162,6 +171,38 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
+    add(new Property<CDOCheckout>("repositoryConnected", "Connected",
+        "Whether the repository of this checkout is connected", CDORepositoryProperties.CATEGORY_REPOSITORY)
+    {
+      @Override
+      protected Object eval(CDOCheckout checkout)
+      {
+        CDORepository repository = checkout.getRepository();
+        if (repository != null)
+        {
+          return repository.isConnected();
+        }
+
+        return null;
+      }
+    });
+
+    add(new Property<CDOCheckout>("repositoryType", "Type", "The type of the repository of this checkout",
+        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    {
+      @Override
+      protected Object eval(CDOCheckout checkout)
+      {
+        CDORepository repository = checkout.getRepository();
+        if (repository != null)
+        {
+          return repository.getType();
+        }
+
+        return null;
+      }
+    });
+
     add(new Property<CDOCheckout>("repositoryID", "ID", "The ID of the repository of this checkout",
         CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
@@ -178,6 +219,22 @@ public class CDOCheckoutProperties extends Properties<CDOCheckout>
       }
     });
 
+    add(new Property<CDOCheckout>("repositoryLabel", "Label", "The label of the repository of this checkout",
+        CDORepositoryProperties.CATEGORY_REPOSITORY)
+    {
+      @Override
+      protected Object eval(CDOCheckout checkout)
+      {
+        CDORepository repository = checkout.getRepository();
+        if (repository != null)
+        {
+          return repository.getLabel();
+        }
+
+        return null;
+      }
+    });
+
     add(new Property<CDOCheckout>("repositoryFolder", "Folder", "The folder of the repository of this checkout",
         CDORepositoryProperties.CATEGORY_REPOSITORY)
     {
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
index 09ae93b351..c3d8123470 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java
@@ -40,7 +40,7 @@ public class CDORepositoryProperties extends Properties<CDORepository>
       }
     });
 
-    add(new Property<CDORepository>("connected", "Connected", "Whether this repository is connected or not",
+    add(new Property<CDORepository>("connected", "Connected", "Whether this repository is connected",
         CATEGORY_REPOSITORY)
     {
       @Override
@@ -68,6 +68,15 @@ public class CDORepositoryProperties extends Properties<CDORepository>
       }
     });
 
+    add(new Property<CDORepository>("label", "Label", "The label of this repository", CATEGORY_REPOSITORY)
+    {
+      @Override
+      protected Object eval(CDORepository repository)
+      {
+        return repository.getLabel();
+      }
+    });
+
     add(new Property<CDORepository>("folder", "Folder", "The folder of this repository", CATEGORY_REPOSITORY)
     {
       @Override