1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-21 15:23:59 +02:00

[cleanup] Fix compiler warnings

This commit is contained in:
Martin Oberhuber 2006-08-25 16:27:52 +00:00
parent 54e3040567
commit 4009b3cc5d
58 changed files with 85 additions and 84 deletions

View file

@ -567,7 +567,7 @@ implements ISchemaExtender
*/ */
public final String getCommandName(DataElement command) public final String getCommandName(DataElement command)
{ {
return (String) command.getAttribute(DE.A_NAME); return command.getAttribute(DE.A_NAME);
} }
/** /**

View file

@ -204,7 +204,7 @@ public class ServerCommandHandler extends CommandHandler
if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET)) if (commandName.equals(DataStoreSchema.C_VALIDATE_TICKET))
{ {
DataElement serverTicket = _dataStore.getTicket(); DataElement serverTicket = _dataStore.getTicket();
DataElement clientTicket = (DataElement) command.get(0); DataElement clientTicket = command.get(0);
String st = serverTicket.getName(); String st = serverTicket.getName();
String ct = clientTicket.getName(); String ct = clientTicket.getName();
if (ct.equals(st)) if (ct.equals(st))
@ -230,19 +230,19 @@ public class ServerCommandHandler extends CommandHandler
} }
else if (commandName.equals(DataStoreSchema.C_SET)) else if (commandName.equals(DataStoreSchema.C_SET))
{ {
DataElement dataObject = (DataElement) command.get(0); DataElement dataObject = command.get(0);
status.setAttribute(DE.A_NAME,DataStoreResources.model_done); status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
} }
else if (commandName.equals(DataStoreSchema.C_MODIFY)) else if (commandName.equals(DataStoreSchema.C_MODIFY))
{ {
DataElement dataObject = (DataElement) command.get(0); DataElement dataObject = command.get(0);
DataElement original = _dataStore.find(dataObject.getId()); DataElement original = _dataStore.find(dataObject.getId());
original.setAttributes(dataObject.getAttributes()); original.setAttributes(dataObject.getAttributes());
status.setAttribute(DE.A_NAME,DataStoreResources.model_done); status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
} }
else if (commandName.equals(DataStoreSchema.C_SET_HOST)) else if (commandName.equals(DataStoreSchema.C_SET_HOST))
{ {
DataElement dataObject = (DataElement) command.get(0); DataElement dataObject = command.get(0);
DataElement original = _dataStore.getHostRoot(); DataElement original = _dataStore.getHostRoot();
original.setAttributes(dataObject.getAttributes()); original.setAttributes(dataObject.getAttributes());
@ -253,13 +253,13 @@ public class ServerCommandHandler extends CommandHandler
} }
else if (commandName.equals(DataStoreSchema.C_ADD_MINERS)) else if (commandName.equals(DataStoreSchema.C_ADD_MINERS))
{ {
DataElement location = (DataElement) command.get(1); DataElement location = command.get(1);
_dataStore.addMinersLocation(location); _dataStore.addMinersLocation(location);
status.setAttribute(DE.A_NAME,DataStoreResources.model_done); status.setAttribute(DE.A_NAME,DataStoreResources.model_done);
} }
else if (commandName.equals(DataStoreSchema.C_ACTIVATE_MINER)) else if (commandName.equals(DataStoreSchema.C_ACTIVATE_MINER))
{ {
DataElement minerId = (DataElement) command.get(0); DataElement minerId = command.get(0);
String minerName = minerId.getName(); String minerName = minerId.getName();
Miner miner = loadMiner(minerName); Miner miner = loadMiner(minerName);
miner.initMiner(status); miner.initMiner(status);
@ -268,7 +268,7 @@ public class ServerCommandHandler extends CommandHandler
} }
else if (commandName.equals(DataStoreSchema.C_SET_PREFERENCE)) else if (commandName.equals(DataStoreSchema.C_SET_PREFERENCE))
{ {
DataElement dataObject = (DataElement) command.get(0); DataElement dataObject = command.get(0);
String property = dataObject.getName(); String property = dataObject.getName();
String value = dataObject.getValue(); String value = dataObject.getValue();
_dataStore.setPreference(property, value); _dataStore.setPreference(property, value);

View file

@ -54,7 +54,7 @@ public class ServerReceiver extends Receiver
// parse request and determine what is wanted // parse request and determine what is wanted
for (int a = 0; a < documentObject.getNestedSize(); a++) for (int a = 0; a < documentObject.getNestedSize(); a++)
{ {
DataElement rootOutput = (DataElement) documentObject.get(a); DataElement rootOutput = documentObject.get(a);
DataElement log = _dataStore.getLogRoot(); DataElement log = _dataStore.getLogRoot();
log.addNestedData(rootOutput, false); log.addNestedData(rootOutput, false);

View file

@ -90,8 +90,6 @@ public class SystemAddToArchiveAction extends SystemBaseAction
String[] relativePaths = getRelativePaths(); String[] relativePaths = getRelativePaths();
AddToArchiveDialog dialog = new AddToArchiveDialog(getShell(), title, relativePaths); AddToArchiveDialog dialog = new AddToArchiveDialog(getShell(), title, relativePaths);
if (dialog == null)
return;
dialog.setNeedsProgressMonitor(false); dialog.setNeedsProgressMonitor(false);
dialog.setMessage(FileResources.RESID_ADDTOARCHIVE_PROMPT); dialog.setMessage(FileResources.RESID_ADDTOARCHIVE_PROMPT);
@ -299,7 +297,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
_selected.clear(); _selected.clear();
boolean enable = false; boolean enable = false;
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (e.hasNext()) while (e.hasNext())
{ {
Object selected = e.next(); Object selected = e.next();

View file

@ -85,7 +85,7 @@ public class SystemCompareFilesAction extends SystemBaseAction
_selected.clear(); _selected.clear();
boolean enable = false; boolean enable = false;
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (e.hasNext()) while (e.hasNext())
{ {
Object selected = e.next(); Object selected = e.next();

View file

@ -130,7 +130,7 @@ public class SystemEditionAction extends SystemBaseAction
{ {
boolean enable = false; boolean enable = false;
_selected.clear(); _selected.clear();
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
if (e.hasNext()) if (e.hasNext())
{ {
Object selected = e.next(); Object selected = e.next();

View file

@ -193,7 +193,7 @@ public class SystemExtractAction extends SystemBaseAction
_selected.clear(); _selected.clear();
boolean enable = false; boolean enable = false;
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (e.hasNext()) while (e.hasNext())
{ {
Object selected = e.next(); Object selected = e.next();

View file

@ -130,8 +130,8 @@ public class UniversalPreferencePage
protected void createFieldEditors() { protected void createFieldEditors() {
modeRegistry = (SystemFileTransferModeRegistry)(SystemFileTransferModeRegistry.getDefault()); modeRegistry = SystemFileTransferModeRegistry.getDefault();
editorRegistry = (IEditorRegistry)(PlatformUI.getWorkbench().getEditorRegistry()); editorRegistry = PlatformUI.getWorkbench().getEditorRegistry();
modeMappings = new ArrayList(); modeMappings = new ArrayList();
editorMappings = new ArrayList(); editorMappings = new ArrayList();

View file

@ -733,7 +733,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
browseAction.run(); browseAction.run();
IRemoteFile folder = ((SystemSelectRemoteFolderAction)browseAction).getSelectedFolder(); IRemoteFile folder = browseAction.getSelectedFolder();
if (folder != null) if (folder != null)
setFolder(folder); setFolder(folder);
}; };

View file

@ -523,7 +523,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
} }
browseAction.run(); browseAction.run();
IRemoteFile folder = ((SystemSelectRemoteFolderAction)browseAction).getSelectedFolder(); IRemoteFile folder = browseAction.getSelectedFolder();
if (folder != null) if (folder != null)
setText(folder.getAbsolutePath()); setText(folder.getAbsolutePath());

View file

@ -699,7 +699,7 @@ public class SystemSelectRemoteFileOrFolderForm
} }
// MESSAGE/VERBAGE TEXT AT TOP // MESSAGE/VERBAGE TEXT AT TOP
verbageLabel = (Label) SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH); verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH);
//verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns); //verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns);
// SPACER LINE // SPACER LINE

View file

@ -144,7 +144,7 @@ public class SystemKillDialog extends SystemPromptDialog
} }
} }
else { else {
prompt = (Label)SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200); prompt = SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200);
} }
// WARNING // WARNING

View file

@ -198,7 +198,7 @@ public class CommandMiner extends Miner
} }
else if (name.equals("C_CANCEL")) else if (name.equals("C_CANCEL"))
{ {
DataElement de = (DataElement) subject.dereference().get(1); DataElement de = subject.dereference().get(1);
DataElement cancelStatus = getCommandStatus(subject); DataElement cancelStatus = getCommandStatus(subject);
cancelCommand(de.getName().trim(), cancelStatus); cancelCommand(de.getName().trim(), cancelStatus);
return status; return status;

View file

@ -622,7 +622,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
try try
{ {
DownloadListener dlistener = new DownloadListener(monitor, status, localFile, remotePath, (long) fileLength); DownloadListener dlistener = new DownloadListener(monitor, status, localFile, remotePath, fileLength);
try try
{ {
dlistener.waitForUpdate(); dlistener.waitForUpdate();

View file

@ -96,7 +96,7 @@ public class LocalSearchHandler implements ISearchHandler
// if the remote file is not virtual, then simply get the file // if the remote file is not virtual, then simply get the file
if (!(_theRmtFile instanceof LocalVirtualHostFile)) if (!(_theRmtFile instanceof LocalVirtualHostFile))
{ {
_theFile = (File) (_theRmtFile.getFile()); _theFile = _theRmtFile.getFile();
} }
// for virtual file, fake it with a non-existent file representing the // for virtual file, fake it with a non-existent file representing the
// actual path (note this file won't actually exist on the filesystem) // actual path (note this file won't actually exist on the filesystem)

View file

@ -158,7 +158,7 @@ public class TarFile implements ITarConstants {
// determine how many blocks make up the contents of the file // determine how many blocks make up the contents of the file
long fileSize = header.getSize(); long fileSize = header.getSize();
int numFileBlocks = (int)(fileSize / BLOCK_SIZE); int numFileBlocks = (int)(fileSize / BLOCK_SIZE);
numFileBlocks += (int)((fileSize % BLOCK_SIZE) > 0 ? 1 : 0); numFileBlocks += (fileSize % BLOCK_SIZE) > 0 ? 1 : 0;
// if the file is a symbolic link, number of blocks will be 0 // if the file is a symbolic link, number of blocks will be 0
if (header.getTypeFlag() == ITarConstants.TF_SYMLINK) { if (header.getTypeFlag() == ITarConstants.TF_SYMLINK) {
@ -306,7 +306,7 @@ public class TarFile implements ITarConstants {
// determine how many blocks make up the contents of the file // determine how many blocks make up the contents of the file
int numFileBlocks = (int)(fileSize / BLOCK_SIZE); int numFileBlocks = (int)(fileSize / BLOCK_SIZE);
numFileBlocks += (int)((fileSize % BLOCK_SIZE) > 0 ? 1 : 0); numFileBlocks += (fileSize % BLOCK_SIZE) > 0 ? 1 : 0;
// if the file is a symbolic link, number of blocks will be 0 // if the file is a symbolic link, number of blocks will be 0
if (header.getTypeFlag() == ITarConstants.TF_SYMLINK) { if (header.getTypeFlag() == ITarConstants.TF_SYMLINK) {

View file

@ -716,7 +716,7 @@ public class SystemCommandsViewPart
if (source instanceof IRemoteCommandShell) if (source instanceof IRemoteCommandShell)
{ {
updateOutput((IRemoteCommandShell) source, false); updateOutput((IRemoteCommandShell) source, false);
_folder.remove((IRemoteCommandShell)source); _folder.remove(source);
updateActionStates(); updateActionStates();
} }
} }

View file

@ -244,7 +244,7 @@ public class SearchResultsChangeListener implements IDomainListener, ICommunicat
String remotePath = parentPath + slash + result.getName(); String remotePath = parentPath + slash + result.getName();
if (_subsys instanceof FileServiceSubSystem) if (_subsys instanceof FileServiceSubSystem)
{ {
remoteFile = (IRemoteFile)((FileServiceSubSystem)_subsys).getCachedRemoteFile(remotePath); remoteFile = ((FileServiceSubSystem)_subsys).getCachedRemoteFile(remotePath);
} }
if (remoteFile == null) if (remoteFile == null)

View file

@ -529,7 +529,7 @@ public class SystemBaseAction extends Action implements ISystemAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = true; boolean enable = true;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e= selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
enable = checkObjectType(e.next()); enable = checkObjectType(e.next());

View file

@ -66,7 +66,7 @@ public class SystemCollapseAction extends SystemBaseAction
{ {
return ((ISystemTree)viewer).areAnySelectedItemsExpanded(); return ((ISystemTree)viewer).areAnySelectedItemsExpanded();
} }
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
while (!enable && e.hasNext()) while (!enable && e.hasNext())
{ {

View file

@ -66,7 +66,7 @@ public class SystemExpandAction extends SystemBaseAction
{ {
return ((ISystemTree)viewer).areAnySelectedItemsExpandable(); return ((ISystemTree)viewer).areAnySelectedItemsExpandable();
} }
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
ISystemViewElementAdapter adapter = null; ISystemViewElementAdapter adapter = null;
while (!enable && e.hasNext()) while (!enable && e.hasNext())
{ {

View file

@ -63,7 +63,7 @@ public class SystemMoveDownConnectionAction extends SystemBaseAction
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();

View file

@ -63,7 +63,7 @@ public class SystemMoveUpConnectionAction extends SystemBaseAction
boolean enable = true; boolean enable = true;
ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry(); ISystemRegistry sr = RSEUIPlugin.getDefault().getSystemRegistry();
prevProfile = null; prevProfile = null;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();

View file

@ -85,7 +85,7 @@ public class SystemShowInMonitorAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = false; boolean enable = false;
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
Object selected = e.next(); Object selected = e.next();
if (selected != null && selected instanceof IAdaptable) if (selected != null && selected instanceof IAdaptable)

View file

@ -84,7 +84,7 @@ public class SystemShowInTableAction extends SystemBaseAction
public boolean updateSelection(IStructuredSelection selection) public boolean updateSelection(IStructuredSelection selection)
{ {
boolean enable = false; boolean enable = false;
Iterator e = ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
Object selected = e.next(); Object selected = e.next();
if (selected != null && selected instanceof IAdaptable) if (selected != null && selected instanceof IAdaptable)

View file

@ -162,7 +162,7 @@ public class SystemDeleteDialog extends SystemPromptDialog
} }
} }
else { else {
prompt = (Label)SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200); prompt = SystemWidgetHelpers.createVerbiage(composite, promptLabel, nbrColumns, false, 200);
} }
// WARNING // WARNING

View file

@ -265,7 +265,7 @@ public class SystemSimpleSelectDialog extends SystemPromptDialog
{ {
for (int idx=0; idx<disable.length; idx++) for (int idx=0; idx<disable.length; idx++)
{ {
SystemSimpleContentElement currElement = (SystemSimpleContentElement)disable[idx]; SystemSimpleContentElement currElement = disable[idx];
tree.setGrayed(currElement, true); // so it appears readonly tree.setGrayed(currElement, true); // so it appears readonly
} }
} }

View file

@ -145,7 +145,7 @@ public class SystemChangeFilterAction extends SystemBaseDialogAction
if (filter != null) if (filter != null)
if (filter.isSingleFilterStringOnly()) if (filter.isSingleFilterStringOnly())
dlg.setSupportsMultipleStrings(false); dlg.setSupportsMultipleStrings(false);
return (Dialog)dlg; return dlg;
} }
/** /**

View file

@ -71,7 +71,7 @@ public class SystemFilterMoveDownFilterAction extends SystemBaseAction
{ {
ISystemFilterContainer prevContainer = null; ISystemFilterContainer prevContainer = null;
boolean enable = true; boolean enable = true;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();

View file

@ -69,7 +69,7 @@ public class SystemFilterMoveDownFilterPoolReferenceAction extends SystemBaseAct
{ {
ISystemFilterPoolReferenceManager prevMgr = null; ISystemFilterPoolReferenceManager prevMgr = null;
boolean enable = true; boolean enable = true;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();

View file

@ -70,7 +70,7 @@ public class SystemFilterMoveUpFilterAction extends SystemBaseAction
{ {
ISystemFilterContainer prevContainer = null; ISystemFilterContainer prevContainer = null;
boolean enable = true; boolean enable = true;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();

View file

@ -69,7 +69,7 @@ public class SystemFilterMoveUpFilterPoolReferenceAction extends SystemBaseActio
{ {
ISystemFilterPoolReferenceManager prevMgr = null; ISystemFilterPoolReferenceManager prevMgr = null;
boolean enable = true; boolean enable = true;
Iterator e= ((IStructuredSelection) selection).iterator(); Iterator e = selection.iterator();
while (enable && e.hasNext()) while (enable && e.hasNext())
{ {
Object selectedObject = e.next(); Object selectedObject = e.next();
@ -123,7 +123,7 @@ public class SystemFilterMoveUpFilterPoolReferenceAction extends SystemBaseActio
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));

View file

@ -365,7 +365,7 @@ public class SystemNewFilterWizard
mainPage.setDefaultFilterStrings(defaultFilterStrings); mainPage.setDefaultFilterStrings(defaultFilterStrings);
if (showFilterStrings) if (showFilterStrings)
{ {
addPage((WizardPage)mainPage); addPage(mainPage);
} }
// NAME PAGE... // NAME PAGE...
@ -396,7 +396,7 @@ public class SystemNewFilterWizard
} }
if (!showFilterStrings && page1DescriptionSet) if (!showFilterStrings && page1DescriptionSet)
namePage.setDescription(configurator.getPage1Description()); namePage.setDescription(configurator.getPage1Description());
addPage((WizardPage)namePage); addPage(namePage);
} }
// INFO PAGE... // INFO PAGE...
@ -405,7 +405,7 @@ public class SystemNewFilterWizard
infoPage = createInfoPage(); infoPage = createInfoPage();
if (infoPage!=null) if (infoPage!=null)
{ {
addPage((WizardPage)infoPage); addPage(infoPage);
} }
} }
} catch (Exception exc) } catch (Exception exc)

View file

@ -171,7 +171,7 @@ public class SystemMessageDialog extends ErrorDialog implements Listener {
this(parentShell, this(parentShell,
message.getFullMessageID(), message.getFullMessageID(),
message.getLevelOneText(), message.getLevelOneText(),
(IStatus)(new MultiStatus(SystemBasePlugin.getBaseDefault().getSymbolicName(), IStatus.OK, "", new Exception(""))), (new MultiStatus(SystemBasePlugin.getBaseDefault().getSymbolicName(), IStatus.OK, "", new Exception(""))),
0xFFFFF); 0xFFFFF);
((MultiStatus)this.status).add(new Status(IStatus.INFO, SystemBasePlugin.getBaseDefault().getSymbolicName(), IStatus.OK, message.getLevelTwoText(), new Exception(""))); ((MultiStatus)this.status).add(new Status(IStatus.INFO, SystemBasePlugin.getBaseDefault().getSymbolicName(), IStatus.OK, message.getLevelTwoText(), new Exception("")));
statusList = Arrays.asList(status.getChildren()); statusList = Arrays.asList(status.getChildren());

View file

@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.services.clientserver.messages.IndicatorException; import org.eclipse.rse.services.clientserver.messages.IndicatorException;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
@ -51,10 +52,10 @@ public class SystemUIMessageFile extends SystemMessageFile {
messageFileStream, dtdStream); messageFileStream, dtdStream);
dtdStream.close(); dtdStream.close();
} catch (IOException e) { } catch (IOException e) {
RSEUIPlugin.logError("Could not open message file DTD.", e); SystemBasePlugin.logError("Could not open message file DTD.", e);
} }
} else { } else {
RSEUIPlugin.logError("Could not find mesage file DTD."); SystemBasePlugin.logError("Could not find mesage file DTD.");
} }
return result; return result;
} }

View file

@ -96,7 +96,7 @@ public abstract class ServicesPropertyPage extends SystemBasePropertyPage
FactoryServiceElement selectedService = (FactoryServiceElement)_form.getSelectedService(); FactoryServiceElement selectedService = (FactoryServiceElement)_form.getSelectedService();
IServiceSubSystemConfiguration factory = (IServiceSubSystemConfiguration)selectedService.getFactory(); IServiceSubSystemConfiguration factory = selectedService.getFactory();
IServiceSubSystemConfiguration currentFactory = getCurrentServiceSubSystemConfiguration(); IServiceSubSystemConfiguration currentFactory = getCurrentServiceSubSystemConfiguration();
if (factory != currentFactory) if (factory != currentFactory)
{ {

View file

@ -71,7 +71,7 @@ public class SystemTeamViewCategoryPropertyPage extends SystemBasePropertyPage
//key = ISystemConstants.RESID_PROPERTY_DESCRIPTION_ROOT; //key = ISystemConstants.RESID_PROPERTY_DESCRIPTION_ROOT;
//Label l = SystemWidgetHelpers.createLabel(composite_prompts, rb, key, nbrColumns, false); //Label l = SystemWidgetHelpers.createLabel(composite_prompts, rb, key, nbrColumns, false);
//l.setText(l.getText() + ":"); //l.setText(l.getText() + ":");
labelDescription = (Label)SystemWidgetHelpers.createVerbiage(composite_prompts, "", nbrColumns, false, 200); labelDescription = SystemWidgetHelpers.createVerbiage(composite_prompts, "", nbrColumns, false, 200);
if (!initDone) if (!initDone)
doInitializeFields(); doInitializeFields();

View file

@ -146,7 +146,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener
// MESSAGE/VERBAGE TEXT AT TOP // MESSAGE/VERBAGE TEXT AT TOP
verbageLabel = (Label) SystemWidgetHelpers.createVerbiage(composite_prompts, _verbage, gridColumns, false, PROMPT_WIDTH); verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, _verbage, gridColumns, false, PROMPT_WIDTH);
boolean allowMultipleConnnections = _inputProvider.allowMultipleConnections(); boolean allowMultipleConnnections = _inputProvider.allowMultipleConnections();

View file

@ -757,7 +757,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
int ops = DND.DROP_COPY | DND.DROP_MOVE; int ops = DND.DROP_COPY | DND.DROP_MOVE;
Transfer[] transfers = new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance(), EditorInputTransfer.getInstance(), FileTransfer.getInstance()}; Transfer[] transfers = new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance(), EditorInputTransfer.getInstance(), FileTransfer.getInstance()};
addDragSupport(ops, transfers, new SystemViewDataDragAdapter((ISelectionProvider) this)); addDragSupport(ops, transfers, new SystemViewDataDragAdapter(this));
addDropSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDropAdapter(this)); addDropSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDropAdapter(this));
} }

View file

@ -421,11 +421,11 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
original_portData = getPortString(ss); original_portData = getPortString(ss);
changed_userId = changed_port = false; changed_userId = changed_port = false;
if (userIdDescriptor != null) if (userIdDescriptor != null)
userIdDescriptor.setValidator((ICellEditorValidator)ssFactory.getUserIdValidator()); userIdDescriptor.setValidator(ssFactory.getUserIdValidator());
//getPortDescriptor().setValidator((ICellEditorValidator)ssFactory.getPortValidator()); //getPortDescriptor().setValidator((ICellEditorValidator)ssFactory.getPortValidator());
if (propertyPortDescriptor != null) if (propertyPortDescriptor != null)
{ {
propertyPortDescriptor.setValidator((ICellEditorValidator)ssFactory.getPortValidator()); propertyPortDescriptor.setValidator(ssFactory.getPortValidator());
} }
ss.getConnectorService().getPort(); ss.getConnectorService().getPort();
port_editable = ssFactory.isPortEditable(); port_editable = ssFactory.isPortEditable();
@ -486,7 +486,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
{ {
if (!port_editable) if (!port_editable)
return; return;
String port = (String)data; String port = data;
Integer portInteger = null; Integer portInteger = null;
if (port.length()>0) if (port.length()>0)
{ {

View file

@ -208,7 +208,7 @@ public class MonitorViewWorkbook extends Composite
if (createTab) if (createTab)
{ {
// never shown this, so add it // never shown this, so add it
createTabItem((IAdaptable) root); createTabItem(root);
} }
} }
} }

View file

@ -290,7 +290,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
int ops = DND.DROP_COPY | DND.DROP_MOVE; int ops = DND.DROP_COPY | DND.DROP_MOVE;
Transfer[] transfers = new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance(), EditorInputTransfer.getInstance(), FileTransfer.getInstance()}; Transfer[] transfers = new Transfer[] { PluginTransfer.getInstance(), TextTransfer.getInstance(), EditorInputTransfer.getInstance(), FileTransfer.getInstance()};
addDragSupport(ops, transfers, new SystemViewDataDragAdapter((ISelectionProvider) this)); addDragSupport(ops, transfers, new SystemViewDataDragAdapter(this));
addDropSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDropAdapter(this)); addDropSupport(ops | DND.DROP_DEFAULT, transfers, new SystemViewDataDropAdapter(this));
} }
@ -1028,7 +1028,7 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec
Tree tree = getTree(); Tree tree = getTree();
Tree theTree = (Tree) tree; Tree theTree = tree;
theTree.setSelection(theTree.getItems()); theTree.setSelection(theTree.getItems());
TreeItem[] items = theTree.getItems(); TreeItem[] items = theTree.getItems();
Object[] objects = new Object[items.length]; Object[] objects = new Object[items.length];

View file

@ -371,7 +371,7 @@ public class SystemSearchViewPart extends ViewPart implements ISystemResourceCha
return false; return false;
} }
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)getAdapter(input); ISystemViewElementAdapter adapter = getAdapter(input);
if (adapter == null) { if (adapter == null) {
return false; return false;
@ -537,7 +537,7 @@ public class SystemSearchViewPart extends ViewPart implements ISystemResourceCha
// TODO change to tabletree when eclipse fixes the swt widget // TODO change to tabletree when eclipse fixes the swt widget
//TableTree table = new TableTree(pageBook, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); //TableTree table = new TableTree(pageBook, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
Tree tabletree = new Tree(pageBook, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION); Tree tabletree = new Tree(pageBook, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
SystemSearchTableView viewer = new SystemSearchTableView(tabletree, (IHostSearchResultSet)resultSet, this); SystemSearchTableView viewer = new SystemSearchTableView(tabletree, resultSet, this);
viewer.setWorkbenchPart(this); viewer.setWorkbenchPart(this);
getSite().registerContextMenu(viewer.getContextMenuManager(), viewer); getSite().registerContextMenu(viewer.getContextMenuManager(), viewer);

View file

@ -84,7 +84,7 @@ public class SystemTeamViewLabelProvider extends LabelProvider
// If we have a project, return the resource project images. // If we have a project, return the resource project images.
else if (element instanceof IProject) else if (element instanceof IProject)
{ {
Image projectImage = aWorkbenchLabelProvider.getImage((IProject)element); Image projectImage = aWorkbenchLabelProvider.getImage(element);
return projectImage; return projectImage;
} }

View file

@ -310,7 +310,7 @@ public class SystemTeamViewPart
{ {
menuListenerAdded = true; menuListenerAdded = true;
SystemViewMenuListener ml = new SystemViewMenuListener(); SystemViewMenuListener ml = new SystemViewMenuListener();
ml.setShowToolTipText(true, (ISystemMessageLine)this); ml.setShowToolTipText(true, this);
m.addMenuListener(ml); m.addMenuListener(ml);
} }
} }
@ -996,7 +996,7 @@ public class SystemTeamViewPart
public boolean canDelete() public boolean canDelete()
{ {
boolean ok = true; boolean ok = true;
IStructuredSelection selection= (IStructuredSelection)getStructuredSelection(); IStructuredSelection selection= getStructuredSelection();
Iterator elements= selection.iterator(); Iterator elements= selection.iterator();
ISystemProfileManager mgr = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager(); ISystemProfileManager mgr = RSEUIPlugin.getTheSystemRegistry().getSystemProfileManager();
int nbrActiveProfiles = mgr.getActiveSystemProfiles().length; int nbrActiveProfiles = mgr.getActiveSystemProfiles().length;
@ -1023,7 +1023,7 @@ public class SystemTeamViewPart
public boolean doDelete(IProgressMonitor monitor) public boolean doDelete(IProgressMonitor monitor)
{ {
boolean ok = true; boolean ok = true;
IStructuredSelection selection= (IStructuredSelection)getStructuredSelection(); IStructuredSelection selection= getStructuredSelection();
Iterator elements= selection.iterator(); Iterator elements= selection.iterator();
Object currObj = null; Object currObj = null;
while (ok && elements.hasNext()) while (ok && elements.hasNext())
@ -1059,7 +1059,7 @@ public class SystemTeamViewPart
public boolean canRename() public boolean canRename()
{ {
boolean ok = true; boolean ok = true;
IStructuredSelection selection= (IStructuredSelection)getStructuredSelection(); IStructuredSelection selection= getStructuredSelection();
Iterator elements= selection.iterator(); Iterator elements= selection.iterator();
while (ok && elements.hasNext()) while (ok && elements.hasNext())
{ {
@ -1076,7 +1076,7 @@ public class SystemTeamViewPart
public boolean doRename(String[] newNames) public boolean doRename(String[] newNames)
{ {
boolean ok = true; boolean ok = true;
IStructuredSelection selection= (IStructuredSelection)getStructuredSelection(); IStructuredSelection selection= getStructuredSelection();
Iterator elements= selection.iterator(); Iterator elements= selection.iterator();
Object currObj = null; Object currObj = null;
int idx = 0; int idx = 0;
@ -1084,7 +1084,7 @@ public class SystemTeamViewPart
{ {
currObj = elements.next(); currObj = elements.next();
try { try {
profileAdapter.doRename(getShell(), (ISystemProfile)currObj, newNames[idx++]); profileAdapter.doRename(getShell(), currObj, newNames[idx++]);
} }
catch (SystemMessageException exc) catch (SystemMessageException exc)
{ {

View file

@ -562,7 +562,7 @@ public class EnvironmentVariablesForm extends SystemBaseForm implements Selectio
private SystemMessage validateName(String value) private SystemMessage validateName(String value)
{ {
SystemMessage msg = null; SystemMessage msg = null;
String name = (String) value; String name = value;
if (name == null || name.trim().equals("")) if (name == null || name.trim().equals(""))
{ {
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_ENVVAR_NONAME); msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_ENVVAR_NONAME);
@ -573,7 +573,7 @@ public class EnvironmentVariablesForm extends SystemBaseForm implements Selectio
{ {
if (invalidNameChars.indexOf(' ') != -1) if (invalidNameChars.indexOf(' ') != -1)
{ {
name = ((String) value).trim(); name = (value).trim();
} }
// first check for invalid characters // first check for invalid characters

View file

@ -355,7 +355,7 @@ public class SystemSelectConnectionForm extends SystemBaseForm
} }
// MESSAGE/VERBAGE TEXT AT TOP // MESSAGE/VERBAGE TEXT AT TOP
verbageLabel = (Label) SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH); verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH);
//verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns); //verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns);
// SPACER LINE // SPACER LINE

View file

@ -287,7 +287,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar
{ {
boolean ok = mainPage.performFinish(); boolean ok = mainPage.performFinish();
if (!ok) if (!ok)
getWizard().setPageError((IWizardPage)mainPage); getWizard().setPageError(mainPage);
else if (ok && hasAdditionalPages()) else if (ok && hasAdditionalPages())
{ {
for (int idx=0; ok && (idx<subsystemFactorySuppliedWizardPages.length); idx++) for (int idx=0; ok && (idx<subsystemFactorySuppliedWizardPages.length); idx++)
@ -413,7 +413,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar
*/ */
public SystemConnectionForm getMainPageForm() public SystemConnectionForm getMainPageForm()
{ {
return ((RSENewConnectionWizardDefaultDelegateMainPage)mainPage).getForm(); return (mainPage).getForm();
} }
// ---------------------------------------- // ----------------------------------------
@ -478,7 +478,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar
{ {
if ((subsystemFactorySuppliedWizardPages != null) && (subsystemFactorySuppliedWizardPages.length>0)) if ((subsystemFactorySuppliedWizardPages != null) && (subsystemFactorySuppliedWizardPages.length>0))
{ {
IWizardPage previousPage = (IWizardPage)mainPage; IWizardPage previousPage = mainPage;
for (int idx=0; idx<subsystemFactorySuppliedWizardPages.length; idx++) for (int idx=0; idx<subsystemFactorySuppliedWizardPages.length; idx++)
{ {
subsystemFactorySuppliedWizardPages[idx].setPreviousPage(previousPage); subsystemFactorySuppliedWizardPages[idx].setPreviousPage(previousPage);

View file

@ -24,6 +24,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemResources;
@ -115,7 +116,7 @@ public class RSENewConnectionWizard extends AbstractSystemWizard implements IRSE
} }
} }
catch (CoreException e) { catch (CoreException e) {
RSEUIPlugin.logError("Class " + obj + " is not executable extension", e); SystemBasePlugin.logError("Class " + obj + " is not executable extension", e);
continue; continue;
} }
} }

View file

@ -50,7 +50,7 @@ public class SystemNewProfileWizard
{ {
try { try {
mainPage = createMainPage(); mainPage = createMainPage();
addPage((WizardPage)mainPage); addPage(mainPage);
//super.addPages(); //super.addPages();
} catch (Exception exc) } catch (Exception exc)
{ {

View file

@ -329,7 +329,7 @@ public class SystemFilterReference extends SystemReferencingObject implements IA
*/ */
public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString) public ISystemFilterStringReference getSystemFilterStringReference(ISystemFilterString filterString)
{ {
return new SystemFilterStringReference((ISystemFilterReference)this, filterString); return new SystemFilterStringReference(this, filterString);
} }

View file

@ -145,7 +145,7 @@ public class SystemFilterPoolReference extends SystemPersistableReferencingObjec
* This also calls addReference(this) on that pool! * This also calls addReference(this) on that pool!
*/ */
public void setReferenceToFilterPool(ISystemFilterPool pool) { public void setReferenceToFilterPool(ISystemFilterPool pool) {
super.setReferencedObject((IRSEPersistableReferencedObject) pool); super.setReferencedObject(pool);
} }
/** /**

View file

@ -100,7 +100,7 @@ public class AbstractSystemResourceSet implements ISystemResourceSet
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
for (int i = 0; i < _resourceSet.size(); i++) for (int i = 0; i < _resourceSet.size(); i++)
{ {
Object resource = (Object)_resourceSet.get(i); Object resource = _resourceSet.get(i);
buf.append(pathFor(resource)); buf.append(pathFor(resource));
if (i < _resourceSet.size()) if (i < _resourceSet.size())
{ {

View file

@ -110,7 +110,7 @@ public class SystemEscapeCharHelper {
return ""+c; return ""+c;
*/ */
int intValue = (int)c; int intValue = c;
String returnStr=""+ESCAPE_CHAR; String returnStr=""+ESCAPE_CHAR;
if (intValue < 10) if (intValue < 10)

View file

@ -53,7 +53,7 @@ public class SystemPersistableReferencingObjectHelper
*/ */
public void setReferencedObject(IRSEBasePersistableReferencedObject obj) public void setReferencedObject(IRSEBasePersistableReferencedObject obj)
{ {
super.setReferencedObject((IRSEBaseReferencedObject)obj); super.setReferencedObject(obj);
this.masterObjectName = obj.getReferenceName(); this.masterObjectName = obj.getReferenceName();
} }

View file

@ -78,7 +78,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy
} }
catch (NumberFormatException e) { catch (NumberFormatException e) {
priority = Integer.MAX_VALUE; priority = Integer.MAX_VALUE;
RSEUIPlugin.logError("Exception reading priority for subsystem configuration " + name + " defined in plugin " + element.getDeclaringExtension().getNamespaceIdentifier(), e); SystemBasePlugin.logError("Exception reading priority for subsystem configuration " + name + " defined in plugin " + element.getDeclaringExtension().getNamespaceIdentifier(), e);
} }
String className = element.getAttribute("class"); String className = element.getAttribute("class");

View file

@ -22,6 +22,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.core.ISystemUserIdConstants; import org.eclipse.rse.core.ISystemUserIdConstants;
import org.eclipse.rse.core.PasswordPersistenceManager; import org.eclipse.rse.core.PasswordPersistenceManager;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.model.RSEModelObject; import org.eclipse.rse.core.model.RSEModelObject;
import org.eclipse.rse.logging.Logger; import org.eclipse.rse.logging.Logger;
import org.eclipse.rse.logging.LoggerFactory; import org.eclipse.rse.logging.LoggerFactory;
@ -1151,7 +1152,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
public void run() public void run()
{ {
SystemChangePasswordDialog dlg = new SystemChangePasswordDialog(RSEUIPlugin.getActiveWorkbenchShell(), getHostName(), getUserId(), _msg); SystemChangePasswordDialog dlg = new SystemChangePasswordDialog(SystemBasePlugin.getActiveWorkbenchShell(), getHostName(), getUserId(), _msg);
// Check if password was saved, if so preselect the save checkbox // Check if password was saved, if so preselect the save checkbox
if (getLocalUserId() != null) if (getLocalUserId() != null)
{ {

View file

@ -97,7 +97,7 @@ public class SystemPropertyPageExtensionManager
if (applies) if (applies)
{ {
added = true; added = true;
propertyPageSuppliers[idx].contributePropertyPages(manager, (IAdaptable)object); propertyPageSuppliers[idx].contributePropertyPages(manager, object);
} }
} }
} }