Attachment 90390 Details for Bug 215914 – Enable/Disable Old Update UI v04

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

[patch] Enable/Disable Old Update UI v04

patch.txt (text/plain), 13.43 KB, created by John Arthorne

on 2008-02-21 14:28:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2008-02-21 14:28:50 EST

Size: 13.43 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.ui
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.ui/plugin.xml,v
>retrieving revision 1.92
>diff -u -r1.92 plugin.xml
>--- plugin.xml	6 May 2005 16:36:03 -0000	1.92
>+++ plugin.xml	21 Feb 2008 19:27:28 -0000
>@@ -57,4 +57,17 @@
>             label="%preferenceKeywords.general"
>             id="org.eclipse.update.ui.general"/>
>       </extension>
>+
>+   <extension
>+         point="org.eclipse.ui.handlers">
>+      <handler
>+            class="org.eclipse.update.internal.ui.views.ManageConfigurationHandler"
>+            commandId="org.eclipse.ui.update.manageConfiguration">
>+      </handler>
>+      <handler
>+            class="org.eclipse.update.internal.ui.views.FindAndInstallHandler"
>+            commandId="org.eclipse.ui.update.findAndInstallUpdates">
>+      </handler>
>+   </extension>
>+
> </plugin>
>Index: src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java
>===================================================================
>RCS file: src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java
>diff -N src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 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.update.internal.ui.views;
>+
>+import org.eclipse.core.commands.*;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.ui.handlers.HandlerUtil;
>+import org.eclipse.update.ui.UpdateManagerUI;
>+
>+/**
>+ * This handler is hooked to a command provided by the application (such
>+ * as org.eclipse.ui.ide). This allows RCP applications to control how update
>+ * functionality is surfaced.
>+ */
>+public class FindAndInstallHandler extends AbstractHandler {
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
>+	 */
>+	public Object execute(ExecutionEvent event) throws ExecutionException {
>+		UpdateManagerUI.openInstaller(HandlerUtil.getActiveShell(event));
>+		return null;
>+	}
>+
>+}
>Index: src/org/eclipse/update/internal/ui/views/ManageConfigurationHandler.java
>===================================================================
>RCS file: src/org/eclipse/update/internal/ui/views/ManageConfigurationHandler.java
>diff -N src/org/eclipse/update/internal/ui/views/ManageConfigurationHandler.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/update/internal/ui/views/ManageConfigurationHandler.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 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.update.internal.ui.views;
>+
>+import org.eclipse.core.commands.*;
>+import org.eclipse.ui.handlers.HandlerUtil;
>+import org.eclipse.update.ui.UpdateManagerUI;
>+
>+/**
>+ * This handler is hooked to a command provided by the application (such
>+ * as org.eclipse.ui.ide). This allows RCP applications to control how update
>+ * functionality is surfaced.
>+ */
>+public class ManageConfigurationHandler extends AbstractHandler {
>+
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
>+	 */
>+	public Object execute(ExecutionEvent event) throws ExecutionException {
>+		UpdateManagerUI.openConfigurationManager(HandlerUtil.getActiveShell(event));
>+		return null;
>+	}
>+
>+}
>#P org.eclipse.ui.ide
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/plugin.properties,v
>retrieving revision 1.128
>diff -u -r1.128 plugin.properties
>--- plugin.properties	10 Feb 2008 22:18:41 -0000	1.128
>+++ plugin.properties	21 Feb 2008 19:27:29 -0000
>@@ -190,11 +190,6 @@
> command.showResourceByPath.description= Show a resource in the Navigator given its path
> commandParameter.showResourceByPath.resourcePath.name= Resource Path
> 
>-UpdateActionSet.label = Software Updates
>-UpdateActionSet.menu.label = &Software Updates
>-UpdateActionSet.updates.label = &Find and Install...
>-UpdateActionSet.configManager.label = &Manage Configuration
>-
> KeyBindingActionSet.label = Keyboard Shortcuts
> KeyBindingActionSet.showKeyAssist.label = &Key Assist...
> 
>@@ -276,4 +271,8 @@
> PreferenceTransfer.BookmarksConfigurations = Bookmarks View Configuration
> PreferenceTransfer.BookmarksConfigurations.Description = All configurations set in the bookmarks view.
> PreferenceTransfer.AllMarkersConfigurations = All Markers View Configuration
>-PreferenceTransfer.AllMarkersConfigurations.Description = All configurations set in the all markers view.
>\ No newline at end of file
>+PreferenceTransfer.AllMarkersConfigurations.Description = All configurations set in the all markers view.
>+
>+updateMenu.label = &Software Updates
>+actionSets.updates.label = &Find and Install...
>+actionSets.configManager.label = &Manage Configuration...
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/plugin.xml,v
>retrieving revision 1.267
>diff -u -r1.267 plugin.xml
>--- plugin.xml	13 Feb 2008 19:16:40 -0000	1.267
>+++ plugin.xml	21 Feb 2008 19:27:29 -0000
>@@ -984,43 +984,6 @@
> 
> 
>    <extension
>-         point="org.eclipse.ui.actionSets">
>-      <actionSet
>-            label="%UpdateActionSet.label"
>-            visible="true"
>-            id="org.eclipse.update.ui.softwareUpdates">
>-         <menu
>-               label="%UpdateActionSet.menu.label"
>-               path="help/group.updates"
>-               id="org.eclipse.update.ui.updateMenu">
>-            <separator
>-                  name="group0">
>-            </separator>
>-            <separator
>-                  name="group1">
>-            </separator>
>-         </menu>
>-         <action
>-               class="org.eclipse.ui.internal.ide.update.ConfigurationManagerAction"
>-               definitionId="org.eclipse.ui.update.manageConfiguration"
>-               helpContextId="org.eclipse.update.ui.newUpdates"
>-               icon="$nl$/icons/full/elcl16/configs.gif"
>-               id="org.eclipse.update.ui.configManager"
>-               label="%UpdateActionSet.configManager.label"
>-               menubarPath="help/org.eclipse.update.ui.updateMenu/group0">
>-         </action>
>-         <action
>-               class="org.eclipse.ui.internal.ide.update.InstallWizardAction"
>-               definitionId="org.eclipse.ui.update.findAndInstallUpdates"
>-               helpContextId="org.eclipse.update.ui.newUpdates"
>-               icon="$nl$/icons/full/elcl16/usearch_obj.gif"
>-               id="org.eclipse.update.ui.newUpdates"
>-               label="%UpdateActionSet.updates.label"
>-               menubarPath="help/org.eclipse.update.ui.updateMenu/group0">
>-         </action>
>-      </actionSet>
>-   </extension>
>-   <extension
>          point="org.eclipse.core.runtime.preferences">
>       <initializer class="org.eclipse.ui.internal.ide.IDEPreferenceInitializer"/>
>    </extension>
>@@ -1982,6 +1945,25 @@
>             </parameter>
>          </command>
>       </menuContribution>
>+       <menuContribution
>+             locationURI="menu:help?after=additions">
>+       <menu label="%updateMenu.label">
>+               <command
>+                     commandId="org.eclipse.ui.update.findAndInstallUpdates"
>+                     helpContextId="org.eclipse.update.ui.newUpdates"
>+                     icon="icons/elcl16/usearch_obj.gif"
>+                     label="%actionSets.updates.label"
>+                     style="push">
>+               </command>
>+               <command
>+                     commandId="org.eclipse.ui.update.manageConfiguration"
>+                     helpContextId="org.eclipse.update.ui.newUpdates"
>+                     icon="icons/elcl16/configs.gif"
>+                     label="%actionSets.configManager.label"
>+                     style="push">
>+               </command>
>+       </menu>
>+       </menuContribution>
>    </extension>
>    <extension
>          point="org.eclipse.ui.handlers">
>@@ -2188,5 +2170,4 @@
>             type="org.eclipse.ui.internal.views.markers.ExtendedMarkersView">
>       </propertyTester>
>    </extension>
>-   
> </plugin>
>#P org.eclipse.equinox.p2.ui.sdk
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/equinox-incubator/provisioning/org.eclipse.equinox.p2.ui.sdk/plugin.xml,v
>retrieving revision 1.11
>diff -u -r1.11 plugin.xml
>--- plugin.xml	10 Feb 2008 22:45:31 -0000	1.11
>+++ plugin.xml	21 Feb 2008 19:27:29 -0000
>@@ -105,5 +105,38 @@
>             </command>
>       </menuContribution>
>    </extension>
>+   <extension
>+         point="org.eclipse.ui.activities">
>+      <activity
>+            description="Enables classic update functionality"
>+            id="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
>+            name="Classic Update">
>+      </activity>
>+      <activityPatternBinding
>+            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
>+            isEqualityPattern="false"
>+            pattern=".*org\.eclipse\.update\.ui.*">
>+      </activityPatternBinding>
>+      <activityPatternBinding
>+            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
>+            isEqualityPattern="false"
>+            pattern=".*org\.eclipse\.ui\.update.*">
>+      </activityPatternBinding>
>+      <category
>+            description="Enables classic update functionality"
>+            id="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate"
>+            name="Classic Update">
>+      </category>
>+      <categoryActivityBinding
>+            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
>+            categoryId="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate">
>+      </categoryActivityBinding>
>+   </extension>
>+   <extension
>+         point="org.eclipse.core.runtime.preferences">
>+      <initializer
>+            class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.ClassicUpdateInitializer">
>+      </initializer>
>+   </extension>
> 
> </plugin>
>Index: src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ClassicUpdateInitializer.java
>===================================================================
>RCS file: src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ClassicUpdateInitializer.java
>diff -N src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ClassicUpdateInitializer.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ClassicUpdateInitializer.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,42 @@
>+/*******************************************************************************
>+ * Copyright (c) 2008 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.equinox.internal.p2.ui.sdk.prefs;
>+
>+import java.util.HashSet;
>+import java.util.Set;
>+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
>+import org.eclipse.ui.IWorkbench;
>+import org.eclipse.ui.PlatformUI;
>+import org.eclipse.ui.activities.IMutableActivityManager;
>+import org.eclipse.ui.activities.IWorkbenchActivitySupport;
>+
>+public class ClassicUpdateInitializer extends AbstractPreferenceInitializer {
>+
>+	private static final String ACTIVITY_ID = "org.eclipse.equinox.p2.ui.sdk.classicUpdate"; //$NON-NLS-1$
>+
>+	public void initializeDefaultPreferences() {
>+		IWorkbench workbench = PlatformUI.getWorkbench();
>+		if (workbench == null) {
>+			return;
>+		}
>+		final IWorkbenchActivitySupport activitySupport = workbench.getActivitySupport();
>+		IMutableActivityManager createWorkingCopy = activitySupport.createWorkingCopy();
>+		Set activityIds = createWorkingCopy.getEnabledActivityIds();
>+		final Set enabledActivityIds = new HashSet(activityIds);
>+		enabledActivityIds.remove(ACTIVITY_ID);
>+		workbench.getDisplay().asyncExec(new Runnable() {
>+			public void run() {
>+				//activity change listeners may touch widgets
>+				activitySupport.setEnabledActivityIds(enabledActivityIds);
>+			}
>+		});
>+	}
>+}

Actions: View | Diff

Attachments on bug 215914: 88333 | 88782 | 89320 | 90390 | 90391 | 90680