Improve Launch plugin

git-svn-id: https://svn.argeo.org/slc/trunk@2394 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.ui.launch/META-INF/MANIFEST.MF
index 17591eb63d97a9b6ca93c61c6ca843a611103da2..ba95f93442d0eb1316a69563e53671ada03cfae2 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.launch/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.core.variables,
  org.eclipse.pde.build,
- org.eclipse.pde.ui;bundle-version="3.4.0"
+ org.eclipse.pde.ui;bundle-version="3.4.0",
+ org.eclipse.jdt.ui;bundle-version="3.4.2"
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Argeo

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/SlcPerspectiveFactory.java b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/SlcPerspectiveFactory.java
index 483d1eb80459736c00874d153ddb30748c2942d6..e375949896aadaedf8421923c22792a61e2227bc 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/SlcPerspectiveFactory.java
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/SlcPerspectiveFactory.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.ui.launch;\r
 \r
+import org.eclipse.jdt.ui.JavaUI;\r
 import org.eclipse.ui.IFolderLayout;\r
 import org.eclipse.ui.IPageLayout;\r
 import org.eclipse.ui.IPerspectiveFactory;\r
@@ -13,7 +14,7 @@ public class SlcPerspectiveFactory implements IPerspectiveFactory {
 \r
                IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f,\r
                        editorArea);\r
-               topLeft.addView(IPageLayout.ID_RES_NAV);\r
+               topLeft.addView(JavaUI.ID_PACKAGES);\r
 \r
                IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, 0.66f,\r
                                editorArea);\r

diff --git a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/osgi/SlcLaunchShortcut.java b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/osgi/SlcLaunchShortcut.java
index e7764a731beae57e64056e577543305059ba36cf..4b596300637e36a9245d6bb01caaa7f3ffc5a624 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/osgi/SlcLaunchShortcut.java
+++ b/eclipse/plugins/org.argeo.slc.ui.launch/src/main/java/org/argeo/slc/ui/launch/osgi/SlcLaunchShortcut.java
@@ -27,6 +27,7 @@ public class SlcLaunchShortcut extends OSGiLaunchShortcut {
        private Boolean debug = false;
 
        private String springOsgiExtenderId = "org.springframework.osgi.extender";
+       private String slcSupportEquinoxId = "org.argeo.slc.support.equinox";
        // private String slcAgentId = "org.argeo.slc.agent";
        // private String osgiBootId = "org.argeo.slc.osgiboot";
 
@@ -39,10 +40,10 @@ public class SlcLaunchShortcut extends OSGiLaunchShortcut {
        public SlcLaunchShortcut() {
                super();
                defaultBundlesToStart.add(springOsgiExtenderId);
+               defaultBundlesToStart.add(slcSupportEquinoxId);
                // defaultBundlesToStart.add(slcAgentId);
        }
 
-       @Override
        public void launch(ISelection selection, String mode) {
                this.selection = selection;
                this.name = new StringBuffer();
@@ -62,7 +63,6 @@ public class SlcLaunchShortcut extends OSGiLaunchShortcut {
                bundlesToStart = null;
        }
 
-       @Override
        protected void initializeConfiguration(
                        ILaunchConfigurationWorkingCopy configuration) {
                try {
@@ -179,9 +179,8 @@ public class SlcLaunchShortcut extends OSGiLaunchShortcut {
                }
        }
 
-       @Override
        protected String getName(ILaunchConfigurationType type) {
-               if (name != null)
+               if (name != null && !name.toString().trim().equals(""))
                        return name.toString();
                else
                        return "SLC";