Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-03-11 20:48:02 +0000
committerJean Michel-Lemieux2004-03-11 20:48:02 +0000
commit3a087613532d71c24bfde5f833ebb2159fd81bec (patch)
tree10e10e3bfc42d801b359f71f4227a78c12bdc42e
parentfe2ec41fafe64ff3bbeb1e6912c9860113a11784 (diff)
downloadeclipse.platform.team-3a087613532d71c24bfde5f833ebb2159fd81bec.tar.gz
eclipse.platform.team-3a087613532d71c24bfde5f833ebb2159fd81bec.tar.xz
eclipse.platform.team-3a087613532d71c24bfde5f833ebb2159fd81bec.zip
Fix for compile errors access JFace colors. Solution is to use system colors.
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/viewers/SynchronizeModelElementLabelProvider.java4
2 files changed, 4 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
index a0b90fea1..dbfc639cc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
@@ -13,14 +13,12 @@ package org.eclipse.team.internal.ui.synchronize;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.resource.JFaceColors;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.*;
import org.eclipse.team.core.ITeamStatus;
import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.internal.ui.*;
@@ -341,6 +339,6 @@ public class ChangesSection extends Composite {
}
protected Color getBackgroundColor() {
- return JFaceColors.getSchemeBackground(parent.getDisplay());
+ return getShell().getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/viewers/SynchronizeModelElementLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/viewers/SynchronizeModelElementLabelProvider.java
index ca14ae936..e703cdab4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/viewers/SynchronizeModelElementLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/viewers/SynchronizeModelElementLabelProvider.java
@@ -18,10 +18,10 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.internal.ui.*;
import org.eclipse.team.ui.ISharedImages;
-import org.eclipse.ui.internal.WorkbenchColors;
import org.eclipse.ui.model.WorkbenchLabelProvider;
/**
@@ -87,7 +87,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
if (element instanceof SynchronizeModelElement) {
SynchronizeModelElement node = (SynchronizeModelElement)element;
if(node.getProperty(SynchronizeModelElement.BUSY_PROPERTY)) {
- return WorkbenchColors.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+ return Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
}
}
return null;

Back to the top