Attachment 89320 Details for Bug 215914 – Enable/Disable Old Update UI v03

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

[patch] Enable/Disable Old Update UI v03

patch-oldUpdateManager_v03.txt (text/plain), 17.08 KB, created by Tim Mok

on 2008-02-08 17:13:40 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Mok

Created: 2008-02-08 17:13:40 EST

Size: 17.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.10
>diff -u -r1.10 plugin.xml
>--- plugin.xml	30 Jan 2008 00:48:05 -0000	1.10
>+++ plugin.xml	8 Feb 2008 22:07:48 -0000
>@@ -105,5 +105,33 @@
>             </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>
>+      <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,38 @@
>+/*******************************************************************************
>+ * 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;
>+		}
>+		IWorkbenchActivitySupport activitySupport = workbench.getActivitySupport();
>+		IMutableActivityManager createWorkingCopy = activitySupport.createWorkingCopy();
>+		Set activityIds = createWorkingCopy.getEnabledActivityIds();
>+		Set enabledActivityIds = new HashSet(activityIds);
>+		enabledActivityIds.remove(ACTIVITY_ID);
>+		activitySupport.setEnabledActivityIds(enabledActivityIds);
>+	}
>+
>+}
>#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	8 Feb 2008 22:07:48 -0000
>@@ -57,4 +57,55 @@
>             label="%preferenceKeywords.general"
>             id="org.eclipse.update.ui.general"/>
>       </extension>
>+      <extension
>+            point="org.eclipse.ui.commands">
>+      <command
>+            categoryId="org.eclipse.ui.category.update"
>+            description="%command.manageConfiguration.description"
>+            id="org.eclipse.ui.update.manageConfiguration"
>+            name="%command.manageConfiguration.name"/>
>+      <command
>+            categoryId="org.eclipse.ui.category.update"
>+            description="%command.findAndInstallUpdates.description"
>+            id="org.eclipse.ui.update.findAndInstallUpdates"
>+            name="%command.findAndInstallUpdates.name"/>
>+      <category
>+            description="%category.update.description"
>+            id="org.eclipse.ui.category.update"
>+            name="%category.update.name">
>+      </category>
>+      </extension>
>+      <extension
>+            point="org.eclipse.ui.menus">
>+       <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">
>+      <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: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.update.ui/plugin.properties,v
>retrieving revision 1.43
>diff -u -r1.43 plugin.properties
>--- plugin.properties	6 Jun 2007 19:42:39 -0000	1.43
>+++ plugin.properties	8 Feb 2008 22:07:48 -0000
>@@ -21,6 +21,14 @@
> actionSets.configManager.label = &Manage Configuration...
> actionSets.webSites.label = &Update Sites (experimental)
> 
>+command.manageConfiguration.name= Manage Configuration
>+command.manageConfiguration.description= Open the product configuration dialog
>+command.findAndInstallUpdates.name= Find and Install Updates
>+command.findAndInstallUpdates.description= Open the feature install and update dialog
>+
>+category.update.name= Update
>+category.update.description= Commands for Software Updates
>+
> searchCategory.name = Search Category
> searchCategories.updates = Available Updates
> searchCategories.updates.desc = <form><p>Search for updates to \
>@@ -44,6 +52,7 @@
> were not found in this application.</p></form>
> 
> mainPreference.name = Install/Update
>+updateManagerPreference.name = Update Manager Install/Updates
> 
> properties.general-info.label = General Information
> properties.license.label = License Agreement
>Index: icons/elcl16/configs.gif
>===================================================================
>RCS file: icons/elcl16/configs.gif
>diff -N icons/elcl16/configs.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/elcl16/configs.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,5 @@
>+GIF89aÕ??_M`{Iáêöèîö®¹Æãìöåíöçîö?¿àëöâìöäíöèïöòôöXuçïöëñöäîöíòöïóöN?½ñôö_¿óõö¿¿ÅÜÛÙàÜ¿ß¿ÒÕËáêºéì¿¿¿òìÆúîËÿîÎÿÿÿ!ù$,?@pH,?F@a£I<*?ËÆX@N I\À(PÀ0Nà;Ô"2Èât§Â§²n(l$UCVoVC
>+?C KCz¶v	xBv
>+
>+
>+j§	Z\^HOQ¼HÓA;
>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,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.IWorkbenchWindow;
>+import org.eclipse.ui.handlers.HandlerUtil;
>+import org.eclipse.update.ui.UpdateManagerUI;
>+
>+/**
>+ *
>+ */
>+public class FindAndInstallHandler extends AbstractHandler {
>+
>+	public Object execute(ExecutionEvent event) throws ExecutionException {
>+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
>+		if (window == null) {
>+			return null;
>+		}
>+		UpdateManagerUI.openInstaller(window.getShell());
>+		return null;
>+	}
>+
>+}
>Index: icons/elcl16/usearch_obj.gif
>===================================================================
>RCS file: icons/elcl16/usearch_obj.gif
>diff -N icons/elcl16/usearch_obj.gif
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ icons/elcl16/usearch_obj.gif	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+GIF89aæ°¥¬»µ¹³©°ª?§§¤«¨ÄÀÃ¶´´«²±§¯£«À»¿¾¹½§¥½¶¼¹²¸ÇÄÇÁ¾ÁÊÈÊêéêèçèçæèIm¡ÿÿÉÿÿþþýïþô?êà¤ûð³ûð´ýùáéÖsûéùéªôæ®ùÝzñÚúéªúé«ñÓsûÞùÓfúÚ}÷ßùÍ_õÕôÕ½õÔ±x¹ß½«p«qä¢9¦ké¯Wë²]_¹f§\öß¼ð¥;²?bÜÏ¾}V?}VoN?nM?oNrPrQÿÿÿÿÿÿ!ùI,§I//>E?;3/">8;$¡$2=%+?I/' ¯¯#1!+-EI4(,45()4&+.9>º½I7)7@Ä+0È4I:77BÆÔ:Fß:ë
>+CÉ6<Dõ?IP@¿Cÿ0(¼p¤ÁÁC.ÔPäá¡
>+1\Ð Âb¢?;
>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,29 @@
>+/*******************************************************************************
>+ * 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.IWorkbenchWindow;
>+import org.eclipse.ui.handlers.HandlerUtil;
>+import org.eclipse.update.ui.UpdateManagerUI;
>+
>+public class ManageConfigurationHandler extends AbstractHandler {
>+
>+	public Object execute(ExecutionEvent event) throws ExecutionException {
>+		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
>+		if (window == null) {
>+			return null;
>+		}
>+		UpdateManagerUI.openConfigurationManager(window.getShell());
>+		return null;
>+	}
>+
>+}
>#P org.eclipse.ui.ide
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/plugin.xml,v
>retrieving revision 1.263
>diff -u -r1.263 plugin.xml
>--- plugin.xml	25 Jan 2008 21:09:42 -0000	1.263
>+++ plugin.xml	8 Feb 2008 22:07:49 -0000
>@@ -791,20 +791,6 @@
>             categoryId="org.eclipse.ui.category.edit"
>             id="org.eclipse.ui.navigate.removeFromWorkingSet">
>       </command>
>-      <category
>-            description="%category.update.description"
>-            id="org.eclipse.ui.category.update"
>-            name="%category.update.name"/>
>-      <command
>-            categoryId="org.eclipse.ui.category.update"
>-            description="%command.manageConfiguration.description"
>-            id="org.eclipse.ui.update.manageConfiguration"
>-            name="%command.manageConfiguration.name"/>
>-      <command
>-            categoryId="org.eclipse.ui.category.update"
>-            description="%command.findAndInstallUpdates.description"
>-            id="org.eclipse.ui.update.findAndInstallUpdates"
>-            name="%command.findAndInstallUpdates.name"/>
>       <command
>             categoryId="org.eclipse.ui.category.navigate"
>             defaultHandler="org.eclipse.ui.internal.ide.handlers.ShowResourceByPathHandler"
>@@ -991,43 +977,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>
>@@ -2186,5 +2135,4 @@
>             type="org.eclipse.ui.internal.views.markers.ExtendedMarkersView">
>       </propertyTester>
>    </extension>
>-   
> </plugin>
>Index: plugin.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/plugin.properties,v
>retrieving revision 1.127
>diff -u -r1.127 plugin.properties
>--- plugin.properties	22 Jan 2008 18:20:25 -0000	1.127
>+++ plugin.properties	8 Feb 2008 22:07:48 -0000
>@@ -174,23 +174,11 @@
> command.newQuickMenu.name= New menu
> command.newQuickMenu.description= Open the New menu
> 
>-category.update.name= Update
>-category.update.description= Commands for Software Updates
>-command.manageConfiguration.name= Manage Configuration
>-command.manageConfiguration.description= Open the product configuration dialog
>-command.findAndInstallUpdates.name= Find and Install Updates
>-command.findAndInstallUpdates.description= Open the feature install and update dialog
>-
> commandParameter.openFileByPath.filePath.name= File Path
> command.showResourceByPath.name= Show Resource in Navigator
> 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...
>

Actions: View | Diff

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