Attachment 236702 Details for Bug 413921 – patch which fixes the bug

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

[patch] patch which fixes the bug

0001-fix-for-bug-413921.patch (text/plain), 3.46 KB, created by Sebastian Struckmann

on 2013-10-21 07:25:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Struckmann

Created: 2013-10-21 07:25:27 EDT

Size: 3.46 KB

patch

obsolete

>From bf45241995f09aa28de6e8404d81bce4a5018cc9 Mon Sep 17 00:00:00 2001
>From: Sebastian Struckmann <sebastian.struckmann@bredex.de>
>Date: Mon, 21 Oct 2013 13:15:36 +0200
>Subject: [PATCH] fix for bug 413921
>
>---
> .../labelprovider/GeneralLabelProvider.java        | 35 ++++++++++++++++++----
> 1 file changed, 29 insertions(+), 6 deletions(-)
>
>diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/labelprovider/GeneralLabelProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/labelprovider/GeneralLabelProvider.java
>index 28e21bd..a547d59 100644
>--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/labelprovider/GeneralLabelProvider.java
>+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/labelprovider/GeneralLabelProvider.java
>@@ -102,13 +102,12 @@ public class GeneralLabelProvider extends ColumnLabelProvider
>     
>     /** The color for disabled elements */
>     private static final Color DISABLED_COLOR = LayoutUtil.GRAY_COLOR;
>+    
>     /** The color for reusedProjects */
>-    private static final Color REUSED_PROJECTS_COLOR = Display.getDefault()
>-            .getSystemColor(SWT.COLOR_BLUE);
>+    private static Color reusedProjectsColor = null;
>     
>     /** clipboard */
>-    private static Clipboard clipboard = new Clipboard(PlatformUI
>-            .getWorkbench().getActiveWorkbenchWindow().getShell().getDisplay());
>+    private static Clipboard clipboard = null;
> 
>     /** {@inheritDoc} */
>     public void dispose() {
>@@ -131,7 +130,7 @@ public class GeneralLabelProvider extends ColumnLabelProvider
>         }
>         
>         // elements that have been "cut" to the clipboard should be grayscale
>-        Object cbContents = clipboard.getContents(
>+        Object cbContents = getClipboard().getContents(
>                 LocalSelectionClipboardTransfer.getInstance());
>         if (cbContents instanceof IStructuredSelection) {
>             IStructuredSelection sel = (IStructuredSelection)cbContents;
>@@ -144,6 +143,18 @@ public class GeneralLabelProvider extends ColumnLabelProvider
>     }
>     
>     /**
>+     * returns the clipboard after creating it if necessary
>+     * @return the clipboard
>+     */
>+    private Clipboard getClipboard() {
>+        if (clipboard == null) {
>+            clipboard = new Clipboard(PlatformUI.getWorkbench()
>+                    .getActiveWorkbenchWindow().getShell().getDisplay());
>+        }
>+        return clipboard;
>+    }
>+
>+    /**
>      * {@inheritDoc}
>      */
>     public String getToolTipText(Object element) {
>@@ -332,13 +343,25 @@ public class GeneralLabelProvider extends ColumnLabelProvider
>         if (element instanceof IReusedProjectPO
>                 || (element instanceof INodePO 
>                 && !NodeBP.isEditable((INodePO)element))) {
>-            return REUSED_PROJECTS_COLOR;
>+            return getReusedProjectsColor();
>         }
> 
>         return null;
>     }
>     
>     /**
>+     * returns the color of a reused project after creating it if necessary
>+     * @return the color of a reused project
>+     */
>+    private Color getReusedProjectsColor() {
>+        if (reusedProjectsColor == null) {
>+            reusedProjectsColor = Display.getDefault()
>+                    .getSystemColor(SWT.COLOR_BLUE);
>+        }
>+        return reusedProjectsColor;
>+    }
>+
>+    /**
>      * 
>      * @param testStep The Test Step to examine.
>      * @return label text for the given Test Step.
>-- 
>1.7.11
>

Flags:

marvin_m: iplog+

Actions: View | Diff

Attachments on bug 413921: 233888 | 233921 | 233922 | 234011 | 236648 | 236702