Attachment 188034 Details for Bug 335840 – Proposed patch

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

[patch] Proposed patch

Bug-335840.patch (text/plain), 3.51 KB, created by Ivan Furnadjiev

on 2011-02-01 04:56:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-02-01 04:56:35 EST

Size: 3.51 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.25
>diff -u -r1.25 WorkbenchPlugin.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	28 Dec 2010 14:47:59 -0000	1.25
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	1 Feb 2011 09:50:38 -0000
>@@ -303,7 +303,8 @@
> // RAP [rh] PerspectiveRegistry has session scope    
> //    private PerspectiveRegistry perspRegistry;
> 
>-    private ActionSetRegistry actionSetRegistry;
>+// RAP [if] ActionSetRegistry has session scope 
>+//    private ActionSetRegistry actionSetRegistry;
> 
>     private SharedImages sharedImages;
> 
>@@ -376,7 +377,8 @@
> //            perspRegistry = null;
> //        }
>         
>-        actionSetRegistry = null;
>+// RAP [if] actionSetRegistry field is unused, ActionsetRegistry has session scope 
>+//        actionSetRegistry = null;
>         sharedImages = null;
> 
>         productInfo = null;
>@@ -579,10 +581,13 @@
>      * @return the workbench action set registry
>      */
>     public ActionSetRegistry getActionSetRegistry() {
>-        if (actionSetRegistry == null) {
>-            actionSetRegistry = new ActionSetRegistry();
>-        }
>-        return actionSetRegistry;
>+        // RAP [if]
>+//        if (actionSetRegistry == null) {
>+//            actionSetRegistry = new ActionSetRegistry();
>+//        }
>+//        return actionSetRegistry;
>+        return ActionSetRegistry.getInstance();
>+        // RAPEND: [if]
>     }
> 
>     /**
>Index: Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java,v
>retrieving revision 1.2
>diff -u -r1.2 ActionSetRegistry.java
>--- Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java	21 Apr 2008 10:05:12 -0000	1.2
>+++ Eclipse UI/org/eclipse/ui/internal/registry/ActionSetRegistry.java	1 Feb 2011 09:50:38 -0000
>@@ -24,6 +24,7 @@
> import org.eclipse.core.runtime.dynamichelpers.ExtensionTracker;
> import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler;
> import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
>+import org.eclipse.rwt.SessionSingletonBase;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.contexts.IContextService;
> import org.eclipse.ui.internal.WorkbenchPlugin;
>@@ -61,7 +62,10 @@
>     /**
>      * Creates the action set registry.
>      */
>-    public ActionSetRegistry() {
>+	// RAP [if]: see getInstance
>+//    public ActionSetRegistry() {
>+	private ActionSetRegistry() {
>+    // RAPEND: [if] 
>     	contextService = (IContextService) PlatformUI
> 				.getWorkbench().getService(IContextService.class);
> 		PlatformUI.getWorkbench().getExtensionTracker().registerHandler(
>@@ -72,6 +76,16 @@
>                                 getActionSetPartAssociationExtensionPoint() }));
>         readFromRegistry();
>     }
>+	
>+	// RAP [if]: 
>+    /**
>+     * Returns a session scoped ActionSetRegistry
>+     * @return
>+     */
>+    public static ActionSetRegistry getInstance() {
>+        return ( ActionSetRegistry )SessionSingletonBase.getInstance( ActionSetRegistry.class );  
>+    }
>+    // RAPEND: [if]
> 
>     /**
>      * Return the action set part association extension point.

Actions: View | Diff

Attachments on bug 335840: 188034