Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 293140
Collapse All | Expand All

(-)Eclipse UI/org/eclipse/ui/plugin/AbstractUIPlugin.java (-5 / +7 lines)
Lines 257-277 Link Here
257
     * @return the image registry
257
     * @return the image registry
258
     */
258
     */
259
    public ImageRegistry getImageRegistry() {
259
    public ImageRegistry getImageRegistry() {
260
		// RAP [bm]: needs session scope
260
		// RAP [rh]: there is one imageRegistry per plug-in per session
261
//        if (imageRegistry == null) {
261
//        if (imageRegistry == null) {
262
//            imageRegistry = createImageRegistry();
262
//            imageRegistry = createImageRegistry();
263
//            initializeImageRegistry(imageRegistry);
263
//            initializeImageRegistry(imageRegistry);
264
//        }
264
//        }
265
//        return imageRegistry;
265
//        return imageRegistry;
266
    	String IMAGE_REGISTRY = AbstractUIPlugin.class.getName() + ".imageRegistry";
266
    	  String imageRegistryKey
267
        ImageRegistry imageRegistry = ( ImageRegistry )RWT.getSessionStore().getAttribute( IMAGE_REGISTRY  );
267
    	    = AbstractUIPlugin.class.getName()
268
    	    + ".imageRegistry-"
269
    	    + RWT.getSessionStore().getId();
270
        ImageRegistry imageRegistry = ( ImageRegistry )RWT.getSessionStore().getAttribute( imageRegistryKey  );
268
        if( imageRegistry == null ) {
271
        if( imageRegistry == null ) {
269
          imageRegistry = createImageRegistry();
272
          imageRegistry = createImageRegistry();
270
          initializeImageRegistry( imageRegistry );
273
          initializeImageRegistry( imageRegistry );
271
          RWT.getSessionStore().setAttribute( IMAGE_REGISTRY, imageRegistry );
274
          RWT.getSessionStore().setAttribute( imageRegistryKey, imageRegistry );
272
        }
275
        }
273
        return imageRegistry;
276
        return imageRegistry;
274
        // RAPEND: [bm]
275
    }
277
    }
276
278
277
    /**
279
    /**

Return to bug 293140