|
Lines 193-198
Link Here
|
| 193 |
} |
193 |
} |
| 194 |
} |
194 |
} |
| 195 |
|
195 |
|
|
|
196 |
// RAP [rh] session-singleton-wrapper for PreferenceManager |
| 197 |
private final static class PreferenceManagerStore extends SessionSingletonBase { |
| 198 |
private final WorkbenchPreferenceManager preferenceManager; |
| 199 |
|
| 200 |
static PreferenceManagerStore getInstance() { |
| 201 |
Class clazz = PreferenceManagerStore.class; |
| 202 |
return ( PreferenceManagerStore )getInstance( clazz ); |
| 203 |
} |
| 204 |
|
| 205 |
public PreferenceManagerStore() { |
| 206 |
// RAP [rh] PreferenceManager initialization code, copied from getPreferenceManager() |
| 207 |
preferenceManager = new WorkbenchPreferenceManager( PREFERENCE_PAGE_CATEGORY_SEPARATOR ); |
| 208 |
// Get the pages from the registry |
| 209 |
PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader( PlatformUI.getWorkbench() ); |
| 210 |
registryReader.loadFromRegistry( Platform.getExtensionRegistry() ); |
| 211 |
preferenceManager.addPages( registryReader.getTopLevelNodes() ); |
| 212 |
} |
| 213 |
|
| 214 |
public PreferenceManager getPreferenceManager() { |
| 215 |
return preferenceManager; |
| 216 |
} |
| 217 |
} |
| 218 |
|
| 196 |
// RAP [bm]: |
219 |
// RAP [bm]: |
| 197 |
// /** |
220 |
// /** |
| 198 |
// * Splash shell constant. |
221 |
// * Splash shell constant. |
|
Lines 263-269
Link Here
|
| 263 |
public static char PREFERENCE_PAGE_CATEGORY_SEPARATOR = '/'; |
286 |
public static char PREFERENCE_PAGE_CATEGORY_SEPARATOR = '/'; |
| 264 |
|
287 |
|
| 265 |
// Other data. |
288 |
// Other data. |
| 266 |
private WorkbenchPreferenceManager preferenceManager; |
289 |
// RAP [rh] replaced with session-scoped one |
|
|
290 |
// private WorkbenchPreferenceManager preferenceManager; |
| 267 |
|
291 |
|
| 268 |
// RAP [bm]: replaced with session scoped one |
292 |
// RAP [bm]: replaced with session scoped one |
| 269 |
// private ViewRegistry viewRegistry; |
293 |
// private ViewRegistry viewRegistry; |
|
Lines 326-332
Link Here
|
| 326 |
// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton |
350 |
// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton |
| 327 |
// workingSetRegistry = null; |
351 |
// workingSetRegistry = null; |
| 328 |
|
352 |
|
| 329 |
preferenceManager = null; |
353 |
// RAP [rh] preferenceManager field is unused since replaced with session-singleton |
|
|
354 |
// preferenceManager = null; |
| 330 |
|
355 |
|
| 331 |
// RAP [bm]: |
356 |
// RAP [bm]: |
| 332 |
// if (viewRegistry != null) { |
357 |
// if (viewRegistry != null) { |
|
Lines 801-819
Link Here
|
| 801 |
* the receiver. |
826 |
* the receiver. |
| 802 |
*/ |
827 |
*/ |
| 803 |
public PreferenceManager getPreferenceManager() { |
828 |
public PreferenceManager getPreferenceManager() { |
| 804 |
if (preferenceManager == null) { |
829 |
// RAP [rh] PreferenceManager must be a session-singleton |
| 805 |
preferenceManager = new WorkbenchPreferenceManager( |
830 |
// if (preferenceManager == null) { |
| 806 |
PREFERENCE_PAGE_CATEGORY_SEPARATOR); |
831 |
// preferenceManager = new WorkbenchPreferenceManager( |
| 807 |
|
832 |
// PREFERENCE_PAGE_CATEGORY_SEPARATOR); |
| 808 |
//Get the pages from the registry |
833 |
// |
| 809 |
PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader( |
834 |
// //Get the pages from the registry |
| 810 |
getWorkbench()); |
835 |
// PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader( |
| 811 |
registryReader |
836 |
// getWorkbench()); |
| 812 |
.loadFromRegistry(Platform.getExtensionRegistry()); |
837 |
// registryReader |
| 813 |
preferenceManager.addPages(registryReader.getTopLevelNodes()); |
838 |
// .loadFromRegistry(Platform.getExtensionRegistry()); |
| 814 |
|
839 |
// preferenceManager.addPages(registryReader.getTopLevelNodes()); |
| 815 |
} |
840 |
// |
| 816 |
return preferenceManager; |
841 |
// } |
|
|
842 |
// return preferenceManager; |
| 843 |
return PreferenceManagerStore.getInstance().getPreferenceManager(); |
| 817 |
} |
844 |
} |
| 818 |
|
845 |
|
| 819 |
/** |
846 |
/** |
