Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Bricon2019-03-19 15:24:44 -0400
committerFred Bricon2019-03-19 15:25:45 -0400
commite593978e05a4c1e5aab40cb80712e32dfc332f38 (patch)
tree053530c907a66772b159e3238ac987b02eade75f
parentfc1e0eef9b455d8beef701ec7ec231a38b7177ac (diff)
downloadm2e-core-e593978e05a4c1e5aab40cb80712e32dfc332f38.tar.gz
m2e-core-e593978e05a4c1e5aab40cb80712e32dfc332f38.tar.xz
m2e-core-e593978e05a4c1e5aab40cb80712e32dfc332f38.zip
Revert "Bug 545026: fix background color in Source Lookup preferences"
This reverts commit c5392da6bab9893bcbf5b43f651abe48d5819bea. Change-Id: I879a797c7eab84217af09fa67622cfc8582628ce Signed-off-by: Fred Bricon <fbricon@gmail.com>
-rw-r--r--org.eclipse.m2e.sourcelookup.ui/plugin.xml1
-rw-r--r--org.eclipse.m2e.sourcelookup.ui/src/org/eclipse/m2e/sourcelookup/ui/internal/SourceLookupPreferencePage.java14
2 files changed, 1 insertions, 14 deletions
diff --git a/org.eclipse.m2e.sourcelookup.ui/plugin.xml b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
index ccee9bfd..240d8388 100644
--- a/org.eclipse.m2e.sourcelookup.ui/plugin.xml
+++ b/org.eclipse.m2e.sourcelookup.ui/plugin.xml
@@ -102,7 +102,6 @@
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 64c8b6ed..69f6fbc7 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,18 +11,13 @@
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;
@@ -57,18 +52,12 @@ public class SourceLookupPreferencePage extends PreferencePage implements IWorkb
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:");
@@ -76,7 +65,6 @@ public class SourceLookupPreferencePage extends PreferencePage implements IWorkb
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:");
@@ -85,7 +73,7 @@ public class SourceLookupPreferencePage extends PreferencePage implements IWorkb
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;
}
}

Back to the top