Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAlain Magloire2004-09-06 23:52:25 -0400
committerAlain Magloire2004-09-06 23:52:25 -0400
commitb62a30b9a8c8ea0d4e574f5d2c2e89b8b1666ed1 (patch)
tree34b787fb0dbec2250f2efa910e8f672018ba83f1 /build
parent681edb943a860c8b001c437fe76c14e57c8eb056 (diff)
downloadorg.eclipse.cdt-b62a30b9a8c8ea0d4e574f5d2c2e89b8b1666ed1.tar.gz
org.eclipse.cdt-b62a30b9a8c8ea0d4e574f5d2c2e89b8b1666ed1.tar.xz
org.eclipse.cdt-b62a30b9a8c8ea0d4e574f5d2c2e89b8b1666ed1.zip
Removing some warnings.
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java5
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java3
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java1
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java2
-rw-r--r--build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java5
5 files changed, 5 insertions, 11 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java
index a3117c58cfb..8512dc5a0db 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java
@@ -230,10 +230,9 @@ public class MakeUIPlugin extends AbstractUIPlugin {
public Shell getShell() {
if (getActiveWorkbenchShell() != null) {
return getActiveWorkbenchShell();
- } else {
- IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
- return windows[0].getShell();
}
+ IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
+ return windows[0].getShell();
}
public synchronized IMakefileDocumentProvider getMakefileDocumentProvider() {
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
index bc48c16c2f5..1511bd5de7e 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MessageLine.java
@@ -51,9 +51,8 @@ public class MessageLine extends CLabel {
setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
setBackground(JFaceColors.getErrorBackground(getDisplay()));
return;
- } else {
- hasErrorMessage = false;
}
+ hasErrorMessage = false;
setText(fMessage);
setImage(null);
setBackground(fNormalMsgAreaBackground);
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java
index fec5a35a274..2b55d09e63f 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java
@@ -77,7 +77,6 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
// folding
protected Button fFoldingCheckbox;
- private SelectionListener fSelectionListener;
protected Map fWorkingValues;
protected ArrayList fComboBoxes;
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java
index 38dbea718ec..ffd1db5a70c 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java
@@ -47,8 +47,6 @@ public abstract class AbstractMakefileCodeScanner extends RuleBasedScanner {
*/
private String[] fPropertyNamesItalic;
- private boolean fNeedsLazyColorLoading;
-
/**
* Returns the list of preference keys which define the tokens
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java
index e1e1fc2b634..e1b15210ede 100644
--- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java
+++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java
@@ -78,9 +78,8 @@ public abstract class StatusWizardPage extends WizardPage {
public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
if (s1.getSeverity() >= s2.getSeverity()) {
return s1;
- } else {
- return s2;
- }
+ }
+ return s2;
}

Back to the top