mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-09 01:55:24 +02:00
[cleanup] Fix compiler warnings
This commit is contained in:
parent
ef98b74284
commit
3479b29549
11 changed files with 18 additions and 27 deletions
|
@ -472,12 +472,14 @@ public class SystemFileFilterStringEditPane
|
||||||
|
|
||||||
errorMessage = validateFolderInput();
|
errorMessage = validateFolderInput();
|
||||||
if (errorMessage != null)
|
if (errorMessage != null)
|
||||||
controlInError = folderCombo;
|
{
|
||||||
|
controlInError = folderCombo;
|
||||||
if (errorMessage == null)
|
}
|
||||||
{
|
else
|
||||||
if (subsetByFileNameRadioButton.getSelection())
|
{
|
||||||
|
if (subsetByFileNameRadioButton.getSelection()) {
|
||||||
errorMessage = validateFileInput();
|
errorMessage = validateFileInput();
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (textTypes.getText().trim().length() == 0)
|
if (textTypes.getText().trim().length() == 0)
|
||||||
|
|
|
@ -43,7 +43,7 @@ public class StatusChangeListener implements IDomainListener
|
||||||
|
|
||||||
protected Vector historyOfTargets;
|
protected Vector historyOfTargets;
|
||||||
|
|
||||||
protected class FindShell implements Runnable {
|
protected static class FindShell implements Runnable {
|
||||||
private Shell shell;
|
private Shell shell;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -169,9 +169,6 @@ public class StatusChangeListener implements IDomainListener
|
||||||
this.done = done;
|
this.done = done;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @see IDomainListener#getShell()
|
|
||||||
*/
|
|
||||||
public Shell getShell() {
|
public Shell getShell() {
|
||||||
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
|
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
|
||||||
//if (shell == null) {
|
//if (shell == null) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis
|
||||||
|
|
||||||
protected Vector historyOfTargets;
|
protected Vector historyOfTargets;
|
||||||
|
|
||||||
protected class FindShell implements Runnable {
|
protected static class FindShell implements Runnable {
|
||||||
private Shell shell;
|
private Shell shell;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -192,9 +192,6 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis
|
||||||
this.done = done;
|
this.done = done;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @see IDomainListener#getShell()
|
|
||||||
*/
|
|
||||||
public Shell getShell() {
|
public Shell getShell() {
|
||||||
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
|
// dy: DomainNotifier (which calls this method) requires the shell not be disposed
|
||||||
//if (shell == null) {
|
//if (shell == null) {
|
||||||
|
@ -412,7 +409,7 @@ public class StatusChangeListener implements IDomainListener, ICommunicationsLis
|
||||||
* Start diagnostic
|
* Start diagnostic
|
||||||
*
|
*
|
||||||
* @param Class diagnostic is the an implementation of ICommunicationsDiagnostic
|
* @param Class diagnostic is the an implementation of ICommunicationsDiagnostic
|
||||||
* @param boolean quiet is the flag to indicate if user should be prompted
|
* @param quiet is the flag to indicate if user should be prompted
|
||||||
* - true for no prompt
|
* - true for no prompt
|
||||||
* @return ICommunciationsDiagnostic class instance
|
* @return ICommunciationsDiagnostic class instance
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class SystemFilterMoveDownFilterPoolReferenceAction extends SystemBaseAct
|
||||||
ISystemFilterPoolReferenceManager fprMgr = null;
|
ISystemFilterPoolReferenceManager fprMgr = null;
|
||||||
while (i.hasNext())
|
while (i.hasNext())
|
||||||
{
|
{
|
||||||
sortableArray[idx] = new SystemSortableSelection((ISystemFilterPoolReference)i.next());
|
sortableArray[idx] = new SystemSortableSelection(i.next());
|
||||||
filterPoolRef = (ISystemFilterPoolReference)sortableArray[idx].getSelectedObject();
|
filterPoolRef = (ISystemFilterPoolReference)sortableArray[idx].getSelectedObject();
|
||||||
fprMgr = filterPoolRef.getFilterPoolReferenceManager();
|
fprMgr = filterPoolRef.getFilterPoolReferenceManager();
|
||||||
sortableArray[idx].setPosition(fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef));
|
sortableArray[idx].setPosition(fprMgr.getSystemFilterPoolReferencePosition(filterPoolRef));
|
||||||
|
|
|
@ -19,7 +19,6 @@ package org.eclipse.rse.ui.filters.dialogs;
|
||||||
import java.util.Vector;
|
import java.util.Vector;
|
||||||
|
|
||||||
import org.eclipse.jface.resource.ImageDescriptor;
|
import org.eclipse.jface.resource.ImageDescriptor;
|
||||||
import org.eclipse.jface.wizard.WizardPage;
|
|
||||||
import org.eclipse.rse.core.SystemBasePlugin;
|
import org.eclipse.rse.core.SystemBasePlugin;
|
||||||
import org.eclipse.rse.filters.ISystemFilter;
|
import org.eclipse.rse.filters.ISystemFilter;
|
||||||
import org.eclipse.rse.filters.ISystemFilterContainer;
|
import org.eclipse.rse.filters.ISystemFilterContainer;
|
||||||
|
|
|
@ -230,7 +230,7 @@ public class SystemFetchOperation extends JobChangeAdapter implements IRunnableW
|
||||||
*/
|
*/
|
||||||
protected void displayAsyncMsg(SubSystem ss, org.eclipse.rse.services.clientserver.messages.SystemMessageException msg)
|
protected void displayAsyncMsg(SubSystem ss, org.eclipse.rse.services.clientserver.messages.SystemMessageException msg)
|
||||||
{
|
{
|
||||||
DisplayErrorMessageJob job = ss.new DisplayErrorMessageJob(null, msg);
|
DisplayErrorMessageJob job = new DisplayErrorMessageJob(null, msg);
|
||||||
job.setPriority(Job.INTERACTIVE);
|
job.setPriority(Job.INTERACTIVE);
|
||||||
job.setSystem(true);
|
job.setSystem(true);
|
||||||
job.schedule();
|
job.schedule();
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.ui.wizards;
|
package org.eclipse.rse.ui.wizards;
|
||||||
import org.eclipse.jface.wizard.WizardPage;
|
|
||||||
import org.eclipse.rse.core.SystemBasePlugin;
|
import org.eclipse.rse.core.SystemBasePlugin;
|
||||||
import org.eclipse.rse.model.ISystemRegistry;
|
import org.eclipse.rse.model.ISystemRegistry;
|
||||||
import org.eclipse.rse.ui.ISystemIconConstants;
|
import org.eclipse.rse.ui.ISystemIconConstants;
|
||||||
|
|
|
@ -18,7 +18,6 @@ package org.eclipse.rse.internal.filters;
|
||||||
|
|
||||||
import org.eclipse.core.runtime.IAdaptable;
|
import org.eclipse.core.runtime.IAdaptable;
|
||||||
import org.eclipse.core.runtime.Platform;
|
import org.eclipse.core.runtime.Platform;
|
||||||
import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
|
|
||||||
import org.eclipse.rse.core.subsystems.ISubSystem;
|
import org.eclipse.rse.core.subsystems.ISubSystem;
|
||||||
import org.eclipse.rse.filters.ISystemFilter;
|
import org.eclipse.rse.filters.ISystemFilter;
|
||||||
import org.eclipse.rse.filters.ISystemFilterContainer;
|
import org.eclipse.rse.filters.ISystemFilterContainer;
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
|
|
||||||
package org.eclipse.rse.internal.references;
|
package org.eclipse.rse.internal.references;
|
||||||
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
import org.eclipse.rse.core.references.IRSEBasePersistableReferencedObject;
|
||||||
import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
|
|
||||||
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -961,7 +961,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
||||||
/**
|
/**
|
||||||
* Display message on message thread
|
* Display message on message thread
|
||||||
*/
|
*/
|
||||||
protected void displayAsyncMsg(org.eclipse.rse.services.clientserver.messages.SystemMessageException msg)
|
protected void displayAsyncMsg(SystemMessageException msg)
|
||||||
{
|
{
|
||||||
DisplayErrorMessageJob job = new DisplayErrorMessageJob(getShell(), msg);
|
DisplayErrorMessageJob job = new DisplayErrorMessageJob(getShell(), msg);
|
||||||
job.setPriority(Job.INTERACTIVE);
|
job.setPriority(Job.INTERACTIVE);
|
||||||
|
@ -969,18 +969,18 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
|
||||||
job.schedule();
|
job.schedule();
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Inner class which extends WorkbenchJob to allow us to show an error message, which is a GUI operation,
|
* Nested class which extends WorkbenchJob to allow us to show an error message, which is a GUI operation,
|
||||||
* from a non-GUI thread. This is done by creating an instance of this class and then scheduling it.
|
* from a non-GUI thread. This is done by creating an instance of this class and then scheduling it.
|
||||||
*/
|
*/
|
||||||
public class DisplayErrorMessageJob extends WorkbenchJob
|
public static class DisplayErrorMessageJob extends WorkbenchJob
|
||||||
{
|
{
|
||||||
private Shell shell;
|
private Shell shell;
|
||||||
private org.eclipse.rse.services.clientserver.messages.SystemMessageException msgExc;
|
private SystemMessageException msgExc;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
*/
|
*/
|
||||||
public DisplayErrorMessageJob(Shell shell, org.eclipse.rse.services.clientserver.messages.SystemMessageException msgExc)
|
public DisplayErrorMessageJob(Shell shell, SystemMessageException msgExc)
|
||||||
{
|
{
|
||||||
super("");
|
super("");
|
||||||
this.shell = shell; //FIXME remove this
|
this.shell = shell; //FIXME remove this
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.core;
|
package org.eclipse.rse.core;
|
||||||
import org.eclipse.core.runtime.IAdaptable;
|
|
||||||
import org.eclipse.rse.ui.RSEUIPlugin;
|
import org.eclipse.rse.ui.RSEUIPlugin;
|
||||||
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
|
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
|
||||||
import org.eclipse.ui.internal.dialogs.PropertyPageManager;
|
import org.eclipse.ui.internal.dialogs.PropertyPageManager;
|
||||||
|
|
Loading…
Add table
Reference in a new issue