mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00
Code Issues Wiki Activity

removing some compile warnings

Browse source
This commit is contained in:
David McKnight 2007-01-03 18:13:53 +00:00
parent 48b45595df
commit e94377283d
88 changed files with 456 additions and 487 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/FileResources.java
View file

@ -20,7 +20,7 @@ import org.eclipse.osgi.util.NLS;
public class FileResources extends NLS
{
private static String BUNDLE_NAME = "org.eclipse.rse.files.ui.FileResources";
private static String BUNDLE_NAME = "org.eclipse.rse.files.ui.FileResources"; //$NON-NLS-1$
public static String RESID_FILES_PREFERENCES_BUFFER;
public static String RESID_FILES_PREFERENCES_DOWNLOAD_BUFFER_SIZE_LABEL;

160
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java
View file

@ -23,136 +23,136 @@ package org.eclipse.rse.files.ui;
*/
public interface ISystemFileConstants
{
public static final String PLUGIN_ID ="org.eclipse.rse.files.ui";
public static final String PREFIX = PLUGIN_ID+".files.";
public static final String PLUGIN_ID ="org.eclipse.rse.files.ui"; //$NON-NLS-1$
public static final String PREFIX = PLUGIN_ID+".files."; //$NON-NLS-1$
// Icons
public static final String ICON_DIR = "icons";
public static final String ICON_DIR = "icons"; //$NON-NLS-1$
public static final String ICON_PATH = java.io.File.separator + ICON_DIR + java.io.File.separator;
public static final String ICON_SUFFIX = "Icon";
public static final String ICON_EXT = ".gif";
public static final String ICON_SUFFIX = "Icon"; //$NON-NLS-1$
public static final String ICON_EXT = ".gif"; //$NON-NLS-1$
// Resource Bundle ids
public static final String RESID_PREFIX = PREFIX+"ui.";
public static final String RESID_PREFIX = PREFIX+"ui."; //$NON-NLS-1$
// -------------------
// DEFAULT FILTERS...
// -------------------
public static final String RESID_FILTER_ROOTS = RESID_PREFIX + "RootsFileFilter.label";
public static final String RESID_FILTER_ROOTFILES = RESID_PREFIX + "RootFileFilter.label";
public static final String RESID_FILTER_ROOTFOLDERS= RESID_PREFIX + "RootFolderFilter.label";
public static final String RESID_FILTER_DRIVES = RESID_PREFIX + "DrivesFileFilter.label";
public static final String RESID_FILTER_HOME = RESID_PREFIX + "HomeFileFilter.label";
public static final String RESID_FILTER_USERHOME = RESID_PREFIX + "UserHomeFileFilter.label";
public static final String RESID_FILTER_MYHOME = RESID_PREFIX + "MyHomeFileFilter.label";
public static final String RESID_FILTER_ROOTS = RESID_PREFIX + "RootsFileFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_ROOTFILES = RESID_PREFIX + "RootFileFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_ROOTFOLDERS= RESID_PREFIX + "RootFolderFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_DRIVES = RESID_PREFIX + "DrivesFileFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_HOME = RESID_PREFIX + "HomeFileFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_USERHOME = RESID_PREFIX + "UserHomeFileFilter.label"; //$NON-NLS-1$
public static final String RESID_FILTER_MYHOME = RESID_PREFIX + "MyHomeFileFilter.label"; //$NON-NLS-1$
// -------------------------
// MISCELLANEOUS...
// -------------------------
public static final String RESID_PROPERTY_FILE_FILTER_VALUE = RESID_PREFIX + "FileFilterProperty.value";
public static final String RESID_PROPERTY_FILE_FILTER_VALUE = RESID_PREFIX + "FileFilterProperty.value"; //$NON-NLS-1$
// -------------------------
// WIZARDS...
// -------------------------
// New System File Filter wizard...
public static final String RESID_NEWFILEFILTER_PAGE1_TITLE = RESID_PREFIX+"NewFileFilter.page1.title";
public static final String RESID_NEWFILEFILTER_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFileFilter.page1.description";
public static final String RESID_FILEFILTER_ROOT = RESID_PREFIX+"filefilter.";
public static final String RESID_FILEFILTER_NAME_ROOT = RESID_FILEFILTER_ROOT+"name.";
public static final String RESID_FILEFILTER_FOLDER_ROOT = RESID_FILEFILTER_ROOT+"folder.";
public static final String RESID_FILEFILTER_FILE_ROOT = RESID_FILEFILTER_ROOT+"file.";
public static final String RESID_FILEFILTER_STRING_ROOT = RESID_FILEFILTER_ROOT+"strings.";
public static final String RESID_NEWFILEFILTER_PAGE1_TITLE = RESID_PREFIX+"NewFileFilter.page1.title"; //$NON-NLS-1$
public static final String RESID_NEWFILEFILTER_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFileFilter.page1.description"; //$NON-NLS-1$
public static final String RESID_FILEFILTER_ROOT = RESID_PREFIX+"filefilter."; //$NON-NLS-1$
public static final String RESID_FILEFILTER_NAME_ROOT = RESID_FILEFILTER_ROOT+"name."; //$NON-NLS-1$
public static final String RESID_FILEFILTER_FOLDER_ROOT = RESID_FILEFILTER_ROOT+"folder."; //$NON-NLS-1$
public static final String RESID_FILEFILTER_FILE_ROOT = RESID_FILEFILTER_ROOT+"file."; //$NON-NLS-1$
public static final String RESID_FILEFILTER_STRING_ROOT = RESID_FILEFILTER_ROOT+"strings."; //$NON-NLS-1$
// New Filter String wizard...
public static final String RESID_NEWFILTERSTRING_TITLE = RESID_PREFIX+"NewFilterString.title";
public static final String RESID_NEWFILTERSTRING_PAGE1_TITLE = RESID_PREFIX+"NewFilterString.page1.title";
public static final String RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFilterString.page1.description";
public static final String RESID_NEWFILTERSTRING_TITLE = RESID_PREFIX+"NewFilterString.title"; //$NON-NLS-1$
public static final String RESID_NEWFILTERSTRING_PAGE1_TITLE = RESID_PREFIX+"NewFilterString.page1.title"; //$NON-NLS-1$
public static final String RESID_NEWFILTERSTRING_PAGE1_DESCRIPTION = RESID_PREFIX+"NewFilterString.page1.description"; //$NON-NLS-1$
// File Filter String Re-Usable form (used in dialog and wizard)
public static final String RESID_FILEFILTERSTRING_ROOT = RESID_PREFIX+"filefilterstring.";
public static final String RESID_FILEFILTERSTRING_FOLDER_ROOT = RESID_FILEFILTERSTRING_ROOT+"folder.";
public static final String RESID_FILEFILTERSTRING_FILE_ROOT = RESID_FILEFILTERSTRING_ROOT+"file.";
public static final String RESID_FILEFILTERSTRING_INCFOLDERS_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.folders.";
public static final String RESID_FILEFILTERSTRING_INCFILES_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.files.";
public static final String RESID_FILEFILTERSTRING_INCFILESONLY_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.filesonly.";
public static final String RESID_FILEFILTERSTRING_BYFILENAME_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.byfilename.";
public static final String RESID_FILEFILTERSTRING_BYFILETYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"include.byfiletypes.";
public static final String RESID_FILEFILTERSTRING_TYPES_ROOT = RESID_FILEFILTERSTRING_ROOT+"types.";
public static final String RESID_FILEFILTERSTRING_SELECTTYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"selectTypes.";
public static final String RESID_FILEFILTERSTRING_TEST_ROOT = RESID_FILEFILTERSTRING_ROOT+"test.";
public static final String RESID_FILEFILTERSTRING_ROOT = RESID_PREFIX+"filefilterstring."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_FOLDER_ROOT = RESID_FILEFILTERSTRING_ROOT+"folder."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_FILE_ROOT = RESID_FILEFILTERSTRING_ROOT+"file."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_INCFOLDERS_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.folders."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_INCFILES_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.files."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_INCFILESONLY_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.filesonly."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_BYFILENAME_ROOT = RESID_FILEFILTERSTRING_ROOT+"include.byfilename."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_BYFILETYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"include.byfiletypes."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_TYPES_ROOT = RESID_FILEFILTERSTRING_ROOT+"types."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_SELECTTYPES_ROOT= RESID_FILEFILTERSTRING_ROOT+"selectTypes."; //$NON-NLS-1$
public static final String RESID_FILEFILTERSTRING_TEST_ROOT = RESID_FILEFILTERSTRING_ROOT+"test."; //$NON-NLS-1$
// -------------------------
// DIALOGS...
// -------------------------
// Change System File Filter dialog...
public static final String RESID_CHGFILEFILTER_TITLE = RESID_PREFIX+"ChgFileFilter.title";
public static final String RESID_CHGFILEFILTER_TITLE = RESID_PREFIX+"ChgFileFilter.title"; //$NON-NLS-1$
// Change System File Filter String dialog...
public static final String RESID_CHGFILEFILTERSTRING_TITLE = RESID_PREFIX+"ChgFileFilterString.title";
public static final String RESID_CHGFILEFILTERSTRING_TITLE = RESID_PREFIX+"ChgFileFilterString.title"; //$NON-NLS-1$
// Select Directory dialog...
public static final String RESID_SELECTDIRECTORY_TITLE = RESID_PREFIX+"SelectDirectory.title";
public static final String RESID_SELECTDIRECTORY_VERBAGE = RESID_PREFIX+"SelectDirectory.verbage.";
public static final String RESID_SELECTDIRECTORY_SELECT = RESID_PREFIX+"SelectDirectory.select.";
public static final String RESID_SELECTDIRECTORY_TITLE = RESID_PREFIX+"SelectDirectory.title"; //$NON-NLS-1$
public static final String RESID_SELECTDIRECTORY_VERBAGE = RESID_PREFIX+"SelectDirectory.verbage."; //$NON-NLS-1$
public static final String RESID_SELECTDIRECTORY_SELECT = RESID_PREFIX+"SelectDirectory.select."; //$NON-NLS-1$
// Select File dialog...
public static final String RESID_SELECTFILE_TITLE = RESID_PREFIX+"SelectFile.title";
public static final String RESID_SELECTFILE_VERBAGE = RESID_PREFIX+"SelectFile.verbage.";
public static final String RESID_SELECTFILE_SELECT = RESID_PREFIX+"SelectFile.select.";
public static final String RESID_SELECTFILE_TITLE = RESID_PREFIX+"SelectFile.title"; //$NON-NLS-1$
public static final String RESID_SELECTFILE_VERBAGE = RESID_PREFIX+"SelectFile.verbage."; //$NON-NLS-1$
public static final String RESID_SELECTFILE_SELECT = RESID_PREFIX+"SelectFile.select."; //$NON-NLS-1$
// Prompt for home folder dialog...
public static final String RESID_HOMEPROMPT_TITLE = RESID_PREFIX+"HomePrompt.title";
public static final String RESID_HOMEPROMPT_VERBAGE = RESID_PREFIX+"HomePrompt.verbage.";
public static final String RESID_HOMEPROMPT_PROMPT_ROOT = RESID_PREFIX+"HomePrompt.prompt.";
public static final String RESID_HOMEPROMPT_TITLE = RESID_PREFIX+"HomePrompt.title"; //$NON-NLS-1$
public static final String RESID_HOMEPROMPT_VERBAGE = RESID_PREFIX+"HomePrompt.verbage."; //$NON-NLS-1$
public static final String RESID_HOMEPROMPT_PROMPT_ROOT = RESID_PREFIX+"HomePrompt.prompt."; //$NON-NLS-1$
// -------------------------
// ACTIONS...
// -------------------------
public static final String ACTION_ID = RESID_PREFIX + "action.";
public static final String ACTION_ID = RESID_PREFIX + "action."; //$NON-NLS-1$
public static final String ACTION_NEWFILEFILTER = ACTION_ID + "NewFilter";
public static final String ACTION_NEWNESTEDFILEFILTER= ACTION_ID + "NewNestedFilter";
public static final String ACTION_UPDATEFILEFILTER = ACTION_ID + "UpdateFilter";
public static final String ACTION_NEWFILEFILTER = ACTION_ID + "NewFilter"; //$NON-NLS-1$
public static final String ACTION_NEWNESTEDFILEFILTER= ACTION_ID + "NewNestedFilter"; //$NON-NLS-1$
public static final String ACTION_UPDATEFILEFILTER = ACTION_ID + "UpdateFilter"; //$NON-NLS-1$
public static final String ACTION_NEWFILEFILTERSTRING = ACTION_ID + "NewFilterString";
public static final String ACTION_ADDFILEFILTERSTRING = ACTION_ID + "AddFilterString";
public static final String ACTION_UPDATEFILEFILTERSTRING = ACTION_ID + "UpdateFilterString";
public static final String ACTION_SELECTFILETYPES = ACTION_ID + "SelectFileTypes";
public static final String ACTION_NEWFILEFILTERSTRING = ACTION_ID + "NewFilterString"; //$NON-NLS-1$
public static final String ACTION_ADDFILEFILTERSTRING = ACTION_ID + "AddFilterString"; //$NON-NLS-1$
public static final String ACTION_UPDATEFILEFILTERSTRING = ACTION_ID + "UpdateFilterString"; //$NON-NLS-1$
public static final String ACTION_SELECTFILETYPES = ACTION_ID + "SelectFileTypes"; //$NON-NLS-1$
// -------------------------
// WIDGETS...
// -------------------------
public static final String WIDGET_ID = RESID_PREFIX + "widget.";
public static final String WIDGET_ID = RESID_PREFIX + "widget."; //$NON-NLS-1$
public static final String WIDGET_FOLDER_ROOT = WIDGET_ID + "directory.";
public static final String WIDGET_BROWSE_ROOT = WIDGET_ID + "browse.";
public static final String WIDGET_FOLDER_ROOT = WIDGET_ID + "directory."; //$NON-NLS-1$
public static final String WIDGET_BROWSE_ROOT = WIDGET_ID + "browse."; //$NON-NLS-1$
// -------------------------
// PROPERTY PAGES...
// -------------------------
public static final String RESID_PP_FILE_ROOT = RESID_PREFIX+"pp.file.";
public static final String RESID_PP_FILE_TITLE = RESID_PP_FILE_ROOT+"title";
public static final String RESID_PP_FILE_TYPE_ROOT = RESID_PP_FILE_ROOT+"type.";
public static final String RESID_PP_FILE_TYPE_FILE_VALUE = RESID_PP_FILE_ROOT+"type.file.value";
public static final String RESID_PP_FILE_TYPE_FOLDER_VALUE = RESID_PP_FILE_ROOT+"type.folder.value";
public static final String RESID_PP_FILE_TYPE_ROOT_VALUE = RESID_PP_FILE_ROOT+"type.root.value";
public static final String RESID_PP_FILE_NAME_ROOT = RESID_PP_FILE_ROOT+"name.";
public static final String RESID_PP_FILE_PATH_ROOT = RESID_PP_FILE_ROOT+"path.";
public static final String RESID_PP_FILE_SIZE_ROOT = RESID_PP_FILE_ROOT+"size.";
public static final String RESID_PP_FILE_SIZE_VALUE = RESID_PP_FILE_ROOT+"size.value";
public static final String RESID_PP_FILE_MODIFIED_ROOT = RESID_PP_FILE_ROOT+"modified.";
public static final String RESID_PP_FILE_READONLY_ROOT = RESID_PP_FILE_ROOT+"readonly.";
public static final String RESID_PP_FILE_READABLE_ROOT = RESID_PP_FILE_ROOT+"readable.";
public static final String RESID_PP_FILE_WRITABLE_ROOT = RESID_PP_FILE_ROOT+"writable.";
public static final String RESID_PP_FILE_HIDDEN_ROOT = RESID_PP_FILE_ROOT+"hidden.";
public static final String RESID_PP_FILE_ROOT = RESID_PREFIX+"pp.file."; //$NON-NLS-1$
public static final String RESID_PP_FILE_TITLE = RESID_PP_FILE_ROOT+"title"; //$NON-NLS-1$
public static final String RESID_PP_FILE_TYPE_ROOT = RESID_PP_FILE_ROOT+"type."; //$NON-NLS-1$
public static final String RESID_PP_FILE_TYPE_FILE_VALUE = RESID_PP_FILE_ROOT+"type.file.value"; //$NON-NLS-1$
public static final String RESID_PP_FILE_TYPE_FOLDER_VALUE = RESID_PP_FILE_ROOT+"type.folder.value"; //$NON-NLS-1$
public static final String RESID_PP_FILE_TYPE_ROOT_VALUE = RESID_PP_FILE_ROOT+"type.root.value"; //$NON-NLS-1$
public static final String RESID_PP_FILE_NAME_ROOT = RESID_PP_FILE_ROOT+"name."; //$NON-NLS-1$
public static final String RESID_PP_FILE_PATH_ROOT = RESID_PP_FILE_ROOT+"path."; //$NON-NLS-1$
public static final String RESID_PP_FILE_SIZE_ROOT = RESID_PP_FILE_ROOT+"size."; //$NON-NLS-1$
public static final String RESID_PP_FILE_SIZE_VALUE = RESID_PP_FILE_ROOT+"size.value"; //$NON-NLS-1$
public static final String RESID_PP_FILE_MODIFIED_ROOT = RESID_PP_FILE_ROOT+"modified."; //$NON-NLS-1$
public static final String RESID_PP_FILE_READONLY_ROOT = RESID_PP_FILE_ROOT+"readonly."; //$NON-NLS-1$
public static final String RESID_PP_FILE_READABLE_ROOT = RESID_PP_FILE_ROOT+"readable."; //$NON-NLS-1$
public static final String RESID_PP_FILE_WRITABLE_ROOT = RESID_PP_FILE_ROOT+"writable."; //$NON-NLS-1$
public static final String RESID_PP_FILE_HIDDEN_ROOT = RESID_PP_FILE_ROOT+"hidden."; //$NON-NLS-1$
// -------------------------------
// Enter or select file form
// -------------------------------
public static final String RESID_ENTER_OR_SELECT_FILE_PREFIX = RESID_PREFIX + "EnterOrSelectFile.";
public static final String RESID_ENTER_OR_SELECT_FILE_TITLE = RESID_ENTER_OR_SELECT_FILE_PREFIX + "title";
public static final String RESID_ENTER_OR_SELECT_FILE_VERBAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbage.label";
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.label";
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "select.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.label";
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.tooltip";
public static final String RESID_ENTER_OR_SELECT_FILE_PREFIX = RESID_PREFIX + "EnterOrSelectFile."; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_TITLE = RESID_ENTER_OR_SELECT_FILE_PREFIX + "title"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_VERBAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbage.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "enter.tooltip"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "select.tooltip"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.label"; //$NON-NLS-1$
public static final String RESID_ENTER_OR_SELECT_FILE_FILE_TOOLTIP = RESID_ENTER_OR_SELECT_FILE_PREFIX + "file.tooltip"; //$NON-NLS-1$
}

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileMessages.java
View file

@ -29,8 +29,8 @@ public interface ISystemFileMessages
// Messages
//public static final String FILEMSG_VALIDATE_PREFIX = FILEMSG_PREFIX + "Validate.";
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY = "RSEF1006";
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE= "RSEF1007";
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID = "RSEF1008";
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES = "RSEF1009";
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_EMPTY = "RSEF1006"; //$NON-NLS-1$
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTUNIQUE= "RSEF1007"; //$NON-NLS-1$
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOTVALID = "RSEF1008"; //$NON-NLS-1$
public static final String FILEMSG_VALIDATE_FILEFILTERSTRING_NOINCLUDES = "RSEF1009"; //$NON-NLS-1$
}

46
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java
View file

@ -176,15 +176,15 @@ public class SystemFileFilterStringEditPane
// directory prompt
String historyKey = null;
if (refProvider != null)
historyKey = ((ISubSystem)refProvider).getSubSystemConfiguration().getId()+".filterStringDialog"; // unique to us
historyKey = ((ISubSystem)refProvider).getSubSystemConfiguration().getId()+".filterStringDialog"; // unique to us //$NON-NLS-1$
else
historyKey = "files.filterStringDialog"; // unique to us
historyKey = "files.filterStringDialog"; // unique to us //$NON-NLS-1$
boolean readonly = false;
folderCombo = SystemFileWidgetHelpers.createFolderCombo(composite_prompts, null, gridColumns, historyKey, readonly);
folderCombo.setShowNewConnectionPrompt(false);
SystemWidgetHelpers.setHelp(folderCombo, RSEUIPlugin.HELPPREFIX+"ffsd0001");
SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
SystemWidgetHelpers.setHelp(folderCombo, RSEUIPlugin.HELPPREFIX+"ffsd0001"); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER //$NON-NLS-1$
// parent folder prompt
//textFolder = SystemWidgetHelpers.createLabeledTextField(composite_prompts, null, rb, RESID_FILEFILTERSTRING_FOLDER_ROOT);
@ -192,33 +192,33 @@ public class SystemFileFilterStringEditPane
// "Subset by file name filter" radiobutton
subsetByFileNameRadioButton = SystemWidgetHelpers.createRadioButton(composite_prompts, null, SystemFileResources.RESID_FILEFILTERSTRING_BYFILENAME_LABEL, SystemFileResources.RESID_FILEFILTERSTRING_BYFILENAME_TOOLTIP);
//SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0002", RSEUIPlugin.HELPPREFIX+"ffsd0003");
SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0002");
SystemWidgetHelpers.setHelp(subsetByFileNameRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0002"); //$NON-NLS-1$
updateGridData(subsetByFileNameRadioButton, gridColumns);
// File name prompt
//textFile = SystemWidgetHelpers.createLabeledTextField(composite_prompts, null, rb, RESID_FILEFILTERSTRING_FILE_ROOT);
String indent = " ";
String indent = " "; //$NON-NLS-1$
String temp = SystemWidgetHelpers.appendColon(SystemFileResources.RESID_FILEFILTERSTRING_FILE_LABEL);
labelFile = SystemWidgetHelpers.createLabel(composite_prompts, indent+temp);
labelFile.setToolTipText(SystemFileResources.RESID_FILEFILTERSTRING_FILE_TOOLTIP);
textFile = SystemWidgetHelpers.createTextField(composite_prompts, null);
textFile.setToolTipText(SystemFileResources.RESID_FILEFILTERSTRING_FILE_TOOLTIP);
//SystemWidgetHelpers.setHelp(textFile, RSEUIPlugin.HELPPREFIX+"ffsd0003",RSEUIPlugin.HELPPREFIX+"ffsd0002");
SystemWidgetHelpers.setHelp(textFile, RSEUIPlugin.HELPPREFIX+"ffsd0003");
SystemWidgetHelpers.setHelp(textFile, RSEUIPlugin.HELPPREFIX+"ffsd0003"); //$NON-NLS-1$
updateGridData(textFile, gridColumns-1);
textFile.setText("*");
textFile.setText("*"); //$NON-NLS-1$
// "Subset by file types filter" radiobutton
subsetByFileTypesRadioButton = SystemWidgetHelpers.createRadioButton(composite_prompts, null, SystemFileResources.RESID_FILEFILTERSTRING_BYFILETYPES_LABEL, SystemFileResources.RESID_FILEFILTERSTRING_BYFILETYPES_TOOLTIP);
//SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0004", RSEUIPlugin.HELPPREFIX+"ffsd0005");
SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0004");
SystemWidgetHelpers.setHelp(subsetByFileTypesRadioButton, RSEUIPlugin.HELPPREFIX+"ffsd0004"); //$NON-NLS-1$
updateGridData(subsetByFileTypesRadioButton, gridColumns);
// File types prompt
Composite typesGroup = SystemWidgetHelpers.createComposite(composite_prompts, 3);
//SystemWidgetHelpers.setHelp(typesGroup, RSEUIPlugin.HELPPREFIX+"ffsd0005",RSEUIPlugin.HELPPREFIX+"ffsd0004");
SystemWidgetHelpers.setHelp(typesGroup, RSEUIPlugin.HELPPREFIX+"ffsd0005");
SystemWidgetHelpers.setHelp(typesGroup, RSEUIPlugin.HELPPREFIX+"ffsd0005"); //$NON-NLS-1$
GridLayout layout = (GridLayout)typesGroup.getLayout();
layout.marginWidth = 0;
layout.marginHeight = 0;
@ -248,10 +248,10 @@ public class SystemFileFilterStringEditPane
*/
// Show Files Only check box
SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER
SystemWidgetHelpers.createLabel(composite_prompts," ",gridColumns); // FILLER //$NON-NLS-1$
filesOnlyCheckBox = SystemWidgetHelpers.createCheckBox(composite_prompts, gridColumns, null,
SystemFileResources.RESID_FILEFILTERSTRING_INCFILESONLY_LABEL, SystemFileResources.RESID_FILEFILTERSTRING_INCFILESONLY_TOOLTIP);
SystemWidgetHelpers.setHelp(filesOnlyCheckBox, RSEUIPlugin.HELPPREFIX+"ffsd0006");
SystemWidgetHelpers.setHelp(filesOnlyCheckBox, RSEUIPlugin.HELPPREFIX+"ffsd0006"); //$NON-NLS-1$
// Test button
/*
@ -337,11 +337,11 @@ public class SystemFileFilterStringEditPane
{
RemoteFileFilterString rffs = new RemoteFileFilterString(inputSubsystemConfiguration, inputFilterString);
String defaultPath = rffs.getPath();
folderCombo.setText((defaultPath==null) ? "" : defaultPath);
folderCombo.setText((defaultPath==null) ? "" : defaultPath); //$NON-NLS-1$
String defaultFile = rffs.getFile();
textFile.setText((defaultFile==null) ? "" : defaultFile);
textFile.setText((defaultFile==null) ? "" : defaultFile); //$NON-NLS-1$
String defaultTypes = rffs.getTypesAsString();
textTypes.setText((defaultTypes==null) ? "" : defaultTypes);
textTypes.setText((defaultTypes==null) ? "" : defaultTypes); //$NON-NLS-1$
boolean defaultIncludeFilesOnly = rffs.getShowFiles() && !rffs.getShowSubDirs();
boolean defaultSubsetByFileName = !rffs.getFilterByTypes();
// set appropriate radio button for subset type
@ -359,9 +359,9 @@ public class SystemFileFilterStringEditPane
{
if (folderCombo == null)
return;
folderCombo.setText("");
textFile.setText("*");
textTypes.setText("");
folderCombo.setText(""); //$NON-NLS-1$
textFile.setText("*"); //$NON-NLS-1$
textTypes.setText(""); //$NON-NLS-1$
subsetByFileNameRadioButton.setSelection(true);
subsetByFileTypesRadioButton.setSelection(false);
filesOnlyCheckBox.setSelection(false);
@ -413,8 +413,8 @@ public class SystemFileFilterStringEditPane
// KM: defect 53210
// if folder path empty, only valid filter is subset by file name and it
// must be wild card
if (subsetByFileName) {
return fileNameText.equals("*");
if (subsetByFileName && fileNameText != null) {
return fileNameText.equals("*"); //$NON-NLS-1$
}
// if we are not subsetting by file name, it is not valid
else {
@ -623,7 +623,7 @@ public class SystemFileFilterStringEditPane
// and that it is wild card character
else {
if (!subsetByFileNameRadioButton.getSelection() || !textFile.getText().trim().equals("*")) {
if (!subsetByFileNameRadioButton.getSelection() || !textFile.getText().trim().equals("*")) { //$NON-NLS-1$
// let error message come from path validator
if (pathValidator != null) {
@ -733,7 +733,7 @@ public class SystemFileFilterStringEditPane
{
if (refProvider == null)
{
SystemBasePlugin.logWarning("Programming Error: input subsystem is not set");
SystemBasePlugin.logWarning("Programming Error: input subsystem is not set"); //$NON-NLS-1$
return;
}
skipUniquenessChecking = true;
@ -813,7 +813,7 @@ public class SystemFileFilterStringEditPane
// or subset by file type fields. KM: defect 53210
if (folderComboText.length() == 0 &&
subsetByFileNameRadioButton.getSelection() &&
textFile.getText().trim().equals("*")) {
textFile.getText().trim().equals("*")) { //$NON-NLS-1$
return false;
}
else {

13
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
View file

@ -104,7 +104,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
dialog.setNameAndTypePrompt(FileResources.RESID_ADDTOARCHIVE_NAMEANDTYPE);
//dialog.setSelectionValidator(this);
int rc = dialog.open();
dialog.open();
// if (rc != 0) NOT RELIABLE!
boolean cancelled = false;
@ -126,11 +126,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
{
return;
}
if (destinationArchive == null)
{
System.out.println("blah");
}
if (ArchiveHandlerManager.isVirtual(destinationArchive.getAbsolutePath()))
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ADDTO_VIRTUAL_DEST);
@ -231,8 +227,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
}
}
IRemoteFileSubSystem sourceSS = source.getParentRemoteFileSubSystem();
IRunnableContext runnableContext = getRunnableContext(_parent);
CopyRunnable runnable = new CopyRunnable(source, destination);
@ -279,7 +274,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
catch (Exception e)
{
System.out.println(e.getMessage());
System.out.println("SystemAddToArchiveAction: Could not drag and drop " + selection.getAbsolutePath());
System.out.println("SystemAddToArchiveAction: Could not drag and drop " + selection.getAbsolutePath()); //$NON-NLS-1$
}
}
}

20
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCombineAction.java
View file

@ -45,7 +45,7 @@ public class SystemCombineAction extends SystemExtractToAction {
public SystemCombineAction(Shell parent)
{
super(parent, FileResources.ACTION_COMBINE_LABEL, FileResources.ACTION_COMBINE_TOOLTIP);
setHelp(RSEUIPlugin.HELPPREFIX + "actn0120");
setHelp(RSEUIPlugin.HELPPREFIX + "actn0120"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_COMBINE_ID));
}
@ -58,8 +58,7 @@ public class SystemCombineAction extends SystemExtractToAction {
IRemoteFile firstSelection = (IRemoteFile) _selected.get(0);
String title = FileResources.RESID_COMBINE_TITLE;
CombineDialog dialog = new CombineDialog(getShell(), title);
if (dialog == null)
return;
dialog.setNeedsProgressMonitor(false);
dialog.setMessage(FileResources.RESID_COMBINE_PROMPT);
@ -71,7 +70,7 @@ public class SystemCombineAction extends SystemExtractToAction {
dialog.setBlockOnOpen(true);
int rc = dialog.open();
dialog.open();
// if (rc != 0) NOT RELIABLE!
boolean cancelled = false;
@ -88,11 +87,7 @@ public class SystemCombineAction extends SystemExtractToAction {
{
return;
}
if (destination == null)
{
System.out.println("blah");
}
if (ArchiveHandlerManager.isVirtual(destination.getAbsolutePath()))
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMBINETO_VIRTUAL_DEST);
@ -120,11 +115,10 @@ public class SystemCombineAction extends SystemExtractToAction {
for (int i = 0; i < _selected.size(); i++)
{
IRemoteFile selection = (IRemoteFile) _selected.get(i);
IRemoteFileSubSystem sourceSS = selection.getParentRemoteFileSubSystem();
IRunnableContext runnableContext = getRunnableContext(_parent);
String nextName = selection.getName();
int j = nextName.lastIndexOf(".");
int j = nextName.lastIndexOf("."); //$NON-NLS-1$
if (j != -1)
{
nextName = nextName.substring(0, j);
@ -135,7 +129,7 @@ public class SystemCombineAction extends SystemExtractToAction {
{
while (destSS.getRemoteFileObject(nextDest).exists())
{
nextDest = nextDest + "1";
nextDest = nextDest + "1"; //$NON-NLS-1$
}
nextDestination = destSS.getRemoteFileObject(nextDest);
destSS.createFolder(nextDestination);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCompareFilesAction.java
View file

@ -59,7 +59,7 @@ public class SystemCompareFilesAction extends SystemBaseAction
public void run()
{
CompareConfiguration cc = new CompareConfiguration();
cc.setProperty("org.eclipse.compare.internal.CONFIRM_SAVE_PROPERTY", new Boolean(false));
cc.setProperty("org.eclipse.compare.internal.CONFIRM_SAVE_PROPERTY", new Boolean(false)); //$NON-NLS-1$
SystemCompareInput fInput = new SystemCompareInput(cc);
for (int i = 0; i < _selected.size(); i++)

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCompareWithEditionAction.java
View file

@ -30,7 +30,7 @@ public class SystemCompareWithEditionAction extends SystemEditionAction
super(parent,
FileResources.ACTION_COMPAREWITH_HISTORY_LABEL,
FileResources.ACTION_COMPAREWITH_HISTORY_TOOLTIP,
"org.eclipse.compare.internal.CompareWithEditionAction",
"org.eclipse.compare.internal.CompareWithEditionAction", //$NON-NLS-1$
false);
this.fHelpContextId= ICompareContextIds.COMPARE_WITH_EDITION_DIALOG;

17
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemConvertAction.java
View file

@ -46,7 +46,7 @@ public class SystemConvertAction extends SystemExtractToAction {
public SystemConvertAction(Shell parent)
{
super(parent, FileResources.ACTION_CONVERT_LABEL, FileResources.ACTION_CONVERT_TOOLTIP);
setHelp(RSEUIPlugin.HELPPREFIX + "actn0121");
setHelp(RSEUIPlugin.HELPPREFIX + "actn0121"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_CONVERT_ID));
}
@ -58,10 +58,9 @@ public class SystemConvertAction extends SystemExtractToAction {
IRemoteFile selection = (IRemoteFile) _selected.get(i);
String title = FileResources.RESID_CONVERT_TITLE;
CombineDialog dialog = new CombineDialog(getShell(), title, true);
if (dialog == null)
return;
dialog.setNeedsProgressMonitor(false);
String message = SystemMessage.sub(FileResources.RESID_CONVERT_PROMPT, "&1", selection.getAbsolutePath());
String message = SystemMessage.sub(FileResources.RESID_CONVERT_PROMPT, "&1", selection.getAbsolutePath()); //$NON-NLS-1$
dialog.setMessage(message);
dialog.setShowNewConnectionPrompt(true);
dialog.setShowPropertySheet(true, false);
@ -70,13 +69,13 @@ public class SystemConvertAction extends SystemExtractToAction {
dialog.setPreSelection(selection);
dialog.setBlockOnOpen(true);
dialog.setHelp(RSEUIPlugin.HELPPREFIX + "cnvd0000");
dialog.setHelp(RSEUIPlugin.HELPPREFIX + "cnvd0000"); //$NON-NLS-1$
dialog.setShowLocationPrompt(true);
dialog.setLocationPrompt(FileResources.RESID_CONVERT_LOCATION);
dialog.setNameAndTypePrompt(FileResources.RESID_CONVERT_NAMEANDTYPE);
dialog.setSelectionValidator(this);
int rc = dialog.open();
dialog.open();
// if (rc != 0) NOT RELIABLE!
boolean cancelled = false;
@ -93,10 +92,7 @@ public class SystemConvertAction extends SystemExtractToAction {
{
return;
}
if (destination == null)
{
System.out.println("blah");
}
if (ArchiveHandlerManager.isVirtual(destination.getAbsolutePath()))
{
@ -153,7 +149,6 @@ public class SystemConvertAction extends SystemExtractToAction {
dlg.open();
continue;
}
IRemoteFileSubSystem sourceSS = selection.getParentRemoteFileSubSystem();
IRunnableContext runnableContext = getRunnableContext(_parent);

11
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCopyRemoteFileAction.java
View file

@ -165,7 +165,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
newName = null;
}
} catch (SystemMessageException e) {
SystemBasePlugin.logError("SystemCopyRemoteFileAction.checkForCollision()", e);
SystemBasePlugin.logError("SystemCopyRemoteFileAction.checkForCollision()", e); //$NON-NLS-1$
}
return newName;
@ -266,7 +266,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
for (int i = 0; i < children.length; i++)
{
IRemoteFile child = children[i];
monitor.subTask("copying " + child.getName());
monitor.subTask("copying " + child.getName()); //$NON-NLS-1$
doCopy(monitor, newTargetFolder, child, child.getName());
monitor.worked(1);
}
@ -361,7 +361,7 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
else
singleTitle = SystemResources.RESID_MOVE_SINGLE_TITLE;
//System.out.println("..."+singleTitle);
if (!singleTitle.startsWith("Missing")) // TODO: remove test after next mri rev
if (!singleTitle.startsWith("Missing")) // TODO: remove test after next mri rev //$NON-NLS-1$
dlg.setTitle(singleTitle);
}
return dlg;
@ -420,8 +420,9 @@ public class SystemCopyRemoteFileAction extends SystemBaseCopyAction
catch (Exception e)
{
}
str = par.getAbsolutePath();
if (par != null)
str = par.getAbsolutePath();
//if (StringCompare.compare(str, path, true))
if (str.equals(path))

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemCreateEditActions.java
View file

@ -115,7 +115,7 @@ public class SystemCreateEditActions
protected IEditorDescriptor getDefaultTextEditor()
{
IEditorRegistry registry = getEditorRegistry();
return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}
/**
* Create actions when one file has been selected.
@ -260,7 +260,7 @@ public class SystemCreateEditActions
imageDesc = editorDesc.getImageDescriptor();
}
if (imageDesc == null) {
if (imageDesc == null && editorDesc != null) {
if (editorDesc.getId().equals(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID))
imageDesc = registry.getSystemExternalEditorImageDescriptor(remoteFile.getName());

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemDoubleClickEditAction.java
View file

@ -48,7 +48,7 @@ public class SystemDoubleClickEditAction extends SystemBaseAction
protected IEditorDescriptor getDefaultTextEditor()
{
IEditorRegistry registry = getEditorRegistry();
return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}
/**
* @see SystemBaseAction#run()

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemDownloadConflictAction.java
View file

@ -251,7 +251,7 @@ public class SystemDownloadConflictAction extends SystemBaseAction implements Ru
dlg.setReplaceText(FileResources.RESID_CONFLICT_DOWNLOAD_REPLACELOCAL);
dlg.setOpenLocalText(FileResources.RESID_CONFLICT_DOWNLOAD_OPENWITHLOCAL);
dlg.setHelpId(RSEUIPlugin.HELPPREFIX + "lcdl0000");
dlg.setHelpId(RSEUIPlugin.HELPPREFIX + "lcdl0000"); //$NON-NLS-1$
return dlg;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileAction.java
View file

@ -19,7 +19,6 @@ package org.eclipse.rse.files.ui.actions;
import org.eclipse.core.resources.IFile;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.files.ui.resources.ISystemRemoteEditConstants;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
import org.eclipse.rse.files.ui.resources.SystemIFileProperties;
@ -132,7 +131,6 @@ public class SystemEditFileAction extends SystemBaseAction implements ISystemRem
editableFile.open(SystemBasePlugin.getActiveWorkbenchShell());
*/
SystemEditableRemoteFile editable = new SystemEditableRemoteFile(remoteFile, _editorId);
if (editable != null)
{
try
{

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemEditFileLineAction.java
View file

@ -106,7 +106,7 @@ public class SystemEditFileLineAction extends SystemEditFileAction {
IDE.gotoMarker(editor, marker);
}
catch (CoreException e) {
SystemBasePlugin.logError("Error occured in handleGotoLine", e);
SystemBasePlugin.logError("Error occured in handleGotoLine", e); //$NON-NLS-1$
}
}
}

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java
View file

@ -64,7 +64,7 @@ public class SystemExtractAction extends SystemBaseAction
_selected = new ArrayList();
_parent = parent;
allowOnMultipleSelection(true);
setHelp(RSEUIPlugin.HELPPREFIX + "actn0118");
setHelp(RSEUIPlugin.HELPPREFIX + "actn0118"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
}
@ -76,7 +76,7 @@ public class SystemExtractAction extends SystemBaseAction
_selected = new ArrayList();
_parent = parent;
allowOnMultipleSelection(true);
setHelp(RSEUIPlugin.HELPPREFIX + "actn0118");
setHelp(RSEUIPlugin.HELPPREFIX + "actn0118"); //$NON-NLS-1$
setImageDescriptor(RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_EXTRACT_ID));
}
@ -168,7 +168,7 @@ public class SystemExtractAction extends SystemBaseAction
SystemMessageDialog dlg = new SystemMessageDialog(getShell(), msg);
dlg.open();
System.out.println(e.getMessage());
System.out.println("Could not extract " + sources[j].getAbsolutePath());
System.out.println("Could not extract " + sources[j].getAbsolutePath()); //$NON-NLS-1$
}
}
}
@ -236,16 +236,16 @@ public class SystemExtractAction extends SystemBaseAction
protected String getActionLabelForSingleSelection()
{
String msg = FileResources.ACTION_EXTRACT_SUB_LABEL;
return SystemMessage.sub(msg, "%1", getExtractedName((IRemoteFile)_selected.get(0)));
return SystemMessage.sub(msg, "%1", getExtractedName((IRemoteFile)_selected.get(0))); //$NON-NLS-1$
}
protected String getExtractedName(IRemoteFile selection)
{
String newName = selection.getName();
int k = newName.lastIndexOf(".");
int k = newName.lastIndexOf("."); //$NON-NLS-1$
if (k == -1)
{
newName = newName + "_contents";
newName = newName + "_contents"; //$NON-NLS-1$
}
else
{

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractToAction.java
View file

@ -79,11 +79,10 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
//IRemoteFileSubSystem sourceSS = selection.getParentRemoteFileSubSystem();
String title = FileResources.RESID_EXTRACTTO_TITLE;
ExtractToDialog dialog = new ExtractToDialog(getShell(), title);
if (dialog == null)
return;
dialog.setNeedsProgressMonitor(true);
String message = SystemMessage.sub(FileResources.RESID_EXTRACTTO_PROMPT, "&1", selection.getAbsolutePath());
String message = SystemMessage.sub(FileResources.RESID_EXTRACTTO_PROMPT, "&1", selection.getAbsolutePath()); //$NON-NLS-1$
dialog.setMessage(message);
dialog.setShowNewConnectionPrompt(true);
dialog.setShowPropertySheet(true, false);
@ -99,7 +98,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
dialog.setHelp(dlgHelpId);
}*/
int rc = dialog.open();
dialog.open();
// if (rc != 0) NOT RELIABLE!
boolean cancelled = false;
@ -116,10 +115,7 @@ public class SystemExtractToAction extends SystemExtractAction implements IValid
{
return;
}
if (destination == null)
{
System.out.println("blah");
}
if (selection.isAncestorOf(destination))
{
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_DEST_NOT_IN_SOURCE);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemMoveRemoteFileAction.java
View file

@ -21,8 +21,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.model.ISystemRemoteChangeEvents;
import org.eclipse.rse.model.ISystemResourceChangeEvents;
import org.eclipse.rse.model.SystemResourceChangeEvent;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterFromFolderAction.java
View file

@ -45,7 +45,7 @@ public class SystemNewFileFilterFromFolderAction extends SystemNewFileFilterActi
{
// initially use null, but update based on selection
super(null, null, parent);
setHelp(RSEUIPlugin.HELPPREFIX+"actn0112");
setHelp(RSEUIPlugin.HELPPREFIX+"actn0112"); //$NON-NLS-1$
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileLineOpenWithMenu.java
View file

@ -84,7 +84,7 @@ public class SystemRemoteFileLineOpenWithMenu extends SystemRemoteFileOpenWithMe
protected IEditorDescriptor getDefaultTextEditor()
{
IEditorRegistry registry = getEditorRegistry();
return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileOpenWithMenu.java
View file

@ -138,7 +138,7 @@ private ImageDescriptor getImageDescriptor(IEditorDescriptor editorDesc) {
else {
imageDesc = editorDesc.getImageDescriptor();
}
if (imageDesc == null) {
if (imageDesc == null && editorDesc != null) {
if (editorDesc.getId().equals(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID))
imageDesc = registry.getSystemExternalEditorImageDescriptor(getFileName());
}
@ -320,7 +320,7 @@ protected IEditorRegistry getEditorRegistry()
protected IEditorDescriptor getDefaultTextEditor()
{
IEditorRegistry registry = getEditorRegistry();
return registry.findEditor("org.eclipse.ui.DefaultTextEditor");
return registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
}
/* (non-Javadoc)
@ -332,7 +332,7 @@ public void fill(Menu menu, int index)
return;
}
IEditorDescriptor defaultEditor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); // may be null
IEditorDescriptor defaultEditor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); // may be null //$NON-NLS-1$
IEditorDescriptor preferredEditor = getPreferredEditor(_remoteFile); // may be null
Object[] editors = registry.getEditors(getFileName());
@ -420,7 +420,7 @@ protected void createDefaultMenuItem(Menu menu, final IRemoteFile file)
openEditor(file, defaultEditor);
}
catch (PartInitException e) {
SystemBasePlugin.logError("Error getting default editor descriptor", e);
SystemBasePlugin.logError("Error getting default editor descriptor", e); //$NON-NLS-1$
}
}
break;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSearchOpenWithMenu.java
View file

@ -128,7 +128,7 @@ public class SystemRemoteFileSearchOpenWithMenu extends
IDE.gotoMarker(editor, firstMarker);
}
catch (CoreException e) {
SystemBasePlugin.logError("Error occured trying to create a marker", e);
SystemBasePlugin.logError("Error occured trying to create a marker", e); //$NON-NLS-1$
}
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemRemoteFileSelectAction.java
View file

@ -396,8 +396,6 @@ public class SystemRemoteFileSelectAction extends SystemBaseDialogAction
return (Object[])remoteObject;
else if (remoteObject instanceof IRemoteFile[])
return (Object[])remoteObject;
else if (remoteObject != null)
return new Object[] {remoteObject};
else
return null;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSearchAction.java
View file

@ -33,7 +33,7 @@ public class SystemSearchAction extends SystemBaseAction {
super(SystemResources.ACTION_SEARCH_LABEL,
RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_SEARCH_ID), parent);
setToolTipText(SystemResources.ACTION_SEARCH_TOOLTIP);
setHelp(RSEUIPlugin.HELPPREFIX + "rsdi0000");
setHelp(RSEUIPlugin.HELPPREFIX + "rsdi0000"); //$NON-NLS-1$
allowOnMultipleSelection(false);
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSearchEditFileLineAction.java
View file

@ -142,7 +142,7 @@ public class SystemSearchEditFileLineAction extends SystemEditFileAction {
IDE.gotoMarker(editor, firstMarker);
}
catch (CoreException e) {
SystemBasePlugin.logError("Error occured trying to create a marker", e);
SystemBasePlugin.logError("Error occured trying to create a marker", e); //$NON-NLS-1$
}
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java
View file

@ -402,8 +402,6 @@ public class SystemSelectRemoteFileAction extends SystemBaseDialogAction
return (Object[])remoteObject;
else if (remoteObject instanceof IRemoteFile[])
return (Object[])remoteObject;
else if (remoteObject != null)
return new Object[] {remoteObject};
else
return null;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java
View file

@ -412,8 +412,6 @@ public class SystemSelectRemoteFolderAction extends SystemBaseDialogAction
return (Object[])remoteObject;
else if (remoteObject instanceof IRemoteFile[])
return (Object[])remoteObject;
else if (remoteObject != null)
return new Object[] {remoteObject};
else
return null;
}

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
View file

@ -74,7 +74,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
private IRemoteFile _saveasFile;
public BackgroundSaveasJob(IRemoteFile saveasFile)
{
super("Save as"); // need to externalize
super("Save as"); // need to externalize //$NON-NLS-1$
_saveasFile = saveasFile;
}
@ -126,7 +126,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
{
public BackgroundDownloadJob()
{
super("Download"); // need to externalize
super("Download"); // need to externalize //$NON-NLS-1$
}
public IStatus run(IProgressMonitor monitor)
@ -166,7 +166,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
public BackgroundUploadJob()
{
super("Upload"); // need to externalize
super("Upload"); // need to externalize //$NON-NLS-1$
}
public IStatus run(IProgressMonitor monitor)

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemCachePreferencePage.java
View file

@ -52,16 +52,12 @@ import org.eclipse.rse.ui.view.SystemTableViewProvider;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
@ -105,7 +101,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
public void createControl(Composite parent)
{
super.createControl(parent);
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "fchp0000");
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), RSEUIPlugin.HELPPREFIX + "fchp0000"); //$NON-NLS-1$
}
/**
@ -197,7 +193,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
String maxCacheSizeStr = store.getString(ISystemPreferencesConstants.MAX_CACHE_SIZE);
if (maxCacheSizeStr == null || maxCacheSizeStr.equals("")) {
if (maxCacheSizeStr == null || maxCacheSizeStr.equals("")) { //$NON-NLS-1$
maxCacheSizeStr = ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
}
@ -248,7 +244,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
String size = _maxCacheSize.getText();
if (size == null || size.trim().equals("")) {
if (size == null || size.trim().equals("")) { //$NON-NLS-1$
size = ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE;
}
@ -282,7 +278,7 @@ public class SystemCachePreferencePage extends PreferencePage implements IWorkbe
{
IResource member = members[i];
if ((member instanceof IFile) &&
member.getName().equals(".project"))
member.getName().equals(".project")) //$NON-NLS-1$
{
}
else

13
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemFilePropertyPage.java
View file

@ -61,7 +61,6 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
public SystemFilePropertyPage()
{
super();
RSEUIPlugin sp = RSEUIPlugin.getDefault();
}
/**
* Create the page's GUI contents.
@ -78,14 +77,14 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
labelNamePrompt = SystemWidgetHelpers.createLabel(
composite_prompts, SystemFileResources.RESID_PP_FILE_NAME_LABEL, SystemFileResources.RESID_PP_FILE_NAME_TOOLTIP);
labelName = SystemWidgetHelpers.createLabel(
composite_prompts, "");
composite_prompts, ""); //$NON-NLS-1$
labelName.setToolTipText(SystemFileResources.RESID_PP_FILE_NAME_TOOLTIP);
// Type display
labelTypePrompt = SystemWidgetHelpers.createLabel(
composite_prompts, SystemFileResources.RESID_PP_FILE_TYPE_LABEL, SystemFileResources.RESID_PP_FILE_TYPE_TOOLTIP);
labelType = SystemWidgetHelpers.createLabel(
composite_prompts, "");
composite_prompts, ""); //$NON-NLS-1$
labelType.setToolTipText(SystemFileResources.RESID_PP_FILE_TYPE_TOOLTIP);
// Path display
@ -94,7 +93,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
labelPathPrompt = SystemWidgetHelpers.createLabel(
composite_prompts, SystemFileResources.RESID_PP_FILE_PATH_LABEL, SystemFileResources.RESID_PP_FILE_PATH_TOOLTIP);
labelPath = SystemWidgetHelpers.createLabel(
composite_prompts, "");
composite_prompts, ""); //$NON-NLS-1$
labelPath.setToolTipText(SystemFileResources.RESID_PP_FILE_PATH_TOOLTIP);
}
@ -104,7 +103,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
labelSizePrompt = SystemWidgetHelpers.createLabel(
composite_prompts, SystemFileResources.RESID_PP_FILE_SIZE_LABEL, SystemFileResources.RESID_PP_FILE_SIZE_TOOLTIP);
labelSize = SystemWidgetHelpers.createLabel(
composite_prompts, "");
composite_prompts, ""); //$NON-NLS-1$
labelSize.setToolTipText(SystemFileResources.RESID_PP_FILE_SIZE_TOOLTIP);
}
@ -114,7 +113,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
labelModifiedPrompt = SystemWidgetHelpers.createLabel(
composite_prompts, SystemFileResources.RESID_PP_FILE_MODIFIED_LABEL, SystemFileResources.RESID_PP_FILE_MODIFIED_TOOLTIP);
labelModified = SystemWidgetHelpers.createLabel(
composite_prompts, "");
composite_prompts, ""); //$NON-NLS-1$
labelModified.setToolTipText(SystemFileResources.RESID_PP_FILE_MODIFIED_TOOLTIP);
}
@ -180,7 +179,7 @@ public class SystemFilePropertyPage extends SystemBasePropertyPage
String name = file.getName();
if (name.length() > 100)
{
String shortName = name.substring(0, 97).concat("...");
String shortName = name.substring(0, 97).concat("..."); //$NON-NLS-1$
labelName.setText(shortName);
}
else

18
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/UniversalPreferencePage.java
View file

@ -123,7 +123,7 @@ public class UniversalPreferencePage
*/
public void createControl(Composite parent) {
super.createControl(parent);
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, RSEUIPlugin.HELPPREFIX+"ufpf0000");
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, RSEUIPlugin.HELPPREFIX+"ufpf0000"); //$NON-NLS-1$
}
@ -291,7 +291,7 @@ public class UniversalPreferencePage
tgd.widthHint = 75;
downloadBufferSize.setLayoutData(tgd);
downloadBufferSize.setTextLimit(10);
downloadBufferSize.setText(getDownloadBufferSize() + "");
downloadBufferSize.setText(getDownloadBufferSize() + ""); //$NON-NLS-1$
downloadBufferSize.addVerifyListener(new VerifyListener()
{
public void verifyText(VerifyEvent e)
@ -313,7 +313,7 @@ public class UniversalPreferencePage
tgd.widthHint = 75;
uploadBufferSize.setLayoutData(tgd);
uploadBufferSize.setTextLimit(10);
uploadBufferSize.setText(getUploadBufferSize() +"");
uploadBufferSize.setText(getUploadBufferSize() +""); //$NON-NLS-1$
uploadBufferSize.addVerifyListener(new VerifyListener()
{
public void verifyText(VerifyEvent e)
@ -351,7 +351,7 @@ public class UniversalPreferencePage
String initialArchiveType = store.getString(ISystemPreferencesConstants.SUPERTRANSFER_ARC_TYPE);
if (initialArchiveType == null ||
!ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + initialArchiveType))
!ArchiveHandlerManager.getInstance().isRegisteredArchive("test." + initialArchiveType)) //$NON-NLS-1$
{
initialArchiveType = ISystemPreferencesConstants.DEFAULT_SUPERTRANSFER_ARCHIVE_TYPE;
}
@ -412,7 +412,7 @@ public class UniversalPreferencePage
tableLayout.addColumnData(layoutData);
TableColumn tableCol = new TableColumn(resourceTypeTable, SWT.NONE);
tableCol.setResizable(false);
tableCol.setText("");
tableCol.setText(""); //$NON-NLS-1$
layoutData = new ColumnWeightData(40, false);
tableLayout.addColumnData(layoutData);
@ -480,8 +480,8 @@ public class UniversalPreferencePage
protected void resetBufferSizePrefs()
{
downloadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + "");
uploadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + "");
downloadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
uploadBufferSize.setText(ISystemPreferencesConstants.DEFAULT_DOWNLOAD_BUFFER_SIZE + ""); //$NON-NLS-1$
}
/**
@ -634,7 +634,7 @@ public class UniversalPreferencePage
}
if (newName == null || newName.length() < 1)
newName = "*";
newName = "*"; //$NON-NLS-1$
else {
int index = newName.indexOf('*');
@ -654,7 +654,7 @@ public class UniversalPreferencePage
}
// Find the index at which to insert the new entry.
String newFilename = (newName + "." + newExtension).toUpperCase();
String newFilename = (newName + "." + newExtension).toUpperCase(); //$NON-NLS-1$
IFileEditorMapping resourceType;
boolean found = false;
int i = 0;

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveDialog.java
View file

@ -33,18 +33,18 @@ public class AddToArchiveDialog extends CombineDialog {
public AddToArchiveDialog(Shell shell)
{
super(shell);
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000"); //$NON-NLS-1$
}
public AddToArchiveDialog(Shell shell, String title) {
super(shell, title);
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000"); //$NON-NLS-1$
}
public AddToArchiveDialog(Shell shell, String title, String[] relativePaths)
{
super(shell, title);
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000"); //$NON-NLS-1$
_relativePaths = relativePaths;
((AddToArchiveForm)form).setRelativePathList(_relativePaths);
}
@ -55,7 +55,7 @@ public class AddToArchiveDialog extends CombineDialog {
boolean prePopSelection)
{
super(shell, title, prePopSelection);
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000"); //$NON-NLS-1$
}
public AddToArchiveDialog(
@ -65,7 +65,7 @@ public class AddToArchiveDialog extends CombineDialog {
String[] relativePaths)
{
super(shell, title, prePopSelection);
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000");
setHelp(RSEUIPlugin.HELPPREFIX + "atad0000"); //$NON-NLS-1$
_relativePaths = relativePaths;
((AddToArchiveForm)form).setRelativePathList(_relativePaths);
}

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/AddToArchiveForm.java
View file

@ -41,7 +41,7 @@ public class AddToArchiveForm extends CombineForm
protected Button savePathInfoCheckBox;
protected Combo relativeToCombo;
protected String[] _relativePathList = null;
protected String relativePath = "";
protected String relativePath = ""; //$NON-NLS-1$
protected boolean saveFullPathInfo = false;
public AddToArchiveForm(
@ -120,13 +120,13 @@ public class AddToArchiveForm extends CombineForm
public void widgetDefaultSelected(SelectionEvent e) {
setPageComplete();
relativeToCombo.setEnabled(savePathInfoCheckBox.getSelection());
if (!savePathInfoCheckBox.getSelection()) relativePath = "";
if (!savePathInfoCheckBox.getSelection()) relativePath = ""; //$NON-NLS-1$
setSaveFullPathInfo();
}
public void widgetSelected(SelectionEvent e) {
setPageComplete();
relativeToCombo.setEnabled(savePathInfoCheckBox.getSelection());
if (!savePathInfoCheckBox.getSelection()) relativePath = "";
if (!savePathInfoCheckBox.getSelection()) relativePath = ""; //$NON-NLS-1$
setSaveFullPathInfo();
}
});
@ -145,7 +145,7 @@ public class AddToArchiveForm extends CombineForm
public boolean isPageComplete()
{
boolean pathInfoChecked = (savePathInfoCheckBox != null && savePathInfoCheckBox.getSelection());
boolean relPathSelectionMade = relativePath != null && !relativePath.equals("");
boolean relPathSelectionMade = relativePath != null && !relativePath.equals(""); //$NON-NLS-1$
boolean relPathComplete = savePathInfoCheckBox == null || !savePathInfoCheckBox.getEnabled();
if (!relPathComplete)
{

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineDialog.java
View file

@ -37,7 +37,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
public CombineDialog(Shell shell)
{
super(shell, false);
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000"); //$NON-NLS-1$
}
/**
@ -48,7 +48,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
public CombineDialog(Shell shell, String title)
{
super(shell, title, false);
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000"); //$NON-NLS-1$
}
/**
@ -65,7 +65,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
super(shell, title, false);
prePop = prePopSelection;
if (form != null) form.setPrePopSelection(prePop);
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000"); //$NON-NLS-1$
}
/**
@ -84,7 +84,7 @@ public class CombineDialog extends SystemSelectRemoteFileOrFolderDialog {
super(shell, title, false);
prePop = prePopSelection;
if (form != null) form.setPrePopSelection(prePop);
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000");
setHelp(RSEUIPlugin.HELPPREFIX + "cmbd0000"); //$NON-NLS-1$
}

7
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
View file

@ -22,7 +22,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.files.ui.FileResources;
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
import org.eclipse.rse.filters.SystemFilterSimple;
@ -34,7 +33,6 @@ import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ValidatorArchiveName;
@ -206,7 +204,9 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
if (ok)
{
/*
IRemoteFile file = (IRemoteFile)getSelectedObject();
IRemoteFile saveasFile = null;
try
@ -216,6 +216,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
catch (Exception e)
{
}
*/
}
return ok;
}
@ -372,7 +373,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm
setDefaultConnection(connection);
setShowNewConnectionPrompt(true);
setAutoExpandDepth(0);
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
View file

@ -20,7 +20,6 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.rse.core.SystemAdapterHelpers;
import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.files.ui.widgets.SystemSelectRemoteFileOrFolderForm;
import org.eclipse.rse.filters.SystemFilterSimple;
import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -30,9 +29,7 @@ import org.eclipse.rse.subsystems.files.core.model.RemoteFileUtility;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.messages.ISystemMessageLine;
import org.eclipse.rse.ui.validators.ValidatorFolderName;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.swt.widgets.Composite;
@ -49,8 +46,7 @@ import org.eclipse.swt.widgets.Shell;
public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
{
private String fileName;
private ValidatorFolderName validator;
private String fileName;
/**
* Constructor for ExtractToForm
@ -58,8 +54,6 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
public ExtractToForm(ISystemMessageLine msgLine, Object caller, boolean fileMode)
{
super(msgLine, caller, fileMode);
validator = new ValidatorFolderName();
}
/**
@ -132,6 +126,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
public boolean isPageComplete()
{
/*
String errMsg = null; //validator.isValid(fileName);
if (errMsg != null)
@ -140,6 +135,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
return false;
}
else
*/
{
if (valid) clearErrorMessage();
return valid;
@ -258,7 +254,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm
setDefaultConnection(connection);
setShowNewConnectionPrompt(true);
setAutoExpandDepth(0);
ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry();
IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection);
IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration();
RemoteFileFilterString rffs = new RemoteFileFilterString(ssf);

9
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionDialog.java
View file

@ -28,19 +28,15 @@ public class FileSelectionDialog
implements ISaveAsDialog
{
public static final String Copyright =
"(C) Copyright IBM Corp. 2003 All Rights Reserved.";
private FileSelectionForm form;
/**
* Constructor
*
* @param shell The shell to hang the dialog off of
* @param fileMode True if selecting files, false if selecting folders
*
*/
private FileSelectionForm form;
protected FileSelectionDialog(Shell shell)
{
super(shell, false);
@ -50,7 +46,6 @@ public class FileSelectionDialog
*
* @param shell The shell to hang the dialog off of
* @param title The title to give the dialog
* @param fileMode True if selecting files, false if selecting folders
*/
protected FileSelectionDialog(Shell shell, String title)
{

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/FileSelectionForm.java
View file

@ -23,7 +23,7 @@ import org.eclipse.rse.ui.messages.ISystemMessageLine;
public class FileSelectionForm extends SaveAsForm
{
public static final String Copyright =
"(C) Copyright IBM Corp. 2003 All Rights Reserved.";
"(C) Copyright IBM Corp. 2003 All Rights Reserved."; //$NON-NLS-1$
/**
* Constructor for FileSelectionForm

36
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISystemRemoteEditConstants.java
View file

@ -21,35 +21,35 @@ public interface ISystemRemoteEditConstants {
// Constants for remote editing
public static final String REMOTE_FILE_OBJECT_KEY = "remote_file_object_key";
public static final String REMOTE_FILE_OBJECT_KEY = "remote_file_object_key"; //$NON-NLS-1$
public static final String REMOTE_FILE_SUBSYSTEM_KEY = "remote_file_subsystem_key";
public static final String REMOTE_FILE_PATH_KEY = "remote_file_path_key";
public static final String REMOTE_FILE_SUBSYSTEM_KEY = "remote_file_subsystem_key"; //$NON-NLS-1$
public static final String REMOTE_FILE_PATH_KEY = "remote_file_path_key"; //$NON-NLS-1$
public static final String REMOTE_FILE_MODIFIED_STAMP = "remote_file_modified_stamp";
public static final String REMOTE_FILE_BINARY_TRANSFER = "remote_file_binary_transfer";
public static final String TEMP_FILE_DIRTY = "temp_file_dirty";
public static final String TEMP_FILE_READONLY = "temp_file_readonly";
public static final String REMOTE_FILE_MODIFIED_STAMP = "remote_file_modified_stamp"; //$NON-NLS-1$
public static final String REMOTE_FILE_BINARY_TRANSFER = "remote_file_binary_transfer"; //$NON-NLS-1$
public static final String TEMP_FILE_DIRTY = "temp_file_dirty"; //$NON-NLS-1$
public static final String TEMP_FILE_READONLY = "temp_file_readonly"; //$NON-NLS-1$
public static final String DOWNLOAD_FILE_MODIFIED_STAMP = "download_file_modified_stamp";
public static final String DOWNLOAD_FILE_MODIFIED_STAMP = "download_file_modified_stamp"; //$NON-NLS-1$
// for mounted mappings
public static final String REMOTE_FILE_MOUNTED = "remote_file_mounted";
public static final String RESOLVED_MOUNTED_REMOTE_FILE_PATH_KEY = "resolved_mounted_remote_file_path_key";
public static final String RESOLVED_MOUNTED_REMOTE_FILE_HOST_KEY = "resolved_mounted_remote_file_host_key";
public static final String REMOTE_FILE_MOUNTED = "remote_file_mounted"; //$NON-NLS-1$
public static final String RESOLVED_MOUNTED_REMOTE_FILE_PATH_KEY = "resolved_mounted_remote_file_path_key"; //$NON-NLS-1$
public static final String RESOLVED_MOUNTED_REMOTE_FILE_HOST_KEY = "resolved_mounted_remote_file_host_key"; //$NON-NLS-1$
// Constants related to how the editor will set the document content
public static final String LOAD_TYPE_KEY = "load_type_key";
public static final String LOAD_TYPE_USE_STRING = "load_type_use_string";
public static final String LOAD_TYPE_KEY = "load_type_key"; //$NON-NLS-1$
public static final String LOAD_TYPE_USE_STRING = "load_type_use_string"; //$NON-NLS-1$
// Universal remote editing profile
public static final String DEFAULT_EDITOR_PROFILE = "default";
public static final String UNIVERSAL_EDITOR_PROFILE = "universal";
public static final String UNIVERSAL_LOCAL_EDITOR_PROFILE = "universallocal";
public static final String DEFAULT_EDITOR_PROFILE = "default"; //$NON-NLS-1$
public static final String UNIVERSAL_EDITOR_PROFILE = "universal"; //$NON-NLS-1$
public static final String UNIVERSAL_LOCAL_EDITOR_PROFILE = "universallocal"; //$NON-NLS-1$
// Local relative directory for various editor actions
public static final String EDITOR_COMPARE_LOCATION = "/compare/";
public static final String EDITOR_GET_FILE_LOCATION = "/get/";
public static final String EDITOR_COMPARE_LOCATION = "/compare/"; //$NON-NLS-1$
public static final String EDITOR_GET_FILE_LOCATION = "/get/"; //$NON-NLS-1$
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISystemRemoteMarker.java
View file

@ -31,7 +31,7 @@ public interface ISystemRemoteMarker {
/**
* Remote markers extension point id.
*/
public static final String EXTENSION_POINT_ID = "remoteMarkers";
public static final String EXTENSION_POINT_ID = "remoteMarkers"; //$NON-NLS-1$
/**
* Deletes this marker from its associated resource. This method has no

20
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ISystemTextEditorConstants.java
View file

@ -21,30 +21,30 @@ public interface ISystemTextEditorConstants {
// Editor id
public static final String SYSTEM_TEXT_EDITOR_ID = "org.eclipse.rse.editor";
public static final String SYSTEM_TEXT_BROWSER_ID = "org.eclipse.rse.browser";
public static final String SYSTEM_TEXT_EDITOR_ID = "org.eclipse.rse.editor"; //$NON-NLS-1$
public static final String SYSTEM_TEXT_BROWSER_ID = "org.eclipse.rse.browser"; //$NON-NLS-1$
// Identifier for profile type
public static final String EDITOR_PROFILE_TYPE = "editorProfileType";
public static final String EDITOR_PROFILE_TYPE = "editorProfileType"; //$NON-NLS-1$
// key to identify file has sequence numbers
public static final String SEQUENCE_NUMBERS_KEY = "sequence_numbers_key";
public static final String SEQUENCE_NUMBERS_KEY = "sequence_numbers_key"; //$NON-NLS-1$
// key to identify that a save limit should be set
public static final String MAX_LINE_LENGTH_KEY = "record_length_key";
public static final String MAX_LINE_LENGTH_KEY = "record_length_key"; //$NON-NLS-1$
// key to identify that a source encoding should be set
// this is used to emulate the remote encoding of the file
public static final String SOURCE_ENCODING_KEY = "source_encoding_key";
public static final String SOURCE_ENCODING_KEY = "source_encoding_key"; //$NON-NLS-1$
// key to identify host ccsid
public static final String CCSID_KEY = "ccsid_key";
public static final String TEMP_CCSID_KEY = "temp_ccsid_key";
public static final String CCSID_KEY = "ccsid_key"; //$NON-NLS-1$
public static final String TEMP_CCSID_KEY = "temp_ccsid_key"; //$NON-NLS-1$
// key to identify logical or visual BIDI
public static final String BIDI_LOGICAL_KEY = "bidi_logical_key";
public static final String BIDI_LOGICAL_KEY = "bidi_logical_key"; //$NON-NLS-1$
// key to identify the local encoding
// NOTE: DO NOT CHANGE THIS!! This is used by the IBM debugger.
public static final String LOCAL_ENCODING_KEY = "encoding";
public static final String LOCAL_ENCODING_KEY = "encoding"; //$NON-NLS-1$
}

9
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsDialog.java
View file

@ -24,19 +24,15 @@ import org.eclipse.swt.widgets.Shell;
public class SaveAsDialog extends SystemSelectRemoteFileOrFolderDialog implements ISaveAsDialog {
private SaveAsForm form;
/**
* Constructor
*
* @param shell The shell to hang the dialog off of
* @param fileMode True if selecting files, false if selecting folders
*
*/
private SaveAsForm form;
protected SaveAsDialog(Shell shell)
{
super(shell, false);
@ -46,7 +42,6 @@ public class SaveAsDialog extends SystemSelectRemoteFileOrFolderDialog implement
*
* @param shell The shell to hang the dialog off of
* @param title The title to give the dialog
* @param fileMode True if selecting files, false if selecting folders
*/
protected SaveAsDialog(Shell shell, String title)
{

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
View file

@ -106,7 +106,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
*/
private InternalDownloadFileRunnable()
{
super("Download"); // TODO - need to externalize
super("Download"); // TODO - need to externalize //$NON-NLS-1$
}

14
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemIFileProperties.java
View file

@ -29,8 +29,8 @@ import org.eclipse.rse.ui.RSEUIPlugin;
public class SystemIFileProperties implements ISystemTextEditorConstants, ISystemRemoteEditConstants {
private static final String STRING_EMPTY = "";
private static final String EXPORT_KEY = "export";
private static final String STRING_EMPTY = ""; //$NON-NLS-1$
private static final String EXPORT_KEY = "export"; //$NON-NLS-1$
private static QualifiedName _nameDirty = new QualifiedName( STRING_EMPTY, TEMP_FILE_DIRTY );
private static QualifiedName _nameReadOnly = new QualifiedName( STRING_EMPTY, TEMP_FILE_READONLY );
@ -147,7 +147,7 @@ public class SystemIFileProperties implements ISystemTextEditorConstants, ISyste
if( strValue == null )
return false;
return strValue.equals( "true" );
return strValue.equals( "true" ); //$NON-NLS-1$
}
catch( CoreException ex ){
return false;
@ -385,7 +385,7 @@ public class SystemIFileProperties implements ISystemTextEditorConstants, ISyste
* Sets a boolean property given a property name, and its value.
*/
protected void setPropertyBoolean( QualifiedName name, boolean bValue ){
setPropertyString( name, bValue == true ? "true" : "false" );
setPropertyString( name, bValue == true ? "true" : "false" ); //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@ -524,17 +524,17 @@ public class SystemIFileProperties implements ISystemTextEditorConstants, ISyste
}
public void setModificationStampAtExport(String hostName, String destination, long modificationStamp) {
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination);
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination); //$NON-NLS-1$ //$NON-NLS-2$
setPropertyLong(key, modificationStamp);
}
public long getModificationStampAtExport(String hostName, String destination) {
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination);
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination); //$NON-NLS-1$ //$NON-NLS-2$
return getPropertyLong(key);
}
public boolean hasModificationStampAtExport(String hostName, String destination) {
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination);
QualifiedName key = new QualifiedName(STRING_EMPTY, EXPORT_KEY + ":" + hostName + ":" + destination); //$NON-NLS-1$ //$NON-NLS-2$
String val = getPropertyString(key);
if (val != null) {

28
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteEditManager.java
View file

@ -57,9 +57,9 @@ import org.eclipse.ui.IWorkbenchWindow;
public class SystemRemoteEditManager
{
public static final String REMOTE_EDIT_PROJECT_NAME = "RemoteSystemsTempFiles";
public static final String REMOTE_EDIT_PROJECT_NATURE_ID = "org.eclipse.rse.ui.remoteSystemsTempNature";
public static final String REMOTE_EDIT_PROJECT_BUILDER_ID = "org.eclipse.rse.ui.remoteSystemsTempBuilder";
public static final String REMOTE_EDIT_PROJECT_NAME = "RemoteSystemsTempFiles"; //$NON-NLS-1$
public static final String REMOTE_EDIT_PROJECT_NATURE_ID = "org.eclipse.rse.ui.remoteSystemsTempNature"; //$NON-NLS-1$
public static final String REMOTE_EDIT_PROJECT_BUILDER_ID = "org.eclipse.rse.ui.remoteSystemsTempBuilder"; //$NON-NLS-1$
private static SystemRemoteEditManager inst;
//private RSEUIPlugin plugin;
@ -176,13 +176,13 @@ public class SystemRemoteEditManager
IExtensionRegistry registry = Platform.getExtensionRegistry();
// Get configured extenders
IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "mountPathMappers");
IConfigurationElement[] systemTypeExtensions = registry.getConfigurationElementsFor("org.eclipse.rse.ui", "mountPathMappers"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < systemTypeExtensions.length; i++)
{
try
{
_mountPathMappers.add(systemTypeExtensions[i].createExecutableExtension("class"));
_mountPathMappers.add(systemTypeExtensions[i].createExecutableExtension("class")); //$NON-NLS-1$
}
catch (Exception e)
{
@ -288,6 +288,8 @@ public class SystemRemoteEditManager
try
{
if (editProject != null)
{
if (!editProject.exists())
editProject.create(null);
@ -317,10 +319,11 @@ public class SystemRemoteEditManager
// add c support
//addCSupport(editProject);
}
}
catch (CoreException e)
{
SystemBasePlugin.logError("Error creating temp project", e);
SystemBasePlugin.logError("Error creating temp project", e); //$NON-NLS-1$
}
return editProject;
}
@ -506,7 +509,7 @@ public class SystemRemoteEditManager
candidate = (IFile) child;
}
if (candidate != null && !deletedList.contains(candidate) && !candidate.getName().startsWith(".") && !isFileInUse(candidate, true))
if (candidate != null && !deletedList.contains(candidate) && !candidate.getName().startsWith(".") && !isFileInUse(candidate, true)) //$NON-NLS-1$
{
if (result == null)
{
@ -590,7 +593,6 @@ public class SystemRemoteEditManager
if (!doesRemoteEditProjectExist())
return false;
IProject tempFilesProject = SystemRemoteEditManager.getDefault().getRemoteEditProject();
IWorkbenchWindow activeWindow = SystemBasePlugin.getActiveWorkbenchWindow();
IWorkbenchPage activePage = activeWindow.getActivePage();
@ -671,12 +673,12 @@ public class SystemRemoteEditManager
try {
String maxSize = store.getString(ISystemPreferencesConstants.MAX_CACHE_SIZE);
if (maxSize != null && !maxSize.equals("")) {
if (maxSize != null && !maxSize.equals("")) { //$NON-NLS-1$
max = Integer.parseInt(maxSize) * 1000000;
}
}
catch (NumberFormatException nfe) {
SystemBasePlugin.logError("Could not get max cache size", nfe);
SystemBasePlugin.logError("Could not get max cache size", nfe); //$NON-NLS-1$
max = Integer.parseInt(ISystemPreferencesConstants.DEFAULT_MAX_CACHE_SIZE) * 1000000;
}
@ -715,7 +717,7 @@ public class SystemRemoteEditManager
}
catch (Exception e)
{
SystemBasePlugin.logError("Error occured trying to clean cache", e);
SystemBasePlugin.logError("Error occured trying to clean cache", e); //$NON-NLS-1$
// e.printStackTrace();
}
}
@ -742,7 +744,7 @@ public class SystemRemoteEditManager
}
catch (Exception e)
{
SystemBasePlugin.logError("Error refreshing remote edit project", e);
SystemBasePlugin.logError("Error refreshing remote edit project", e); //$NON-NLS-1$
}
}
@ -767,7 +769,7 @@ public class SystemRemoteEditManager
}
catch (Exception e)
{
SystemBasePlugin.logError("Error refreshing remote edit project", e);
SystemBasePlugin.logError("Error refreshing remote edit project", e); //$NON-NLS-1$
}
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerInfo.java
View file

@ -33,7 +33,7 @@ public class SystemRemoteMarkerInfo implements ISystemRemoteMarkerSetElement, Cl
protected long id = UNDEFINED_ID;
// marker type
protected String type = null;;
protected String type = null;
// marker attributes
protected Map attributes = null;

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteMarkerTypeDefinition.java
View file

@ -58,8 +58,8 @@ public class SystemRemoteMarkerTypeDefinition {
IConfigurationElement element = elements[i];
// supertype
if (element.getName().equalsIgnoreCase("super")) {
String type = element.getAttribute("type");
if (element.getName().equalsIgnoreCase("super")) { //$NON-NLS-1$
String type = element.getAttribute("type"); //$NON-NLS-1$
if (type != null) {
@ -72,8 +72,8 @@ public class SystemRemoteMarkerTypeDefinition {
}
// attribute name
if (element.getName().equalsIgnoreCase("attribute")) {
String name = element.getAttribute("name");
if (element.getName().equalsIgnoreCase("attribute")) { //$NON-NLS-1$
String name = element.getAttribute("name"); //$NON-NLS-1$
if (name != null) {
@ -86,8 +86,8 @@ public class SystemRemoteMarkerTypeDefinition {
}
// persistence
if (element.getName().equalsIgnoreCase("persistent")) {
String bool = element.getAttribute("value");
if (element.getName().equalsIgnoreCase("persistent")) { //$NON-NLS-1$
String bool = element.getAttribute("value"); //$NON-NLS-1$
if (bool != null) {
this.isPersistent = (new Boolean(bool)).booleanValue();

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemotePath.java
View file

@ -23,7 +23,7 @@ public class SystemRemotePath implements ISystemRemotePath {
public static final ISystemRemotePath ROOT = new SystemRemotePath("", "", "/");
public static final ISystemRemotePath ROOT = new SystemRemotePath("", "", "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
protected String profileName;
protected String connectionName;

1
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemRemoteResourceInfo.java
View file

@ -67,7 +67,6 @@ public class SystemRemoteResourceInfo implements Cloneable {
/**
* Sets the flags for this info.
* @return the flags
*/
public void setFlags(int value) {
flags = value;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemSafeFileOutputStream.java
View file

@ -41,7 +41,7 @@ public class SystemSafeFileOutputStream extends OutputStream {
protected File temp = null;
protected OutputStream output = null;
protected boolean failed = false;
protected static final String BACKUP_EXTENSION = ".bak";
protected static final String BACKUP_EXTENSION = ".bak"; //$NON-NLS-1$
/**
* Constructor for SystemSafeFileOutputStream.

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
View file

@ -118,7 +118,6 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
if (_isEnabled)
{
Object source = event.getSource();
IResourceDelta delta = event.getDelta();
if (delta != null)
{
@ -347,7 +346,6 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
if (resource instanceof IFile)
{
String loc = resource.getLocation().toString();
// see if this temp file has been changed
int ckind = child.getKind();

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -129,7 +129,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
else
{
// for mounting...
if (fs.getHost().getSystemType().equals("Local"))
if (fs.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
boolean isMounted = properties.getRemoteFileMounted();
if (isMounted)

49
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -272,7 +272,6 @@ public class UniversalFileTransferUtility
String remotePath = remoteFile.getAbsolutePath();
ISystemRegistry registry = RSEUIPlugin.getTheSystemRegistry();
// String subSystemId = registry.getAbsoluteNameForSubSystem(subSystem);
// properties.setRemoteFileSubSystem(subSystemId);
properties.setRemoteFilePath(remotePath);
@ -441,7 +440,7 @@ public class UniversalFileTransferUtility
if (!srcFileOrFolder.exists()) {
SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_FILE_NOTFOUND);
errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), "LOCALHOST");
errorMessage.makeSubstitution(srcFileOrFolder.getAbsolutePath(), "LOCALHOST"); //$NON-NLS-1$
return errorMessage;
}
@ -474,7 +473,7 @@ public class UniversalFileTransferUtility
{
try
{
setIFileProperties(tempFile, srcFileOrFolder, "LOCALHOST");
setIFileProperties(tempFile, srcFileOrFolder, "LOCALHOST"); //$NON-NLS-1$
}
catch (Exception e)
{
@ -563,7 +562,7 @@ public class UniversalFileTransferUtility
}
catch (Exception e)
{
SystemBasePlugin.logError("An exception occured " + e.getMessage(), e);
SystemBasePlugin.logError("An exception occured " + e.getMessage(), e); //$NON-NLS-1$
return null;
}
@ -632,11 +631,13 @@ public class UniversalFileTransferUtility
if (isEncodingConversionRequired)
{
String s = new String(buffer, 0, bytesRead, hostEncoding);
bufWriter.write(s);
if (bufWriter != null)
bufWriter.write(s);
}
else
{
bufOutputStream.write(buffer, 0, bytesRead);
if (bufOutputStream != null)
bufOutputStream.write(buffer, 0, bytesRead);
}
totalRead += bytesRead;
@ -794,10 +795,11 @@ public class UniversalFileTransferUtility
{
e.printStackTrace();
}
IResource[] childResources = new IResource[children.length];
IResource[] childResources = null;
if (children != null)
{
childResources = new IResource[children.length];
if (children.length == 0)
{
File tempFolderFile = tempFolder.getLocation().toFile();
@ -833,7 +835,7 @@ public class UniversalFileTransferUtility
refreshResourceInWorkspace(tempFolder);
// set properties of files
if (tempFolder.exists() && children != null)
if (tempFolder.exists() && children != null && childResources != null)
{
for (int i = 0; i < childResources.length; i++)
{
@ -1066,6 +1068,8 @@ public class UniversalFileTransferUtility
// recursively copy
try
{
if (existingFiles != null)
{
IRemoteFile newTargetFolder = (IRemoteFile)existingFiles.get(newPath);
if (!newTargetFolder.exists())
{
@ -1083,7 +1087,7 @@ public class UniversalFileTransferUtility
else
{
IResource[] children = directory.members();
SystemWorkspaceResourceSet childSet = new SystemWorkspaceResourceSet(directory.members());
SystemWorkspaceResourceSet childSet = new SystemWorkspaceResourceSet(children);
SystemRemoteResourceSet childResults = copyWorkspaceResourcesToRemote(childSet, newTargetFolder, monitor, checkForCollisions);
if (childResults == null)
{
@ -1096,6 +1100,7 @@ public class UniversalFileTransferUtility
}
newFilePathList.add(newPath);
}
}
catch (CoreException e)
{
@ -1525,8 +1530,7 @@ public class UniversalFileTransferUtility
ISystemArchiveHandler handler = ArchiveHandlerManager.getInstance().getRegisteredHandler(dest);
String sourceEncoding = sourceFS.getRemoteEncoding();
VirtualChild[] arcContents = handler.getVirtualChildrenList();
Display display = Display.getCurrent();
monitor.beginTask(FileResources.RESID_SUPERTRANSFER_PROGMON_SUBTASK_EXTRACT, arcContents.length);
@ -1578,14 +1582,17 @@ public class UniversalFileTransferUtility
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXTRACT_PROGRESS);
msg.makeSubstitution(currentSource.getName());
monitor.subTask(msg.getLevelOneText());
boolean isText = currentSource.isText();
/* DKM - should not be calling this
while (display.readAndDispatch()) {
//Process everything on event queue
}
*/
boolean canWrite = true;
if (currentTarget != null)
{
IResource currentTargetResource = SystemBasePlugin.getWorkspaceRoot().getContainerForLocation(new Path(currentTarget.getAbsolutePath()));
if (currentTargetResource != null && currentTargetResource.exists())
{
@ -1609,6 +1616,7 @@ public class UniversalFileTransferUtility
properties.setRemoteFileTimeStamp(arcContents[i].getTimeStamp());
monitor.worked(1);
}
}
}
}
else
@ -1746,7 +1754,7 @@ public class UniversalFileTransferUtility
char separator = '/';
StringBuffer path = new StringBuffer(editMgr.getRemoteEditProjectLocation().makeAbsolute().toOSString());
String actualHost = "LOCALHOST";
String actualHost = "LOCALHOST"; //$NON-NLS-1$
path = path.append(separator + actualHost + separator);
String absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath());
@ -1858,7 +1866,7 @@ public class UniversalFileTransferUtility
public static String getActualHostFor(ISubSystem subsystem, String remotePath)
{
String hostname = subsystem.getHost().getHostName();
if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
if (subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
return result;
@ -1892,7 +1900,7 @@ public class UniversalFileTransferUtility
protected static boolean isRemoteFileMounted(ISubSystem subsystem, String remotePath)
{
String hostname = subsystem.getHost().getHostName();
if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
if (subsystem.getHost().getSystemType().equals("Local")) //$NON-NLS-1$
{
String result = SystemRemoteEditManager.getDefault().getActualHostFor(hostname, remotePath);
if (!result.equals(hostname))
@ -1916,7 +1924,7 @@ public class UniversalFileTransferUtility
protected static String getWorkspaceRemotePath(ISubSystem subsystem, String remotePath) {
if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) {
if (subsystem != null && subsystem.getHost().getSystemType().equals("Local")) { //$NON-NLS-1$
return SystemRemoteEditManager.getDefault().getWorkspacePathFor(subsystem.getHost().getHostName(), remotePath);
}
@ -1931,7 +1939,6 @@ public class UniversalFileTransferUtility
{
String newName = oldName;
IRemoteFileSubSystem ss = targetFolder.getParentRemoteFileSubSystem();
IRemoteFile targetFileOrFolder = (IRemoteFile) existingFiles.get(oldPath);
RenameStatus status = new RenameStatus(IStatus.OK, Activator.getDefault().getBundle().getSymbolicName(), IStatus.OK, newName, null);
@ -1946,10 +1953,10 @@ public class UniversalFileTransferUtility
int state = rr.getCancelStatus();
if (state == RenameRunnable.RENAME_DIALOG_CANCELLED_ALL) {
status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), RenameStatus.CANCEL_ALL, "", null);
status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), RenameStatus.CANCEL_ALL, "", null); //$NON-NLS-1$
}
else if (state == RenameRunnable.RENAME_DIALOG_CANCELLED) {
status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), IStatus.CANCEL, "", null);
status = new RenameStatus(IStatus.CANCEL, Activator.getDefault().getBundle().getSymbolicName(), IStatus.CANCEL, "", null); //$NON-NLS-1$
}
}
else {
@ -2042,7 +2049,7 @@ public class UniversalFileTransferUtility
}
catch (SystemMessageException e)
{
SystemBasePlugin.logError("SystemCopyRemoteFileAction.checkForCollision()", e);
SystemBasePlugin.logError("SystemCopyRemoteFileAction.checkForCollision()", e); //$NON-NLS-1$
}
return newName[0];

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java
View file

@ -523,7 +523,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
}
// if a match has been found, modify its properties
if (matchFound) {
if (matchFound && data != null) {
data.searchString = searchString;
data.caseSensitive = caseButton.getSelection();
data.stringRegex = stringRegexButton.getSelection();
@ -647,7 +647,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
}
catch (SystemMessageException e) {
// TODO: show error
SystemBasePlugin.logError("Error occured trying to get remote file object", e);
SystemBasePlugin.logError("Error occured trying to get remote file object", e); //$NON-NLS-1$
return false;
}
@ -662,7 +662,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
// set the name
String name = remoteFile.getAbsolutePath() + " - " + searchString.getFileNamesString() + "(" + searchString.getTextString() + ")";
String name = remoteFile.getAbsolutePath() + " - " + searchString.getFileNamesString() + "(" + searchString.getTextString() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
set.setName(name);
FileServiceSubSystem ss = (FileServiceSubSystem)subsys;

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchSelectFileTypesDialog.java
View file

@ -73,7 +73,7 @@ public class SystemSearchSelectFileTypesDialog extends SystemSelectFileTypesDial
if (!first) {
// if not the first entry, add a comma and a space
entries.append(TYPE_DELIMITER);
entries.append(" ");
entries.append(" "); //$NON-NLS-1$
}
else {
first = false;
@ -95,7 +95,7 @@ public class SystemSearchSelectFileTypesDialog extends SystemSelectFileTypesDial
while (tokenizer.hasMoreTokens()) {
String currentExtension = tokenizer.nextToken().trim();
if (!currentExtension.equals("")) {
if (!currentExtension.equals("")) { //$NON-NLS-1$
result.add(currentExtension);
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/DownloadJob.java
View file

@ -71,7 +71,7 @@ public class DownloadJob extends Job
*/
public DownloadJob(ISystemEditableRemoteObject editable, boolean systemEditor)
{
super("Download");
super("Download"); //$NON-NLS-1$
_editable = editable;
_systemEditor = systemEditor;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
View file

@ -182,7 +182,7 @@ public class RemoteFileSubSystemConfigurationAdapter extends SubSystemConfigurat
String absoluteSubSystemName = properties.getRemoteFileSubSystem();
if (absoluteSubSystemName != null)
{
int profileDelim = absoluteSubSystemName.indexOf(".");
int profileDelim = absoluteSubSystemName.indexOf("."); //$NON-NLS-1$
String theRest = absoluteSubSystemName.substring(profileDelim, absoluteSubSystemName.length());
properties.setRemoteFileSubSystem(newName + theRest);
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewFileAdapterFactory.java
View file

@ -56,7 +56,7 @@ public class SystemViewFileAdapterFactory extends AbstractSystemRemoteAdapterFac
}
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;
}

49
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -38,7 +38,6 @@ import org.eclipse.jface.action.Separator;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.filters.ISystemFilterReference;
@ -47,7 +46,6 @@ import org.eclipse.rse.core.model.ISystemContainer;
import org.eclipse.rse.core.model.ISystemMessageObject;
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.model.ISystemResourceSet;
import org.eclipse.rse.core.model.SystemChildrenContentsType;
import org.eclipse.rse.core.model.SystemMessageObject;
import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
import org.eclipse.rse.core.subsystems.ISubSystem;
@ -123,7 +121,6 @@ import org.eclipse.rse.ui.view.ISystemEditableRemoteObject;
import org.eclipse.rse.ui.view.ISystemMementoConstants;
import org.eclipse.rse.ui.view.ISystemPropertyConstants;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
import org.eclipse.rse.ui.view.ISystemTree;
import org.eclipse.rse.ui.view.ISystemViewDropDestination;
import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
import org.eclipse.rse.ui.view.SystemDNDTransferRunnable;
@ -661,10 +658,6 @@ public class SystemViewRemoteFileAdapter
rffs.setShowFiles(true);
filter = rffs.toString();
}
else
{
filter = null; // this is our clue to RemoteFileSubSystemImpl to use all filter strings associated with this folder
}
}
else if (foldersOnly)
{
@ -816,8 +809,8 @@ public class SystemViewRemoteFileAdapter
boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement();
boolean isArchive = file != null && file.isArchive() && supportsArchiveManagement;
boolean isVirtual = file != null && file instanceof IVirtualRemoteFile && supportsArchiveManagement;
boolean isArchive = file.isArchive() && supportsArchiveManagement;
boolean isVirtual = file instanceof IVirtualRemoteFile && supportsArchiveManagement;
boolean isRegular = !isArchive && !isVirtual;
if (isRegular && uniquePropertyDescriptorArray == null ||
@ -1160,7 +1153,8 @@ public class SystemViewRemoteFileAdapter
}
else if (name.equals(ISystemPropertyConstants.P_ARCHIVE_EXPANDEDSIZE))
{
if (!isVirtual) return new Long(0);
if (!isVirtual || virtualFile == null) return new Long(0);
if (formatted)
{
return sub(xlatedExpandedSize, MSG_SUB1, Long.toString(virtualFile.getExpandedSize()));
@ -1172,7 +1166,7 @@ public class SystemViewRemoteFileAdapter
}
else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSEDSIZE))
{
if (!isVirtual) return new Long(0);
if (!isVirtual || virtualFile == null) return new Long(0);
if (formatted)
{
return sub(xlatedCompressedSize, MSG_SUB1, Long.toString(virtualFile.getCompressedSize()));
@ -1220,11 +1214,13 @@ public class SystemViewRemoteFileAdapter
}
else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONMETHOD))
{
if (!isVirtual) return ""; //$NON-NLS-1$
if (!isVirtual || virtualFile == null) return ""; //$NON-NLS-1$
return virtualFile.getCompressionMethod();
}
else if (name.equals(ISystemPropertyConstants.P_VIRTUAL_COMPRESSIONRATIO))
{
if (virtualFile != null)
{
Double ratio = new Double(virtualFile.getCompressionRatio());
if (formatted)
{
@ -1234,7 +1230,9 @@ public class SystemViewRemoteFileAdapter
else
{
return ratio;
}
}}
else
return null;
}
else
return null; //super.getPropertyValue(name);
@ -1561,7 +1559,8 @@ public class SystemViewRemoteFileAdapter
if (config.getStatus() == IHostSearchConstants.FINISHED)
{
submonitor.worked(1);
if (submonitor != null)
submonitor.worked(1);
Object[] results = config.getResults();
for (int m = 0; m < results.length; m++)
{
@ -1764,6 +1763,8 @@ public class SystemViewRemoteFileAdapter
{
}
if (children != null)
{
for (int c = 0; c < children.length; c++)
{
Object child = children[c];
@ -1788,6 +1789,7 @@ public class SystemViewRemoteFileAdapter
}
}
}
}
}
return doDrop(downloadedFilterResults, target, sameSystemType, srcSubSystem == targetFS, SystemDNDTransferRunnable.SRC_TYPE_RSE_RESOURCE, monitor);
@ -2040,6 +2042,8 @@ public class SystemViewRemoteFileAdapter
{
}
if (children != null)
{
for (int c = 0; c < children.length; c++)
{
Object child = children[c];
@ -2060,6 +2064,7 @@ public class SystemViewRemoteFileAdapter
doDrop(newSrc, target, sameSystemType, filterSubSystem == targetFS, SystemDNDTransferRunnable.SRC_TYPE_RSE_RESOURCE, monitor);
}
}
}
return target;
}
}
@ -2210,10 +2215,7 @@ public class SystemViewRemoteFileAdapter
}
}
}
else
{
result = null;
}
return result;
}
@ -2367,8 +2369,15 @@ public class SystemViewRemoteFileAdapter
SystemMessageDialog.displayErrorMessage(shell, RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_DELETE_FILE_FAILED).makeSubstitution(file.toString()));
}
}
ok = ss.deleteBatch(files, monitor);
return ok;
if (ss != null)
{
ok = ss.deleteBatch(files, monitor);
return ok;
}
else
{
return false;
}
}
// FOR COMMON RENAME ACTIONS
/**

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java
View file

@ -89,7 +89,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt
{
IWorkbench desktop = PlatformUI.getWorkbench();
IWorkbenchPage persp = desktop.getActiveWorkbenchWindow().getActivePage();
IEditorPart editor = null;
String fileName = _file.getAbsolutePath();
IEditorReference[] editors = persp.getEditorReferences();
for (int i = 0; i < editors.length; i++)

7
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java
View file

@ -114,8 +114,11 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd
msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_OPERATION_DISCONNECTED);
}
msg.makeSubstitution(name);
return msg.getLevelOneText();
if (msg != null)
{
msg.makeSubstitution(name);
return msg.getLevelOneText();
}
}
return null;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewSearchResultAdapterFactory.java
View file

@ -70,7 +70,7 @@ public class SystemViewSearchResultAdapterFactory implements IAdapterFactory
}
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;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewSearchResultSetAdapterFactory.java
View file

@ -68,7 +68,7 @@ public class SystemViewSearchResultSetAdapterFactory implements IAdapterFactory
}
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;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemEnterOrSelectRemoteFileForm.java
View file

@ -56,7 +56,7 @@ public class SystemEnterOrSelectRemoteFileForm extends SystemSelectRemoteFileOrF
public SystemEnterOrSelectRemoteFileForm(ISystemMessageLine msgLine, Object caller, boolean fileMode) {
super(msgLine, caller, fileMode);
validator = new ValidatorFileName();
initialFileName = "";
initialFileName = ""; //$NON-NLS-1$
fileName = initialFileName;
}

1
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
View file

@ -297,7 +297,6 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
String[] folderStrings = folderCombo.getItems();
if ( (folderStrings == null) || (folderStrings.length==0) )
return match;
IHost conn = folder.getSystemConnection();
String fulldir = folder.getAbsolutePathPlusConnection();
for (int idx=0; (idx<folderStrings.length) && (match==-1); idx++)
{

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java
View file

@ -516,7 +516,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo
try {
currentFolderObject = fileSubSystem.getRemoteFileObject(currentFolder);
} catch(SystemMessageException e) {
SystemBasePlugin.logError("SystemRemoteFolderCombo.wdigetSelected", e);
SystemBasePlugin.logError("SystemRemoteFolderCombo.wdigetSelected", e); //$NON-NLS-1$
}
if (currentFolderObject != null)
browseAction.setPreSelection(currentFolderObject);

1
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
View file

@ -1038,7 +1038,6 @@ public class SystemSelectRemoteFileOrFolderForm
/**
* Add viewer filter.
* @param filter a viewer filter.
* @see SystemActionViewerFilter.
*/
public void addViewerFilter(ViewerFilter filter) {
viewerFilters.add(filter);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFilesForm.java
View file

@ -420,7 +420,7 @@ public class SystemSelectRemoteFilesForm extends Composite
String msg = exc.getMessage();
if ((msg == null) || (msg.length()==0))
{
msg = "Exception: " + exc.getClass().getName();
msg = "Exception: " + exc.getClass().getName(); //$NON-NLS-1$
displayExceptionMessage(exc);
}
else

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemFileNewConnectionWizardPage.java
View file

@ -136,7 +136,7 @@ public class SystemFileNewConnectionWizardPage extends AbstractSystemNewConnecti
textPort = SystemWidgetHelpers.createTextField(
composite_prompts,null,SystemResources.RESID_SUBSYSTEM_PORT_TIP);
textPort.setText("0");
textPort.setText("0"); //$NON-NLS-1$
textPort.addModifyListener(
new ModifyListener() {

12
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java
View file

@ -55,7 +55,7 @@ public class SystemNewFileWizard
//protected IRemoteFile parentFolder;
//protected IStructuredSelection selection;
private static final String CLASSNAME = "SystemNewFileWizard";
private static final String CLASSNAME = "SystemNewFileWizard"; //$NON-NLS-1$
/**
* Constructor
@ -81,7 +81,7 @@ public class SystemNewFileWizard
//super.addPages();
} catch (Exception exc)
{
SystemBasePlugin.logError("New File: Error in createPages: ",exc);
SystemBasePlugin.logError("New File: Error in createPages: ",exc); //$NON-NLS-1$
}
}
@ -172,19 +172,19 @@ public class SystemNewFileWizard
IRemoteFile newFilePath = rfss.getRemoteFileObject(absName);
newFile = rfss.createFile(newFilePath);
} catch (RemoteFileIOException exc ) {
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileIOException " );
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileIOException " ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
msg = (RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_FILE_FAILED_EXIST)).makeSubstitution(absName);
mainPage.setMessage(msg);
ok = false;
//DY } catch (Exception RemoteFileSecurityException) {
} catch (RemoteFileSecurityException e) {
msg = (RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_FILE_FAILED)).makeSubstitution(absName);
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileSecurityException ");
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote file "+ absName + " failed with RemoteFileSecurityException "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
//SystemMessage.displayErrorMessage(SystemMessage.getDefaultShell(), msg);
mainPage.setMessage(msg);
ok = false;
} catch (SystemMessageException e) {
SystemBasePlugin.logError(CLASSNAME+ ":", e);
SystemBasePlugin.logError(CLASSNAME+ ":", e); //$NON-NLS-1$
mainPage.setMessage(e.getSystemMessage());
ok = false;
}
@ -250,7 +250,7 @@ public class SystemNewFileWizard
for (int idx = 0; idx < strings.length; idx++) {
if (strings[idx].equals("*")) {
if (strings[idx].equals("*")) { //$NON-NLS-1$
return true;
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizardMainPage.java
View file

@ -62,7 +62,7 @@ public class SystemNewFileWizardMainPage
*/
public SystemNewFileWizardMainPage(Wizard wizard, IRemoteFile[] parentFolders)
{
super(wizard, "NewFile",
super(wizard, "NewFile", //$NON-NLS-1$
FileResources.RESID_NEWFILE_PAGE1_TITLE, FileResources.RESID_NEWFILE_PAGE1_DESCRIPTION);
this.parentFolders = parentFolders;
}

14
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFolderWizard.java
View file

@ -41,7 +41,7 @@ public class SystemNewFolderWizard
//protected IRemoteFile myObject;
//protected IStructuredSelection selection;
private static final String CLASSNAME = "SystemNewFolderWizard";
private static final String CLASSNAME = "SystemNewFolderWizard"; //$NON-NLS-1$
/**
* Constructor
@ -66,7 +66,7 @@ public class SystemNewFolderWizard
//super.addPages();
} catch (Exception exc)
{
SystemBasePlugin.logError("New File: Error in createPages: ",exc);
SystemBasePlugin.logError("New File: Error in createPages: ",exc); //$NON-NLS-1$
}
}
@ -157,7 +157,7 @@ public class SystemNewFolderWizard
IRemoteFile newFolderPath = rfss.getRemoteFileObject(absName);
newFolder = rfss.createFolder(newFolderPath);
} catch (RemoteFileIOException exc ) {
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " );
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileIOException " ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (exc.getRemoteException() instanceof SystemMessageException)
{
msg = ((SystemMessageException)exc.getRemoteException()).getSystemMessage();
@ -170,13 +170,13 @@ public class SystemNewFolderWizard
ok = false;
// DY } catch (Exception RemoteFileSecurityException) {
} catch (RemoteFileSecurityException e) {
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException ");
SystemBasePlugin.logDebugMessage(CLASSNAME+ ":", " Creating remote folder "+ absName + " failed with RemoteFileSecurityException "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
msg = (RSEUIPlugin.getPluginMessage(ISystemMessages.FILEMSG_CREATE_FOLDER_FAILED)).makeSubstitution(absName);
//SystemMessage.displayErrorMessage(SystemMessage.getDefaultShell(), msg);
mainPage.setMessage(msg);
ok = false;
} catch (SystemMessageException e) {
SystemBasePlugin.logError(CLASSNAME+ ":", e);
SystemBasePlugin.logError(CLASSNAME+ ":", e); //$NON-NLS-1$
mainPage.setMessage(e.getSystemMessage());
ok = false;
}
@ -204,11 +204,11 @@ public class SystemNewFolderWizard
for (int idx=0; !meets && (idx<strings.length); idx++)
{
String filterString = strings[idx];
if (filterString.indexOf("/ns") == -1) // if this filter string allows folders (no /ns switch) then we have a match!
if (filterString.indexOf("/ns") == -1) // if this filter string allows folders (no /ns switch) then we have a match! //$NON-NLS-1$
{
if (strings.length > 0 && !filterString.startsWith(parentFolder.getAbsolutePath()))
{
if (!filterString.equals("./*")) //DKM - ./ will always meet
if (!filterString.equals("./*")) //DKM - ./ will always meet //$NON-NLS-1$
{
meets = false;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFolderWizardMainPage.java
View file

@ -63,7 +63,7 @@ public class SystemNewFolderWizardMainPage
*/
public SystemNewFolderWizardMainPage(Wizard wizard, IRemoteFile[] parentFolders)
{
super(wizard, "NewFolder",
super(wizard, "NewFolder", //$NON-NLS-1$
FileResources.RESID_NEWFOLDER_PAGE1_TITLE,
FileResources.RESID_NEWFOLDER_PAGE1_DESCRIPTION);
// nameValidator = new ValidatorProfileName(RSEUIPlugin.getTheSystemRegistry().getAllSystemProfileNamesVector());

10
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java
View file

@ -43,7 +43,7 @@ public class ProcessesPlugin extends SystemBasePlugin {
private static SystemMessageFile messageFile = null;
private static SystemMessageFile defaultMessageFile = null;
public static final String HELPPREFIX = "org.eclipse.rse.processes.ui.";
public static final String HELPPREFIX = "org.eclipse.rse.processes.ui."; //$NON-NLS-1$
/**
@ -59,8 +59,8 @@ public class ProcessesPlugin extends SystemBasePlugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
messageFile = getMessageFile("processmessages.xml");
defaultMessageFile = getDefaultMessageFile("processmessages.xml");
messageFile = getMessageFile("processmessages.xml"); //$NON-NLS-1$
defaultMessageFile = getDefaultMessageFile("processmessages.xml"); //$NON-NLS-1$
IAdapterManager manager = Platform.getAdapterManager();
svpaf = new SystemViewProcessAdapterFactory();
@ -105,7 +105,7 @@ public class ProcessesPlugin extends SystemBasePlugin {
public ResourceBundle getResourceBundle() {
try {
if (resourceBundle == null)
resourceBundle = ResourceBundle.getBundle("org.eclipse.rse.processes.ui.SystemProcessesResources");
resourceBundle = ResourceBundle.getBundle("org.eclipse.rse.processes.ui.SystemProcessesResources"); //$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
@ -150,7 +150,7 @@ public class ProcessesPlugin extends SystemBasePlugin {
public ImageDescriptor getImageDescriptorFromPath(String path)
{
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.processes.ui", path);
return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.rse.processes.ui", path); //$NON-NLS-1$
}
/**

74
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java
View file

@ -77,7 +77,7 @@ public class SystemProcessFilterStringEditPane extends
// validators
protected ValidatorLongRangeInput vmRangeValidator = new ValidatorLongRangeInput(0, vmMaxValue);
protected ValidatorIntegerRangeInput gidValidator = new ValidatorIntegerRangeInput(0, gidLimit);
protected ValidatorSpecialChar nameValidator = new ValidatorSpecialChar(" \t|", true);
protected ValidatorSpecialChar nameValidator = new ValidatorSpecialChar(" \t|", true); //$NON-NLS-1$
// inputs
protected String[] inputFilterStrings;
@ -158,9 +158,9 @@ public class SystemProcessFilterStringEditPane extends
txtExeName = SystemWidgetHelpers.createTextField(sub_prompts1, null);
txtExeName.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_EXENAME_TOOLTIP);
SystemWidgetHelpers.setHelp(txtExeName, ProcessesPlugin.HELPPREFIX+"pfsd0001");
SystemWidgetHelpers.setHelp(txtExeName, ProcessesPlugin.HELPPREFIX+"pfsd0001"); //$NON-NLS-1$
updateGridData(txtExeName, gridColumns-1);
txtExeName.setText("*");
txtExeName.setText("*"); //$NON-NLS-1$
// User name prompt
lblUserName = SystemWidgetHelpers.createLabel(sub_prompts1, SystemProcessesResources.RESID_PROCESSFILTERSTRING_USERNAME_LABEL);
@ -168,9 +168,9 @@ public class SystemProcessFilterStringEditPane extends
txtUserName = SystemWidgetHelpers.createTextField(sub_prompts1, null);
txtUserName.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_USERNAME_TOOLTIP);
SystemWidgetHelpers.setHelp(txtUserName, ProcessesPlugin.HELPPREFIX+"pfsd0002");
SystemWidgetHelpers.setHelp(txtUserName, ProcessesPlugin.HELPPREFIX+"pfsd0002"); //$NON-NLS-1$
updateGridData(txtUserName, gridColumns-1);
txtUserName.setText("*");
txtUserName.setText("*"); //$NON-NLS-1$
// Group ID prompt
lblGid = SystemWidgetHelpers.createLabel(sub_prompts1, SystemProcessesResources.RESID_PROCESSFILTERSTRING_GID_LABEL);
@ -178,9 +178,9 @@ public class SystemProcessFilterStringEditPane extends
txtGid = SystemWidgetHelpers.createTextField(sub_prompts1, null);
txtGid.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_GID_TOOLTIP);
SystemWidgetHelpers.setHelp(txtGid, ProcessesPlugin.HELPPREFIX+"pfsd0003");
SystemWidgetHelpers.setHelp(txtGid, ProcessesPlugin.HELPPREFIX+"pfsd0003"); //$NON-NLS-1$
updateGridData(txtGid, gridColumns-1);
txtGid.setText("*");
txtGid.setText("*"); //$NON-NLS-1$
// status checkbox table
lblStatus = SystemWidgetHelpers.createLabel(sub_prompts1, SystemProcessesResources.RESID_PROCESSFILTERSTRING_STATUS_LABEL);
@ -192,8 +192,8 @@ public class SystemProcessFilterStringEditPane extends
chkStatus.getTable().setLayoutData(data);
chkStatus.setLabelProvider(new LabelProvider());
SystemWidgetHelpers.setHelp(chkStatus.getControl(), ProcessesPlugin.HELPPREFIX+"pfsd0004");
SystemWidgetHelpers.createLabel(sub_prompts1, " ");
SystemWidgetHelpers.setHelp(chkStatus.getControl(), ProcessesPlugin.HELPPREFIX+"pfsd0004"); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(sub_prompts1, " "); //$NON-NLS-1$
addSelectionButtons(sub_prompts1);
// Range prompt
@ -203,22 +203,22 @@ public class SystemProcessFilterStringEditPane extends
txtMinVM = SystemWidgetHelpers.createTextField(subsub, null);
txtMinVM.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_MINVM_TOOLTIP);
SystemWidgetHelpers.setHelp(txtMinVM, ProcessesPlugin.HELPPREFIX+"pfsd0005");
txtMinVM.setText("0");
SystemWidgetHelpers.createLabel(subsub, " ");
SystemWidgetHelpers.setHelp(txtMinVM, ProcessesPlugin.HELPPREFIX+"pfsd0005"); //$NON-NLS-1$
txtMinVM.setText("0"); //$NON-NLS-1$
SystemWidgetHelpers.createLabel(subsub, " "); //$NON-NLS-1$
lblMaxVM = SystemWidgetHelpers.createLabel(subsub, SystemProcessesResources.RESID_PROCESSFILTERSTRING_MAXVM_LABEL);
lblMaxVM.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_MAXVM_TOOLTIP);
txtMaxVM = SystemWidgetHelpers.createTextField(subsub, null);
txtMaxVM.setToolTipText(SystemProcessesResources.RESID_PROCESSFILTERSTRING_MAXVM_TOOLTIP);
SystemWidgetHelpers.setHelp(txtMaxVM, ProcessesPlugin.HELPPREFIX+"pfsd0006");
SystemWidgetHelpers.setHelp(txtMaxVM, ProcessesPlugin.HELPPREFIX+"pfsd0006"); //$NON-NLS-1$
txtMaxVM.setEnabled(false);
// Unlimited check box
chkBoxUnlimitedVM = SystemWidgetHelpers.createCheckBox(subsub, 1, null,
SystemProcessesResources.RESID_PROCESSFILTERSTRING_UNLIMITED_LABEL, SystemProcessesResources.RESID_PROCESSFILTERSTRING_UNLIMITED_TOOLTIP);
SystemWidgetHelpers.setHelp(chkBoxUnlimitedVM, ProcessesPlugin.HELPPREFIX+"pfsd0007");
SystemWidgetHelpers.setHelp(chkBoxUnlimitedVM, ProcessesPlugin.HELPPREFIX+"pfsd0007"); //$NON-NLS-1$
txtExeName.setFocus();
@ -263,7 +263,7 @@ public class SystemProcessFilterStringEditPane extends
public void modifyText(ModifyEvent e) {
if (validateMinVMInput() == null)
{
if (!chkBoxUnlimitedVM.getSelection() && !txtMaxVM.getText().trim().equals(""))
if (!chkBoxUnlimitedVM.getSelection() && !txtMaxVM.getText().trim().equals("")) //$NON-NLS-1$
{
SystemMessage message = validateMinLessThanMax();
fireChangeEvent(message);
@ -277,7 +277,7 @@ public class SystemProcessFilterStringEditPane extends
public void modifyText(ModifyEvent e) {
if (validateMaxVMInput() == null)
{
if (!txtMinVM.getText().trim().equals(""))
if (!txtMinVM.getText().trim().equals("")) //$NON-NLS-1$
{
SystemMessage message = validateMinLessThanMax();
fireChangeEvent(message);
@ -359,18 +359,18 @@ public class SystemProcessFilterStringEditPane extends
{
HostProcessFilterImpl rffs = new HostProcessFilterImpl(inputFilterString);
String defaultExeName = rffs.getName();
txtExeName.setText((defaultExeName==null) ? "" : defaultExeName);
txtExeName.setText((defaultExeName==null) ? "" : defaultExeName); //$NON-NLS-1$
String defaultUserName = rffs.getUsername();
txtUserName.setText((defaultUserName==null) ? "" : defaultUserName);
txtUserName.setText((defaultUserName==null) ? "" : defaultUserName); //$NON-NLS-1$
String defaultGid = rffs.getGid();
txtGid.setText((defaultGid==null) ? "" : defaultGid);
txtGid.setText((defaultGid==null) ? "" : defaultGid); //$NON-NLS-1$
String defaultMinVM = rffs.getMinVM();
txtMinVM.setText((defaultMinVM==null) ? "" : defaultMinVM);
txtMinVM.setText((defaultMinVM==null) ? "" : defaultMinVM); //$NON-NLS-1$
String defaultMaxVM = rffs.getMaxVM();
if (defaultMaxVM.equals("-1") || defaultMaxVM == null)
if (defaultMaxVM.equals("-1")) //$NON-NLS-1$
{
txtMaxVM.setText("");
txtMaxVM.setText(""); //$NON-NLS-1$
txtMaxVM.setEnabled(false);
chkBoxUnlimitedVM.setEnabled(true);
chkBoxUnlimitedVM.setSelection(true);
@ -399,11 +399,11 @@ public class SystemProcessFilterStringEditPane extends
{
if (txtExeName == null)
return;
txtExeName.setText("*");
txtUserName.setText("*");
txtGid.setText("");
txtMinVM.setText("0");
txtMaxVM.setText("");
txtExeName.setText("*"); //$NON-NLS-1$
txtUserName.setText("*"); //$NON-NLS-1$
txtGid.setText(""); //$NON-NLS-1$
txtMinVM.setText("0"); //$NON-NLS-1$
txtMaxVM.setText(""); //$NON-NLS-1$
chkBoxUnlimitedVM.setSelection(true);
txtMaxVM.setEnabled(false);
chkBoxUnlimitedVM.setEnabled(true);
@ -482,7 +482,7 @@ public class SystemProcessFilterStringEditPane extends
if (errorMessage != null)
{
if (!dontStealFocus)
if (!dontStealFocus && controlInError != null)
controlInError.setFocus();
}
@ -622,7 +622,7 @@ public class SystemProcessFilterStringEditPane extends
}
if (maxVM < minVM)
{
return ProcessesPlugin.getPluginMessage("RSEPG1001");
return ProcessesPlugin.getPluginMessage("RSEPG1001"); //$NON-NLS-1$
}
return null;
}
@ -642,25 +642,25 @@ public class SystemProcessFilterStringEditPane extends
HostProcessFilterImpl rpfs = new HostProcessFilterImpl();
String exeName = txtExeName.getText().trim();
if (!exeName.equals("")) rpfs.setName(exeName);
if (!exeName.equals("")) rpfs.setName(exeName); //$NON-NLS-1$
String userName = txtUserName.getText().trim();
if (!userName.equals("")) rpfs.setUsername(userName);
if (!userName.equals("")) rpfs.setUsername(userName); //$NON-NLS-1$
String gid = txtGid.getText().trim();
if (!gid.equals("")) rpfs.setGid(gid);
if (!gid.equals("")) rpfs.setGid(gid); //$NON-NLS-1$
String minVM = txtMinVM.getText().trim();
if (!minVM.equals("")) rpfs.setMinVM(minVM);
if (!minVM.equals("")) rpfs.setMinVM(minVM); //$NON-NLS-1$
if (chkBoxUnlimitedVM.getSelection())
{
rpfs.setMaxVM("-1");
rpfs.setMaxVM("-1"); //$NON-NLS-1$
}
else
{
String maxVM = txtMaxVM.getText().trim();
if (!maxVM.equals("")) rpfs.setMaxVM(maxVM);
if (!maxVM.equals("")) rpfs.setMaxVM(maxVM); //$NON-NLS-1$
}
String[] stateStrings = SystemProcessStatesContentProvider.getStates();
@ -690,7 +690,7 @@ public class SystemProcessFilterStringEditPane extends
txtMaxVM.setFocus();
if (validateMaxVMInput() == null)
{
if (!txtMinVM.getText().trim().equals(""))
if (!txtMinVM.getText().trim().equals("")) //$NON-NLS-1$
{
SystemMessage message = validateMinLessThanMax();
fireChangeEvent(message);
@ -709,7 +709,7 @@ public class SystemProcessFilterStringEditPane extends
{
if (refProvider == null)
{
SystemBasePlugin.logWarning("Programming Error: input subsystem is not set");
SystemBasePlugin.logWarning("Programming Error: input subsystem is not set"); //$NON-NLS-1$
return;
}
skipUniquenessChecking = true;

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessesResources.java
View file

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

12
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/actions/SystemKillProcessAction.java
View file

@ -65,13 +65,13 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
{
super(SystemProcessesResources.ACTION_KILLPROCESS_LABEL,
SystemProcessesResources.ACTION_KILLPROCESS_TOOLTIP,
ProcessesPlugin.getDefault().getImageDescriptorFromPath("/icons/full/elcl16/killprocessj.gif"),
ProcessesPlugin.getDefault().getImageDescriptorFromPath("/icons/full/elcl16/killprocessj.gif"), //$NON-NLS-1$
shell);
allowOnMultipleSelection(true);
setProcessAllSelections(true);
setContextMenuGroup(ISystemContextMenuConstants.GROUP_REORGANIZE);
setHelp(ProcessesPlugin.HELPPREFIX+"actn0001");
setDialogHelp(ProcessesPlugin.HELPPREFIX+"dkrp0000");
setHelp(ProcessesPlugin.HELPPREFIX+"actn0001"); //$NON-NLS-1$
setDialogHelp(ProcessesPlugin.HELPPREFIX+"dkrp0000"); //$NON-NLS-1$
}
/**
@ -218,7 +218,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
ok = ss.kill(process, signal);
if (!ok)
{
SystemMessage msg = ProcessesPlugin.getPluginMessage("RSEPG1300");
SystemMessage msg = ProcessesPlugin.getPluginMessage("RSEPG1300"); //$NON-NLS-1$
msg.makeSubstitution(process.getName());
throw new SystemMessageException(msg);
}
@ -287,7 +287,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
protected SystemMessage getKillingMessage()
{
return ProcessesPlugin.getPluginMessage("RSEPG1003");
return ProcessesPlugin.getPluginMessage("RSEPG1003"); //$NON-NLS-1$
}
/**
* Get the specific "kill" message
@ -295,7 +295,7 @@ public class SystemKillProcessAction extends SystemBaseDialogAction implements I
protected SystemMessage getKillingMessage(String signal, String processName)
{
SystemMessage msg = null;
msg = ProcessesPlugin.getPluginMessage("RSEPG1004");
msg = ProcessesPlugin.getPluginMessage("RSEPG1004"); //$NON-NLS-1$
msg.makeSubstitution(signal, processName);
return msg;
}

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/actions/SystemNewProcessFilterAction.java
View file

@ -37,8 +37,8 @@ public class SystemNewProcessFilterAction extends SystemNewFilterAction implemen
{
super(shell, parentPool, SystemProcessesResources.ACTION_NEWPROCESSFILTER_LABEL,
SystemProcessesResources.ACTION_NEWPROCESSFILTER_TOOLTIP, RSEUIPlugin.getDefault().getImageDescriptor(ICON_SYSTEM_NEWFILTER_ID));
setHelp(RSEUIPlugin.HELPPREFIX+"actn0042");
setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnfr0000");
setHelp(RSEUIPlugin.HELPPREFIX+"actn0042"); //$NON-NLS-1$
setDialogHelp(RSEUIPlugin.HELPPREFIX+"wnfr0000"); //$NON-NLS-1$
}
/**

6
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/RemoteProcessesDialog.java
View file

@ -86,7 +86,7 @@ public class RemoteProcessesDialog extends SystemPromptDialog implements KeyList
});
SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "ucmd0000");
SystemWidgetHelpers.setHelp(_viewer.getControl(), RSEUIPlugin.HELPPREFIX + "ucmd0000"); //$NON-NLS-1$
TableLayout layout = new TableLayout();
_table.setLayout(layout);
@ -148,8 +148,8 @@ public class RemoteProcessesDialog extends SystemPromptDialog implements KeyList
protected void updateViewFilter()
{
if (_executableFilter.indexOf("*") == -1)
_executableFilter += "*";
if (_executableFilter.indexOf("*") == -1) //$NON-NLS-1$
_executableFilter += "*"; //$NON-NLS-1$
String[] viewFilters = {_executableFilter};
_viewer.setViewFilters(viewFilters);
}

12
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillDialog.java
View file

@ -67,7 +67,7 @@ public class SystemKillDialog extends SystemPromptDialog
// column headers
private String columnHeaders[] = {
"",
"", //$NON-NLS-1$
SystemProcessesResources.RESID_KILL_COLHDG_EXENAME,
SystemProcessesResources.RESID_KILL_COLHDG_PID
};
@ -95,7 +95,7 @@ public class SystemKillDialog extends SystemPromptDialog
{
super(shell, SystemProcessesResources.RESID_KILL_TITLE);
super.setOkButtonLabel(SystemProcessesResources.RESID_KILL_BUTTON);
setHelp(ProcessesPlugin.HELPPREFIX+"dkrp0000");
setHelp(ProcessesPlugin.HELPPREFIX+"dkrp0000"); //$NON-NLS-1$
}
/**
@ -151,7 +151,7 @@ public class SystemKillDialog extends SystemPromptDialog
if (warningMessage != null)
{
// filler line
SystemWidgetHelpers.createLabel(composite, "", nbrColumns);
SystemWidgetHelpers.createLabel(composite, "", nbrColumns); //$NON-NLS-1$
// create image
Image image = getShell().getDisplay().getSystemImage(SWT.ICON_WARNING);
Label imageLabel = null;
@ -178,7 +178,7 @@ public class SystemKillDialog extends SystemPromptDialog
warningLabel.setLayoutData(data);
// filler line
SystemWidgetHelpers.createLabel(composite, "", nbrColumns);
SystemWidgetHelpers.createLabel(composite, "", nbrColumns); //$NON-NLS-1$
}
// TABLE
@ -324,10 +324,10 @@ public class SystemKillDialog extends SystemPromptDialog
public String getSignal()
{
if (cmbSignal == null) return "";
if (cmbSignal == null) return ""; //$NON-NLS-1$
if (cmbSignal.isDisposed()) return signalType;
String signal = cmbSignal.getText();
if (signal == null) return "";
if (signal == null) return ""; //$NON-NLS-1$
return signal;
}
}

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableProvider.java
View file

@ -63,7 +63,7 @@ public class SystemKillTableProvider extends SystemDeleteTableProvider
*/
public String getColumnText(Object element, int column)
{
String text = "";
String text = ""; //$NON-NLS-1$
if (column == COLUMN_NAME)
text = getTableRow(element).getName();
else if (column == COLUMN_TYPE)

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/dialogs/SystemKillTableRow.java
View file

@ -55,7 +55,7 @@ public class SystemKillTableRow extends SystemDeleteTableRow
this.exename = ((IRemoteProcess)element).getName();
}
if (element instanceof IRemoteProcess)
this.pid = "" + ((IRemoteProcess)element).getPid();
this.pid = "" + ((IRemoteProcess)element).getPid(); //$NON-NLS-1$
if (adapter != null)
this.imageDescriptor = adapter.getImageDescriptor(element);
else this.imageDescriptor = RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);

22
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/ISystemProcessPropertyConstants.java
View file

@ -21,16 +21,16 @@ public interface ISystemProcessPropertyConstants
public static final String P_PREFIX = org.eclipse.rse.ui.ISystemIconConstants.PREFIX;
// PROCESS PROPERTIES
public static String P_PROCESS_PID = P_PREFIX+"process.pid";
public static String P_PROCESS_NAME = P_PREFIX+"process.name";
public static String P_PROCESS_UID = P_PREFIX+"process.uid";
public static String P_PROCESS_USERNAME = P_PREFIX+"process.username";
public static String P_PROCESS_PPID = P_PREFIX+"process.ppid";
public static String P_PROCESS_GID = P_PREFIX+"process.gid";
public static String P_PROCESS_STATE = P_PREFIX+"process.state";
public static String P_PROCESS_TGID = P_PREFIX+"process.tgid";
public static String P_PROCESS_TRACERPID = P_PREFIX+"process.tracerpid";
public static String P_PROCESS_VMSIZE = P_PREFIX+"process.vmsize";
public static String P_PROCESS_VMRSS = P_PREFIX+"process.vmrss";
public static String P_PROCESS_PID = P_PREFIX+"process.pid"; //$NON-NLS-1$
public static String P_PROCESS_NAME = P_PREFIX+"process.name"; //$NON-NLS-1$
public static String P_PROCESS_UID = P_PREFIX+"process.uid"; //$NON-NLS-1$
public static String P_PROCESS_USERNAME = P_PREFIX+"process.username"; //$NON-NLS-1$
public static String P_PROCESS_PPID = P_PREFIX+"process.ppid"; //$NON-NLS-1$
public static String P_PROCESS_GID = P_PREFIX+"process.gid"; //$NON-NLS-1$
public static String P_PROCESS_STATE = P_PREFIX+"process.state"; //$NON-NLS-1$
public static String P_PROCESS_TGID = P_PREFIX+"process.tgid"; //$NON-NLS-1$
public static String P_PROCESS_TRACERPID = P_PREFIX+"process.tracerpid"; //$NON-NLS-1$
public static String P_PROCESS_VMSIZE = P_PREFIX+"process.vmsize"; //$NON-NLS-1$
public static String P_PROCESS_VMRSS = P_PREFIX+"process.vmrss"; //$NON-NLS-1$
}

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemProcessStatesContentProvider.java
View file

@ -104,9 +104,9 @@ public class SystemProcessStatesContentProvider implements ISystemProcessRemoteC
public String getStateString(String state)
{
Integer index = (Integer) strIndices.get(state);
if (index == null) return "";
if (index == null) return ""; //$NON-NLS-1$
String[] resources = getStates();
if (index.intValue() >= resources.length) return "";
if (index.intValue() >= resources.length) return ""; //$NON-NLS-1$
return resources[index.intValue()];
}

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemProcessesViewResources.java
View file

@ -21,7 +21,7 @@ import org.eclipse.osgi.util.NLS;
public class SystemProcessesViewResources extends NLS
{
private static String BUNDLE_NAME = "org.eclipse.rse.processes.ui.view.SystemProcessesViewResources";
private static String BUNDLE_NAME = "org.eclipse.rse.processes.ui.view.SystemProcessesViewResources"; //$NON-NLS-1$
// PROCESS PROPERTIES
public static String RESID_PROPERTY_PROCESS_PID_LABEL;

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewProcessAdapterFactory.java
View file

@ -53,7 +53,7 @@ public class SystemViewProcessAdapterFactory extends AbstractSystemRemoteAdapter
}
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;
}

38
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java
View file

@ -107,13 +107,13 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
public ImageDescriptor getImageDescriptor(Object element)
{
//return RSEUIPlugin.getDefault().getImageDescriptor(ISystemIconConstants.ICON_SYSTEM_PROCESS_ID);
return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif");
return ProcessesPlugin.getDefault().getImageDescriptorFromPath("icons/full/obj16/activeprocess_obj.gif"); //$NON-NLS-1$
}
public String getText(Object element)
{
String text = ((IRemoteProcess) element).getLabel();
return (text == null) ? "" : text;
return (text == null) ? "" : text; //$NON-NLS-1$
}
/**
@ -129,7 +129,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
public String getAbsoluteName(Object object)
{
IRemoteProcess process = (IRemoteProcess) object;
return "" + process.getPid();
return "" + process.getPid(); //$NON-NLS-1$
}
public String getType(Object element)
@ -181,7 +181,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
children = new SystemMessageObject[1];
children[0] = new SystemMessageObject(RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_EXPAND_FAILED), ISystemMessageObject.MSGTYPE_ERROR, element);
SystemBasePlugin.logError("Exception resolving file filter strings", exc);
SystemBasePlugin.logError("Exception resolving file filter strings", exc); //$NON-NLS-1$
}
return children;
}
@ -259,7 +259,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getGid();
return "" + process.getGid(); //$NON-NLS-1$
}
else
{
@ -274,7 +274,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getPid();
return "" + process.getPid(); //$NON-NLS-1$
}
else
{
@ -285,7 +285,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getPPid();
return "" + process.getPPid(); //$NON-NLS-1$
}
else
{
@ -307,7 +307,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getTgid();
return "" + process.getTgid(); //$NON-NLS-1$
}
else
{
@ -318,7 +318,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getTracerPid();
return "" + process.getTracerPid(); //$NON-NLS-1$
}
else
{
@ -329,7 +329,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
{
if (formatted)
{
return "" + process.getUid();
return "" + process.getUid(); //$NON-NLS-1$
}
else
{
@ -368,18 +368,18 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
protected String formatState(String state)
{
if (state == null) return "";
if (state == null) return ""; //$NON-NLS-1$
state = state.trim();
String longState = "";
String[] allStates = state.split(",");
String longState = ""; //$NON-NLS-1$
String[] allStates = state.split(","); //$NON-NLS-1$
if (allStates == null) return longState;
SystemProcessStatesContentProvider zstates = new SystemProcessStatesContentProvider();
for (int i = 0; i < allStates.length; i++)
{
longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]);
longState = longState + allStates[i].charAt(0) + "-" + zstates.getStateString(allStates[i]); //$NON-NLS-1$
if (i < allStates.length - 1)
longState = longState + ", ";
longState = longState + ", "; //$NON-NLS-1$
}
return longState;
}
@ -392,7 +392,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
IRemoteProcess process = (IRemoteProcess) element;
IRemoteProcess parent = process.getParentRemoteProcess();
if (parent != null) return parent.getAbsolutePath();
else return "/proc/0";
else return "/proc/0"; //$NON-NLS-1$
}
/**
@ -422,8 +422,8 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
String[] pids = EMPTY_STRING_LIST;
IRemoteProcess process = (IRemoteProcess) element;
String parentName = "" + process.getPPid();
if (parentName.equals("-1")) // given a root?
String parentName = "" + process.getPPid(); //$NON-NLS-1$
if (parentName.equals("-1")) // given a root? //$NON-NLS-1$
return pids; // not much we can do. Should never happen: you can't rename a root!
Object[] children = getChildren(process.getParentRemoteProcess());
@ -432,7 +432,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter
pids = new String[children.length];
for (int idx = 0; idx < pids.length; idx++)
pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid();
pids[idx] = "" + ((IRemoteProcess) children[idx]).getPid(); //$NON-NLS-1$
return pids;
}