]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Improve RAP and RCP
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 15 Apr 2011 17:55:51 +0000 (17:55 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 15 Apr 2011 17:55:51 +0000 (17:55 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@4438 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

19 files changed:
demo/slc_demo_rap.properties
demo/slc_demo_rcp.properties
eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
eclipse/plugins/org.argeo.slc.client.rap/.classpath
eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.rap/plugin.xml
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcSecureRap.java
eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml
eclipse/plugins/org.argeo.slc.client.ui/META-INF/MANIFEST.MF
eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java [new file with mode: 0644]
eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java [deleted file]

index 583101abf7cc938afe9e496926fec536d1581b2f..00ab25e90d2e9c423cfeed474221f9b7186e85f9 100644 (file)
@@ -33,7 +33,7 @@ org.argeo.slc.demo.basic,\
 eclipse.ignoreApp=true
 osgi.noShutdown=true
 
-org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
 
 log4j.configuration=file:../../log4j.properties
 
index 5b51e35a6495d426bc3e8eafbfb41d1e51c50665..c3b5c3e19e4cc2323b2b83250a013d5caf8744d5 100644 (file)
@@ -5,9 +5,9 @@ org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
 
 eclipse.application=org.argeo.slc.client.rcp.application
-org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.slcExecutionPerspective
 
 log4j.configuration=file:../../log4j.properties
 
-argeo.node.repo.home=~/.argeo/server_noderepo
-argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db
+argeo.node.repo.home=${system_property:osgi.instance.area}/noderepo
+argeo.node.repo.dburl=jdbc:h2:${system_property:osgi.instance.area}/h2/noderepo_db
index eb766a5f9ed87add094e90efacc6d2dca489d54f..5d3eced5907598cc65134ff335da5d113be82625 100644 (file)
@@ -11,7 +11,7 @@
        <reference id="modulesManager"\r
                interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
 \r
-<!--   <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" /> -->\r
+       <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
        <service ref="slcAgent" interface="org.argeo.slc.runtime.SlcAgent" />\r
 \r
 </beans:beans>
\ No newline at end of file
index eff0df67e2cd6242f069fd6f67aca148e318b23a..0eb4407a8dea9d9e13892f050d608c64ee80a226 100644 (file)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>
index fd3794f869eef27b7ab31df84750511df3b9f04f..8b45224bcd092600f74abf80fd86cb7892f388c5 100644 (file)
@@ -1,8 +1,8 @@
-#Wed Nov 24 21:23:34 CET 2010\r
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
+#Thu Apr 14 17:49:18 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
index 10aef160fc7359f468b801bd9fdac802baea7349..3f5db65e8ad4daa3c3e9fd807cf92be6920ce0fd 100644 (file)
@@ -3,10 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Rap Client for SLC
 Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true
 Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin
 Bundle-Vendor: Argeo SASU
 Require-Bundle: org.eclipse.rap.ui;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.servlet;version="2.4.0",
  javax.servlet.http;version="2.4.0",
index f7715af65f482403f29279c394ca5f8ad1bb57ad..e51a32853ac3b441bce5503cae55660760e60fbd 100644 (file)
@@ -2,24 +2,6 @@
 <?eclipse version="3.4"?>\r
 <plugin>\r
 \r
- <extension\r
-         id="org.argeo.slc.client.rap.product"\r
-         point="org.eclipse.core.runtime.products">\r
-      <product\r
-            name="Slc RAP Product"\r
-            application="org.eclipse.ui.ide.workbench"\r
-            >\r
-         <property\r
-               name="windowImages"\r
-               value="icons/argeo-icon-256.png">\r
-         </property>\r
-         <property\r
-               name="appName"\r
-               value="SLC">\r
-         </property>\r
-      </product>\r
-   </extension>\r
-\r
    <extension\r
          point="org.eclipse.rap.ui.entrypoint">\r
       <entrypoint\r
       </entrypoint>\r
    </extension>\r
      \r
-   <extension\r
-         point="org.eclipse.ui.perspectives">\r
-      <perspective\r
-            name="Slc Execution"\r
-            class="org.argeo.slc.client.ui.perspectives.SlcExecution"\r
-                       id="org.argeo.slc.client.ui.perspectives.slcExecution"\r
-            icon="icons/slc_execution_perspective.gif">\r
-      </perspective>\r
-   </extension>\r
-       <extension\r
-         point="org.eclipse.ui.menus">\r
-      <menuContribution\r
-            locationURI="menu:org.eclipse.ui.main.menu">\r
-         <menu\r
-               id="fileMenu"\r
-               label="File">\r
-            <command\r
-                  id="exitCommand"\r
-                  commandId="org.eclipse.ui.file.exit"\r
-                  label="Exit"\r
-                  style="push"\r
-                  tooltip="Exits the application">\r
-            </command>\r
-         </menu>\r
-      </menuContribution>\r
-   </extension>\r
-  <!-- <extension\r
-         point="org.eclipse.ui.commands">\r
-      <command\r
-            defaultHandler="org.eclipse.ui.internal.handlers.QuitHandler"\r
-            id="org.eclipse.ui.file.exit"\r
-            name="Exit">\r
-      </command> \r
-   </extension> -->\r
 </plugin>\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
deleted file mode 100644 (file)
index 62904be..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * Creates, adds and disposes actions for the menus and action bars of
- * each workbench window.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(IWorkbenchWindow window) {
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-    }
-    
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
deleted file mode 100644 (file)
index f272f05..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * This workbench advisor creates the window advisor, and specifies
- * the perspective id for the initial window.
- */
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-       private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.perspectives.slcExecution";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new SlcRapSecureWorkbenchWindowAdvisor(configurer);
-    }
-
-       public String getInitialWindowPerspectiveId() {
-               return PERSPECTIVE_ID;
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
deleted file mode 100644 (file)
index 51c0f24..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-/**
- * Configures the perspective layout. This class is contributed 
- * through the plugin.xml.
- */
-public class Perspective implements IPerspectiveFactory {
-
-       public void createInitialLayout(IPageLayout layout) {
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
deleted file mode 100644 (file)
index 60ca364..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.argeo.slc.client.rap;\r
-\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-import org.eclipse.ui.plugin.AbstractUIPlugin;\r
-import org.osgi.framework.BundleContext;\r
-\r
-/**\r
- * The activator class controls the plug-in life cycle\r
- */\r
-public class SlcClientRapPlugin extends AbstractUIPlugin {\r
-\r
-       // The plug-in ID\r
-       public static final String PLUGIN_ID = "org.argeo.slc.client.rap"; //$NON-NLS-1$\r
-\r
-       // The shared instance\r
-       private static SlcClientRapPlugin plugin;\r
-\r
-       /**\r
-        * The constructor\r
-        */\r
-       public SlcClientRapPlugin() {\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see\r
-        * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext\r
-        * )\r
-        */\r
-       public void start(BundleContext context) throws Exception {\r
-               super.start(context);\r
-               plugin = this;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see\r
-        * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext\r
-        * )\r
-        */\r
-       public void stop(BundleContext context) throws Exception {\r
-               plugin = null;\r
-               super.stop(context);\r
-       }\r
-\r
-       /**\r
-        * Returns the shared instance\r
-        * \r
-        * @return the shared instance\r
-        */\r
-       public static SlcClientRapPlugin getDefault() {\r
-               return plugin;\r
-       }\r
-\r
-       /**\r
-        * Returns an image descriptor for the image file at the given plug-in\r
-        * relative path\r
-        * \r
-        * @param path\r
-        *            the path\r
-        * @return the image descriptor\r
-        */\r
-       public static ImageDescriptor getImageDescriptor(String path) {\r
-               return imageDescriptorFromPlugin(PLUGIN_ID, path);\r
-       }\r
-}\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcRapSecureWorkbenchWindowAdvisor.java
deleted file mode 100644 (file)
index f96e97e..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.argeo.security.ui.rap.RapSecureWorkbenchWindowAdvisor;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-
-/**
- * Configures the initial size and appearance of a workbench window.
- */
-public class SlcRapSecureWorkbenchWindowAdvisor extends
-               RapSecureWorkbenchWindowAdvisor {
-
-       public SlcRapSecureWorkbenchWindowAdvisor(
-                       IWorkbenchWindowConfigurer configurer) {
-               super(configurer);
-       }
-
-       // Customisation of the main frame can be done here.
-       @Override
-       public void preWindowOpen() {
-               super.preWindowOpen();
-               //
-               // IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-               // configurer.setShowCoolBar(true);
-               // configurer.setShowMenuBar(true);
-               // configurer.setShowStatusLine(false);
-               // configurer.setShowPerspectiveBar(true);
-               //              configurer.setTitle("Argeo Secure UI"); //$NON-NLS-1$
-               // // Full screen, see
-               // //
-               // http://dev.eclipse.org/newslists/news.eclipse.technology.rap/msg02697.html
-               // configurer.setShellStyle(SWT.NONE);
-               // Rectangle bounds = Display.getDefault().getBounds();
-               // configurer.setInitialSize(new Point(bounds.width, bounds.height));
-       }
-
-}
index 4929700558e966159da951abc3e2961572af5fb1..c7ff8d4d1ae5a1ad95070a4cd2e6821f95021ba7 100644 (file)
@@ -1,26 +1,10 @@
 package org.argeo.slc.client.rap;
 
 import org.argeo.security.ui.rap.SecureEntryPoint;
-import org.argeo.security.ui.rap.SecureWorkbenchAdvisor;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 /**
  * This class controls all aspects of the application's execution and is
  * contributed through the plugin.xml.
  */
 public class SlcSecureRap extends SecureEntryPoint {
-
-
-       @Override
-       protected WorkbenchAdvisor createWorkbenchAdvisor() {
-               return new SecureWorkbenchAdvisor() {
-                       public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
-                                       IWorkbenchWindowConfigurer configurer) {
-                               return new SlcRapSecureWorkbenchWindowAdvisor(configurer);
-                       }
-
-               };
-       }
 }
index 61a7e9d47f288dccf14c20794a2144a9b38cf3a7..304491516e29e3eb519b88ee4362d6e96f33458a 100644 (file)
@@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.argeo.security.ui.rcp,
- org.argeo.slc.client.ui.perspectives,
  org.argeo.slc.core.test.tree,
  org.argeo.slc.execution,
  org.argeo.slc.process,
index 58605baabc9efb696a4a3d56ac60e8254d8b3f99..dc5ca4392c42eece2236b0c23b5686ab2ed594d7 100644 (file)
          </run>
       </application>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="SLC Execution"
-            class="org.argeo.slc.client.ui.perspectives.SlcExecution"
-            id="org.argeo.slc.client.ui.perspectives.slcExecution"
-            icon="icons/slc_execution_perspective.gif">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu">
-<!--         <menu
-               id="fileMenu"
-               label="File">
-            <command
-                  id="exitCommand"
-                  commandId="org.argeo.slc.client.rcp.commands.Exit"
-                  label="Exit"
-                  style="push"
-                  tooltip="Exits the application">
-            </command>
-         </menu> -->
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.argeo.slc.client.rcp.commands.ExitHandler"
-            id="org.argeo.slc.client.rcp.commands.exit"
-            name="Exit">
-      </command>
-   </extension>
    
-    <!-- RCP Specific, does not function with RAP --> 
+    <!-- RCP Specific, does not work with RAP --> 
    <extension
         point="org.eclipse.ui.bindings">
      <key
index 3d0eb14ed09a85ba50c7f4a2f15dc5e1a7b2ab7c..611233eb06a1d038c937b862ad73504dd7d05252 100644 (file)
@@ -12,7 +12,6 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.argeo.slc.client.ui,
  org.argeo.slc.client.ui.listeners,
- org.argeo.slc.client.ui.perspectives,
  org.argeo.slc.client.ui.views
 Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
index 31be01dc80585ee4ace3fab8d0a9305d91552be6..36aa61d6d5a0e76fc5fbdea720bd790aecd06793 100644 (file)
                        </command>
                </menuContribution>
        </extension>
-</plugin>
\ No newline at end of file
+   <extension
+         point="org.eclipse.ui.perspectives">
+      <perspective
+            class="org.argeo.slc.client.ui.SlcExecutionPerspective"
+            id="org.argeo.slc.client.ui.slcExecutionPerspective"
+            name="SLC Execution">
+      </perspective>
+   </extension>
+</plugin>
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcExecutionPerspective.java
new file mode 100644 (file)
index 0000000..abc0130
--- /dev/null
@@ -0,0 +1,46 @@
+package org.argeo.slc.client.ui;
+
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+public class SlcExecutionPerspective implements IPerspectiveFactory {
+
+       public void createInitialLayout(IPageLayout layout) {
+               String editorArea = layout.getEditorArea();
+               layout.setEditorAreaVisible(false);
+               layout.setFixed(false);
+
+               // Create the main ui layout
+
+               // For a vertical split, the part on top gets the specified ratio of the
+               // current space and the part on bottom gets the rest. Likewise, for a
+               // horizontal split, the part at left gets the specified ratio of the
+               // current space.
+               IFolderLayout main = layout.createFolder("main", IPageLayout.RIGHT,
+                               0.3f, editorArea);
+               IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT,
+                               0.3f, editorArea);
+
+               IFolderLayout bottom = layout.createFolder("bottom",
+                               IPageLayout.BOTTOM, 0.65f, "main");
+
+               IFolderLayout topRight = layout.createFolder("topRight",
+                               IPageLayout.RIGHT, 0.6f, "main");
+
+               // add the views to the corresponding place holder
+               left.addView("org.argeo.slc.client.ui.executionModulesView");
+               left.addView("org.argeo.slc.client.ui.resultListView");
+
+               main.addView("org.argeo.slc.client.ui.processBuilderView");
+               main.addPlaceholder("org.argeo.slc.client.ui.resultDetailView:UUID-*");
+               // main.addView("org.argeo.slc.client.ui.resultExcelView");
+               // main.addPlaceholder("org.argeo.slc.client.ui.resultExcelView:UUID-*");
+               main.addPlaceholder("org.argeo.slc.client.ui.processDetailView:UUID-*");
+
+               bottom.addView("org.argeo.slc.client.ui.processListView");
+
+               topRight.addView("org.argeo.slc.client.ui.processParametersView");
+       }
+
+}
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/perspectives/SlcExecution.java
deleted file mode 100644 (file)
index acb72db..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.argeo.slc.client.ui.perspectives;
-
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-public class SlcExecution implements IPerspectiveFactory {
-
-       public void createInitialLayout(IPageLayout layout) {
-               String editorArea = layout.getEditorArea();
-               layout.setEditorAreaVisible(false);
-               layout.setFixed(false);
-
-               // Create the main ui layout
-
-               // For a vertical split, the part on top gets the specified ratio of the
-               // current space and the part on bottom gets the rest. Likewise, for a
-               // horizontal split, the part at left gets the specified ratio of the
-               // current space.
-               IFolderLayout main = layout.createFolder("main", IPageLayout.RIGHT,
-                               0.3f, editorArea);
-               IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT,
-                               0.3f, editorArea);
-
-               IFolderLayout bottom = layout.createFolder("bottom",
-                               IPageLayout.BOTTOM, 0.65f, "main");
-
-               IFolderLayout topRight = layout.createFolder("topRight",
-                               IPageLayout.RIGHT, 0.6f, "main");
-
-               // add the views to the corresponding place holder
-               left.addView("org.argeo.slc.client.ui.executionModulesView");
-               left.addView("org.argeo.slc.client.ui.resultListView");
-
-               main.addView("org.argeo.slc.client.ui.processBuilderView");
-               main.addPlaceholder("org.argeo.slc.client.ui.resultDetailView:UUID-*");
-               // main.addView("org.argeo.slc.client.ui.resultExcelView");
-               // main.addPlaceholder("org.argeo.slc.client.ui.resultExcelView:UUID-*");
-               main.addPlaceholder("org.argeo.slc.client.ui.processDetailView:UUID-*");
-
-               bottom.addView("org.argeo.slc.client.ui.processListView");
-
-               topRight.addView("org.argeo.slc.client.ui.processParametersView");
-       }
-
-}