[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows

https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405

4 files changed, 54 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java b/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
index 3c8db887ef..766d0dfbe9 100644
--- a/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
+++ b/plugins/org.eclipse.emf.cdo.location/src/org/eclipse/emf/cdo/internal/location/BranchCheckoutSource.java
@@ -66,13 +66,13 @@ public class BranchCheckoutSource extends Container<BranchCheckoutSource> implem
   {
     if (subBranches == null)
     {
-      subBranches = new ArrayList<BranchCheckoutSource>();
       CDOSessionConfiguration config = getRepositoryLocation().createSessionConfiguration();
       CDOSession session = config.openSession();
 
       try
       {
         CDOBranch[] branches = session.getBranchManager().getBranch(getBranchPath()).getBranches();
+        subBranches = new ArrayList<BranchCheckoutSource>();
         for (CDOBranch branch : branches)
         {
           subBranches.add(new BranchCheckoutSource(this, branch.getName()));
diff --git a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationsView.java b/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationsView.java
index b8cbddae45..719f1c6e22 100644
--- a/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui.location/src/org/eclipse/emf/cdo/ui/internal/location/RepositoryLocationsView.java
@@ -18,9 +18,12 @@ import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
 import org.eclipse.net4j.util.ui.views.ContainerView;
 
 import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbenchActionConstants;
 
 /**
  * @author Eike Stepper
@@ -53,9 +56,16 @@ public class RepositoryLocationsView extends ContainerView
   }
 
   @Override
+  protected void fillLocalPullDown(IMenuManager manager)
+  {
+    manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+  }
+
+  @Override
   protected void fillLocalToolBar(IToolBarManager manager)
   {
     manager.add(newAction);
+    manager.add(getRefreshAction());
     super.fillLocalToolBar(manager);
   }
 
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index 0a3c299931..c2d8a4c44f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -238,6 +238,16 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
   /**
    * @since 3.1
    */
+  protected void executeLazyRunnable(Runnable runnable)
+  {
+    Thread thread = new Thread(runnable);
+    thread.setDaemon(true);
+    thread.start();
+  }
+
+  /**
+   * @since 3.1
+   */
   protected boolean isSlow(IContainer<Object> container)
   {
     return container instanceof ISlow;
@@ -473,9 +483,8 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
         final LazyElement lazyElement = new LazyElement(container);
         addChild(children, lazyElement);
 
-        Thread thread = new Thread()
+        Runnable runnable = new Runnable()
         {
-          @Override
           public void run()
           {
             try
@@ -496,8 +505,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends
           }
         };
 
-        thread.setDaemon(true);
-        thread.start();
+        executeLazyRunnable(runnable);
       }
       else
       {
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index d8254c4b90..d8cca0525f 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -200,15 +200,24 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
 
   protected Control createUI(Composite parent)
   {
-    itemProvider = createContainerItemProvider();
     viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+    initViewer();
+
+    viewer.addSelectionChangedListener(selectionListener);
+    getSite().setSelectionProvider(this);
+    return viewer.getControl();
+  }
+
+  /**
+   * @since 3.1
+   */
+  protected void initViewer()
+  {
+    itemProvider = createContainerItemProvider();
     viewer.setContentProvider(createContentProvider());
     viewer.setLabelProvider(createLabelProvider());
     viewer.setSorter(new ContainerNameSorter());
     resetInput();
-    viewer.addSelectionChangedListener(selectionListener);
-    getSite().setSelectionProvider(this);
-    return viewer.getControl();
   }
 
   /**
@@ -429,6 +438,15 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
     }
   }
 
+  /**
+   * @since 3.1
+   */
+  protected void refreshPressed()
+  {
+    itemProvider.dispose();
+    initViewer();
+  }
+
   protected void closeView()
   {
     try
@@ -485,6 +503,14 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
     }
   }
 
+  /**
+   * @since 3.1
+   */
+  protected Action getRefreshAction()
+  {
+    return refreshAction;
+  }
+
   protected Display getDisplay()
   {
     Display display = viewer.getControl().getDisplay();
@@ -610,7 +636,7 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
     @Override
     protected void safeRun() throws Exception
     {
-      viewer.refresh(false);
+      refreshPressed();
     }
   }