Attachment 140941 Details for Bug 282640 – Patch to fix the bug

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

[patch] Patch to fix the bug

workbench-colors.txt (text/plain), 2.60 KB, created by Igor Pavlenko

on 2009-07-07 05:12:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Pavlenko

Created: 2009-07-07 05:12:50 EDT

Size: 2.60 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java
>===================================================================
>RCS file: /cvs/eclipse/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java,v
>retrieving revision 1.1
>diff -u -r1.1 WorkbenchColors.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java	31 Mar 2009 07:03:44 -0000	1.1
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java	7 Jul 2009 09:13:47 -0000
>@@ -22,16 +22,18 @@
> 
>     static private Color[] workbenchColors;
> 
>-    /**
>-     * Dispose all color pre-allocated by the workbench.
>-     */
>-    private static void disposeWorkbenchColors() {
>-        for (int i = 0; i < workbenchColors.length; i++) {
>-// RAP [rh] Color#dispose() missing          
>-//            workbenchColors[i].dispose();
>-        }
>-        workbenchColors = null;
>-    }
>+// On RAP workbenchColors should not be disposed until the platform stops
>+//    /**
>+//     * Dispose all color pre-allocated by the workbench.
>+//     */
>+//    private static void disposeWorkbenchColors() {
>+//        for (int i = 0; i < workbenchColors.length; i++) {
>+//// RAP [rh] Color#dispose() missing          
>+////            workbenchColors[i].dispose();
>+//        }
>+//        
>+//        workbenchColors = null;
>+//    }
> 
>     /**
>      * Initialize all colors used in the workbench in case the OS is using
>@@ -39,7 +41,8 @@
>      *
>      * This list comes from the designers.
>      */
>-    private static void initWorkbenchColors(Display d) {
>+    // Should be synchronized because of multiple instances of Workbench allowed
>+    private synchronized static void initWorkbenchColors(Display d) {
>         if (workbenchColors != null) {
> 			return;
> 		}
>@@ -81,18 +84,21 @@
>      * system colors as they do not need
>      * to be disposed.
>      */
>-    static public void shutdown() {
>-        if (!init) {
>-			return;
>-		}
>-        disposeWorkbenchColors();
>-        init = false;
>+    // Should be synchronized because of multiple instances of Workbench allowed
>+    static synchronized public void shutdown() {
>+        // do nothing because of RAP workbenchColors should not be disposed until the platform stops
>+//        if (!init) {
>+//			return;
>+//		}
>+//        disposeWorkbenchColors();
>+//        init = false;
>     }
> 
>     /**
>      * Initializes the colors.
>      */
>-    static public void startup() {
>+    // Should be synchronized because of multiple instances of Workbench allowed
>+    static synchronized public void startup() {
>         if (init) {
> 			return;
> 		}

Actions: View | Diff

Attachments on bug 282640: 140941 | 143811