Attachment 135775 Details for Bug 275996 – Alternate patch, keeps WorkbenchPlugin#getPreferenceManager intact

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

[patch] Alternate patch, keeps WorkbenchPlugin#getPreferenceManager intact

clipboard.txt (text/plain), 3.80 KB, created by Rüdiger Herrmann

on 2009-05-14 09:12:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-05-14 09:12:36 EDT

Size: 3.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java,v
>retrieving revision 1.17
>diff -u -r1.17 WorkbenchPlugin.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	12 May 2009 07:56:22 -0000	1.17
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	14 May 2009 13:12:16 -0000
>@@ -193,6 +193,29 @@
>     }
>   }
>   
>+// RAP [rh] session-singleton-wrapper for PreferenceManager
>+  private final static class PreferenceManagerStore extends SessionSingletonBase {
>+    private final WorkbenchPreferenceManager preferenceManager;
>+    
>+    static PreferenceManagerStore getInstance() {
>+      Class clazz = PreferenceManagerStore.class;
>+      return ( PreferenceManagerStore )getInstance( clazz );
>+    }
>+    
>+    public PreferenceManagerStore() {
>+// RAP [rh] PreferenceManager initialization code, copied from getPreferenceManager()
>+      preferenceManager = new WorkbenchPreferenceManager( PREFERENCE_PAGE_CATEGORY_SEPARATOR );
>+      // Get the pages from the registry
>+      PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader( PlatformUI.getWorkbench() );
>+      registryReader.loadFromRegistry( Platform.getExtensionRegistry() );
>+      preferenceManager.addPages( registryReader.getTopLevelNodes() );
>+    }
>+    
>+    public PreferenceManager getPreferenceManager() {
>+      return preferenceManager;
>+    }
>+  }
>+  
> 	// RAP [bm]:
> // /**
> // * Splash shell constant.
>@@ -263,7 +286,8 @@
>     public static char PREFERENCE_PAGE_CATEGORY_SEPARATOR = '/';
> 
>     // Other data.
>-    private WorkbenchPreferenceManager preferenceManager;
>+// RAP [rh] replaced with session-scoped one    
>+//    private WorkbenchPreferenceManager preferenceManager;
> 
>     // RAP [bm]: replaced with session scoped one
> //    private ViewRegistry viewRegistry;
>@@ -326,7 +350,8 @@
> // RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton    
> //        workingSetRegistry = null;
> 
>-        preferenceManager = null;
>+// RAP [rh] preferenceManager field is unused since replaced with session-singleton        
>+//        preferenceManager = null;
> 
>         // RAP [bm]: 
> //        if (viewRegistry != null) {
>@@ -801,19 +826,21 @@
>      * the receiver.
>      */
>     public PreferenceManager getPreferenceManager() {
>-        if (preferenceManager == null) {
>-            preferenceManager = new WorkbenchPreferenceManager(
>-                    PREFERENCE_PAGE_CATEGORY_SEPARATOR);
>-
>-            //Get the pages from the registry
>-            PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(
>-                    getWorkbench());
>-            registryReader
>-                    .loadFromRegistry(Platform.getExtensionRegistry());
>-            preferenceManager.addPages(registryReader.getTopLevelNodes());
>-           
>-        }
>-        return preferenceManager;
>+// RAP [rh] PreferenceManager must be a session-singleton
>+//        if (preferenceManager == null) {
>+//            preferenceManager = new WorkbenchPreferenceManager(
>+//                    PREFERENCE_PAGE_CATEGORY_SEPARATOR);
>+//
>+//            //Get the pages from the registry
>+//            PreferencePageRegistryReader registryReader = new PreferencePageRegistryReader(
>+//                    getWorkbench());
>+//            registryReader
>+//                    .loadFromRegistry(Platform.getExtensionRegistry());
>+//            preferenceManager.addPages(registryReader.getTopLevelNodes());
>+//           
>+//        }
>+//        return preferenceManager;
>+      return PreferenceManagerStore.getInstance().getPreferenceManager();
>     }
> 
>     /**

Actions: View | Diff

Attachments on bug 275996: 135488 | 135775