Attachment 150743 Details for Bug 293140 – Returns an ImageRegistry per session per plug-in

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

[patch] Returns an ImageRegistry per session per plug-in

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

on 2009-10-28 12:38:20 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-10-28 12:38:20 EDT

Size: 1.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java,v
>retrieving revision 1.5
>diff -u -r1.5 AbstractUIPlugin.java
>--- Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java	15 Sep 2009 09:07:20 -0000	1.5
>+++ Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java	28 Oct 2009 16:40:08 -0000
>@@ -257,21 +257,23 @@
>      * @return the image registry
>      */
>     public ImageRegistry getImageRegistry() {
>-		// RAP [bm]: needs session scope
>+		// RAP [rh]: there is one imageRegistry per plug-in per session
> //        if (imageRegistry == null) {
> //            imageRegistry = createImageRegistry();
> //            initializeImageRegistry(imageRegistry);
> //        }
> //        return imageRegistry;
>-    	String IMAGE_REGISTRY = AbstractUIPlugin.class.getName() + ".imageRegistry";
>-        ImageRegistry imageRegistry = ( ImageRegistry )RWT.getSessionStore().getAttribute( IMAGE_REGISTRY  );
>+    	  String imageRegistryKey
>+    	    = AbstractUIPlugin.class.getName()
>+    	    + ".imageRegistry-"
>+    	    + RWT.getSessionStore().getId();
>+        ImageRegistry imageRegistry = ( ImageRegistry )RWT.getSessionStore().getAttribute( imageRegistryKey  );
>         if( imageRegistry == null ) {
>           imageRegistry = createImageRegistry();
>           initializeImageRegistry( imageRegistry );
>-          RWT.getSessionStore().setAttribute( IMAGE_REGISTRY, imageRegistry );
>+          RWT.getSessionStore().setAttribute( imageRegistryKey, imageRegistry );
>         }
>         return imageRegistry;
>-        // RAPEND: [bm]
>     }
> 
>     /**

Actions: View | Diff

Attachments on bug 293140: 150743