Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2010-11-22 05:10:32 -0500
committerDani Megert2010-11-22 05:10:32 -0500
commit742369fe8c1fa67f67768a2f8c294b9f866157e9 (patch)
tree2e35f55f29f9113fdc285031fa493b3f2428836b
parent03da9c5211bbce07c1577ff9588ef5f8f6f57413 (diff)
downloadeclipse.platform.team-742369fe8c1fa67f67768a2f8c294b9f866157e9.tar.gz
eclipse.platform.team-742369fe8c1fa67f67768a2f8c294b9f866157e9.tar.xz
eclipse.platform.team-742369fe8c1fa67f67768a2f8c294b9f866157e9.zip
Fixed compile warning in official build.
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java11
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java13
4 files changed, 22 insertions, 20 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java
index 5fd65a30a..386b68384 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 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
@@ -291,7 +291,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
private Composite createEnableParticipantModelProvidersPane(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -358,7 +358,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
private Composite getInitializationPane(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -417,7 +417,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
private Composite getInitializingMessagePane(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -442,7 +442,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -532,7 +532,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
private Composite getErrorComposite(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
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 f4d10a76a..e10b187e1 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 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
@@ -51,8 +51,9 @@ public class ChangesSection extends Composite {
/**
* Create a changes section on the following page.
*
- * @param parent the parent control
+ * @param parent the parent control
* @param page the page showing this section
+ * @param configuration the configuration for the synchronize page
*/
public ChangesSection(Composite parent, AbstractSynchronizePage page, ISynchronizePageConfiguration configuration) {
super(parent, SWT.NONE);
@@ -68,9 +69,9 @@ public class ChangesSection extends Composite {
setLayoutData(data);
forms = new FormToolkit(parent.getDisplay());
- forms.setBackground(getBackgroundColor());
+ forms.setBackground(getListBackgroundColor());
HyperlinkGroup group = forms.getHyperlinkGroup();
- group.setBackground(getBackgroundColor());
+ group.setBackground(getListBackgroundColor());
changesSectionContainer = new PageBook(this, SWT.NONE);
data = new GridData(GridData.FILL_BOTH);
@@ -79,7 +80,7 @@ public class ChangesSection extends Composite {
changesSectionContainer.setLayoutData(data);
}
- protected Color getBackgroundColor() {
+ protected Color getListBackgroundColor() {
return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
index 2df50e0c6..850506b4c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 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
@@ -83,7 +83,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
protected Composite getEmptyChangesComposite(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -140,7 +140,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
data.widthHint = 100;
description.setLayoutData(data);
description.setText(text);
- description.setBackground(getBackgroundColor());
+ description.setBackground(getListBackgroundColor());
return description;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
index f24570f88..c834e829d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2006 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
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.team.core.ITeamStatus;
import org.eclipse.team.core.synchronize.*;
import org.eclipse.team.internal.ui.*;
@@ -86,8 +86,9 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
/**
* Create a changes section on the following page.
*
- * @param parent the parent control
+ * @param parent the parent control
* @param page the page showing this section
+ * @param configuration the configuration for the synchronize page
*/
public SyncInfoSetChangesSection(Composite parent, AbstractSynchronizePage page, ISynchronizePageConfiguration configuration) {
super(parent, page, configuration);
@@ -179,7 +180,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
private Composite getErrorComposite(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
- composite.setBackground(getBackgroundColor());
+ composite.setBackground(getListBackgroundColor());
GridLayout layout = new GridLayout();
layout.numColumns = 2;
composite.setLayout(layout);
@@ -194,7 +195,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
showErrors();
}
});
- link.setBackground(getBackgroundColor());
+ link.setBackground(getListBackgroundColor());
link.setUnderlined(true);
link = new Hyperlink(composite, SWT.WRAP);
@@ -204,7 +205,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
getPage().reset();
}
});
- link.setBackground(getBackgroundColor());
+ link.setBackground(getListBackgroundColor());
link.setUnderlined(true);
createDescriptionLabel(composite, NLS.bind(TeamUIMessages.ChangesSection_10, new String[] { Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, getConfiguration().getParticipant().getName()) }));

Back to the top