From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 29 Apr 2009 15:42:59 +0000 (+0000)
Subject: Improve Launch plugin
X-Git-Tag: argeo-slc-2.1.7~1922
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f55807e0f3035d53ac2bcfe404a549a88bc199dc;p=gpl%2Fargeo-slc.git

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 17591eb63..ba95f9344 100644
--- 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 483d1eb80..e37594989 100644
--- 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;
 
+import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -13,7 +14,7 @@ public class SlcPerspectiveFactory implements IPerspectiveFactory {
 
 		IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f,
 			editorArea);
-		topLeft.addView(IPageLayout.ID_RES_NAV);
+		topLeft.addView(JavaUI.ID_PACKAGES);
 
 		IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, 0.66f,
 				editorArea);
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 e7764a731..4b5963006 100644
--- 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";