mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-22 00:15:25 +02:00
Removing some warnings.
This commit is contained in:
parent
681edb943a
commit
b62a30b9a8
5 changed files with 5 additions and 11 deletions
|
@ -230,11 +230,10 @@ public class MakeUIPlugin extends AbstractUIPlugin {
|
||||||
public Shell getShell() {
|
public Shell getShell() {
|
||||||
if (getActiveWorkbenchShell() != null) {
|
if (getActiveWorkbenchShell() != null) {
|
||||||
return getActiveWorkbenchShell();
|
return getActiveWorkbenchShell();
|
||||||
} else {
|
}
|
||||||
IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
|
IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows();
|
||||||
return windows[0].getShell();
|
return windows[0].getShell();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public synchronized IMakefileDocumentProvider getMakefileDocumentProvider() {
|
public synchronized IMakefileDocumentProvider getMakefileDocumentProvider() {
|
||||||
if (fMakefileDocumentProvider == null) {
|
if (fMakefileDocumentProvider == null) {
|
||||||
|
|
|
@ -51,9 +51,8 @@ public class MessageLine extends CLabel {
|
||||||
setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
|
setImage(MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ERROR));
|
||||||
setBackground(JFaceColors.getErrorBackground(getDisplay()));
|
setBackground(JFaceColors.getErrorBackground(getDisplay()));
|
||||||
return;
|
return;
|
||||||
} else {
|
|
||||||
hasErrorMessage = false;
|
|
||||||
}
|
}
|
||||||
|
hasErrorMessage = false;
|
||||||
setText(fMessage);
|
setText(fMessage);
|
||||||
setImage(null);
|
setImage(null);
|
||||||
setBackground(fNormalMsgAreaBackground);
|
setBackground(fNormalMsgAreaBackground);
|
||||||
|
|
|
@ -77,7 +77,6 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
|
||||||
// folding
|
// folding
|
||||||
protected Button fFoldingCheckbox;
|
protected Button fFoldingCheckbox;
|
||||||
|
|
||||||
private SelectionListener fSelectionListener;
|
|
||||||
protected Map fWorkingValues;
|
protected Map fWorkingValues;
|
||||||
protected ArrayList fComboBoxes;
|
protected ArrayList fComboBoxes;
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,6 @@ public abstract class AbstractMakefileCodeScanner extends RuleBasedScanner {
|
||||||
*/
|
*/
|
||||||
private String[] fPropertyNamesItalic;
|
private String[] fPropertyNamesItalic;
|
||||||
|
|
||||||
private boolean fNeedsLazyColorLoading;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the list of preference keys which define the tokens
|
* Returns the list of preference keys which define the tokens
|
||||||
|
|
|
@ -78,9 +78,8 @@ public abstract class StatusWizardPage extends WizardPage {
|
||||||
public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
|
public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
|
||||||
if (s1.getSeverity() >= s2.getSeverity()) {
|
if (s1.getSeverity() >= s2.getSeverity()) {
|
||||||
return s1;
|
return s1;
|
||||||
} else {
|
|
||||||
return s2;
|
|
||||||
}
|
}
|
||||||
|
return s2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue