Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 301262 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/equinox/internal/app/DefaultApplicationListener.java (-1 / +5 lines)
Lines 1-5 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * Copyright (c) 2007, 2008 IBM Corporation and others.
 2 
 * Copyright (c) 2007, 2010 IBM Corporation and others.
3 
 *  All rights reserved. This program and the accompanying materials
 3 
 *  All rights reserved. This program and the accompanying materials
4 
 *  are made available under the terms of the Eclipse Public License v1.0
 4 
 *  are made available under the terms of the Eclipse Public License v1.0
5 
 *  which accompanies this distribution, and is available at
 5 
 *  which accompanies this distribution, and is available at
Lines 58-63 Link Here
58 
	public Object run(Object context) {
 58 
	public Object run(Object context) {
59 
		if (handleTracker == null)
 59 
		if (handleTracker == null)
60 
			return getResult(); // app has ended, return the result
 60 
			return getResult(); // app has ended, return the result
61 
		EclipseAppHandle anyThreadedDefaultApp = (EclipseAppHandle) handleTracker.getService();
62 
		if (anyThreadedDefaultApp != null)
63 
			// We now need to actual launch the application; this will run the application on another thread.
64 
			AnyThreadAppLauncher.launchEclipseApplication(anyThreadedDefaultApp);
61 
		try {
 65 
		try {
62 
			while (waitOnRunning()) {
 66 
			while (waitOnRunning()) {
63 
				EclipseAppHandle mainHandle = getMainHandle();
 67 
				EclipseAppHandle mainHandle = getMainHandle();
(-)src/org/eclipse/equinox/internal/app/EclipseAppContainer.java (-4 / +5 lines)
Lines 1-5 Link Here
1 
/*******************************************************************************
 1 
/*******************************************************************************
2 
 * Copyright (c) 2005, 2009 IBM Corporation and others.
 2 
 * Copyright (c) 2005, 2010 IBM Corporation and others.
3 
 * All rights reserved. This program and the accompanying materials
 3 
 * All rights reserved. This program and the accompanying materials
4 
 * are made available under the terms of the Eclipse Public License v1.0
 4 
 * are made available under the terms of the Eclipse Public License v1.0
5 
 * which accompanies this distribution, and is available at
 5 
 * which accompanies this distribution, and is available at
Lines 337-346 Link Here
337 
			else
 337 
			else
338 
				appLauncher.launch(appHandle, appHandle.getArguments().get(IApplicationContext.APPLICATION_ARGS));
 338 
				appLauncher.launch(appHandle, appHandle.getArguments().get(IApplicationContext.APPLICATION_ARGS));
339 
		} else {
 339 
		} else {
340 
			AnyThreadAppLauncher.launchEclipseApplication(appHandle);
341 
			DefaultApplicationListener curDefaultApplicationListener = null;
342 
			MainApplicationLauncher curMissingAppLauncher = null;
343 
			if (isDefault) {
 340 
			if (isDefault) {
341 
				DefaultApplicationListener curDefaultApplicationListener = null;
342 
				MainApplicationLauncher curMissingAppLauncher = null;
344 
				ApplicationLauncher appLauncher = null;
 343 
				ApplicationLauncher appLauncher = null;
345 
				synchronized (this) {
 344 
				synchronized (this) {
346 
					appLauncher = (ApplicationLauncher) launcherTracker.getService();
 345 
					appLauncher = (ApplicationLauncher) launcherTracker.getService();
Lines 359-364 Link Here
359 
					curMissingAppLauncher.launch(curDefaultApplicationListener);
 358 
					curMissingAppLauncher.launch(curDefaultApplicationListener);
360 
				else
 359 
				else
361 
					appLauncher.launch(curDefaultApplicationListener, null);
 360 
					appLauncher.launch(curDefaultApplicationListener, null);
361 
			} else {
362 
				AnyThreadAppLauncher.launchEclipseApplication(appHandle);
362 
			}
 363 
			}
363 
		}
 364 
		}
364 
	}
 365 
	}

Return to bug 301262