Attachment 92736 Details for Bug 222378 – Welcome Page v03

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

[patch] Welcome Page v03

patch-welcomePage_v03.txt (text/plain), 4.86 KB, created by Tim Mok

on 2008-03-17 15:11:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Mok

Created: 2008-03-17 15:11:53 EDT

Size: 4.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.platform
>Index: src-intro/org/eclipse/platform/internal/LaunchUpdateIntroAction.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform/src-intro/org/eclipse/platform/internal/LaunchUpdateIntroAction.java,v
>retrieving revision 1.1
>diff -u -r1.1 LaunchUpdateIntroAction.java
>--- src-intro/org/eclipse/platform/internal/LaunchUpdateIntroAction.java	21 Jun 2005 22:42:02 -0000	1.1
>+++ src-intro/org/eclipse/platform/internal/LaunchUpdateIntroAction.java	17 Mar 2008 19:10:26 -0000
>@@ -1,40 +1,76 @@
> /*******************************************************************************
>- * Copyright (c) 200, 2005 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>+ * Copyright (c) 200, 2005 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 http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors: IBM Corporation - initial API and implementation
>+ ******************************************************************************/
> package org.eclipse.platform.internal;
> 
> import java.util.Properties;
> 
>+import org.eclipse.core.commands.Command;
>+import org.eclipse.core.commands.ExecutionEvent;
>+import org.eclipse.core.commands.ExecutionException;
>+import org.eclipse.core.commands.NotEnabledException;
>+import org.eclipse.core.commands.NotHandledException;
>+import org.eclipse.core.commands.common.NotDefinedException;
>+import org.eclipse.core.internal.registry.BundleHelper;
>+import org.eclipse.core.internal.runtime.Log;
>+import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Platform;
>+import org.eclipse.core.runtime.Status;
>+import org.eclipse.core.runtime.internal.adaptor.PluginParser.PluginInfo;
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.commands.ICommandService;
>+import org.eclipse.ui.handlers.IHandlerService;
>+import org.eclipse.ui.internal.util.BundleUtility;
> import org.eclipse.ui.intro.IIntroSite;
> import org.eclipse.ui.intro.config.IIntroAction;
> import org.eclipse.update.ui.UpdateManagerUI;
>+import org.osgi.framework.Bundle;
> 
> public class LaunchUpdateIntroAction implements IIntroAction {
> 
>-    public LaunchUpdateIntroAction() {
>-    }
>+	private static final String COMMAND_P2 = "org.eclipse.equinox.p2.ui.sdk.update";
>+	private static final String COMMAND_UPDATE_MANAGER = "org.eclipse.ui.update.findAndInstallUpdates";
> 
>-    public void run(IIntroSite site, Properties params) {
>+	public LaunchUpdateIntroAction() {
>+	}
> 
>-        Runnable r = new Runnable() {
>-            public void run() {
>-                Shell currentShell = PlatformUI.getWorkbench()
>-                    .getActiveWorkbenchWindow().getShell();
>-                UpdateManagerUI.openInstaller(currentShell);
>-            }
>-        };
>-
>-        Shell currentShell = PlatformUI.getWorkbench()
>-            .getActiveWorkbenchWindow().getShell();
>-        currentShell.getDisplay().asyncExec(r);
>-    }
>+	public void run(IIntroSite site, Properties params) {
>+		Runnable r = new Runnable() {
>+			public void run() {
>+				if (!executeUpdateCommand(COMMAND_P2)) {
>+					executeUpdateCommand(COMMAND_UPDATE_MANAGER);
>+				}
>+			}
>+		};
>+		Shell currentShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
>+		currentShell.getDisplay().asyncExec(r);
>+	}
>+
>+	private boolean executeUpdateCommand(String command) {
>+		ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
>+		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
>+		Command cmd;
>+		cmd = commandService.getCommand(command);
>+		ExecutionEvent executionEvent = handlerService.createExecutionEvent(cmd, null);
>+		try {
>+			cmd.executeWithChecks(executionEvent);
>+		} catch (ExecutionException e) {
>+			String bundleId = "org.eclipse.platform";
>+			Bundle bundle = Platform.getBundle(bundleId);
>+			Status status = new Status(IStatus.ERROR, bundleId, "Exception executing command: " + command, e);
>+			Platform.getLog(bundle).log(status);
>+		} catch (NotDefinedException e) {
>+			return false;
>+		} catch (NotEnabledException e) {
>+		} catch (NotHandledException e) {
>+			return false;
>+		}
>+		return true;
>+	}
> }

Actions: View | Diff

Attachments on bug 222378: 92593 | 92730 | 92736