mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-08 09:35:23 +02:00
[cleanup] Fix compiler warnings
This commit is contained in:
parent
4009b3cc5d
commit
ef98b74284
2 changed files with 4 additions and 8 deletions
|
@ -60,7 +60,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
|
||||||
|
|
||||||
protected boolean _networkDown = false;
|
protected boolean _networkDown = false;
|
||||||
|
|
||||||
protected class FindShell implements Runnable
|
protected static class FindShell implements Runnable
|
||||||
{
|
{
|
||||||
|
|
||||||
private Shell shell;
|
private Shell shell;
|
||||||
|
@ -237,9 +237,6 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @see IDomainListener#getShell()
|
|
||||||
*/
|
|
||||||
public Shell getShell()
|
public Shell getShell()
|
||||||
{
|
{
|
||||||
// dy: DomainNotifier (which calls this method) requires the shell not
|
// dy: DomainNotifier (which calls this method) requires the shell not
|
||||||
|
|
|
@ -18,7 +18,6 @@ package org.eclipse.rse.ui.view;
|
||||||
import org.eclipse.core.runtime.IProgressMonitor;
|
import org.eclipse.core.runtime.IProgressMonitor;
|
||||||
import org.eclipse.jface.action.IAction;
|
import org.eclipse.jface.action.IAction;
|
||||||
import org.eclipse.jface.resource.ImageDescriptor;
|
import org.eclipse.jface.resource.ImageDescriptor;
|
||||||
import org.eclipse.jface.viewers.ICellEditorValidator;
|
|
||||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||||
import org.eclipse.rse.core.ISystemUserIdConstants;
|
import org.eclipse.rse.core.ISystemUserIdConstants;
|
||||||
import org.eclipse.rse.core.SystemBasePlugin;
|
import org.eclipse.rse.core.SystemBasePlugin;
|
||||||
|
@ -274,13 +273,13 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
|
||||||
if (subsys.isConnected())
|
if (subsys.isConnected())
|
||||||
{
|
{
|
||||||
String connectedId = subsys.getConnectorService().getUserId();
|
String connectedId = subsys.getConnectorService().getUserId();
|
||||||
boolean connectedIdIsNull = (connectedId == null); // caused crash! Happens on Local subsystems. Phil.
|
//On Local subsystems, connectedId==null. Phil.
|
||||||
if (data.getIsLocal() && !connectedIdIsNull && !connectedId.equals(localUserId))
|
if (data.getIsLocal() && connectedId!=null && !connectedId.equals(localUserId))
|
||||||
{
|
{
|
||||||
data.setLocalValue(connectedId);
|
data.setLocalValue(connectedId);
|
||||||
data.setIsLocal(true);
|
data.setIsLocal(true);
|
||||||
}
|
}
|
||||||
else if (!connectedIdIsNull && !connectedId.equals(parentUserId))
|
else if (connectedId!=null && !connectedId.equals(parentUserId))
|
||||||
{
|
{
|
||||||
data.setLocalValue(connectedId);
|
data.setLocalValue(connectedId);
|
||||||
data.setIsLocal(true);
|
data.setIsLocal(true);
|
||||||
|
|
Loading…
Add table
Reference in a new issue