X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.ide.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fide%2Fui%2Flaunch%2Fosgi%2FOsgiBootLauncherTabGroup.java;h=419862d86af9a7ee81e554080ed71b9b114b9b79;hb=16016e4621c540a86bbc40c040bc9d528a5b573d;hp=d7fa841a542eec1b110e76a0f3900d220a8697c7;hpb=01e4319b49fcc2a6cdf6f0f9271ae27343c7430f;p=gpl%2Fargeo-slc.git

diff --git a/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java
index d7fa841a5..419862d86 100644
--- a/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java
+++ b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootLauncherTabGroup.java
@@ -1,12 +1,12 @@
 package org.argeo.slc.ide.ui.launch.osgi;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.EnvironmentTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
 import org.eclipse.pde.ui.launcher.BundlesTab;
 import org.eclipse.pde.ui.launcher.OSGiLauncherTabGroup;
 import org.eclipse.pde.ui.launcher.OSGiSettingsTab;
@@ -17,13 +17,13 @@ public class OsgiBootLauncherTabGroup extends OSGiLauncherTabGroup {
 	@Override
 	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
 		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
-				new OsgiBootMainTab(), new EnvironmentTab(), new BundlesTab() {
+				new OsgiBootMainTab(),
+				new BundlesTab() {
 					private boolean activating = false;
 
 					@Override
 					public void performApply(
 							ILaunchConfigurationWorkingCopy config) {
-						System.out.println("performApply");
 						super.performApply(config);
 						if (activating) {
 							try {
@@ -40,7 +40,20 @@ public class OsgiBootLauncherTabGroup extends OSGiLauncherTabGroup {
 							ILaunchConfigurationWorkingCopy workingCopy) {
 						activating = true;
 					}
-				}, new OSGiSettingsTab(), new TracingTab(), new CommonTab() };
+				}, new OSGiSettingsTab(), new EnvironmentTab(),
+				new JavaArgumentsTab() {
+					private boolean initializing = false;
+
+					@Override
+					public void performApply(
+							ILaunchConfigurationWorkingCopy configuration) {
+						if (initializing)
+							return;
+						initializing = true;
+						initializeFrom(configuration);
+						initializing = false;
+					}
+				}, new TracingTab(), new CommonTab() };
 		setTabs(tabs);
 	}