[SCM] eclipse - Powerful IDE written in java - Debian package. branch, lucid, updated. c83804cd06d9cdf403b487821b0c141cb2a76459
Benjamin Drung
bdrung-guest at alioth.debian.org
Thu Jun 24 23:04:12 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, lucid has been updated
via c83804cd06d9cdf403b487821b0c141cb2a76459 (commit)
via b73ed34f246da7cd9d16d87e3436f9716395fa2c (commit)
via a062c190f5ea51a939dd12be9743d2205b6715b4 (commit)
from 8ed2e17fe8aa4abad87c802c2caa759beb420dfc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c83804cd06d9cdf403b487821b0c141cb2a76459
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Jun 25 01:01:03 2010 +0200
Release 3.5.2-2ubuntu4.2 to Ubuntu lucid-proposed.
commit b73ed34f246da7cd9d16d87e3436f9716395fa2c
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Jun 25 01:00:23 2010 +0200
Correct LP link.
commit a062c190f5ea51a939dd12be9743d2205b6715b4
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Jun 25 01:00:11 2010 +0200
Revert patch refreshing.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 9 +-
debian/patches/bp-hover-visability.patch | 850 +++++++++++++++---------------
debian/patches/ecj-gccmain-java.patch | 8 +-
debian/patches/fix-help-contents.patch | 6 +-
debian/patches/fix-tooltip-color.patch | 2 +-
5 files changed, 438 insertions(+), 437 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 21ce0e3..dcc123c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-eclipse (3.5.2-2ubuntu4.3~1.gbp046839) UNRELEASED; urgency=low
+eclipse (3.5.2-2ubuntu4.2) lucid-proposed; urgency=low
- ** SNAPSHOT build @046839fb6d67f3b1a6e688bb22dd6b0b9c06d15e **
-
- * Backported fix for poor tooltip colors with certain themes. (LP:
- #540332)
+ * Backported fix for poor tooltip colors with certain themes. (LP: #540332)
* Backported fix for hover text visability problem.
- -- Niels Thykier <niels at thykier.net> Sat, 05 Jun 2010 17:46:09 +0200
+ -- Niels Thykier <niels at thykier.net> Fri, 25 Jun 2010 00:43:37 +0200
eclipse (3.5.2-2ubuntu4.1) lucid-proposed; urgency=low
diff --git a/debian/patches/bp-hover-visability.patch b/debian/patches/bp-hover-visability.patch
index 6f702d4..5d2f9f7 100644
--- a/debian/patches/bp-hover-visability.patch
+++ b/debian/patches/bp-hover-visability.patch
@@ -1,428 +1,428 @@
Description: Backported fix for hover text visability problem.
Origin: Upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=312966
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/light-themes/+bug/540332
+Bug-Ubuntu: https://launchpad.net/bugs/540332
---- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
-+++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2008 IBM Corporation and others.
-+ * Copyright (c) 2000, 2010 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
-@@ -48,7 +48,9 @@
- import org.eclipse.jface.text.source.ISourceViewer;
- import org.eclipse.jface.text.source.SourceViewer;
-
-+import org.eclipse.jdt.ui.JavaUI;
- import org.eclipse.jdt.ui.PreferenceConstants;
-+import org.eclipse.jdt.ui.text.IJavaColorConstants;
- import org.eclipse.jdt.ui.text.IJavaPartitions;
-
- import org.eclipse.jdt.internal.ui.JavaPlugin;
-@@ -90,6 +92,11 @@
- */
- private Font fStatusTextFont;
- /**
-+ * The color of the optional status text label or <code>null</code> if none.
-+ * @since 3.6
-+ */
-+ private Color fStatusTextForegroundColor;
-+ /**
- * The width size constraint.
- * @since 3.2
- */
-@@ -198,15 +205,42 @@
- fStatusField.setFont(fStatusTextFont);
- GridData gd2= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- fStatusField.setLayoutData(gd2);
--
-- // Regarding the color see bug 41128
-- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-+
-+ RGB javaDefaultColor= JavaUI.getColorManager().getColor(IJavaColorConstants.JAVA_DEFAULT).getRGB();
-+ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(fBackgroundColor.getRGB(), javaDefaultColor, 0.56f));
-+ fStatusField.setForeground(fStatusTextForegroundColor);
- fStatusField.setBackground(fBackgroundColor);
- }
-
- addDisposeListener(this);
- }
-
-+ /**
-+ * Returns an RGB that lies between the given foreground and background
-+ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
-+ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
-+ * equal to <code>bg</code>.
-+ * @param bg the background color
-+ * @param fg the foreground color
-+ * @param factor the mixing factor, must be in [0, 1]
-+ *
-+ * @return the interpolated color
-+ * @since 3.6
-+ */
-+ private static RGB blend(RGB bg, RGB fg, float factor) {
-+ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
-+ Assert.isLegal(bg != null);
-+ Assert.isLegal(fg != null);
-+ Assert.isLegal(factor >= 0f && factor <= 1f);
-+
-+ float complement= 1f - factor;
-+ return new RGB(
-+ (int) (complement * bg.red + factor * fg.red),
-+ (int) (complement * bg.green + factor * fg.green),
-+ (int) (complement * bg.blue + factor * fg.blue)
-+ );
-+ }
-+
- private void initializeColors() {
- RGB bgRGB= getHoverBackgroundColorRGB();
- if (bgRGB != null) {
-@@ -274,8 +308,12 @@
- public void widgetDisposed(DisposeEvent event) {
- if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
- fStatusTextFont.dispose();
--
- fStatusTextFont= null;
-+
-+ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
-+ fStatusTextForegroundColor.dispose();
-+ fStatusTextForegroundColor= null;
-+
- fTextFont= null;
- fShell= null;
- fText= null;
---- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
-+++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2005, 2008 IBM Corporation and others.
-+ * Copyright (c) 2005, 2010 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
-@@ -14,6 +14,7 @@
- import java.util.ArrayList;
- import java.util.List;
-
-+import org.eclipse.core.runtime.Assert;
- import org.eclipse.jface.action.Action;
- import org.eclipse.jface.action.GroupMarker;
- import org.eclipse.jface.action.IAction;
-@@ -36,9 +37,11 @@
- import org.eclipse.swt.graphics.Font;
- import org.eclipse.swt.graphics.FontData;
- import org.eclipse.swt.graphics.Point;
-+import org.eclipse.swt.graphics.RGB;
- import org.eclipse.swt.graphics.Rectangle;
- import org.eclipse.swt.widgets.Composite;
- import org.eclipse.swt.widgets.Control;
-+import org.eclipse.swt.widgets.Display;
- import org.eclipse.swt.widgets.Event;
- import org.eclipse.swt.widgets.Label;
- import org.eclipse.swt.widgets.Listener;
-@@ -321,6 +324,12 @@
- private Control titleSeparator, infoSeparator;
-
- /**
-+ * Color to be used for the info area text.
-+ * @since 3.6
-+ */
-+ private Color infoColor;
-+
-+ /**
- * Font to be used for the info area text. Computed based on the dialog's
- * font.
- */
-@@ -856,12 +865,42 @@
-
- GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL,
- SWT.BEGINNING).applyTo(infoLabel);
-- infoLabel.setForeground(parent.getDisplay().getSystemColor(
-- SWT.COLOR_WIDGET_DARK_SHADOW));
-+ Display display = parent.getDisplay();
-+ infoColor = new Color(display, blend(
-+ display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(),
-+ display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(),
-+ 0.56f));
-+ infoLabel.setForeground(infoColor);
- return infoLabel;
- }
-
- /**
-+ * Returns an RGB that lies between the given foreground and background
-+ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
-+ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
-+ * equal to <code>bg</code>.
-+ * @param bg the background color
-+ * @param fg the foreground color
-+ * @param factor the mixing factor, must be in [0, 1]
-+ *
-+ * @return the interpolated color
-+ * @since 3.6
-+ */
-+ private static RGB blend(RGB bg, RGB fg, float factor) {
-+ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
-+ Assert.isLegal(bg != null);
-+ Assert.isLegal(fg != null);
-+ Assert.isLegal(factor >= 0f && factor <= 1f);
-+
-+ float complement = 1f - factor;
-+ return new RGB(
-+ (int) (complement * bg.red + factor * fg.red),
-+ (int) (complement * bg.green + factor * fg.green),
-+ (int) (complement * bg.blue + factor * fg.blue)
-+ );
-+ }
-+
-+ /**
- * Create a horizontal separator for the given parent.
- *
- * @param parent
-@@ -1586,6 +1625,10 @@
- *
- */
- private void handleDispose() {
-+ if (infoColor != null && !infoColor.isDisposed()) {
-+ infoColor.dispose();
-+ }
-+ infoColor = null;
- if (infoFont != null && !infoFont.isDisposed()) {
- infoFont.dispose();
- }
---- a/eclipse/plugins/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
-+++ b/eclipse/plugins/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2008 IBM Corporation and others.
-+ * Copyright (c) 2000, 2010 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
-@@ -22,6 +22,7 @@
- import org.eclipse.swt.graphics.FontData;
- import org.eclipse.swt.graphics.GC;
- import org.eclipse.swt.graphics.Point;
-+import org.eclipse.swt.graphics.RGB;
- import org.eclipse.swt.graphics.Rectangle;
- import org.eclipse.swt.layout.GridData;
- import org.eclipse.swt.layout.GridLayout;
-@@ -31,6 +32,8 @@
- import org.eclipse.swt.widgets.Label;
- import org.eclipse.swt.widgets.Shell;
-
-+import org.eclipse.core.runtime.Assert;
-+
- import org.eclipse.jface.resource.JFaceResources;
-
- import org.eclipse.jface.text.Document;
-@@ -67,6 +70,11 @@
- private Label fSeparator;
- /** The font of the optional status text label.*/
- private Font fStatusTextFont;
-+ /**
-+ * The color of the optional status text label or <code>null</code> if none.
-+ * @since 3.6
-+ */
-+ private Color fStatusTextForegroundColor;
- /** The maximal widget width. */
- private int fMaxWidth;
- /** The maximal widget height. */
-@@ -158,8 +166,8 @@
- GridData gd2= new GridData(GridData.FILL_VERTICAL | GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
- fStatusField.setLayoutData(gd2);
-
-- // Regarding the color see bug 41128
-- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-+ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(), display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(), 0.56f));
-+ fStatusField.setForeground(fStatusTextForegroundColor);
-
- fStatusField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
- }
-@@ -168,6 +176,32 @@
- }
-
- /**
-+ * Returns an RGB that lies between the given foreground and background
-+ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
-+ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
-+ * equal to <code>bg</code>.
-+ * @param bg the background color
-+ * @param fg the foreground color
-+ * @param factor the mixing factor, must be in [0, 1]
-+ *
-+ * @return the interpolated color
-+ * @since 3.6
-+ */
-+ private static RGB blend(RGB bg, RGB fg, float factor) {
-+ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
-+ Assert.isLegal(bg != null);
-+ Assert.isLegal(fg != null);
-+ Assert.isLegal(factor >= 0f && factor <= 1f);
-+
-+ float complement= 1f - factor;
-+ return new RGB(
-+ (int) (complement * bg.red + factor * fg.red),
-+ (int) (complement * bg.green + factor * fg.green),
-+ (int) (complement * bg.blue + factor * fg.blue)
-+ );
-+ }
-+
-+ /**
- * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
- * @param input the input object
- */
-@@ -204,8 +238,11 @@
- public void widgetDisposed(DisposeEvent event) {
- if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
- fStatusTextFont.dispose();
--
- fStatusTextFont= null;
-+ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
-+ fStatusTextForegroundColor.dispose();
-+ fStatusTextForegroundColor= null;
-+
- fTextFont= null;
- fShell= null;
- fText= null;
---- a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
-+++ b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
-@@ -43,6 +43,7 @@
- import org.eclipse.core.runtime.ListenerList;
-
- import org.eclipse.jface.action.ToolBarManager;
-+import org.eclipse.jface.internal.text.revisions.Colors;
- import org.eclipse.jface.resource.JFaceResources;
- import org.eclipse.jface.util.Geometry;
-
-@@ -85,6 +86,11 @@
- * @since 3.4.2
- */
- private Font fStatusLabelFont;
-+ /**
-+ * Color for the label in the status line or <code>null</code> if none.
-+ * @since 3.6
-+ */
-+ private Color fStatusLabelForeground;
- /** The toolbar manager used by the toolbar or <code>null</code> if none. */
- private final ToolBarManager fToolBarManager;
- /** Status line toolbar or <code>null</code> if none. */
-@@ -224,8 +230,9 @@
- }
- fStatusLabelFont= new Font(fStatusLabel.getDisplay(), fontDatas);
- fStatusLabel.setFont(fStatusLabelFont);
--
-- fStatusLabel.setForeground(fStatusLabel.getDisplay().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-+
-+ fStatusLabelForeground= new Color(fStatusLabel.getDisplay(), Colors.blend(background.getRGB(), foreground.getRGB(), 0.56f));
-+ fStatusLabel.setForeground(fStatusLabelForeground);
- fStatusLabel.setBackground(background);
- setColor(fStatusComposite, foreground, background);
- }
-@@ -672,6 +679,10 @@
- fShell.removeListener(SWT.Deactivate, fShellListener);
- fShellListener= null;
- }
-+ if (fStatusLabelForeground != null) {
-+ fStatusLabelForeground.dispose();
-+ fStatusLabelForeground= null;
-+ }
- }
-
- /**
---- a/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
-+++ b/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
-@@ -1,5 +1,5 @@
- /*******************************************************************************
-- * Copyright (c) 2000, 2008 IBM Corporation and others.
-+ * Copyright (c) 2000, 2010 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
-@@ -22,6 +22,7 @@
- import org.eclipse.swt.graphics.FontData;
- import org.eclipse.swt.graphics.GC;
- import org.eclipse.swt.graphics.Point;
-+import org.eclipse.swt.graphics.RGB;
- import org.eclipse.swt.graphics.Rectangle;
- import org.eclipse.swt.layout.GridData;
- import org.eclipse.swt.layout.GridLayout;
-@@ -31,6 +32,8 @@
- import org.eclipse.swt.widgets.Label;
- import org.eclipse.swt.widgets.Shell;
-
-+import org.eclipse.core.runtime.Assert;
-+
- import org.eclipse.jface.resource.JFaceResources;
-
- import org.eclipse.jface.text.BadLocationException;
-@@ -73,6 +76,11 @@
- private Label fSeparator;
- /** The font of the optional status text label.*/
- private Font fStatusTextFont;
-+ /**
-+ * The color of the optional status text label or <code>null</code> if none.
-+ * @since 3.6
-+ */
-+ private Color fStatusTextForegroundColor;
- /** The maximal widget width. */
- private int fMaxWidth;
- /** The maximal widget height. */
-@@ -167,8 +175,8 @@
- GridData gd2= new GridData(GridData.FILL_VERTICAL | GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
- fStatusField.setLayoutData(gd2);
-
-- // Regarding the color see bug 41128
-- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-+ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(), display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(), 0.56f));
-+ fStatusField.setForeground(fStatusTextForegroundColor);
-
- fStatusField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
- }
-@@ -176,6 +184,32 @@
- addDisposeListener(this);
- }
-
-+ /**
-+ * Returns an RGB that lies between the given foreground and background
-+ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
-+ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
-+ * equal to <code>bg</code>.
-+ * @param bg the background color
-+ * @param fg the foreground color
-+ * @param factor the mixing factor, must be in [0, 1]
-+ *
-+ * @return the interpolated color
-+ * @since 3.6
-+ */
-+ private static RGB blend(RGB bg, RGB fg, float factor) {
-+ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
-+ Assert.isLegal(bg != null);
-+ Assert.isLegal(fg != null);
-+ Assert.isLegal(factor >= 0f && factor <= 1f);
-+
-+ float complement= 1f - factor;
-+ return new RGB(
-+ (int) (complement * bg.red + factor * fg.red),
-+ (int) (complement * bg.green + factor * fg.green),
-+ (int) (complement * bg.blue + factor * fg.blue)
-+ );
-+ }
-+
- /*
- * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
- */
-@@ -217,8 +251,11 @@
- public void widgetDisposed(DisposeEvent event) {
- if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
- fStatusTextFont.dispose();
--
- fStatusTextFont= null;
-+ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
-+ fStatusTextForegroundColor.dispose();
-+ fStatusTextForegroundColor= null;
-+
- fTextFont= null;
- fShell= null;
- fText= null;
+--- a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
++++ b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2008 IBM Corporation and others.
++ * Copyright (c) 2000, 2010 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
+@@ -48,7 +48,9 @@
+ import org.eclipse.jface.text.source.ISourceViewer;
+ import org.eclipse.jface.text.source.SourceViewer;
+
++import org.eclipse.jdt.ui.JavaUI;
+ import org.eclipse.jdt.ui.PreferenceConstants;
++import org.eclipse.jdt.ui.text.IJavaColorConstants;
+ import org.eclipse.jdt.ui.text.IJavaPartitions;
+
+ import org.eclipse.jdt.internal.ui.JavaPlugin;
+@@ -90,6 +92,11 @@
+ */
+ private Font fStatusTextFont;
+ /**
++ * The color of the optional status text label or <code>null</code> if none.
++ * @since 3.6
++ */
++ private Color fStatusTextForegroundColor;
++ /**
+ * The width size constraint.
+ * @since 3.2
+ */
+@@ -198,15 +205,42 @@
+ fStatusField.setFont(fStatusTextFont);
+ GridData gd2= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
+ fStatusField.setLayoutData(gd2);
+-
+- // Regarding the color see bug 41128
+- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
++
++ RGB javaDefaultColor= JavaUI.getColorManager().getColor(IJavaColorConstants.JAVA_DEFAULT).getRGB();
++ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(fBackgroundColor.getRGB(), javaDefaultColor, 0.56f));
++ fStatusField.setForeground(fStatusTextForegroundColor);
+ fStatusField.setBackground(fBackgroundColor);
+ }
+
+ addDisposeListener(this);
+ }
+
++ /**
++ * Returns an RGB that lies between the given foreground and background
++ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
++ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
++ * equal to <code>bg</code>.
++ * @param bg the background color
++ * @param fg the foreground color
++ * @param factor the mixing factor, must be in [0, 1]
++ *
++ * @return the interpolated color
++ * @since 3.6
++ */
++ private static RGB blend(RGB bg, RGB fg, float factor) {
++ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
++ Assert.isLegal(bg != null);
++ Assert.isLegal(fg != null);
++ Assert.isLegal(factor >= 0f && factor <= 1f);
++
++ float complement= 1f - factor;
++ return new RGB(
++ (int) (complement * bg.red + factor * fg.red),
++ (int) (complement * bg.green + factor * fg.green),
++ (int) (complement * bg.blue + factor * fg.blue)
++ );
++ }
++
+ private void initializeColors() {
+ RGB bgRGB= getHoverBackgroundColorRGB();
+ if (bgRGB != null) {
+@@ -274,8 +308,12 @@
+ public void widgetDisposed(DisposeEvent event) {
+ if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
+ fStatusTextFont.dispose();
+-
+ fStatusTextFont= null;
++
++ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
++ fStatusTextForegroundColor.dispose();
++ fStatusTextForegroundColor= null;
++
+ fTextFont= null;
+ fShell= null;
+ fText= null;
+--- a/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
++++ b/eclipse/plugins/org.eclipse.jface/src/org/eclipse/jface/dialogs/PopupDialog.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2005, 2008 IBM Corporation and others.
++ * Copyright (c) 2005, 2010 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
+@@ -14,6 +14,7 @@
+ import java.util.ArrayList;
+ import java.util.List;
+
++import org.eclipse.core.runtime.Assert;
+ import org.eclipse.jface.action.Action;
+ import org.eclipse.jface.action.GroupMarker;
+ import org.eclipse.jface.action.IAction;
+@@ -36,9 +37,11 @@
+ import org.eclipse.swt.graphics.Font;
+ import org.eclipse.swt.graphics.FontData;
+ import org.eclipse.swt.graphics.Point;
++import org.eclipse.swt.graphics.RGB;
+ import org.eclipse.swt.graphics.Rectangle;
+ import org.eclipse.swt.widgets.Composite;
+ import org.eclipse.swt.widgets.Control;
++import org.eclipse.swt.widgets.Display;
+ import org.eclipse.swt.widgets.Event;
+ import org.eclipse.swt.widgets.Label;
+ import org.eclipse.swt.widgets.Listener;
+@@ -321,6 +324,12 @@
+ private Control titleSeparator, infoSeparator;
+
+ /**
++ * Color to be used for the info area text.
++ * @since 3.6
++ */
++ private Color infoColor;
++
++ /**
+ * Font to be used for the info area text. Computed based on the dialog's
+ * font.
+ */
+@@ -856,12 +865,42 @@
+
+ GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL,
+ SWT.BEGINNING).applyTo(infoLabel);
+- infoLabel.setForeground(parent.getDisplay().getSystemColor(
+- SWT.COLOR_WIDGET_DARK_SHADOW));
++ Display display = parent.getDisplay();
++ infoColor = new Color(display, blend(
++ display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(),
++ display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(),
++ 0.56f));
++ infoLabel.setForeground(infoColor);
+ return infoLabel;
+ }
+
+ /**
++ * Returns an RGB that lies between the given foreground and background
++ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
++ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
++ * equal to <code>bg</code>.
++ * @param bg the background color
++ * @param fg the foreground color
++ * @param factor the mixing factor, must be in [0, 1]
++ *
++ * @return the interpolated color
++ * @since 3.6
++ */
++ private static RGB blend(RGB bg, RGB fg, float factor) {
++ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
++ Assert.isLegal(bg != null);
++ Assert.isLegal(fg != null);
++ Assert.isLegal(factor >= 0f && factor <= 1f);
++
++ float complement = 1f - factor;
++ return new RGB(
++ (int) (complement * bg.red + factor * fg.red),
++ (int) (complement * bg.green + factor * fg.green),
++ (int) (complement * bg.blue + factor * fg.blue)
++ );
++ }
++
++ /**
+ * Create a horizontal separator for the given parent.
+ *
+ * @param parent
+@@ -1586,6 +1625,10 @@
+ *
+ */
+ private void handleDispose() {
++ if (infoColor != null && !infoColor.isDisposed()) {
++ infoColor.dispose();
++ }
++ infoColor = null;
+ if (infoFont != null && !infoFont.isDisposed()) {
+ infoFont.dispose();
+ }
+--- a/eclipse/plugins/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
++++ b/eclipse/plugins/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2008 IBM Corporation and others.
++ * Copyright (c) 2000, 2010 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
+@@ -22,6 +22,7 @@
+ import org.eclipse.swt.graphics.FontData;
+ import org.eclipse.swt.graphics.GC;
+ import org.eclipse.swt.graphics.Point;
++import org.eclipse.swt.graphics.RGB;
+ import org.eclipse.swt.graphics.Rectangle;
+ import org.eclipse.swt.layout.GridData;
+ import org.eclipse.swt.layout.GridLayout;
+@@ -31,6 +32,8 @@
+ import org.eclipse.swt.widgets.Label;
+ import org.eclipse.swt.widgets.Shell;
+
++import org.eclipse.core.runtime.Assert;
++
+ import org.eclipse.jface.resource.JFaceResources;
+
+ import org.eclipse.jface.text.Document;
+@@ -67,6 +70,11 @@
+ private Label fSeparator;
+ /** The font of the optional status text label.*/
+ private Font fStatusTextFont;
++ /**
++ * The color of the optional status text label or <code>null</code> if none.
++ * @since 3.6
++ */
++ private Color fStatusTextForegroundColor;
+ /** The maximal widget width. */
+ private int fMaxWidth;
+ /** The maximal widget height. */
+@@ -158,8 +166,8 @@
+ GridData gd2= new GridData(GridData.FILL_VERTICAL | GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+ fStatusField.setLayoutData(gd2);
+
+- // Regarding the color see bug 41128
+- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
++ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(), display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(), 0.56f));
++ fStatusField.setForeground(fStatusTextForegroundColor);
+
+ fStatusField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ }
+@@ -168,6 +176,32 @@
+ }
+
+ /**
++ * Returns an RGB that lies between the given foreground and background
++ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
++ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
++ * equal to <code>bg</code>.
++ * @param bg the background color
++ * @param fg the foreground color
++ * @param factor the mixing factor, must be in [0, 1]
++ *
++ * @return the interpolated color
++ * @since 3.6
++ */
++ private static RGB blend(RGB bg, RGB fg, float factor) {
++ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
++ Assert.isLegal(bg != null);
++ Assert.isLegal(fg != null);
++ Assert.isLegal(factor >= 0f && factor <= 1f);
++
++ float complement= 1f - factor;
++ return new RGB(
++ (int) (complement * bg.red + factor * fg.red),
++ (int) (complement * bg.green + factor * fg.green),
++ (int) (complement * bg.blue + factor * fg.blue)
++ );
++ }
++
++ /**
+ * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
+ * @param input the input object
+ */
+@@ -204,8 +238,11 @@
+ public void widgetDisposed(DisposeEvent event) {
+ if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
+ fStatusTextFont.dispose();
+-
+ fStatusTextFont= null;
++ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
++ fStatusTextForegroundColor.dispose();
++ fStatusTextForegroundColor= null;
++
+ fTextFont= null;
+ fShell= null;
+ fText= null;
+--- a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
++++ b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
+@@ -43,6 +43,7 @@
+ import org.eclipse.core.runtime.ListenerList;
+
+ import org.eclipse.jface.action.ToolBarManager;
++import org.eclipse.jface.internal.text.revisions.Colors;
+ import org.eclipse.jface.resource.JFaceResources;
+ import org.eclipse.jface.util.Geometry;
+
+@@ -85,6 +86,11 @@
+ * @since 3.4.2
+ */
+ private Font fStatusLabelFont;
++ /**
++ * Color for the label in the status line or <code>null</code> if none.
++ * @since 3.6
++ */
++ private Color fStatusLabelForeground;
+ /** The toolbar manager used by the toolbar or <code>null</code> if none. */
+ private final ToolBarManager fToolBarManager;
+ /** Status line toolbar or <code>null</code> if none. */
+@@ -224,8 +230,9 @@
+ }
+ fStatusLabelFont= new Font(fStatusLabel.getDisplay(), fontDatas);
+ fStatusLabel.setFont(fStatusLabelFont);
+-
+- fStatusLabel.setForeground(fStatusLabel.getDisplay().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
++
++ fStatusLabelForeground= new Color(fStatusLabel.getDisplay(), Colors.blend(background.getRGB(), foreground.getRGB(), 0.56f));
++ fStatusLabel.setForeground(fStatusLabelForeground);
+ fStatusLabel.setBackground(background);
+ setColor(fStatusComposite, foreground, background);
+ }
+@@ -672,6 +679,10 @@
+ fShell.removeListener(SWT.Deactivate, fShellListener);
+ fShellListener= null;
+ }
++ if (fStatusLabelForeground != null) {
++ fStatusLabelForeground.dispose();
++ fStatusLabelForeground= null;
++ }
+ }
+
+ /**
+--- a/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
++++ b/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/SourceViewerInformationControl.java
+@@ -1,5 +1,5 @@
+ /*******************************************************************************
+- * Copyright (c) 2000, 2008 IBM Corporation and others.
++ * Copyright (c) 2000, 2010 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
+@@ -22,6 +22,7 @@
+ import org.eclipse.swt.graphics.FontData;
+ import org.eclipse.swt.graphics.GC;
+ import org.eclipse.swt.graphics.Point;
++import org.eclipse.swt.graphics.RGB;
+ import org.eclipse.swt.graphics.Rectangle;
+ import org.eclipse.swt.layout.GridData;
+ import org.eclipse.swt.layout.GridLayout;
+@@ -31,6 +32,8 @@
+ import org.eclipse.swt.widgets.Label;
+ import org.eclipse.swt.widgets.Shell;
+
++import org.eclipse.core.runtime.Assert;
++
+ import org.eclipse.jface.resource.JFaceResources;
+
+ import org.eclipse.jface.text.BadLocationException;
+@@ -73,6 +76,11 @@
+ private Label fSeparator;
+ /** The font of the optional status text label.*/
+ private Font fStatusTextFont;
++ /**
++ * The color of the optional status text label or <code>null</code> if none.
++ * @since 3.6
++ */
++ private Color fStatusTextForegroundColor;
+ /** The maximal widget width. */
+ private int fMaxWidth;
+ /** The maximal widget height. */
+@@ -167,8 +175,8 @@
+ GridData gd2= new GridData(GridData.FILL_VERTICAL | GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
+ fStatusField.setLayoutData(gd2);
+
+- // Regarding the color see bug 41128
+- fStatusField.setForeground(display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
++ fStatusTextForegroundColor= new Color(fStatusField.getDisplay(), blend(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB(), display.getSystemColor(SWT.COLOR_INFO_FOREGROUND).getRGB(), 0.56f));
++ fStatusField.setForeground(fStatusTextForegroundColor);
+
+ fStatusField.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
+ }
+@@ -176,6 +184,32 @@
+ addDisposeListener(this);
+ }
+
++ /**
++ * Returns an RGB that lies between the given foreground and background
++ * colors using the given mixing factor. A <code>factor</code> of 1.0 will produce a
++ * color equal to <code>fg</code>, while a <code>factor</code> of 0.0 will produce one
++ * equal to <code>bg</code>.
++ * @param bg the background color
++ * @param fg the foreground color
++ * @param factor the mixing factor, must be in [0, 1]
++ *
++ * @return the interpolated color
++ * @since 3.6
++ */
++ private static RGB blend(RGB bg, RGB fg, float factor) {
++ // copy of org.eclipse.jface.internal.text.revisions.Colors#blend(..)
++ Assert.isLegal(bg != null);
++ Assert.isLegal(fg != null);
++ Assert.isLegal(factor >= 0f && factor <= 1f);
++
++ float complement= 1f - factor;
++ return new RGB(
++ (int) (complement * bg.red + factor * fg.red),
++ (int) (complement * bg.green + factor * fg.green),
++ (int) (complement * bg.blue + factor * fg.blue)
++ );
++ }
++
+ /*
+ * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
+ */
+@@ -217,8 +251,11 @@
+ public void widgetDisposed(DisposeEvent event) {
+ if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
+ fStatusTextFont.dispose();
+-
+ fStatusTextFont= null;
++ if (fStatusTextForegroundColor != null && !fStatusTextForegroundColor.isDisposed())
++ fStatusTextForegroundColor.dispose();
++ fStatusTextForegroundColor= null;
++
+ fTextFont= null;
+ fShell= null;
+ fText= null;
diff --git a/debian/patches/ecj-gccmain-java.patch b/debian/patches/ecj-gccmain-java.patch
index 5f765e1..25d74b3 100644
--- a/debian/patches/ecj-gccmain-java.patch
+++ b/debian/patches/ecj-gccmain-java.patch
@@ -1,8 +1,8 @@
Description: Adds better support for gcc.
Origin: Vendor, http://packages.qa.debian.org/e/ecj.html
---- /dev/null
-+++ b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
+--- ecj-3.5.1.orig/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
++++ ecj-3.5.1/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
@@ -0,0 +1,501 @@
+/**
+ *
@@ -505,9 +505,11 @@ Origin: Vendor, http://packages.qa.debian.org/e/ecj.html
+ System.exit(result ? 0 : 1);
+ }
+}
+diff --git a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+index bf5dedd..76420d7 100644
--- a/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+++ b/eclipse/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
-@@ -300,3 +300,8 @@
+@@ -300,3 +300,8 @@ misc.usage.warn = {1} {2}\n\
\ uselessTypeCheck unnecessary cast/instanceof operation\n\
\ varargsCast + varargs argument need explicit cast\n\
\ warningToken + unsupported or unnecessary @SuppressWarnings\n
diff --git a/debian/patches/fix-help-contents.patch b/debian/patches/fix-help-contents.patch
index 920d0ff..4e82d43 100644
--- a/debian/patches/fix-help-contents.patch
+++ b/debian/patches/fix-help-contents.patch
@@ -5,9 +5,11 @@ Description: Fixes the problem with the servlet compiler being unable
Author: Niels Thykier <niels at thykier.net>
Forwarded: not needed
+diff --git a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+index 3303026..61cb9c0 100644
--- a/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+++ b/eclipse/plugins/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
-@@ -20,6 +20,7 @@
+@@ -20,6 +20,7 @@ import java.util.Enumeration;
import java.util.StringTokenizer;
import org.osgi.framework.Bundle;
@@ -15,7 +17,7 @@ Forwarded: not needed
import org.osgi.framework.Constants;
/**
-@@ -75,6 +76,20 @@
+@@ -75,6 +76,20 @@ public class JspClassLoader extends URLClassLoader {
private void addBundleClassPathJars(Bundle bundle) {
Dictionary headers = bundle.getHeaders();
String classPath = (String) headers.get(Constants.BUNDLE_CLASSPATH);
diff --git a/debian/patches/fix-tooltip-color.patch b/debian/patches/fix-tooltip-color.patch
index aab3461..7f536e0 100644
--- a/debian/patches/fix-tooltip-color.patch
+++ b/debian/patches/fix-tooltip-color.patch
@@ -1,7 +1,7 @@
Description: Backported fix for LP: #540332, poor tooltip text colors
with certain themes.
Origin: Upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=309907
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/light-themes/+bug/540332
+Bug-Ubuntu: https://launchpad.net/bugs/540332
--- a/build.xml
+++ b/build.xml
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list