Bug 329720: [hover] There is no preference to change background color of debug hover popupv20120917-184302I20120925-0800I20120920-1300I20120919-2000I20120919-0800I20120919-0330I20120918-2200I20120918-2000I20120918-0800I20120917-2000

3 files changed, 23 insertions, 4 deletions

diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
index 15c4612e0..be9dc54e2 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/ExpressionInformationControlCreator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2011 IBM Corporation and others.
+ * Copyright (c) 2008, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -167,6 +167,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 			 */
 			public void paneChanged(String newPaneID) {
 				if (newPaneID.equals(DefaultDetailPane.ID)){
+					fDetailPane.getCurrentControl().setForeground(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
 					fDetailPane.getCurrentControl().setBackground(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
 				}
 			}
@@ -346,6 +347,7 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 				}
 			});        
 	        
+	        setForegroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
 	        setBackgroundColor(getShell().getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
 		}
 		
@@ -388,6 +390,16 @@ public class ExpressionInformationControlCreator implements IInformationControlC
 	    	}
 	    }
 	    		
+	    /* (non-Javadoc)
+	     * @see org.eclipse.jface.text.AbstractInformationControl#setForegroundColor(org.eclipse.swt.graphics.Color)
+	     */
+	    @Override
+	    public void setForegroundColor(Color foreground) {
+	    	super.setForegroundColor(foreground);
+	    	fDetailPaneComposite.setForeground(foreground);
+	    	fTree.setForeground(foreground);
+	    }
+	    
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.AbstractInformationControl#setBackgroundColor(org.eclipse.swt.graphics.Color)
 		 */
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
index 8dc4a0573..c28d728fa 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaLogicalStructuresPreferencePage.java
@@ -97,6 +97,11 @@ public class JavaLogicalStructuresPreferencePage extends PreferencePage implemen
 		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
 		 */
 		public Color getForeground(Object element) {
+			if (element instanceof JavaLogicalStructure) {
+				if (((JavaLogicalStructure) element).isContributed()) {
+					return Display.getCurrent().getSystemColor(SWT.COLOR_INFO_FOREGROUND);		
+				}
+			}
 			return null;
 		}
 
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
index 68995c222..a493793c6 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/classpath/ClasspathLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -58,8 +58,6 @@ public class ClasspathLabelProvider implements ILabelProvider, IColorProvider {
 		if (element instanceof ClasspathGroup) {
 			Display display= Display.getCurrent();
 			return display.getSystemColor(SWT.COLOR_INFO_BACKGROUND);		
-		} else if (element instanceof ClasspathEntry) {
-			
 		}
 		return null;
 	}
@@ -68,6 +66,10 @@ public class ClasspathLabelProvider implements ILabelProvider, IColorProvider {
 	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
 	 */
 	public Color getForeground(Object element) {
+		if (element instanceof ClasspathGroup) {
+			Display display= Display.getCurrent();
+			return display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);		
+		}
 		return null;
 	}