Attachment 175226 Details for Bug 318243 – Fix

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

[patch] Fix

patch.txt (text/plain), 4.56 KB, created by Markus Keller

on 2010-07-26 11:04:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2010-07-26 11:04:01 EDT

Size: 4.56 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java,v
>retrieving revision 1.103
>diff -u -r1.103 JavadocView.java
>--- ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java	21 Jun 2010 15:43:04 -0000	1.103
>+++ ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java	26 Jul 2010 14:59:49 -0000
>@@ -725,6 +725,10 @@
> 		}
> 	}
> 
>+	private static String getStyleSheet() {
>+		return HTMLPrinter.convertInfoTextColor(fgStyleSheet);
>+	}
>+
> 	/*
> 	 * @see AbstractInfoView#createActions()
> 	 */
>@@ -854,7 +858,7 @@
> 		IJavaElement input= getInput();
> 		if (input == null) {
> 			StringBuffer buffer= new StringBuffer(""); //$NON-NLS-1$
>-			HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, fgStyleSheet);
>+			HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, getStyleSheet());
> 			doSetInput(buffer.toString());
> 		} else {
> 			doSetInput(computeInput(input));
>@@ -1128,7 +1132,7 @@
> 
> 		boolean flushContent= true;
> 		if (buffer.length() > 0 || flushContent) {
>-			HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, fgStyleSheet);
>+			HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, getStyleSheet());
> 			if (base != null) {
> 				int endHeadIdx= buffer.indexOf("</head>"); //$NON-NLS-1$
> 				buffer.insert(endHeadIdx, "\n<base href='" + base + "'>\n"); //$NON-NLS-1$ //$NON-NLS-2$
>Index: ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java,v
>retrieving revision 1.60
>diff -u -r1.60 AbstractJavaCompletionProposal.java
>--- ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java	11 May 2010 15:41:28 -0000	1.60
>+++ ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java	26 Jul 2010 14:59:49 -0000
>@@ -621,6 +621,7 @@
> 		if (css != null) {
> 			FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];
> 			css= HTMLPrinter.convertTopLevelFont(css, fontData);
>+			css= HTMLPrinter.convertInfoTextColor(css);
> 		}
> 		return css;
> 	}
>Index: ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java,v
>retrieving revision 1.84
>diff -u -r1.84 JavadocHover.java
>--- ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java	21 Jun 2010 15:43:03 -0000	1.84
>+++ ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java	26 Jul 2010 14:59:49 -0000
>@@ -842,6 +842,7 @@
> 		if (css != null) {
> 			FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];
> 			css= HTMLPrinter.convertTopLevelFont(css, fontData);
>+			css= HTMLPrinter.convertInfoTextColor(css);
> 		}
> 
> 		return css;
>Index: ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java,v
>retrieving revision 1.35
>diff -u -r1.35 SourceViewerInformationControl.java
>--- ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java	23 Jun 2010 13:55:01 -0000	1.35
>+++ ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java	26 Jul 2010 14:59:49 -0000
>@@ -278,7 +278,11 @@
> 		
> 		if (Math.abs(infoBgHSB[2] - javaDefaultHSB[2]) < 0.5f) {
> 			// workaround for dark tooltip background color, see https://bugs.eclipse.org/309334
>-			return PreferenceConverter.getColor(JavaPlugin.getDefault().getCombinedPreferenceStore(), AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);
>+			IPreferenceStore preferenceStore= JavaPlugin.getDefault().getCombinedPreferenceStore();
>+			boolean useDefault= preferenceStore.getBoolean(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT);
>+			if (useDefault)
>+				return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB();
>+			return PreferenceConverter.getColor(preferenceStore, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);
> 		}
> 		return null;
> 	}

Actions: View | Diff

Attachments on bug 318243: 175226