Bug 545026: fix background color in Source Lookup preferences
Change-Id: Icf6a81b3473bfe5c9c79c56c68b7eff64bf6fbd4
Signed-off-by: Fred Bricon <fbricon@gmail.com>
diff --git a/org.eclipse.m2e.sourcelookup.ui/plugin.xml b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
index 240d838..ccee9bf 100644
--- a/org.eclipse.m2e.sourcelookup.ui/plugin.xml
+++ b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
@@ -102,6 +102,7 @@
class="org.eclipse.m2e.sourcelookup.ui.internal.SourceLookupPreferencePage"
id="org.eclipse.m2e.sourcelookup.ui.internal.SourceLookupPreferencePage"
name="Source Lookup">
+ <keywordReference id="org.eclipse.m2e.core.maven"/>
</page>
</extension>
</plugin>
diff --git a/org.eclipse.m2e.sourcelookup.ui/src/org/eclipse/m2e/sourcelookup/ui/internal/SourceLookupPreferencePage.java b/org.eclipse.m2e.sourcelookup.ui/src/org/eclipse/m2e/sourcelookup/ui/internal/SourceLookupPreferencePage.java
index 69f6fbc..64c8b6e 100644
--- a/org.eclipse.m2e.sourcelookup.ui/src/org/eclipse/m2e/sourcelookup/ui/internal/SourceLookupPreferencePage.java
+++ b/org.eclipse.m2e.sourcelookup.ui/src/org/eclipse/m2e/sourcelookup/ui/internal/SourceLookupPreferencePage.java
@@ -11,13 +11,18 @@
package org.eclipse.m2e.sourcelookup.ui.internal;
import org.eclipse.jdt.internal.launching.sourcelookup.advanced.AdvancedSourceLookupSupport;
+import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.resource.JFaceColors;
+import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
@@ -52,12 +57,18 @@
gl_composite.marginHeight = 0;
composite.setLayout(gl_composite);
+ Color background = JFaceResources.getColorRegistry().get(JFacePreferences.INFORMATION_BACKGROUND_COLOR);
+ if(background == null) {
+ background = JFaceColors.getInformationViewerBackgroundColor(Display.getCurrent());
+ }
+ composite.setBackground(background);
Label lblVMArguments = new Label(composite, SWT.NONE);
lblVMArguments.setText("VM arguments:");
vmArguments = new Text(composite, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP);
vmArguments.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
vmArguments.setText(AdvancedSourceLookupSupport.getJavaagentString());
+ vmArguments.setBackground(background);
Label lblLaunchVMArguments = new Label(composite, SWT.NONE);
lblLaunchVMArguments.setText(".launch file VM arguments:");
@@ -65,6 +76,7 @@
launchFileVMArguments = new Text(composite, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP);
launchFileVMArguments.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
launchFileVMArguments.setText("-javaagent:${sourcelookup_agent_path}");
+ launchFileVMArguments.setBackground(background);
Label lblLaunchFileAttribute = new Label(composite, SWT.NONE);
lblLaunchFileAttribute.setText(".launch file attribute:");
@@ -73,7 +85,7 @@
launchFileAttribute.setText(
"<stringAttribute key=\"org.eclipse.debug.core.source_locator_id\" value=\"org.eclipse.m2e.sourcelookupDirector\"/>\n");
launchFileAttribute.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-
+ launchFileAttribute.setBackground(background);
return composite;
}
}