mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-03 23:25:26 +02:00
removing some compile warnings
This commit is contained in:
parent
b44065158f
commit
0de8f94053
22 changed files with 23 additions and 47 deletions
|
@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
|||
}
|
||||
|
||||
protected Item[] sortSelection(Widget parentItem, Item[] oldResult) {
|
||||
Item[] newResult = new Item[oldResult.length];
|
||||
Item[] children = null;
|
||||
Item[] newResult = new Item[oldResult.length];
|
||||
if (parentItem instanceof Item) {
|
||||
children = oldResult;
|
||||
} else
|
||||
children = getChildren(parentItem);
|
||||
/*
|
||||
|
||||
for (int i = 0; i < oldResult.length; i++)
|
||||
{
|
||||
Item first = removeFirstItem(oldResult, children);
|
||||
|
@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
|||
}
|
||||
|
||||
return newResult;
|
||||
*/
|
||||
return oldResult;
|
||||
|
||||
}
|
||||
|
||||
protected Item removeFirstItem(Item[] items, Item[] children) {
|
||||
|
|
|
@ -948,7 +948,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
|||
if ((iconFile!=null)&&(iconFile.length()>0))
|
||||
{
|
||||
// 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
|
||||
Bundle bundle = Platform.getBundle(nameSpace);
|
||||
|
@ -1118,7 +1118,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
|||
try
|
||||
{
|
||||
// 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
|
||||
Bundle bundle = Platform.getBundle(nameSpace);
|
||||
|
@ -1155,7 +1155,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
|||
try
|
||||
{
|
||||
// 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$
|
||||
|
||||
|
@ -1193,7 +1193,7 @@ public class RSEUIPlugin extends SystemBasePlugin implements ISystemMessageProvi
|
|||
try
|
||||
{
|
||||
// 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$
|
||||
|
||||
|
|
|
@ -95,7 +95,6 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction {
|
|||
if (system.isPasswordCached() || system.isPasswordCached(true))
|
||||
{
|
||||
// get the user id
|
||||
String userId = system.getUserId();
|
||||
|
||||
// clear userid/password from memory and fire event
|
||||
//DKM and disk now
|
||||
|
|
|
@ -75,7 +75,6 @@ public class SystemConnectAllSubSystemsAction extends SystemBaseAction
|
|||
IHost conn = (IHost)getFirstSelection();
|
||||
try
|
||||
{
|
||||
Shell shell = getShell();
|
||||
ISubSystem[] subsystems = conn.getSubSystems();
|
||||
for (int i = 0; i < subsystems.length; i++)
|
||||
{
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
|
|||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
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.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.ISystemMessages;
|
||||
|
|
|
@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
|
|||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.rse.core.model.IHost;
|
||||
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.ui.ISystemIconConstants;
|
||||
import org.eclipse.rse.ui.ISystemMessages;
|
||||
|
|
|
@ -206,7 +206,6 @@ public class SystemRenameDialog extends SystemPromptDialog
|
|||
*/
|
||||
protected ISystemMessageLine createMessageLine(Composite c)
|
||||
{
|
||||
ISystemMessageLine msgLine = super.createMessageLine(c);
|
||||
return fMessageLine;
|
||||
}
|
||||
|
||||
|
@ -488,7 +487,6 @@ public class SystemRenameDialog extends SystemPromptDialog
|
|||
e.doit = false;
|
||||
ignoreSelection = true;
|
||||
|
||||
Control focusControl = Display.getCurrent().getFocusControl();
|
||||
|
||||
//System.out.println("...Key pressed. currRow = "+currRow);
|
||||
|
||||
|
|
|
@ -209,8 +209,7 @@ public class SystemSimpleCopyDialog
|
|||
*/
|
||||
public boolean verify()
|
||||
{
|
||||
String errMsg = null;
|
||||
Control controlInError = null;
|
||||
|
||||
clearErrorMessage();
|
||||
/*
|
||||
if (errMsg != null)
|
||||
|
|
|
@ -458,8 +458,7 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog
|
|||
*/
|
||||
public boolean verify()
|
||||
{
|
||||
String errMsg = null;
|
||||
Control controlInError = null;
|
||||
|
||||
clearErrorMessage();
|
||||
/*
|
||||
if (errMsg != null)
|
||||
|
|
|
@ -353,8 +353,7 @@ public class SystemFilterWorkWithFilterPoolsDialog
|
|||
*/
|
||||
public boolean verify()
|
||||
{
|
||||
String errMsg = null;
|
||||
Control controlInError = null;
|
||||
|
||||
clearErrorMessage();
|
||||
/*
|
||||
if (errMsg != null)
|
||||
|
|
|
@ -111,7 +111,7 @@ public class SystemQuickOpenPageDescriptor implements Comparable {
|
|||
URL url = null;
|
||||
|
||||
try {
|
||||
String nameSpace = element.getDeclaringExtension().getNamespace();
|
||||
String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
|
||||
Bundle bundle = Platform.getBundle(nameSpace);
|
||||
url = new URL(bundle.getEntry("/"), imageName); //$NON-NLS-1$
|
||||
}
|
||||
|
|
|
@ -20,7 +20,7 @@ import org.eclipse.rse.ui.Mnemonics;
|
|||
import org.eclipse.rse.ui.SystemWidgetHelpers;
|
||||
import org.eclipse.rse.ui.messages.ISystemMessageLine;
|
||||
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.graphics.Cursor;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
|
@ -479,7 +479,7 @@ public abstract class SystemBasePropertyPage extends PropertyPage
|
|||
if (wantAutomaticValidManagement())
|
||||
setValid(message == 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);
|
||||
if (msgLine!=null)
|
||||
((SystemDialogPageMessageLine)msgLine).internalSetMessage(message);
|
||||
((SystemMessageLine)msgLine).setMessage(message);
|
||||
}
|
||||
|
||||
}
|
|
@ -346,7 +346,6 @@ public class SystemSubSystemPropertyPageCoreForm extends AbstractSystemSubSystem
|
|||
// PROCESS USER ID...
|
||||
if (textUserId != null)
|
||||
{
|
||||
String userId = getUserId();
|
||||
updateUserId(ss);
|
||||
}
|
||||
ss.commit();
|
||||
|
|
|
@ -28,8 +28,6 @@ public class SystemEmptyListAPIProviderImpl
|
|||
{
|
||||
|
||||
|
||||
protected Object[] emptyList = new Object[0];
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*/
|
||||
|
|
|
@ -36,11 +36,7 @@ public class SystemTestFilterStringAPIProviderImpl
|
|||
|
||||
protected String filterString = 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
|
||||
* @param subsystem The subsystem that will resolve the filter string
|
||||
|
|
|
@ -1400,13 +1400,13 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
|||
}
|
||||
|
||||
protected Item[] sortSelection(Widget parentItem, Item[] oldResult) {
|
||||
Item[] newResult = new Item[oldResult.length];
|
||||
Item[] children = null;
|
||||
Item[] newResult = new Item[oldResult.length];
|
||||
if (parentItem instanceof Item) {
|
||||
children = oldResult;
|
||||
} else
|
||||
children = getChildren(parentItem);
|
||||
/*
|
||||
|
||||
for (int i = 0; i < oldResult.length; i++)
|
||||
{
|
||||
Item first = removeFirstItem(oldResult, children);
|
||||
|
@ -1414,8 +1414,7 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour
|
|||
}
|
||||
|
||||
return newResult;
|
||||
*/
|
||||
return oldResult;
|
||||
|
||||
}
|
||||
|
||||
protected Item removeFirstItem(Item[] items, Item[] children) {
|
||||
|
|
|
@ -276,7 +276,6 @@ public class SystemViewFilterPoolReferenceAdapter
|
|||
*/
|
||||
public boolean doDelete(Shell shell, Object element, IProgressMonitor monitor) throws Exception
|
||||
{
|
||||
ISystemFilterPoolReference fpr = getFilterPoolReference(element);
|
||||
ISystemFilterPool fp = getFilterPool(element);
|
||||
ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager();
|
||||
fpMgr.deleteSystemFilterPool(fp);
|
||||
|
|
|
@ -377,7 +377,6 @@ public class SystemViewFilterReferenceAdapter
|
|||
|
||||
if (monitor == null)
|
||||
{
|
||||
Shell shell = getShell();
|
||||
allChildren = ss.resolveFilterStrings(filterStrings);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -253,9 +253,7 @@ public class SystemScratchpadView
|
|||
getTree().setVisible(true);
|
||||
_objectInput = newObject;
|
||||
|
||||
SystemScratchpadViewProvider provider = (SystemScratchpadViewProvider) getContentProvider();
|
||||
Object[] children = provider.getChildren(_objectInput);
|
||||
|
||||
|
||||
super.inputChanged(newObject, oldObject);
|
||||
}
|
||||
else if (newObject == null)
|
||||
|
@ -429,7 +427,6 @@ public class SystemScratchpadView
|
|||
remoteResourceNames = (Vector) remoteResource;
|
||||
remoteResource = remoteResourceNames.elementAt(0);
|
||||
}
|
||||
String remoteResourceParentName = getRemoteResourceAbsoluteName(remoteResourceParent);
|
||||
String remoteResourceName = getRemoteResourceAbsoluteName(remoteResource);
|
||||
if (remoteResourceName == null)
|
||||
return;
|
||||
|
@ -524,7 +521,6 @@ public class SystemScratchpadView
|
|||
// --------------------------
|
||||
case ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED :
|
||||
{
|
||||
String oldName = event.getOldName();
|
||||
Object child = event.getResource();
|
||||
|
||||
if (provider != null)
|
||||
|
|
|
@ -246,7 +246,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
|
|||
try
|
||||
{
|
||||
// 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$
|
||||
|
||||
// use the name space to get the bundle
|
||||
|
@ -354,7 +354,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
|
|||
|
||||
protected Bundle getBundle()
|
||||
{
|
||||
String nameSpace = element.getDeclaringExtension().getNamespace();
|
||||
String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
|
||||
return Platform.getBundle(nameSpace);
|
||||
}
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ public class SystemPropertyPageExtension implements IPropertyPageContributor
|
|||
|
||||
protected Bundle getBundle(IConfigurationElement element)
|
||||
{
|
||||
String nameSpace = element.getDeclaringExtension().getNamespace();
|
||||
String nameSpace = element.getDeclaringExtension().getNamespaceIdentifier();
|
||||
return Platform.getBundle(nameSpace);
|
||||
}
|
||||
|
||||
|
|
|
@ -205,7 +205,7 @@ public class SystemResourceManager implements SystemResourceConstants
|
|||
}
|
||||
try{
|
||||
// create types folder...
|
||||
IFolder folder = getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME);
|
||||
getResourceHelpers().getOrCreateFolder(proj,RESOURCE_TYPE_FILTERS_FOLDER_NAME);
|
||||
} catch (Exception e)
|
||||
{
|
||||
SystemBasePlugin.logError("error opening/creating types folder",e); //$NON-NLS-1$
|
||||
|
|
Loading…
Add table
Reference in a new issue