Attachment #88782 for bug #215914

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




            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"


<!-- Update Actions -->
   <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>

            type="org.eclipse.ui.internal.views.markers.ExtendedMarkersView">
      </propertyTester>
   </extension>
   
</plugin>




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...





            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="%UpdateActionSet.menu.label">
               <command
                     commandId="org.eclipse.ui.update.findAndInstallUpdates"
                     helpContextId="org.eclipse.update.ui.newUpdates"
                     icon="icons/elcl16/usearch_obj.gif"
                     label="%UpdateActionSet.updates.label"
                     style="push">
               </command>
               <command
                     commandId="org.eclipse.ui.update.manageConfiguration"
                     helpContextId="org.eclipse.update.ui.newUpdates"
                     icon="icons/elcl16/configs.gif"
                     label="%UpdateActionSet.configManager.label"
                     style="push">
               </command>
               <visibleWhen
                     checkEnabled="false">
                  <and>
                     <with
                           variable="activePart">
                        <instanceof
                              value="org.eclipse.ui.IWorkbenchPart">
                        </instanceof>
                     </with>
                     <with
                           variable="activeWorkbenchWindow">
                        <test
                              forcePluginActivation="true"
                              property="org.eclipse.ui.update.oldUpdate"
                              value="true">
                        </test>
                     </with>
                  </and>
               </visibleWhen>
       </menu>
       </menuContribution>
      </extension>
   <extension
         point="org.eclipse.core.expressions.propertyTesters">
      <propertyTester
            class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.UseOldUpdateManagerTester"
            id="org.eclipse.ui.update.oldUpdateTester"
            namespace="org.eclipse.ui.update"
            properties="oldUpdate"
            type="java.lang.Object">
      </propertyTester>
   </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>




actionSets.configManager.label = &Manage Configuration...
actionSets.webSites.label = &Update Sites (experimental)

UpdateActionSet.label = Software Updates
UpdateActionSet.menu.label = &Software Updates
UpdateActionSet.updates.label = &Find and Install...
UpdateActionSet.configManager.label = &Manage Configuration

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 \

Lines 19-25 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
19	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",	19	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
20	org.eclipse.update.core;bundle-version="[3.1.0,4.0.0)",	20	org.eclipse.update.core;bundle-version="[3.1.0,4.0.0)",
21	org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)",	21	org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)",
22	org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"	22	org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
		23	org.eclipse.equinox.p2.ui.sdk;bundle-version="0.1.0";resolution:=optional
23	Eclipse-LazyStart: true	24	Eclipse-LazyStart: true
24	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	25	Bundle-RequiredExecutionEnvironment: J2SE-1.4,
25	CDC-1.0/Foundation-1.0,	26	CDC-1.0/Foundation-1.0,

Added Link Here

(-)icons/elcl16/configs.gif (+5 lines)
1	GIF89aÕ??_M`{Iáêöèîö®¹Æãìöåíöçîö?¿àëöâìöäíöèïöòôöXuçïöëñöäîöíòöïóöN?½ñôö_¿óõö¿¿ÅÜÛÙàÜ¿ß¿ÒÕËáêºéì¿¿¿òìÆúîËÿîÎÿÿÿ!ù$,?@pH,?F@a£I<*?ËÆX@N I\À(PÀ0Nà;Ô"2Èât§Â§²n(l$UCVoVC
2	?C KCz¶v xBv
3
4
5	j§ Z\^HOQ¼HÓA;




/*******************************************************************************
 * 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;
	}

}

Added Link Here

(-)icons/elcl16/usearch_obj.gif (+3 lines)
1	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ß:ë
2	CÉ6<Dõ?IP@¿Cÿ0(¼p¤ÁÁC.ÔPäá¡
3	1\Ð Âb¢?;




/*******************************************************************************
 * 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;
	}

}

Lines 95-97 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties (+1 lines)
95	ProvisioningPreferencePage_enableGC=Automatically delete unused files	95	ProvisioningPreferencePage_enableGC=Automatically delete unused files
96	ProvisioningPreferencePage_gcImmediately=Delete unused files immediately	96	ProvisioningPreferencePage_gcImmediately=Delete unused files immediately
97	ProvisioningPreferencePage_gcRetentionTime=Keep unused files for ???	97	ProvisioningPreferencePage_gcRetentionTime=Keep unused files for ???
		98	ProvisioningPreferencePage_oldUpdateUI=Use update manager interface

Lines 108-113 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKMessages.java (+1 lines)
108	public static String ProvisioningPreferencePage_enableGC;	108	public static String ProvisioningPreferencePage_enableGC;
109	public static String ProvisioningPreferencePage_gcImmediately;	109	public static String ProvisioningPreferencePage_gcImmediately;
110	public static String ProvisioningPreferencePage_gcRetentionTime;	110	public static String ProvisioningPreferencePage_gcRetentionTime;
		111	public static String ProvisioningPreferencePage_oldUpdateUI;
111	public static String ProvSDKUIActivator_ErrorWritingLicenseRegistry;	112	public static String ProvSDKUIActivator_ErrorWritingLicenseRegistry;
112	public static String ProvSDKUIActivator_LicenseManagerReadError;	113	public static String ProvSDKUIActivator_LicenseManagerReadError;
113	public static String ProvSDKUIActivator_NoSelfProfile;	114	public static String ProvSDKUIActivator_NoSelfProfile;

Lines 18-23 Link Here

(-)plugin.properties (+3 lines)
18	IU.copyright=Copyright	18	IU.copyright=Copyright
19	Repository.name=General Information	19	Repository.name=General Information
20	Update.command=Software Updates (Incubation)...	20	Update.command=Software Updates (Incubation)...
		21	OldUpdate.menu=Software Updates
		22	OldUpdate.FindAndInstall.command=Find and Install...
		23	OldUpdate.ManageConfiguration.command=Manage Configuration
21	automaticUpdatesPrefPage = Automatic Updates	24	automaticUpdatesPrefPage = Automatic Updates
22	provisioningPrefPage = Install/Update	25	provisioningPrefPage = Install/Update
23	preferenceKeywords.general=automatic update schedule download software install	26	preferenceKeywords.general=automatic update schedule download software install

Lines 34-39 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ProvisioningPreferencePage.java (+9 lines)
34	// private Button garbageCollectorCheck;	34	// private Button garbageCollectorCheck;
35	// private Button deleteImmediatelyRadio, scheduleRadio;	35	// private Button deleteImmediatelyRadio, scheduleRadio;
36	private Button showLatestRadio, showAllRadio;	36	private Button showLatestRadio, showAllRadio;
		37	private Button oldUpdateUICheck;
37		38
38	// private static final int INDENT = 30;	39	// private static final int INDENT = 30;
39		40
Lines 108-113 Link Here
108	}	109	}
109	});	110	});
110	*/	111	*/
		112	oldUpdateUICheck = new Button(container, SWT.CHECK);
		113	oldUpdateUICheck.setText(ProvSDKMessages.ProvisioningPreferencePage_oldUpdateUI);
		114	gd = new GridData();
		115	gd.horizontalSpan = 2;
		116	oldUpdateUICheck.setLayoutData(gd);
111		117
112	initialize();	118	initialize();
113		119
Lines 123-128 Link Here
123	// deleteImmediatelyRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_GC_IMMEDIATELY));	129	// deleteImmediatelyRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_GC_IMMEDIATELY));
124	showLatestRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));	130	showLatestRadio.setSelection(pref.getBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));
125	showAllRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));	131	showAllRadio.setSelection(!pref.getBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));
		132	oldUpdateUICheck.setSelection(pref.getBoolean(PreferenceConstants.PREF_OLD_UPDATE_MANAGER));
126	}	133	}
127		134
128	protected void performDefaults() {	135	protected void performDefaults() {
Lines 133-138 Link Here
133	// scheduleRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_GC_IMMEDIATELY));	140	// scheduleRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_GC_IMMEDIATELY));
134	showLatestRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));	141	showLatestRadio.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));
135	showAllRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));	142	showAllRadio.setSelection(!pref.getDefaultBoolean(PreferenceConstants.PREF_SHOW_LATEST_VERSION));
		143	oldUpdateUICheck.setSelection(pref.getDefaultBoolean(PreferenceConstants.PREF_OLD_UPDATE_MANAGER));
136	}	144	}
137		145
138	public boolean performOk() {	146	public boolean performOk() {
Lines 140-145 Link Here
140	// pref.setValue(PreferenceConstants.PREF_ENABLE_GC, garbageCollectorCheck.getSelection());	148	// pref.setValue(PreferenceConstants.PREF_ENABLE_GC, garbageCollectorCheck.getSelection());
141	pref.setValue(PreferenceConstants.PREF_SHOW_LATEST_VERSION, showLatestRadio.getSelection());	149	pref.setValue(PreferenceConstants.PREF_SHOW_LATEST_VERSION, showLatestRadio.getSelection());
142	// pref.setValue(PreferenceConstants.PREF_GC_IMMEDIATELY, deleteImmediatelyRadio.getSelection());	150	// pref.setValue(PreferenceConstants.PREF_GC_IMMEDIATELY, deleteImmediatelyRadio.getSelection());
		151	pref.setValue(PreferenceConstants.PREF_OLD_UPDATE_MANAGER, oldUpdateUICheck.getSelection());
143	ProvSDKUIActivator.getDefault().savePluginPreferences();	152	ProvSDKUIActivator.getDefault().savePluginPreferences();
144	return true;	153	return true;
145	}	154	}

Lines 26-29 Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/PreferenceConstants.java (+1 lines)
26	public static final String PREF_SHOW_LATEST_VERSION = "showLatestVersion"; //$NON-NLS-1$	26	public static final String PREF_SHOW_LATEST_VERSION = "showLatestVersion"; //$NON-NLS-1$
27	public static final String PREF_ENABLE_GC = "enableArtifactGC"; //$NON-NLS-1$	27	public static final String PREF_ENABLE_GC = "enableArtifactGC"; //$NON-NLS-1$
28	public static final String PREF_GC_IMMEDIATELY = "gcUnusedFilesImmediately"; //$NON-NLS-1$	28	public static final String PREF_GC_IMMEDIATELY = "gcUnusedFilesImmediately"; //$NON-NLS-1$
		29	public static final String PREF_OLD_UPDATE_MANAGER = "enableUpdateManagerUI"; //$NON-NLS-1$
29	}	30	}

Lines 34-40 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
34	org.eclipse.equinox.internal.p2.ui.sdk.updates;x-internal:=true,	34	org.eclipse.equinox.internal.p2.ui.sdk.updates;x-internal:=true,
35	org.eclipse.equinox.p2.ui.sdk	35	org.eclipse.equinox.p2.ui.sdk
36	Require-Bundle: org.eclipse.ui,	36	Require-Bundle: org.eclipse.ui,
37	org.eclipse.core.runtime	37	org.eclipse.core.runtime,
		38	org.eclipse.core.expressions
38	Eclipse-LazyStart: true	39	Eclipse-LazyStart: true
39	Bundle-RequiredExecutionEnvironment: J2SE-1.4,	40	Bundle-RequiredExecutionEnvironment: J2SE-1.4,
40	CDC-1.1/Foundation-1.1	41	CDC-1.1/Foundation-1.1




package org.eclipse.equinox.internal.p2.ui.sdk.prefs;

import org.eclipse.core.expressions.PropertyTester;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator;

public class UseOldUpdateManagerTester extends PropertyTester {

	private static final String OLD_UPDATE = "oldUpdate"; //$NON-NLS-1$

	public UseOldUpdateManagerTester() {
		super();
	}

	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
		if (property.equals(OLD_UPDATE)) {
			Preferences pref = ProvSDKUIActivator.getDefault().getPluginPreferences();
			return pref.getBoolean(PreferenceConstants.PREF_OLD_UPDATE_MANAGER);
		}
		return false;
	}

}

Return to bug 215914

Lines 791-810 Link Here

(-)plugin.xml (-52 lines)
791	categoryId="org.eclipse.ui.category.edit"	791	categoryId="org.eclipse.ui.category.edit"
792	id="org.eclipse.ui.navigate.removeFromWorkingSet">	792	id="org.eclipse.ui.navigate.removeFromWorkingSet">
793	</command>	793	</command>
794	<category
795	description="%category.update.description"
796	id="org.eclipse.ui.category.update"
797	name="%category.update.name"/>
798	<command
799	categoryId="org.eclipse.ui.category.update"
800	description="%command.manageConfiguration.description"
801	id="org.eclipse.ui.update.manageConfiguration"
802	name="%command.manageConfiguration.name"/>
803	<command
804	categoryId="org.eclipse.ui.category.update"
805	description="%command.findAndInstallUpdates.description"
806	id="org.eclipse.ui.update.findAndInstallUpdates"
807	name="%command.findAndInstallUpdates.name"/>
808	<command	794	<command
809	categoryId="org.eclipse.ui.category.navigate"	795	categoryId="org.eclipse.ui.category.navigate"
810	defaultHandler="org.eclipse.ui.internal.ide.handlers.ShowResourceByPathHandler"	796	defaultHandler="org.eclipse.ui.internal.ide.handlers.ShowResourceByPathHandler"
Lines 991-1033 Link Here
991		977
992	<!-- Update Actions -->	978	<!-- Update Actions -->
993	<extension	979	<extension
994	point="org.eclipse.ui.actionSets">
995	<actionSet
996	label="%UpdateActionSet.label"
997	visible="true"
998	id="org.eclipse.update.ui.softwareUpdates">
999	<menu
1000	label="%UpdateActionSet.menu.label"
1001	path="help/group.updates"
1002	id="org.eclipse.update.ui.updateMenu">
1003	<separator
1004	name="group0">
1005	</separator>
1006	<separator
1007	name="group1">
1008	</separator>
1009	</menu>
1010	<action
1011	class="org.eclipse.ui.internal.ide.update.ConfigurationManagerAction"
1012	definitionId="org.eclipse.ui.update.manageConfiguration"
1013	helpContextId="org.eclipse.update.ui.newUpdates"
1014	icon="$nl$/icons/full/elcl16/configs.gif"
1015	id="org.eclipse.update.ui.configManager"
1016	label="%UpdateActionSet.configManager.label"
1017	menubarPath="help/org.eclipse.update.ui.updateMenu/group0">
1018	</action>
1019	<action
1020	class="org.eclipse.ui.internal.ide.update.InstallWizardAction"
1021	definitionId="org.eclipse.ui.update.findAndInstallUpdates"
1022	helpContextId="org.eclipse.update.ui.newUpdates"
1023	icon="$nl$/icons/full/elcl16/usearch_obj.gif"
1024	id="org.eclipse.update.ui.newUpdates"
1025	label="%UpdateActionSet.updates.label"
1026	menubarPath="help/org.eclipse.update.ui.updateMenu/group0">
1027	</action>
1028	</actionSet>
1029	</extension>
1030	<extension
1031	point="org.eclipse.core.runtime.preferences">	980	point="org.eclipse.core.runtime.preferences">
1032	<initializer class="org.eclipse.ui.internal.ide.IDEPreferenceInitializer"/>	981	<initializer class="org.eclipse.ui.internal.ide.IDEPreferenceInitializer"/>
1033	</extension>	982	</extension>
Lines 2186-2190 Link Here
2186	type="org.eclipse.ui.internal.views.markers.ExtendedMarkersView">	2135	type="org.eclipse.ui.internal.views.markers.ExtendedMarkersView">
2187	</propertyTester>	2136	</propertyTester>
2188	</extension>	2137	</extension>
2189
2190	</plugin>	2138	</plugin>

Lines 174-196 Link Here

(-)plugin.properties (-12 lines)
174	command.newQuickMenu.name= New menu	174	command.newQuickMenu.name= New menu
175	command.newQuickMenu.description= Open the New menu	175	command.newQuickMenu.description= Open the New menu
176		176
177	category.update.name= Update
178	category.update.description= Commands for Software Updates
179	command.manageConfiguration.name= Manage Configuration
180	command.manageConfiguration.description= Open the product configuration dialog
181	command.findAndInstallUpdates.name= Find and Install Updates
182	command.findAndInstallUpdates.description= Open the feature install and update dialog
183
184	commandParameter.openFileByPath.filePath.name= File Path	177	commandParameter.openFileByPath.filePath.name= File Path
185	command.showResourceByPath.name= Show Resource in Navigator	178	command.showResourceByPath.name= Show Resource in Navigator
186	command.showResourceByPath.description= Show a resource in the Navigator given its path	179	command.showResourceByPath.description= Show a resource in the Navigator given its path
187	commandParameter.showResourceByPath.resourcePath.name= Resource Path	180	commandParameter.showResourceByPath.resourcePath.name= Resource Path
188		181
189	UpdateActionSet.label = Software Updates
190	UpdateActionSet.menu.label = &Software Updates
191	UpdateActionSet.updates.label = &Find and Install...
192	UpdateActionSet.configManager.label = &Manage Configuration
193
194	KeyBindingActionSet.label = Keyboard Shortcuts	182	KeyBindingActionSet.label = Keyboard Shortcuts
195	KeyBindingActionSet.showKeyAssist.label = &Key Assist...	183	KeyBindingActionSet.showKeyAssist.label = &Key Assist...
196		184

Lines 57-60 Link Here

(-)plugin.xml (+80 lines)
57	label="%preferenceKeywords.general"	57	label="%preferenceKeywords.general"
58	id="org.eclipse.update.ui.general"/>	58	id="org.eclipse.update.ui.general"/>
59	</extension>	59	</extension>
		60	<extension
		61	point="org.eclipse.ui.commands">
		62	<command
		63	categoryId="org.eclipse.ui.category.update"
		64	description="%command.manageConfiguration.description"
		65	id="org.eclipse.ui.update.manageConfiguration"
		66	name="%command.manageConfiguration.name"/>
		67	<command
		68	categoryId="org.eclipse.ui.category.update"
		69	description="%command.findAndInstallUpdates.description"
		70	id="org.eclipse.ui.update.findAndInstallUpdates"
		71	name="%command.findAndInstallUpdates.name"/>
		72	<category
		73	description="%category.update.description"
		74	id="org.eclipse.ui.category.update"
		75	name="%category.update.name">
		76	</category>
		77	</extension>
		78	<extension
		79	point="org.eclipse.ui.menus">
		80	<menuContribution
		81	locationURI="menu:help?after=additions">
		82	<menu label="%UpdateActionSet.menu.label">
		83	<command
		84	commandId="org.eclipse.ui.update.findAndInstallUpdates"
		85	helpContextId="org.eclipse.update.ui.newUpdates"
		86	icon="icons/elcl16/usearch_obj.gif"
		87	label="%UpdateActionSet.updates.label"
		88	style="push">
		89	</command>
		90	<command
		91	commandId="org.eclipse.ui.update.manageConfiguration"
		92	helpContextId="org.eclipse.update.ui.newUpdates"
		93	icon="icons/elcl16/configs.gif"
		94	label="%UpdateActionSet.configManager.label"
		95	style="push">
		96	</command>
		97	<visibleWhen
		98	checkEnabled="false">
		99	<and>
		100	<with
		101	variable="activePart">
		102	<instanceof
		103	value="org.eclipse.ui.IWorkbenchPart">
		104	</instanceof>
		105	</with>
		106	<with
		107	variable="activeWorkbenchWindow">
		108	<test
		109	forcePluginActivation="true"
		110	property="org.eclipse.ui.update.oldUpdate"
		111	value="true">
		112	</test>
		113	</with>
		114	</and>
		115	</visibleWhen>
		116	</menu>
		117	</menuContribution>
		118	</extension>
		119	<extension
		120	point="org.eclipse.core.expressions.propertyTesters">
		121	<propertyTester
		122	class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.UseOldUpdateManagerTester"
		123	id="org.eclipse.ui.update.oldUpdateTester"
124	namespace="org.eclipse.ui.update"
125	properties="oldUpdate"
126	type="java.lang.Object">
127	</propertyTester>
128	</extension>
129	<extension
130	point="org.eclipse.ui.handlers">
131	<handler
132	class="org.eclipse.update.internal.ui.views.ManageConfigurationHandler"
133	commandId="org.eclipse.ui.update.manageConfiguration">
134	</handler>
135	<handler
136	class="org.eclipse.update.internal.ui.views.FindAndInstallHandler"
137	commandId="org.eclipse.ui.update.findAndInstallUpdates">
138	</handler>
139	</extension>
60	</plugin>	140	</plugin>

Lines 21-26 Link Here

(-)plugin.properties (+13 lines)
21	actionSets.configManager.label = &Manage Configuration...	21	actionSets.configManager.label = &Manage Configuration...
22	actionSets.webSites.label = &Update Sites (experimental)	22	actionSets.webSites.label = &Update Sites (experimental)
23		23
		24	UpdateActionSet.label = Software Updates
		25	UpdateActionSet.menu.label = &Software Updates
		26	UpdateActionSet.updates.label = &Find and Install...
		27	UpdateActionSet.configManager.label = &Manage Configuration
		28
		29	command.manageConfiguration.name= Manage Configuration
		30	command.manageConfiguration.description= Open the product configuration dialog
		31	command.findAndInstallUpdates.name= Find and Install Updates
		32	command.findAndInstallUpdates.description= Open the feature install and update dialog
		33
		34	category.update.name= Update
		35	category.update.description= Commands for Software Updates
		36
24	searchCategory.name = Search Category	37	searchCategory.name = Search Category
25	searchCategories.updates = Available Updates	38	searchCategories.updates = Available Updates
26	searchCategories.updates.desc = <form><p>Search for updates to \	39	searchCategories.updates.desc = <form><p>Search for updates to \

Added Link Here

(-)src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java (+32 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.update.internal.ui.views;
12
13	import org.eclipse.core.commands.*;
14	import org.eclipse.ui.IWorkbenchWindow;
15	import org.eclipse.ui.handlers.HandlerUtil;
16	import org.eclipse.update.ui.UpdateManagerUI;
17
18	/**
19	*
20	*/
21	public class FindAndInstallHandler extends AbstractHandler {
22
23	public Object execute(ExecutionEvent event) throws ExecutionException {
24	IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
25	if (window == null) {
26	return null;
27	}
28	UpdateManagerUI.openInstaller(window.getShell());
29	return null;
30	}
31
32	}

Added Link Here

(-)src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/UseOldUpdateManagerTester.java (+23 lines)
1	package org.eclipse.equinox.internal.p2.ui.sdk.prefs;
2
3	import org.eclipse.core.expressions.PropertyTester;
4	import org.eclipse.core.runtime.Preferences;
5	import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator;
6
7	public class UseOldUpdateManagerTester extends PropertyTester {
8
9	private static final String OLD_UPDATE = "oldUpdate"; //$NON-NLS-1$
10
11	public UseOldUpdateManagerTester() {
12	super();
13	}
14
15	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
16	if (property.equals(OLD_UPDATE)) {
17	Preferences pref = ProvSDKUIActivator.getDefault().getPluginPreferences();
18	return pref.getBoolean(PreferenceConstants.PREF_OLD_UPDATE_MANAGER);
19	}
20	return false;
21	}
22
23	}