Attachment 147167 Details for Bug 281852 – patch

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

[patch] patch

clipboard.txt (text/plain), 2.87 KB, created by Benjamin Muskalla

on 2009-09-15 05:04:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Muskalla

Created: 2009-09-15 05:04:41 EDT

Size: 2.87 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.4
>diff -u -r1.4 AbstractUIPlugin.java
>--- Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java	11 Sep 2009 08:37:47 -0000	1.4
>+++ Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java	15 Sep 2009 09:07:05 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.resource.ImageRegistry;
> import org.eclipse.rap.ui.internal.preferences.SessionScope;
>+import org.eclipse.rwt.RWT;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.SWTError;
> import org.eclipse.swt.widgets.Display;
>@@ -133,11 +134,12 @@
>      */
>     private ScopedPreferenceStore preferenceStore;
> 
>-    /**
>-     * The registry for all graphic images; <code>null</code> if not yet
>-     * initialized.
>-     */
>-    private ImageRegistry imageRegistry = null;
>+    // RAP [bm]: replaced with session-specific one
>+//    /**
>+//     * The registry for all graphic images; <code>null</code> if not yet
>+//     * initialized.
>+//     */
>+//    private ImageRegistry imageRegistry = null;
> 
>     /**
>      * The bundle listener used for kicking off refreshPluginActions().
>@@ -255,11 +257,21 @@
>      * @return the image registry
>      */
>     public ImageRegistry getImageRegistry() {
>-        if (imageRegistry == null) {
>-            imageRegistry = createImageRegistry();
>-            initializeImageRegistry(imageRegistry);
>+		// RAP [bm]: needs session scope
>+//        if (imageRegistry == null) {
>+//            imageRegistry = createImageRegistry();
>+//            initializeImageRegistry(imageRegistry);
>+//        }
>+//        return imageRegistry;
>+    	String IMAGE_REGISTRY = AbstractUIPlugin.class.getName() + ".imageRegistry";
>+        ImageRegistry imageRegistry = ( ImageRegistry )RWT.getSessionStore().getAttribute( IMAGE_REGISTRY  );
>+        if( imageRegistry == null ) {
>+          imageRegistry = createImageRegistry();
>+          initializeImageRegistry( imageRegistry );
>+          RWT.getSessionStore().setAttribute( IMAGE_REGISTRY, imageRegistry );
>         }
>         return imageRegistry;
>+        // RAPEND: [bm]
>     }
> 
>     /**
>@@ -639,9 +651,11 @@
>             saveDialogSettings();
>             savePreferenceStore();
>             preferenceStore = null;
>-            if (imageRegistry != null)
>-            	imageRegistry.dispose();
>-            imageRegistry = null;
>+            // RAP [bm]: replaced by session scoped one
>+//            if (imageRegistry != null)
>+//            	imageRegistry.dispose();
>+//            imageRegistry = null;
>+            // RAPEND: [bm]
>         } finally {
>             super.stop(context);
>         }

Actions: View | Diff

Attachments on bug 281852: 147167