mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 21:05:37 +02:00
Code Issues Wiki Activity

removing some compile warnings

Browse source
This commit is contained in:
David McKnight 2007-01-03 19:09:57 +00:00
parent b44065158f
commit 0de8f94053
22 changed files with 23 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
View file

@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
protected Item[] sortSelection(Widget parentItem, Item[] oldResult) { protected Item[] sortSelection(Widget parentItem, Item[] oldResult) {
Item[] newResult = new Item[oldResult.length];
Item[] children = null; Item[] children = null;
Item[] newResult = new Item[oldResult.length];
if (parentItem instanceof Item) { if (parentItem instanceof Item) {
children = oldResult; children = oldResult;
} else } else
children = getChildren(parentItem); children = getChildren(parentItem);
/*
for (int i = 0; i < oldResult.length; i++) for (int i = 0; i < oldResult.length; i++)
{ {
Item first = removeFirstItem(oldResult, children); Item first = removeFirstItem(oldResult, children);
@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
return newResult; return newResult;
*/
return oldResult;
} }
protected Item removeFirstItem(Item[] items, Item[] children) { protected Item removeFirstItem(Item[] items, Item[] children) {

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
View file

@ -948,7 +948,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
if ((iconFile!=null)&&(iconFile.length()>0)) if ((iconFile!=null)&&(iconFile.length()>0))
{ {
// get namespace of extension (i.e. the id of the declaring plugin) // get namespace of extension (i.e. the id of the declaring plugin)
String nameSpace = showPrefPagePlugins[idx].getDeclaringExtension().getNamespace(); String nameSpace = showPrefPagePlugins[idx].getDeclaringExtension().getNamespaceIdentifier();
// now get the associated bundle // now get the associated bundle
Bundle bundle = Platform.getBundle(nameSpace); Bundle bundle = Platform.getBundle(nameSpace);
@ -1118,7 +1118,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
try try
{ {
// get the name space of the declaring extension // get the name space of the declaring extension
String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
// use the name space to get the bundle // use the name space to get the bundle
Bundle bundle = Platform.getBundle(nameSpace); Bundle bundle = Platform.getBundle(nameSpace);
@ -1155,7 +1155,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
try try
{ {
// get the name space of the declaring extension // get the name space of the declaring extension
String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
String menuExtensionType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$ String menuExtensionType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$
@ -1193,7 +1193,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
try try
{ {
// get the name space of the declaring extension // get the name space of the declaring extension
String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespace(); String nameSpace = systemTypeExtensions[i].getDeclaringExtension().getNamespaceIdentifier();
String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$ String keystoreProviderType = systemTypeExtensions[i].getAttribute("class"); //$NON-NLS-1$

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java
View file

@ -95,7 +95,6 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction {
if (system.isPasswordCached() || system.isPasswordCached(true)) if (system.isPasswordCached() || system.isPasswordCached(true))
{ {
// get the user id // get the user id
String userId = system.getUserId();
// clear userid/password from memory and fire event // clear userid/password from memory and fire event
//DKM and disk now //DKM and disk now

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemConnectAllSubSystemsAction.java
View file

@ -75,7 +75,6 @@ public class SystemConnectAllSubSystemsAction extends SystemBaseAction
IHost conn = (IHost)getFirstSelection(); IHost conn = (IHost)getFirstSelection();
try try
{ {
Shell shell = getShell();
ISubSystem[] subsystems = conn.getSubSystems(); ISubSystem[] subsystems = conn.getSubSystems();
for (int i = 0; i < subsystems.length; i++) for (int i = 0; i < subsystems.length; i++)
{ {

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyConnectionAction.java
View file

@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemMoveConnectionAction.java
View file

@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.model.IHost; import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemProfile; import org.eclipse.rse.core.model.ISystemProfile;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java
View file

@ -206,7 +206,6 @@ public class SystemRenameDialog extends SystemPromptDialog
*/ */
protected ISystemMessageLine createMessageLine(Composite c) protected ISystemMessageLine createMessageLine(Composite c)
{ {
ISystemMessageLine msgLine = super.createMessageLine(c);
return fMessageLine; return fMessageLine;
} }
@ -488,7 +487,6 @@ public class SystemRenameDialog extends SystemPromptDialog
e.doit = false; e.doit = false;
ignoreSelection = true; ignoreSelection = true;
Control focusControl = Display.getCurrent().getFocusControl();
//System.out.println("...Key pressed. currRow = "+currRow); //System.out.println("...Key pressed. currRow = "+currRow);

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleCopyDialog.java
View file

@ -209,8 +209,7 @@ public class SystemSimpleCopyDialog
*/ */
public boolean verify() public boolean verify()
{ {
String errMsg = null;
Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/* /*
if (errMsg != null) if (errMsg != null)

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.java
View file

@ -458,8 +458,7 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog
*/ */
public boolean verify() public boolean verify()
{ {
String errMsg = null;
Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/* /*
if (errMsg != null) if (errMsg != null)

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemFilterWorkWithFilterPoolsDialog.java
View file

@ -353,8 +353,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
*/ */
public boolean verify() public boolean verify()
{ {
String errMsg = null;
Control controlInError = null;
clearErrorMessage(); clearErrorMessage();
/* /*
if (errMsg != null) if (errMsg != null)

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/open/SystemQuickOpenPageDescriptor.java
View file

@ -111,7 +111,7 @@ public class SystemQuickOpenPageDescriptor implements Comparable {
URL url = null; URL url = null;
try { try {
String nameSpace = element.getDeclaringExtension().getNamespace(); String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
Bundle bundle = Platform.getBundle(nameSpace); Bundle bundle = Platform.getBundle(nameSpace);
url = new URL(bundle.getEntry("/"), imageName); //$NON-NLS-1$ url = new URL(bundle.getEntry("/"), imageName); //$NON-NLS-1$
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java
View file

@ -20,7 +20,7 @@ import org.eclipse.rse.ui.Mnemonics;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine; import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.messages.ISystemMessageLineTarget; import org.eclipse.rse.ui.messages.ISystemMessageLineTarget;
import org.eclipse.rse.ui.messages.SystemDialogPageMessageLine; import org.eclipse.rse.ui.messages.SystemMessageLine;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
@ -479,7 +479,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage
if (wantAutomaticValidManagement()) if (wantAutomaticValidManagement())
setValid(message == null); setValid(message == null);
if (msgLine != null) if (msgLine != null)
((SystemDialogPageMessageLine)msgLine).internalSetErrorMessage(message); ((SystemMessageLine)msgLine).setErrorMessage(message);
} }
/** /**
@ -527,7 +527,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage
{ {
super.setMessage(message); super.setMessage(message);
if (msgLine!=null) if (msgLine!=null)
((SystemDialogPageMessageLine)msgLine).internalSetMessage(message); ((SystemMessageLine)msgLine).setMessage(message);
} }
} }

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCoreForm.java
View file

@ -346,7 +346,6 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem
// PROCESS USER ID... // PROCESS USER ID...
if (textUserId != null) if (textUserId != null)
{ {
String userId = getUserId();
updateUserId(ss); updateUserId(ss);
} }
ss.commit(); ss.commit();

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemEmptyListAPIProviderImpl.java
View file

@ -28,8 +28,6 @@ public class SystemEmptyListAPIProviderImpl
{ {
protected Object[] emptyList = new Object[0];
/** /**
* Constructor * Constructor
*/ */

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTestFilterStringAPIProviderImpl.java
View file

@ -36,11 +36,7 @@ public class SystemTestFilterStringAPIProviderImpl
protected String filterString = null; protected String filterString = null;
protected ISubSystem subsystem = null; protected ISubSystem subsystem = null;
protected Object[] emptyList = new Object[0];
protected Object[] msgList = new Object[1];
protected SystemMessageObject nullObject = null;
protected SystemMessageObject canceledObject = null;
protected SystemMessageObject errorObject = null;
/** /**
* Constructor * Constructor
* @param subsystem The subsystem that will resolve the filter string * @param subsystem The subsystem that will resolve the filter string

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
View file

@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
protected Item[] sortSelection(Widget parentItem, Item[] oldResult) { protected Item[] sortSelection(Widget parentItem, Item[] oldResult) {
Item[] newResult = new Item[oldResult.length];
Item[] children = null; Item[] children = null;
Item[] newResult = new Item[oldResult.length];
if (parentItem instanceof Item) { if (parentItem instanceof Item) {
children = oldResult; children = oldResult;
} else } else
children = getChildren(parentItem); children = getChildren(parentItem);
/*
for (int i = 0; i < oldResult.length; i++) for (int i = 0; i < oldResult.length; i++)
{ {
Item first = removeFirstItem(oldResult, children); Item first = removeFirstItem(oldResult, children);
@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
} }
return newResult; return newResult;
*/
return oldResult;
} }
protected Item removeFirstItem(Item[] items, Item[] children) { protected Item removeFirstItem(Item[] items, Item[] children) {

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java
View file

@ -276,7 +276,6 @@ public class SystemViewFilterPoolReferenceAdapter
*/ */
public boolean doDelete(Shell shell, Object element, IProgressMonitor monitor) throws Exception public boolean doDelete(Shell shell, Object element, IProgressMonitor monitor) throws Exception
{ {
ISystemFilterPoolReference fpr = getFilterPoolReference(element);
ISystemFilterPool fp = getFilterPool(element); ISystemFilterPool fp = getFilterPool(element);
ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager(); ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager();
fpMgr.deleteSystemFilterPool(fp); fpMgr.deleteSystemFilterPool(fp);

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -377,7 +377,6 @@ public class SystemViewFilterReferenceAdapter
if (monitor == null) if (monitor == null)
{ {
Shell shell = getShell();
allChildren = ss.resolveFilterStrings(filterStrings); allChildren = ss.resolveFilterStrings(filterStrings);
} }
else else

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/scratchpad/SystemScratchpadView.java
View file

@ -253,8 +253,6 @@ public class SystemScratchpadView
getTree().setVisible(true); getTree().setVisible(true);
_objectInput = newObject; _objectInput = newObject;
SystemScratchpadViewProvider provider = (SystemScratchpadViewProvider) getContentProvider();
Object[] children = provider.getChildren(_objectInput);
super.inputChanged(newObject, oldObject); super.inputChanged(newObject, oldObject);
} }
@ -429,7 +427,6 @@ public class SystemScratchpadView
remoteResourceNames = (Vector) remoteResource; remoteResourceNames = (Vector) remoteResource;
remoteResource = remoteResourceNames.elementAt(0); remoteResource = remoteResourceNames.elementAt(0);
} }
String remoteResourceParentName = getRemoteResourceAbsoluteName(remoteResourceParent);
String remoteResourceName = getRemoteResourceAbsoluteName(remoteResource); String remoteResourceName = getRemoteResourceAbsoluteName(remoteResource);
if (remoteResourceName == null) if (remoteResourceName == null)
return; return;
@ -524,7 +521,6 @@ public class SystemScratchpadView
// -------------------------- // --------------------------
case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED : case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED :
{ {
String oldName = event.getOldName();
Object child = event.getResource(); Object child = event.getResource();
if (provider != null) if (provider != null)

4
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java
View file

@ -246,7 +246,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
try try
{ {
// get the name space of the declaring extension // get the name space of the declaring extension
String nameSpace = element.getDeclaringExtension().getNamespace(); String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
String extensionType = element.getAttribute("class"); //$NON-NLS-1$ String extensionType = element.getAttribute("class"); //$NON-NLS-1$
// use the name space to get the bundle // use the name space to get the bundle
@ -354,7 +354,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
protected Bundle getBundle() protected Bundle getBundle()
{ {
String nameSpace = element.getDeclaringExtension().getNamespace(); String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
return Platform.getBundle(nameSpace); return Platform.getBundle(nameSpace);
} }

2
rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemPropertyPageExtension.java
View file

@ -238,7 +238,7 @@ public class SystemPropertyPageExtension implements IPropertyPageContributor
protected Bundle getBundle(IConfigurationElement element) protected Bundle getBundle(IConfigurationElement element)
{ {
String nameSpace = element.getDeclaringExtension().getNamespace(); String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
return Platform.getBundle(nameSpace); return Platform.getBundle(nameSpace);
} }

2
rse/plugins/org.eclipse.rse.ui/systems/org/eclipse/rse/core/SystemResourceManager.java
View file

@ -205,7 +205,7 @@ public class SystemResourceManager implements SystemResourceConstants
} }
try{ try{
// create types folder... // create types folder...
IFolder folder = getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME); getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME);
} catch (Exception e) } catch (Exception e)
{ {
SystemBasePlugin.logError("error opening/creating types folder",e); //$NON-NLS-1$ SystemBasePlugin.logError("error opening/creating types folder",e); //$NON-NLS-1$