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%2FOsgiBootEquinoxLaunchConfiguration.java;h=19cdee12b8b1896f839293499d8fd66f208f9e3b;hb=868102c0f0220e12eca836b6ec9b3a2b9a3441e4;hp=c00b3075224ebb86d5e1f5509de12090faa185d4;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/OsgiBootEquinoxLaunchConfiguration.java b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
index c00b30752..19cdee12b 100644
--- a/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
+++ b/eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
@@ -8,8 +8,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.pde.ui.launcher.EquinoxLaunchConfiguration;
+import org.eclipse.pde.launching.EquinoxLaunchConfiguration;
 
+/** OSGiBoot launch configuration. */
 public class OsgiBootEquinoxLaunchConfiguration extends
 		EquinoxLaunchConfiguration {
 	public final static String ID = SlcIdeUiPlugin.ID
@@ -20,14 +21,17 @@ public class OsgiBootEquinoxLaunchConfiguration extends
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
 		super.launch(configuration, mode, launch, monitor);
 
-		// TODO: add launch listener to be notified when is terminated and
-		// refresh resources
+//		System.out.println("targetBundles="
+//				+ configuration.getAttribute(
+//						IPDELauncherConstants.TARGET_BUNDLES, ""));
+//		System.out.println("workspaceBundles="
+//				+ configuration.getAttribute(
+//						IPDELauncherConstants.WORKSPACE_BUNDLES, ""));
 
-		IFile propertiesFile = (IFile) configuration.getMappedResources()[0];
+		// Refresh resources before launching
+		final IFile propertiesFile = (IFile) configuration.getMappedResources()[0];
 		propertiesFile.getParent().refreshLocal(IResource.DEPTH_INFINITE,
 				monitor);
-		// propertiesFile.getProject().refreshLocal(IResource.DEPTH_INFINITE,
-		// monitor);
 	}
 
 	@Override
@@ -35,7 +39,7 @@ public class OsgiBootEquinoxLaunchConfiguration extends
 			ILaunch launch, IProgressMonitor monitor) throws CoreException {
 		// System.out.println("Launching... " + launch);
 		ILaunchConfigurationWorkingCopy wc = configuration.getWorkingCopy();
-		OsgiLaunchHelper.updateLaunchConfiguration(wc);
+		OsgiLaunchHelper.updateLaunchConfiguration(wc, false);
 		wc.doSave();
 		super.preLaunchCheck(configuration, launch, monitor);