Attachment 143811 Details for Bug 282640 – 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), 7.24 KB, created by Benjamin Muskalla

on 2009-08-07 17:51:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Muskalla

Created: 2009-08-07 17:51:30 EDT

Size: 7.24 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java,v
>retrieving revision 1.2
>diff -u -r1.2 WorkbenchColors.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java	20 Apr 2008 19:59:55 -0000	1.2
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchColors.java	7 Aug 2009 21:51:46 -0000
>@@ -10,71 +10,68 @@
>  *******************************************************************************/
> package org.eclipse.ui.internal;
> 
>-import org.eclipse.rwt.graphics.Graphics;
>-import org.eclipse.swt.graphics.Color;
>-import org.eclipse.swt.widgets.Display;
>+//import org.eclipse.swt.graphics.Color;
>+//import org.eclipse.swt.widgets.Display;
> 
> /**
>  * This class manages the common workbench colors.  
>  */
> public class WorkbenchColors {
>-    static private boolean init = false;
>+//    static private boolean init = false;
> 
>-    static private Color[] workbenchColors;
>+//    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          
>+//    /**
>+//     * Dispose all color pre-allocated by the workbench.
>+//     */
>+//    private static void disposeWorkbenchColors() {
>+//        for (int i = 0; i < workbenchColors.length; i++) {
> //            workbenchColors[i].dispose();
>-        }
>-        workbenchColors = null;
>-    }
>-
>-    /**
>-     * Initialize all colors used in the workbench in case the OS is using
>-     * a 256 color palette making sure the workbench colors are allocated.
>-     *
>-     * This list comes from the designers.
>-     */
>-    private static void initWorkbenchColors(Display d) {
>-        if (workbenchColors != null) {
>-			return;
>-		}
>-
>-// RAP [rh] Color constructor missing        
>-        workbenchColors = new Color[] {
>-        //Product pallet
>-                Graphics.getColor(255, 255, 255), Graphics.getColor(255, 251, 240),
>-                Graphics.getColor(223, 223, 191), Graphics.getColor(223, 191, 191),
>-                Graphics.getColor(192, 220, 192), Graphics.getColor(192, 192, 192),
>-                Graphics.getColor(191, 191, 191), Graphics.getColor(191, 191, 159),
>-                Graphics.getColor(191, 159, 191), Graphics.getColor(160, 160, 164),
>-                Graphics.getColor(159, 159, 191), Graphics.getColor(159, 159, 159),
>-                Graphics.getColor(159, 159, 127), Graphics.getColor(159, 127, 159),
>-                Graphics.getColor(159, 127, 127), Graphics.getColor(128, 128, 128),
>-                Graphics.getColor(127, 159, 159), Graphics.getColor(127, 159, 127),
>-                Graphics.getColor(127, 127, 159), Graphics.getColor(127, 127, 127),
>-                Graphics.getColor(127, 127, 95), Graphics.getColor(127, 95, 127),
>-                Graphics.getColor(127, 95, 95), Graphics.getColor(95, 127, 127),
>-                Graphics.getColor(95, 127, 95), Graphics.getColor(95, 95, 127),
>-                Graphics.getColor(95, 95, 95), Graphics.getColor(95, 95, 63),
>-                Graphics.getColor(95, 63, 95), Graphics.getColor(95, 63, 63),
>-                Graphics.getColor(63, 95, 95), Graphics.getColor(63, 95, 63),
>-                Graphics.getColor(63, 63, 95), Graphics.getColor(0, 0, 0),
>-                //wizban pallet
>-                Graphics.getColor(195, 204, 224), Graphics.getColor(214, 221, 235),
>-                Graphics.getColor(149, 168, 199), Graphics.getColor(128, 148, 178),
>-                Graphics.getColor(106, 128, 158), Graphics.getColor(255, 255, 255),
>-                Graphics.getColor(0, 0, 0), Graphics.getColor(0, 0, 0),
>-                //Perspective 
>-                Graphics.getColor(132, 130, 132), Graphics.getColor(143, 141, 138),
>-                Graphics.getColor(171, 168, 165),
>-                //PreferenceDialog and TitleAreaDialog
>-                Graphics.getColor(230, 226, 221) };
>-    }
>+//        }
>+//        workbenchColors = null;
>+//    }
>+
>+//    /**
>+//     * Initialize all colors used in the workbench in case the OS is using
>+//     * a 256 color palette making sure the workbench colors are allocated.
>+//     *
>+//     * This list comes from the designers.
>+//     */
>+//    private static void initWorkbenchColors(Display d) {
>+//        if (workbenchColors != null) {
>+//			return;
>+//		}
>+//
>+//        workbenchColors = new Color[] {
>+//        //Product pallet
>+//                new Color(d,255, 255, 255), new Color(d,255, 251, 240),
>+//                new Color(d,223, 223, 191), new Color(d,223, 191, 191),
>+//                new Color(d,192, 220, 192), new Color(d,192, 192, 192),
>+//                new Color(d,191, 191, 191), new Color(d,191, 191, 159),
>+//                new Color(d,191, 159, 191), new Color(d,160, 160, 164),
>+//                new Color(d,159, 159, 191), new Color(d,159, 159, 159),
>+//                new Color(d,159, 159, 127), new Color(d,159, 127, 159),
>+//                new Color(d,159, 127, 127), new Color(d,128, 128, 128),
>+//                new Color(d,127, 159, 159), new Color(d,127, 159, 127),
>+//                new Color(d,127, 127, 159), new Color(d,127, 127, 127),
>+//                new Color(d,127, 127, 95), new Color(d,127, 95, 127),
>+//                new Color(d,127, 95, 95), new Color(d,95, 127, 127),
>+//                new Color(d,95, 127, 95), new Color(d,95, 95, 127),
>+//                new Color(d,95, 95, 95), new Color(d,95, 95, 63),
>+//                new Color(d,95, 63, 95), new Color(d,95, 63, 63),
>+//                new Color(d,63, 95, 95), new Color(d,63, 95, 63),
>+//                new Color(d,63, 63, 95), new Color(d,0, 0, 0),
>+//                //wizban pallet
>+//                new Color(d,195, 204, 224), new Color(d,214, 221, 235),
>+//                new Color(d,149, 168, 199), new Color(d,128, 148, 178),
>+//                new Color(d,106, 128, 158), new Color(d,255, 255, 255),
>+//                new Color(d,0, 0, 0), new Color(d,0, 0, 0),
>+//                //Perspective 
>+//                new Color(d,132, 130, 132), new Color(d,143, 141, 138),
>+//                new Color(d,171, 168, 165),
>+//                //PreferenceDialog and TitleAreaDialog
>+//                new Color(d,230, 226, 221) };
>+//    }
> 
>     /**
>      * Disposes of the colors. Ignore all
>@@ -82,26 +79,26 @@
>      * to be disposed.
>      */
>     static public void shutdown() {
>-        if (!init) {
>-			return;
>-		}
>-        disposeWorkbenchColors();
>-        init = false;
>+//        if (!init) {
>+//			return;
>+//		}
>+//        disposeWorkbenchColors();
>+//        init = false;
>     }
> 
>     /**
>      * Initializes the colors.
>      */
>     static public void startup() {
>-        if (init) {
>-			return;
>-		}
>-
>-        // Initialize the caches first.
>-        init = true;
>-
>-        Display display = Display.getDefault();
>-        initWorkbenchColors(display);
>+//        if (init) {
>+//			return;
>+//		}
>+//
>+//        // Initialize the caches first.
>+//        init = true;
>+//
>+//        Display display = Display.getDefault();
>+//        initWorkbenchColors(display);
>     }
> 
> }

Actions: View | Diff

Attachments on bug 282640: 140941 | 143811