Attachment 157844 Details for Bug 301262 – app container patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] app container patch

301262_app.txt (text/plain), 3.35 KB, created by Thomas Watson

on 2010-02-01 16:19:46 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Watson

Created: 2010-02-01 16:19:46 EST

Size: 3.35 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.app
>Index: src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java,v
>retrieving revision 1.5
>diff -u -r1.5 DefaultApplicationListener.java
>--- src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java	20 May 2009 20:00:21 -0000	1.5
>+++ src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java	1 Feb 2010 21:09:29 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2008 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 IBM Corporation and others.
>  *  All rights reserved. This program and the accompanying materials
>  *  are made available under the terms of the Eclipse Public License v1.0
>  *  which accompanies this distribution, and is available at
>@@ -58,6 +58,10 @@
> 	public Object run(Object context) {
> 		if (handleTracker == null)
> 			return getResult(); // app has ended, return the result
>+		EclipseAppHandle anyThreadedDefaultApp = (EclipseAppHandle) handleTracker.getService();
>+		if (anyThreadedDefaultApp != null)
>+			// We now need to actual launch the application; this will run the application on another thread.
>+			AnyThreadAppLauncher.launchEclipseApplication(anyThreadedDefaultApp);
> 		try {
> 			while (waitOnRunning()) {
> 				EclipseAppHandle mainHandle = getMainHandle();
>Index: src/org/eclipse/equinox/internal/app/EclipseAppContainer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/compendium/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppContainer.java,v
>retrieving revision 1.23
>diff -u -r1.23 EclipseAppContainer.java
>--- src/org/eclipse/equinox/internal/app/EclipseAppContainer.java	21 Oct 2009 18:20:29 -0000	1.23
>+++ src/org/eclipse/equinox/internal/app/EclipseAppContainer.java	1 Feb 2010 21:09:29 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2009 IBM Corporation and others.
>+ * Copyright (c) 2005, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -337,10 +337,9 @@
> 			else
> 				appLauncher.launch(appHandle, appHandle.getArguments().get(IApplicationContext.APPLICATION_ARGS));
> 		} else {
>-			AnyThreadAppLauncher.launchEclipseApplication(appHandle);
>-			DefaultApplicationListener curDefaultApplicationListener = null;
>-			MainApplicationLauncher curMissingAppLauncher = null;
> 			if (isDefault) {
>+				DefaultApplicationListener curDefaultApplicationListener = null;
>+				MainApplicationLauncher curMissingAppLauncher = null;
> 				ApplicationLauncher appLauncher = null;
> 				synchronized (this) {
> 					appLauncher = (ApplicationLauncher) launcherTracker.getService();
>@@ -359,6 +358,8 @@
> 					curMissingAppLauncher.launch(curDefaultApplicationListener);
> 				else
> 					appLauncher.launch(curDefaultApplicationListener, null);
>+			} else {
>+				AnyThreadAppLauncher.launchEclipseApplication(appHandle);
> 			}
> 		}
> 	}

Actions: View | Diff

Attachments on bug 301262: 157787 | 157822 | 157844