Offline Example

10 files changed, 98 insertions, 30 deletions

diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch b/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
index db9504f5af..9c5f532b98 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/CDOOfflineExample.launch
@@ -6,7 +6,7 @@
 <booleanAttribute key="automaticAdd" value="false"/>
 <booleanAttribute key="automaticValidate" value="false"/>
 <stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="org.eclipse.ui"/>
+<stringAttribute key="checked" value="[NONE]"/>
 <booleanAttribute key="clearConfig" value="false"/>
 <booleanAttribute key="clearws" value="false"/>
 <booleanAttribute key="clearwslog" value="false"/>
@@ -24,8 +24,8 @@
 <booleanAttribute key="pde.generated.config" value="false"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.b3.cli.product"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common*2.9.0.v20121012-0206@default:default,org.eclipse.emf.ecore*2.9.0.v20121012-0206@default:default,org.eclipse.emf.ecore.change*2.8.0.v20121012-0206@default:default,org.eclipse.emf.ecore.xmi*2.9.0.v20121012-0206@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.nebula.widgets.oscilloscope@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.h2@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.examples.client.offline@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common*2.9.0.v20121012-0206@default:default,org.eclipse.emf.common.ui*2.8.0.v20121016-1049@default:default,org.eclipse.emf.ecore*2.9.0.v20121012-0206@default:default,org.eclipse.emf.ecore.change*2.8.0.v20121012-0206@default:default,org.eclipse.emf.ecore.edit*2.8.0.v20121016-1049@default:default,org.eclipse.emf.ecore.xmi*2.9.0.v20121012-0206@default:default,org.eclipse.emf.edit*2.8.0.v20121016-1049@default:default,org.eclipse.emf.edit.ui*2.8.0.v20121016-1049@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.nebula.widgets.oscilloscope@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.h2@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.client.offline@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <mapAttribute key="tracingOptions">
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index 946a6439ae..caf3b29ca3 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -8,15 +8,18 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.admin;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)"
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
 Bundle-ClassPath: .
 Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.2.0";x-internal:=true,
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/Bean.gif b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/Bean.gif
new file mode 100644
index 0000000000..d9bfbd0541
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/icons/Bean.gif
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/plugin.xml b/plugins/org.eclipse.emf.cdo.examples.client.offline/plugin.xml
index ca36ac64dc..8dea2cbda1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/plugin.xml
@@ -26,6 +26,10 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
+            name="Client"
+            class="org.eclipse.emf.cdo.examples.client.offline.ClientPerspective"
+            id="org.eclipse.emf.cdo.examples.client.offline.ClientPerspective"/>
+      <perspective
             name="Normal Repository"
             class="org.eclipse.emf.cdo.examples.client.offline.NormalRepositoryPerspective"
             id="org.eclipse.emf.cdo.examples.client.offline.NormalRepositoryPerspective"/>
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
new file mode 100644
index 0000000000..3c579117c0
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/ClientPerspective.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.examples.client.offline;
+
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+/**
+ * @author Eike Stepper
+ */
+public class ClientPerspective implements IPerspectiveFactory
+{
+  public void createInitialLayout(IPageLayout layout)
+  {
+    layout.setFixed(true);
+    layout.addView("org.eclipse.emf.cdo.ui.CDOSessionsView", IPageLayout.LEFT, 0.5f, IPageLayout.ID_EDITOR_AREA);
+    layout.addView("org.eclipse.ui.views.PropertySheet", IPageLayout.BOTTOM, 0.5f,
+        "org.eclipse.emf.cdo.ui.CDOSessionsView");
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
index 3f4fb8f16c..046a8d05b1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/FailoverMonitorView.java
@@ -103,7 +103,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
    */
   public static class OScope extends Canvas implements Runnable, PaintListener, ControlListener
   {
-    public static final int[] PEAK = { 25, 50, 100, 80, 100, 50, 25, 10, 5 };
+    public static final int[] PEAK = { 10, 95, 80, 90, 50, 25, 10, 5 };
 
     private static final String INITIAL = "#INITIAL#";
 
@@ -135,8 +135,6 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
     private int channelHeight;
 
-    private int x;
-
     private boolean resizing;
 
     private Color black;
@@ -230,8 +228,6 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
           return;
         }
 
-        x = Math.min(x, width);
-
         int oldChannelHeight = channelHeight;
         if (oldChannelHeight == 0)
         {
@@ -277,11 +273,6 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
       redraw();
 
-      if (++x >= width)
-      {
-        x = 0;
-      }
-
       getDisplay().timerExec(getTimerExecMillis(), this);
     }
 
@@ -311,6 +302,8 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
 
       private boolean headNegate;
 
+      private int x;
+
       private int y;
 
       public Channel(String name)
@@ -367,6 +360,7 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
         }
 
         values = newValues;
+        x = Math.min(x, width);
         this.y = y;
       }
 
@@ -389,6 +383,11 @@ public class FailoverMonitorView extends AbstractView<FailoverMonitor>
         gc.setForeground(black);
         gc.setLineWidth(2);
         gc.drawRectangle(x, fx, 2, 2);
+
+        if (++x >= width)
+        {
+          x = 0;
+        }
       }
 
       void setName(String name)
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
index 10e6689b27..919ce13cb7 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/NormalRepositoryView.java
@@ -22,7 +22,11 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.wb.swt.ExampleResourceManager;
+
+import java.util.concurrent.ExecutorService;
 
 /**
  * @author Eike Stepper
@@ -47,6 +51,25 @@ public class NormalRepositoryView extends AbstractView<IRepository>
   {
     itemProvider = new ContainerItemProvider<IContainer<Object>>()
     {
+      private Image bean = ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/Bean.gif");
+
+      @Override
+      public String getText(Object obj)
+      {
+        if (obj instanceof ExecutorService)
+        {
+          return "ExecutorService";
+        }
+
+        return super.getText(obj);
+      }
+
+      @Override
+      public Image getImage(Object obj)
+      {
+        return bean;
+      }
+
       @Override
       protected void handleElementEvent(final IEvent event)
       {
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java
index cb025c7102..3348436bb1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeManagerDialog.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
-import org.eclipse.wb.swt.ResourceManager;
+import org.eclipse.wb.swt.ExampleResourceManager;
 
 import java.util.Properties;
 
@@ -104,7 +104,7 @@ public class NodeManagerDialog extends TitleAreaDialog
     };
 
     setTitle("Node Manager");
-    setTitleImage(ResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/NodeManager.gif"));
+    setTitleImage(ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/NodeManager.gif"));
     setMessage("Select an existing node or create a new one.");
 
     Composite area = (Composite)super.createDialogArea(parent);
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
index 5c04b5acc3..9af2251769 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/emf/cdo/examples/client/offline/nodes/NodeType.java
@@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.wb.swt.ResourceManager;
+import org.eclipse.wb.swt.ExampleResourceManager;
 
 import org.h2.jdbcx.JdbcDataSource;
 
@@ -169,12 +169,12 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
 
   public Image getImage()
   {
-    return ResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/Folder.gif");
+    return ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/Folder.gif");
   }
 
   public Image getInstanceImage()
   {
-    return ResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/" + getTypeName() + ".gif");
+    return ExampleResourceManager.getPluginImage(Application.PLUGIN_ID, "icons/" + getTypeName() + ".gif");
   }
 
   public String getTypeName()
@@ -512,8 +512,11 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     {
       super.start(node);
 
+      // IConnector connector = (IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", "jvm",
+      // "example");
+
       CDOSession session = (CDOSession)IPluginContainer.INSTANCE.getElement("org.eclipse.emf.cdo.sessions", "cdo",
-          "jvm://example");
+          "jvm://example?repositoryName=" + REPOSITORY_NAME);
       node.getObjects().put(CDOSession.class, session);
     }
 
@@ -530,25 +533,33 @@ public abstract class NodeType extends SetContainer<Node> implements IElement
     protected IRepository createRepository(Node node, IStore store, Map<String, String> props)
     {
       String serverName = node.getSetting(SERVER_PROPERTY);
-      Node serverNode = getManager().getNode(serverName);
+      final Node serverNode = getManager().getNode(serverName);
       if (serverNode == null)
       {
         throw new IllegalStateException("Server not found: " + serverName);
       }
 
-      final String serverAddress = "localhost:" + serverNode.getSetting(PORT_PROPERTY);
-
       CDOSessionConfigurationFactory factory = new CDOSessionConfigurationFactory()
       {
         public CDONet4jSessionConfiguration createSessionConfiguration()
         {
-          IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", serverAddress);
+          String serverAddress = "localhost:" + serverNode.getSetting(PORT_PROPERTY);
 
-          CDONet4jSessionConfiguration configuration = CDONet4jUtil.createNet4jSessionConfiguration();
-          configuration.setConnector(connector);
-          configuration.setRepositoryName(REPOSITORY_NAME);
-          configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP));
+          CDONet4jSessionConfiguration configuration;
+          if (serverNode.getType() instanceof FailoverMonitor)
+          {
+            configuration = CDONet4jUtil.createFailoverSessionConfiguration(serverAddress, serverNode.getName());
+          }
+          else
+          {
+            IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, "tcp", serverAddress);
 
+            configuration = CDONet4jUtil.createNet4jSessionConfiguration();
+            configuration.setConnector(connector);
+            configuration.setRepositoryName(REPOSITORY_NAME);
+          }
+
+          configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP));
           return configuration;
         }
       };
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ResourceManager.java b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
index 42b9dc18f4..4fa47d02e8 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/src/org/eclipse/wb/swt/ExampleResourceManager.java
@@ -43,7 +43,7 @@ import java.util.Map;
  * @author scheglov_ke
  * @author Dan Rubel
  */
-public class ResourceManager extends SWTResourceManager
+public class ExampleResourceManager extends SWTResourceManager
 {
   // //////////////////////////////////////////////////////////////////////////
   //