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 215914 | Differences between
and this patch

Collapse All | Expand All

(-)plugin.xml (+28 lines)
Lines 105-109 Link Here
105
            </command>
105
            </command>
106
      </menuContribution>
106
      </menuContribution>
107
   </extension>
107
   </extension>
108
   <extension
109
         point="org.eclipse.ui.activities">
110
      <activity
111
            description="Enables classic update functionality"
112
            id="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
113
            name="Classic Update">
114
      </activity>
115
      <activityPatternBinding
116
            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
117
            isEqualityPattern="false"
118
            pattern=".*org\.eclipse\.update\.ui.*">
119
      </activityPatternBinding>
120
      <category
121
            description="Enables classic update functionality"
122
            id="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate"
123
            name="Classic Update">
124
      </category>
125
      <categoryActivityBinding
126
            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
127
            categoryId="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate">
128
      </categoryActivityBinding>
129
   </extension>
130
   <extension
131
         point="org.eclipse.core.runtime.preferences">
132
      <initializer
133
            class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.ClassicUpdateInitializer">
134
      </initializer>
135
   </extension>
108
136
109
</plugin>
137
</plugin>
(-)src/org/eclipse/equinox/internal/p2/ui/sdk/prefs/ClassicUpdateInitializer.java (+38 lines)
Added Link Here
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.equinox.internal.p2.ui.sdk.prefs;
12
13
import java.util.HashSet;
14
import java.util.Set;
15
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
16
import org.eclipse.ui.IWorkbench;
17
import org.eclipse.ui.PlatformUI;
18
import org.eclipse.ui.activities.IMutableActivityManager;
19
import org.eclipse.ui.activities.IWorkbenchActivitySupport;
20
21
public class ClassicUpdateInitializer extends AbstractPreferenceInitializer {
22
23
	private static final String ACTIVITY_ID = "org.eclipse.equinox.p2.ui.sdk.classicUpdate"; //$NON-NLS-1$
24
25
	public void initializeDefaultPreferences() {
26
		IWorkbench workbench = PlatformUI.getWorkbench();
27
		if (workbench == null) {
28
			return;
29
		}
30
		IWorkbenchActivitySupport activitySupport = workbench.getActivitySupport();
31
		IMutableActivityManager createWorkingCopy = activitySupport.createWorkingCopy();
32
		Set activityIds = createWorkingCopy.getEnabledActivityIds();
33
		Set enabledActivityIds = new HashSet(activityIds);
34
		enabledActivityIds.remove(ACTIVITY_ID);
35
		activitySupport.setEnabledActivityIds(enabledActivityIds);
36
	}
37
38
}
(-)plugin.xml (+51 lines)
Lines 57-60 Link Here
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="%updateMenu.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="%actionSets.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="%actionSets.configManager.label"
95
                     style="push">
96
               </command>
97
       </menu>
98
       </menuContribution>
99
      </extension>
100
   <extension
101
         point="org.eclipse.ui.handlers">
102
      <handler
103
            class="org.eclipse.update.internal.ui.views.ManageConfigurationHandler"
104
            commandId="org.eclipse.ui.update.manageConfiguration">
105
      </handler>
106
      <handler
107
            class="org.eclipse.update.internal.ui.views.FindAndInstallHandler"
108
            commandId="org.eclipse.ui.update.findAndInstallUpdates">
109
      </handler>
110
   </extension>
60
</plugin>
111
</plugin>
(-)plugin.properties (+9 lines)
Lines 21-26 Link Here
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
command.manageConfiguration.name= Manage Configuration
25
command.manageConfiguration.description= Open the product configuration dialog
26
command.findAndInstallUpdates.name= Find and Install Updates
27
command.findAndInstallUpdates.description= Open the feature install and update dialog
28
29
category.update.name= Update
30
category.update.description= Commands for Software Updates
31
24
searchCategory.name = Search Category
32
searchCategory.name = Search Category
25
searchCategories.updates = Available Updates
33
searchCategories.updates = Available Updates
26
searchCategories.updates.desc = <form><p>Search for updates to \
34
searchCategories.updates.desc = <form><p>Search for updates to \
Lines 44-49 Link Here
44
were not found in this application.</p></form>
52
were not found in this application.</p></form>
45
53
46
mainPreference.name = Install/Update
54
mainPreference.name = Install/Update
55
updateManagerPreference.name = Update Manager Install/Updates
47
56
48
properties.general-info.label = General Information
57
properties.general-info.label = General Information
49
properties.license.label = License Agreement
58
properties.license.label = License Agreement
(-)icons/elcl16/configs.gif (+5 lines)
Added Link Here
1
GIF89aÕ??_M`{I„áêöèîö®¹Æãìöåíöçîö?¿àëöâìöäíöèïöòôöXu‘çïöëñöäîöíòöïóöN?½ñôö_Ÿ¿óõöŸ¿¿ÅÜÛÙàܿ߿ÒÕËáêºéì¿¿¿ŸòìÆúîËÿîÎÿÿÿ!ù$,?@’pH,?F@a£I<*?ËÆX@œN “I\Š›À(PÀ0Nà;Ԁ"2Èât§Â§²n(€l$UCVoVC…—
2
?C K‚Cz¶v	xBv
3
4
5
jƒ§	Z\^HOQ¼HÓA;
(-)src/org/eclipse/update/internal/ui/views/FindAndInstallHandler.java (+32 lines)
Added Link Here
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
}
(-)icons/elcl16/usearch_obj.gif (+3 lines)
Added Link Here
1
GIF89aæ°¥¬»µ¹³©°ª?§§š¤«Ÿ¨ÄÀö­´´«²±§¯­£«À»¿¾¹½§›¥½¶¼¹²¸ÇÄÇÁ¾ÁÊÈÊêéêèçèçæèIm¡ÿÿÉÿÿþþýïþô?êà¤ûð³ûð´ýùáéÖsûéžùéªôæ®ùÝzñڃúéªúé«ñÓsûޅùÓfúÚ}÷ߞùÍ_õՑôՒ½„õԑ±x¹ß½«p«qä¢9¦ké¯Wë²]­Ž_¹˜f§ˆ\öß¼ð¥;²?bÜϾž}V?}V‘oN?nM?oN“rP“rQÿÿÿÿÿÿ!ù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¢?;
(-)src/org/eclipse/update/internal/ui/views/ManageConfigurationHandler.java (+29 lines)
Added Link Here
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
public class ManageConfigurationHandler extends AbstractHandler {
19
20
	public Object execute(ExecutionEvent event) throws ExecutionException {
21
		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
22
		if (window == null) {
23
			return null;
24
		}
25
		UpdateManagerUI.openConfigurationManager(window.getShell());
26
		return null;
27
	}
28
29
}
(-)plugin.xml (-52 lines)
Lines 791-810 Link Here
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>
(-)plugin.properties (-12 lines)
Lines 174-196 Link Here
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

Return to bug 215914