From 197097b649dc63b036ce67f1ac55943703abc82d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 8 Nov 2012 18:28:10 +0000 Subject: [PATCH] Work on SLC IDE eclipse plugin git-svn-id: https://svn.argeo.org/slc/trunk@5755 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- features/org.argeo.slc.ide/category.xml | 2 +- features/org.argeo.slc.ide/feature.xml | 6 +++--- plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF | 2 +- plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF | 2 +- plugins/org.argeo.slc.ide.ui/build.properties | 3 ++- plugins/org.argeo.slc.ide.ui/plugin.xml | 7 +++++++ .../main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java | 4 ++++ .../argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java | 2 ++ plugins/org.argeo.slc.ide.ui/targets/managedTarget.target | 8 ++++++++ 9 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 plugins/org.argeo.slc.ide.ui/targets/managedTarget.target diff --git a/features/org.argeo.slc.ide/category.xml b/features/org.argeo.slc.ide/category.xml index b5d9946f3..635e6e847 100644 --- a/features/org.argeo.slc.ide/category.xml +++ b/features/org.argeo.slc.ide/category.xml @@ -1,6 +1,6 @@ - + diff --git a/features/org.argeo.slc.ide/feature.xml b/features/org.argeo.slc.ide/feature.xml index bb176d12d..77bba7b7c 100644 --- a/features/org.argeo.slc.ide/feature.xml +++ b/features/org.argeo.slc.ide/feature.xml @@ -2,7 +2,7 @@ @@ -64,14 +64,14 @@ and limitations under the License. id="org.argeo.slc.ide.ui" download-size="0" install-size="0" - version="0.13.1.D20110904_1415" + version="1.1.1.D20121107_1340" unpack="false"/> diff --git a/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF index b0066703a..f1381c2c4 100644 --- a/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF +++ b/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Argeo IDE Bundle-SymbolicName: org.argeo.slc.ide.branding;singleton:=true -Bundle-Version: 1.1.3 +Bundle-Version: 1.1.1.D20121107_1340 Bundle-Vendor: Argeo.org Require-Bundle: org.eclipse.ui;bundle-version="3.5.1", org.eclipse.osgi;bundle-version="3.5.1", diff --git a/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF b/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF index ee3bf0d16..e2129b5cc 100644 --- a/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF +++ b/plugins/org.argeo.slc.ide.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SLC IDE UI Bundle-SymbolicName: org.argeo.slc.ide.ui;singleton:=true -Bundle-Version: 1.1.3 +Bundle-Version: 1.1.1.D20121107_1340 Bundle-Activator: org.argeo.slc.ide.ui.SlcIdeUiPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/plugins/org.argeo.slc.ide.ui/build.properties b/plugins/org.argeo.slc.ide.ui/build.properties index 3cfd516d6..92544c5bb 100644 --- a/plugins/org.argeo.slc.ide.ui/build.properties +++ b/plugins/org.argeo.slc.ide.ui/build.properties @@ -2,4 +2,5 @@ source.. = src/main/java/ bin.includes = META-INF/,\ .,\ plugin.xml,\ - icons/ + icons/,\ + targets/ diff --git a/plugins/org.argeo.slc.ide.ui/plugin.xml b/plugins/org.argeo.slc.ide.ui/plugin.xml index 158d007d4..bb9c5f0a7 100644 --- a/plugins/org.argeo.slc.ide.ui/plugin.xml +++ b/plugins/org.argeo.slc.ide.ui/plugin.xml @@ -104,4 +104,11 @@ id="org.argeo.slc.ide.ui.EclipseBootLauncherImage"> + + + + diff --git a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java index 088b4f48b..4e002587d 100644 --- a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java +++ b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/SlcIdeUiPlugin.java @@ -11,6 +11,7 @@ import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.model.IProcess; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.pde.core.plugin.TargetPlatform; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -38,6 +39,9 @@ public class SlcIdeUiPlugin extends AbstractUIPlugin { plugin = this; DebugPlugin.getDefault() .addDebugEventListener(new DebugEventListener()); + + String location = TargetPlatform.getLocation(); + System.out.println(location); } @Override diff --git a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java index 54566b53c..5d12fd8cb 100644 --- a/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java +++ b/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiLaunchHelper.java @@ -74,6 +74,8 @@ public class OsgiLaunchHelper implements OsgiLauncherConstants { String originalVmArgs = wc.getAttribute( IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); wc.setAttribute(ATTR_DEFAULT_VM_ARGS, originalVmArgs); + + // clear config area by default wc.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, true); } catch (CoreException e) { Shell shell = Display.getCurrent().getActiveShell(); diff --git a/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target b/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target new file mode 100644 index 000000000..c9183daae --- /dev/null +++ b/plugins/org.argeo.slc.ide.ui/targets/managedTarget.target @@ -0,0 +1,8 @@ + + + + + + + + -- 2.39.2