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

[cleanup] compiler warnings

Browse source
This commit is contained in:
Martin Oberhuber 2006-11-28 14:01:11 +00:00
parent 4894b3e8a6
commit 712899c35c
27 changed files with 70 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java
View file

@ -88,6 +88,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.shells.ui", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.shells.ui", path); //$NON-NLS-1$
} }
} }

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/ShellResources.java
View file

@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS;
public class ShellResources extends NLS public class ShellResources extends NLS
{ {
private static String BUNDLE_NAME = "org.eclipse.rse.shells.ui.ShellResources"; private static String BUNDLE_NAME = "org.eclipse.rse.shells.ui.ShellResources"; //$NON-NLS-1$
public static String RESID_SHELL_PROPERTYPAGE_TITLE; public static String RESID_SHELL_PROPERTYPAGE_TITLE;
public static String RESID_SHELL_PROPERTYPAGE_DESCRIPTION; public static String RESID_SHELL_PROPERTYPAGE_DESCRIPTION;

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java
View file

@ -152,7 +152,7 @@ public class SystemRemoteCommandEntryForm extends Composite
} }
catch ( Exception e ) catch ( Exception e )
{ {
SystemBasePlugin.logInfo("Exception invoking command "+cmd+" on " + sysConn.getAliasName() ); SystemBasePlugin.logInfo("Exception invoking command "+cmd+" on " + sysConn.getAliasName() ); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }
} }
@ -243,7 +243,7 @@ public class SystemRemoteCommandEntryForm extends Composite
{ {
int type = event.getType(); int type = event.getType();
Object src = event.getSource(); Object src = event.getSource();
Object parent = event.getParent(); //Object parent = event.getParent();
switch ( type ) switch ( type )
{ {
case ISystemResourceChangeEvents.EVENT_COMMAND_RUN: case ISystemResourceChangeEvents.EVENT_COMMAND_RUN:

6
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemCommandAction.java
View file

@ -354,7 +354,7 @@ public class SystemCommandAction extends SystemBaseAction
{ {
try try
{ {
Shell shell = getShell(); //Shell shell = getShell();
IRemoteCmdSubSystem cmdSubSystem = RemoteCommandHelpers.getCmdSubSystem(currSubSystem.getHost()); IRemoteCmdSubSystem cmdSubSystem = RemoteCommandHelpers.getCmdSubSystem(currSubSystem.getHost());
return cmdSubSystem; return cmdSubSystem;
} }
@ -377,7 +377,7 @@ public class SystemCommandAction extends SystemBaseAction
try try
{ {
Shell shell = getShell(); //Shell shell = getShell();
if (_selectedFilterRef != null) if (_selectedFilterRef != null)
{ {
@ -459,7 +459,7 @@ public class SystemCommandAction extends SystemBaseAction
{ {
try try
{ {
Shell shell = getShell(); //Shell shell = getShell();
if (_selectedFilterRef != null) if (_selectedFilterRef != null)
{ {
ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)_selectedFilterRef).getAdapter(ISystemViewElementAdapter.class); ISystemViewElementAdapter adapter = (ISystemViewElementAdapter)((IAdaptable)_selectedFilterRef).getAdapter(ISystemViewElementAdapter.class);

10
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemExportShellHistoryAction.java
View file

@ -20,7 +20,6 @@ import java.io.FileWriter;
import org.eclipse.rse.shells.ui.ShellResources; import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI; import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
@ -51,7 +50,8 @@ public class SystemExportShellHistoryAction extends SystemBaseShellAction
*/ */
public void run() public void run()
{ {
SystemCommandsViewPart viewPart = SystemCommandsUI.getInstance().activateCommandsView(); //SystemCommandsViewPart viewPart = \
SystemCommandsUI.getInstance().activateCommandsView();
for (int i = 0; i < _selected.size(); i++) for (int i = 0; i < _selected.size(); i++)
{ {
IRemoteCommandShell cmdShell = (IRemoteCommandShell)_selected.get(i); IRemoteCommandShell cmdShell = (IRemoteCommandShell)_selected.get(i);
@ -59,8 +59,8 @@ public class SystemExportShellHistoryAction extends SystemBaseShellAction
FileDialog fdlg = new FileDialog(getShell(), SWT.SAVE); FileDialog fdlg = new FileDialog(getShell(), SWT.SAVE);
fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE); fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE);
fdlg.setFileName(cmdShell.getId() + "-history.txt"); fdlg.setFileName(cmdShell.getId() + "-history.txt"); //$NON-NLS-1$
fdlg.setFilterExtensions(new String[] {"*.txt"}); fdlg.setFilterExtensions(new String[] {"*.txt"}); //$NON-NLS-1$
String fileName = fdlg.open(); String fileName = fdlg.open();
try try
{ {
@ -73,7 +73,7 @@ public class SystemExportShellHistoryAction extends SystemBaseShellAction
{ {
String cmd = cmds[o]; String cmd = cmds[o];
writer.write(cmd); writer.write(cmd);
writer.write("\r\n"); writer.write("\r\n"); //$NON-NLS-1$
} }
writer.close(); writer.close();

10
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemExportShellOutputAction.java
View file

@ -21,7 +21,6 @@ import java.io.FileWriter;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.rse.shells.ui.ShellResources; import org.eclipse.rse.shells.ui.ShellResources;
import org.eclipse.rse.shells.ui.view.SystemCommandsUI; import org.eclipse.rse.shells.ui.view.SystemCommandsUI;
import org.eclipse.rse.shells.ui.view.SystemCommandsViewPart;
import org.eclipse.rse.subsystems.files.core.SystemFileResources; import org.eclipse.rse.subsystems.files.core.SystemFileResources;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCommandShell;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
@ -53,15 +52,16 @@ public class SystemExportShellOutputAction extends SystemBaseShellAction
*/ */
public void run() public void run()
{ {
SystemCommandsViewPart viewPart = SystemCommandsUI.getInstance().activateCommandsView(); //SystemCommandsViewPart viewPart = \
SystemCommandsUI.getInstance().activateCommandsView();
for (int i = 0; i < _selected.size(); i++) for (int i = 0; i < _selected.size(); i++)
{ {
IRemoteCommandShell cmdShell = (IRemoteCommandShell)_selected.get(i); IRemoteCommandShell cmdShell = (IRemoteCommandShell)_selected.get(i);
FileDialog fdlg = new FileDialog(getShell(),SWT.SAVE); FileDialog fdlg = new FileDialog(getShell(),SWT.SAVE);
fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE); fdlg.setText(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_TITLE);
fdlg.setFileName(cmdShell.getId() + "-output.txt"); fdlg.setFileName(cmdShell.getId() + "-output.txt"); //$NON-NLS-1$
fdlg.setFilterExtensions(new String[] {"*.txt"}); fdlg.setFilterExtensions(new String[] {"*.txt"}); //$NON-NLS-1$
String fileName = fdlg.open(); String fileName = fdlg.open();
try try
{ {
@ -79,7 +79,7 @@ public class SystemExportShellOutputAction extends SystemBaseShellAction
if (adapter != null) if (adapter != null)
{ {
writer.write(adapter.getText(output)); writer.write(adapter.getText(output));
writer.write("\r\n"); writer.write("\r\n"); //$NON-NLS-1$
} }
} }
writer.close(); writer.close();

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/actions/SystemShowInShellViewAction.java
View file

@ -30,7 +30,7 @@ public class SystemShowInShellViewAction extends SystemBaseShellAction
{ {
/** /**
* Constructor. * Constructor.
* @param shell Shell of parent window, used as the parent for the dialog. * @param parent Shell of parent window, used as the parent for the dialog.
* Can be null, but be sure to call setParent before the action is used (ie, run). * Can be null, but be sure to call setParent before the action is used (ie, run).
*/ */
public SystemShowInShellViewAction(Shell parent) public SystemShowInShellViewAction(Shell parent)

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/EnvironmentVariablesPropertyPage.java
View file

@ -118,7 +118,7 @@ public class EnvironmentVariablesPropertyPage extends SystemBasePropertyPage
else else
{ {
SystemBasePlugin.logError( SystemBasePlugin.logError(
"EnvironmentVariablesPropertyPage.getCmdSubSystem: input element for property page is not an instanceof SubSystem: " "EnvironmentVariablesPropertyPage.getCmdSubSystem: input element for property page is not an instanceof SubSystem: " //$NON-NLS-1$
+ subsystem); + subsystem);
return null; return null;
} }

18
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/SystemShellPropertyPage.java
View file

@ -58,16 +58,16 @@ public class SystemShellPropertyPage extends SystemBasePropertyPage
} }
} }
RSEUIPlugin.getDefault().getPreferenceStore().setValue("shell.encodingDefaults", history.toString()); RSEUIPlugin.getDefault().getPreferenceStore().setValue("shell.encodingDefaults", history.toString()); //$NON-NLS-1$
} }
public List getShellEncodingDefaults() public List getShellEncodingDefaults()
{ {
List result = new ArrayList(); List result = new ArrayList();
String attribute = RSEUIPlugin.getDefault().getPreferenceStore().getString("shell.encodingDefaults"); String attribute = RSEUIPlugin.getDefault().getPreferenceStore().getString("shell.encodingDefaults"); //$NON-NLS-1$
if (attribute != null && attribute.length() > 0) if (attribute != null && attribute.length() > 0)
{ {
String[] list = attribute.split(","); String[] list = attribute.split(","); //$NON-NLS-1$
for (int i = 0; i < list.length; i++) for (int i = 0; i < list.length; i++)
{ {
result.add(list[i]); result.add(list[i]);
@ -75,12 +75,12 @@ public class SystemShellPropertyPage extends SystemBasePropertyPage
} }
else else
{ {
result.add("UTF-8"); result.add("UTF-8"); //$NON-NLS-1$
result.add("UTF-16"); result.add("UTF-16"); //$NON-NLS-1$
result.add("US-ASCII"); result.add("US-ASCII"); //$NON-NLS-1$
result.add("ISO-8859-1"); result.add("ISO-8859-1"); //$NON-NLS-1$
result.add("Cp1252"); result.add("Cp1252"); //$NON-NLS-1$
result.add("Cp1256"); result.add("Cp1256"); //$NON-NLS-1$
} }
return result; return result;
} }

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/EncodingForm.java
View file

@ -130,7 +130,7 @@ public class EncodingForm extends SystemBaseForm
{ {
if (usingDefault()) if (usingDefault())
{ {
return ""; return ""; //$NON-NLS-1$
} }
return _encodingCombo.getText(); return _encodingCombo.getText();
} }

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorView.java
View file

@ -130,7 +130,7 @@ public class SystemBuildErrorView extends SystemTableView
table.setRedraw(false); table.setRedraw(false);
synchronized (table) synchronized (table)
{ {
int count = table.getItemCount(); //int count = table.getItemCount();
table.remove(0, items); table.remove(0, items);
} }

10
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewPart.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.shells.ui.view;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.Action; import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager; import org.eclipse.jface.action.IStatusLineManager;
import org.eclipse.jface.action.IToolBarManager; import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
@ -27,7 +26,6 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.subsystems.IRemoteLineReference; import org.eclipse.rse.core.subsystems.IRemoteLineReference;
import org.eclipse.rse.model.ISystemResourceChangeEvent; import org.eclipse.rse.model.ISystemResourceChangeEvent;
import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.model.ISystemResourceChangeEvents;
@ -144,7 +142,7 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList
// constants // constants
public static final String ID = "org.eclipse.rse.shells.ui.view.buildErrorView"; public static final String ID = "org.eclipse.rse.shells.ui.view.buildErrorView"; //$NON-NLS-1$
// matches id in plugin.xml, view tag // matches id in plugin.xml, view tag
private SystemBuildErrorView _viewer; private SystemBuildErrorView _viewer;
@ -186,7 +184,7 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList
if (firstCall) if (firstCall)
{ {
IMenuManager menuManager = actionBars.getMenuManager(); //IMenuManager menuManager = actionBars.getMenuManager();
_statusLine = actionBars.getStatusLineManager(); _statusLine = actionBars.getStatusLineManager();
//addMenuItems(menuManager); //addMenuItems(menuManager);
} }
@ -220,7 +218,7 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList
handleDoubleClick(event); handleDoubleClick(event);
} }
}); });
SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "uerr0000"); SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "uerr0000"); //$NON-NLS-1$
fillLocalToolBar(); fillLocalToolBar();
} }
@ -351,7 +349,7 @@ public class SystemBuildErrorViewPart extends ViewPart implements ISelectionList
Object source = event.getSource(); Object source = event.getSource();
if (source instanceof IRemoteCmdSubSystem) if (source instanceof IRemoteCmdSubSystem)
{ {
Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell(); //Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
//shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((RemoteCmdSubSystem) source)); //shell.getDisplay().asyncExec(new CommandSubSystemDisconnectedRunnable((RemoteCmdSubSystem) source));
} }
else else

6
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemBuildErrorViewProvider.java
View file

@ -59,13 +59,13 @@ public class SystemBuildErrorViewProvider extends SystemTableViewProvider
else if (newInput instanceof IRemoteOutput) else if (newInput instanceof IRemoteOutput)
{ {
IRemoteOutput output = (IRemoteOutput)newInput; IRemoteOutput output = (IRemoteOutput)newInput;
IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent(); //IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent();
setOffset(output.getIndex()); setOffset(output.getIndex());
} }
else if (newInput instanceof IRemoteLineReference) else if (newInput instanceof IRemoteLineReference)
{ {
IRemoteLineReference output = (IRemoteLineReference)newInput; //IRemoteLineReference output = (IRemoteLineReference)newInput;
IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent(); //IRemoteCommandShell cmd = (IRemoteCommandShell)output.getParent();
//setOffset(output.getIndex()); //setOffset(output.getIndex());
} }
} }

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandEditor.java
View file

@ -255,8 +255,8 @@ public class SystemCommandEditor extends SourceViewer
menu.appendToGroup( menu.appendToGroup(
ITextEditorActionConstants.GROUP_EDIT, ITextEditorActionConstants.GROUP_EDIT,
(IAction) fGlobalActions.get(ITextEditorActionConstants.SELECT_ALL)); (IAction) fGlobalActions.get(ITextEditorActionConstants.SELECT_ALL));
menu.add(new Separator("group.generate")); menu.add(new Separator("group.generate")); //$NON-NLS-1$
menu.appendToGroup("group.generate", (IAction) fGlobalActions.get("ContentAssistProposal")); //$NON-NLS-1$ menu.appendToGroup("group.generate", (IAction) fGlobalActions.get("ContentAssistProposal")); //$NON-NLS-1$ //$NON-NLS-2$
} }
private IActionBars getActionBars() private IActionBars getActionBars()
{ {

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsUI.java
View file

@ -66,7 +66,7 @@ public class SystemCommandsUI
} }
catch (PartInitException e) catch (PartInitException e)
{ {
SystemBasePlugin.logError("Can not open build error view", e); SystemBasePlugin.logError("Can not open build error view", e); //$NON-NLS-1$
} }
return _errorPart; return _errorPart;
@ -83,7 +83,7 @@ public class SystemCommandsUI
catch (PartInitException e) catch (PartInitException e)
{ {
e.printStackTrace(); e.printStackTrace();
SystemBasePlugin.logError("Can not open remote shell view", e); SystemBasePlugin.logError("Can not open remote shell view", e); //$NON-NLS-1$
} }
return _viewPart; return _viewPart;

10
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsView.java
View file

@ -47,7 +47,7 @@ public class SystemCommandsView extends SystemTableView implements ISystemThemeC
if (element instanceof IRemoteOutput) if (element instanceof IRemoteOutput)
{ {
IRemoteOutput remoteOutput = (IRemoteOutput) element; IRemoteOutput remoteOutput = (IRemoteOutput) element;
if (remoteOutput.getText().indexOf("BEGIN-END-TAG:") > -1) if (remoteOutput.getText().indexOf("BEGIN-END-TAG:") > -1) //$NON-NLS-1$
{ {
return false; return false;
} }
@ -210,16 +210,16 @@ public class SystemCommandsView extends SystemTableView implements ISystemThemeC
{ {
IRemoteOutput rmtOutput = (IRemoteOutput) child; IRemoteOutput rmtOutput = (IRemoteOutput) child;
String type = rmtOutput.getType(); String type = rmtOutput.getType();
if (type.equals("stderr") || type.equals("error")) if (type.equals("stderr") || type.equals("error")) //$NON-NLS-1$ //$NON-NLS-2$
{ {
newItem.setForeground(_errColor); newItem.setForeground(_errColor);
} else if (type.equals("warning")) } else if (type.equals("warning")) //$NON-NLS-1$
{ {
newItem.setForeground(_warColor); newItem.setForeground(_warColor);
} else if (type.equals("informational")) } else if (type.equals("informational")) //$NON-NLS-1$
{ {
newItem.setForeground(_infColor); newItem.setForeground(_infColor);
} else if (type.equals("prompt")) } else if (type.equals("prompt")) //$NON-NLS-1$
{ {
newItem.setForeground(_prmColor); newItem.setForeground(_prmColor);
} else } else

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewOutputAdapterFactory.java
View file

@ -75,7 +75,7 @@ public class SystemViewOutputAdapterFactory implements IAdapterFactory
} }
else if (adapter == null) else if (adapter == null)
{ {
SystemBasePlugin.logWarning("No adapter found for object of type: " + adaptableObject.getClass().getName()); SystemBasePlugin.logWarning("No adapter found for object of type: " + adaptableObject.getClass().getName()); //$NON-NLS-1$
} }
return adapter; return adapter;
} }

3
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteErrorAdapter.java
View file

@ -18,7 +18,6 @@ package org.eclipse.rse.shells.ui.view;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteError;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.view.SystemViewResources; import org.eclipse.rse.ui.view.SystemViewResources;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
@ -54,7 +53,7 @@ public class SystemViewRemoteErrorAdapter extends SystemViewRemoteOutputAdapter
int i = -1; int i = -1;
// add our unique property descriptors... // add our unique property descriptors...
RSEUIPlugin plugin = RSEUIPlugin.getDefault(); //RSEUIPlugin plugin = RSEUIPlugin.getDefault();
// path // path
_uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(P_ERROR_FILENAME, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_LABEL, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_TOOLTIP); _uniquePropertyDescriptorArray[++i] = createSimplePropertyDescriptor(P_ERROR_FILENAME, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_LABEL, SystemViewResources.RESID_PROPERTY_ERROR_FILENAME_TOOLTIP);

19
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
View file

@ -125,7 +125,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
{ {
IRemoteOutput result = (IRemoteOutput) firstSelection; IRemoteOutput result = (IRemoteOutput) firstSelection;
String type = result.getType(); String type = result.getType();
if (type.equals("prompt")) if (type.equals("prompt")) //$NON-NLS-1$
{ {
if (_pasteToPromptAction == null) if (_pasteToPromptAction == null)
{ {
@ -134,7 +134,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
menu.add(menuGroup, _pasteToPromptAction); menu.add(menuGroup, _pasteToPromptAction);
} }
else if (type.equals("directory")) else if (type.equals("directory")) //$NON-NLS-1$
{ {
IRemoteOutput output = (IRemoteOutput)firstSelection; IRemoteOutput output = (IRemoteOutput)firstSelection;
if (output.getAbsolutePath() != null) if (output.getAbsolutePath() != null)
@ -250,10 +250,10 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
text = translateTabs(text); text = translateTabs(text);
} }
int tagIndex = text.indexOf("BEGIN-END-TAG"); int tagIndex = text.indexOf("BEGIN-END-TAG"); //$NON-NLS-1$
if (tagIndex == 0) if (tagIndex == 0)
{ {
return ""; return ""; //$NON-NLS-1$
} }
else if (tagIndex > 0) else if (tagIndex > 0)
{ {
@ -414,7 +414,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
protected IEditorDescriptor getDefaultTextEditor() protected IEditorDescriptor getDefaultTextEditor()
{ {
IEditorRegistry registry = getEditorRegistry(); IEditorRegistry registry = getEditorRegistry();
return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
} }
/** /**
@ -669,7 +669,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
{ {
IRemoteOutput out = (IRemoteOutput) element; IRemoteOutput out = (IRemoteOutput) element;
String str = getAbsoluteParentName(element); String str = getAbsoluteParentName(element);
return str + ":" + out.getIndex(); return str + ":" + out.getIndex(); //$NON-NLS-1$
} }
return null; return null;
} }
@ -1072,8 +1072,9 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
* @param src the object to be copied. If the target and source are not on the same system, then this is a * @param src the object to be copied. If the target and source are not on the same system, then this is a
* temporary object produced by the doDrag. * temporary object produced by the doDrag.
* @param target the object to be copied to. * @param target the object to be copied to.
* @param sameSystem an indication whether the target and source reside on the same type of system * @param sameSystemType an indication whether the target and source reside on the same type of system
* @param indicates the type of source * @param sameSystem an indication whether the target and source reside on the same system
* @param srcType the type of source
* @param monitor the progress monitor * @param monitor the progress monitor
* @return an indication whether the operation was successful or not. * @return an indication whether the operation was successful or not.
*/ */
@ -1202,7 +1203,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
} }
} }
} }
return ""; return ""; //$NON-NLS-1$
} }

4
rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
View file

@ -99,7 +99,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
pool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user pool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user
if (pool == null) // hmmm, why would this happen? if (pool == null) // hmmm, why would this happen?
{ {
SystemBasePlugin.logError("Creating default filter pool "+getDefaultFilterPoolName(mgr.getName(), getId())+" for mgr "+mgr.getName()+" failed.",null); SystemBasePlugin.logError("Creating default filter pool "+getDefaultFilterPoolName(mgr.getName(), getId())+" for mgr "+mgr.getName()+" failed.",null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
return null; return null;
} }
//System.out.println("Pool created"); //System.out.println("Pool created");
@ -132,7 +132,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
} }
} catch (Exception exc) } catch (Exception exc)
{ {
SystemBasePlugin.logError("Error creating default filter pool",exc); SystemBasePlugin.logError("Error creating default filter pool",exc); //$NON-NLS-1$
} }
return pool; return pool;
} }

2
rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalJavaLanguageUtility.java
View file

@ -56,7 +56,7 @@ public class LocalJavaLanguageUtility extends AbstractJavaLanguageUtility {
} }
} }
catch (IOException e) { catch (IOException e) {
SystemBasePlugin.logError("Error occurred trying to get qualified class name", e); SystemBasePlugin.logError("Error occurred trying to get qualified class name", e); //$NON-NLS-1$
return null; return null;
} }
} }

2
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/Activator.java
View file

@ -63,6 +63,6 @@ public class Activator extends AbstractUIPlugin {
* @return the image descriptor * @return the image descriptor
*/ */
public static ImageDescriptor getImageDescriptor(String path) { public static ImageDescriptor getImageDescriptor(String path) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.core", path); return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.subsystems.processes.core", path); //$NON-NLS-1$
} }
} }

2
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/SystemProcessesCoreResources.java
View file

@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
public class SystemProcessesCoreResources extends NLS public class SystemProcessesCoreResources extends NLS
{ {
private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; private static String BUNDLE_NAME = "org.eclipse.rse.subsystems.processes.core.subsystem.SystemProcessesCoreResources"; //$NON-NLS-1$
// PROCESS PROPERTIES // PROCESS PROPERTIES
public static String RESID_PROPERTY_PROCESS_DEFAULTFILTER_LABEL; public static String RESID_PROPERTY_PROCESS_DEFAULTFILTER_LABEL;

4
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessImpl.java
View file

@ -26,8 +26,6 @@ import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConst
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcess;
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessContext; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessContext;
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystem; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystem;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
/** /**
@ -131,7 +129,7 @@ public class RemoteProcessImpl implements IRemoteProcess, ISystemProcessRemoteCo
} }
catch (SystemMessageException e) catch (SystemMessageException e)
{ {
SystemBasePlugin.logError("UniversalProcessImpl.getParentRemoteProcess()", e); SystemBasePlugin.logError("UniversalProcessImpl.getParentRemoteProcess()", e); //$NON-NLS-1$
} }
} }

4
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java
View file

@ -169,7 +169,7 @@ public abstract class RemoteProcessSubSystemConfiguration extends
// ---------------------- // ----------------------
filterStrings = new Vector(); filterStrings = new Vector();
HostProcessFilterImpl myProcessesFilterString = new HostProcessFilterImpl(); HostProcessFilterImpl myProcessesFilterString = new HostProcessFilterImpl();
myProcessesFilterString.setUsername("${user.id}"); myProcessesFilterString.setUsername("${user.id}"); //$NON-NLS-1$
filterStrings.add(myProcessesFilterString.toString()); filterStrings.add(myProcessesFilterString.toString());
filter = mgr.createSystemFilter(pool, SystemProcessesCoreResources.RESID_PROPERTY_PROCESS_MYPROCESSESFILTER_LABEL,filterStrings); filter = mgr.createSystemFilter(pool, SystemProcessesCoreResources.RESID_PROPERTY_PROCESS_MYPROCESSESFILTER_LABEL,filterStrings);
@ -178,7 +178,7 @@ public abstract class RemoteProcessSubSystemConfiguration extends
} }
} catch (Exception exc) } catch (Exception exc)
{ {
SystemBasePlugin.logError("Error creating default filter pool",exc); SystemBasePlugin.logError("Error creating default filter pool",exc); //$NON-NLS-1$
} }
return pool; return pool;
} }

2
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java
View file

@ -153,7 +153,7 @@ public abstract class RemoteProcessSubSystemImpl extends SubSystem implements
} }
catch (SystemMessageException e) catch (SystemMessageException e)
{ {
SystemBasePlugin.logError("Exception resolving roots", e); SystemBasePlugin.logError("Exception resolving roots", e); //$NON-NLS-1$
} }
return roots; return roots;
} }

6
rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/subsystems/shells/ssh/SshServiceCommandShell.java
View file

@ -97,7 +97,7 @@ public class SshServiceCommandShell extends ServiceCommandShell implements ISyst
try { try {
// Bug 160202: Remote shell dies. // Bug 160202: Remote shell dies.
if ((_curCommand == null) || (!_curCommand.trim().equals("ls"))) { if ((_curCommand == null) || (!_curCommand.trim().equals("ls"))) { //$NON-NLS-1$
parsedMsg = _patterns.matchLine(line); parsedMsg = _patterns.matchLine(line);
// Bug 160202: Remote shell dies. // Bug 160202: Remote shell dies.
@ -109,8 +109,8 @@ public class SshServiceCommandShell extends ServiceCommandShell implements ISyst
String token1 = tokenizer.nextToken(); String token1 = tokenizer.nextToken();
String token2 = tokenizer.nextToken(); String token2 = tokenizer.nextToken();
if ((token1.equals("ls")) && (token2.indexOf('-') == 0) && (token2.indexOf('l') > 0)) { if ((token1.equals("ls")) && (token2.indexOf('-') == 0) && (token2.indexOf('l') > 0)) { //$NON-NLS-1$
if (line.startsWith("total")) { if (line.startsWith("total")) { //$NON-NLS-1$
parsedMsg = null; parsedMsg = null;
} }
} }