* This is all encapsulated in this interface. There is also a class offered - * that implements all this and is populated via setters. + * that implements all this and is populated via setters. */ public interface ISystemFilterPoolWrapperInformation { @@ -38,7 +38,7 @@ public interface ISystemFilterPoolWrapperInformation { */ public String getPromptTooltip(); - public String getVerbageLabel(); + public String getVerbiageLabel(); /** * Get the list of wrappered filter pool objects to show in the combo. The wrappering allows diff --git a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java index 01eb6d5211b..d2fd3d7549a 100644 --- a/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.dstore.security/src/org/eclipse/rse/dstore/security/wizards/SystemImportCertWizardMainPage.java @@ -79,15 +79,15 @@ public class SystemImportCertWizardMainPage public Control createContents(Composite parent) { - Composite verbage = new Composite(parent, SWT.NULL); + Composite verbiage = new Composite(parent, SWT.NULL); GridLayout vlayout = new GridLayout(); GridData vdata = new GridData(GridData.FILL_BOTH); vlayout.numColumns = 1; - verbage.setLayout(vlayout); - verbage.setLayoutData(vdata); + verbiage.setLayout(vlayout); + verbiage.setLayoutData(vdata); - SystemWidgetHelpers.createLabel(verbage, UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_INFORMATION); - createTableViewer(verbage); + SystemWidgetHelpers.createLabel(verbiage, UniversalSecurityProperties.RESID_SECURITY_CERTIFICATE_INFORMATION); + createTableViewer(verbiage); Composite b = new Composite(parent, SWT.NULL); GridLayout blayout = new GridLayout(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java index b45e660a770..77a35d327e5 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/ISystemFileConstants.java @@ -89,16 +89,16 @@ public interface ISystemFileConstants // Select Directory dialog... 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_VERBIAGE = RESID_PREFIX+"SelectDirectory.verbiage."; //$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"; //$NON-NLS-1$ - public static final String RESID_SELECTFILE_VERBAGE = RESID_PREFIX+"SelectFile.verbage."; //$NON-NLS-1$ + public static final String RESID_SELECTFILE_VERBIAGE = RESID_PREFIX+"SelectFile.verbiage."; //$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"; //$NON-NLS-1$ - public static final String RESID_HOMEPROMPT_VERBAGE = RESID_PREFIX+"HomePrompt.verbage."; //$NON-NLS-1$ + public static final String RESID_HOMEPROMPT_VERBIAGE = RESID_PREFIX+"HomePrompt.verbiage."; //$NON-NLS-1$ public static final String RESID_HOMEPROMPT_PROMPT_ROOT = RESID_PREFIX+"HomePrompt.prompt."; //$NON-NLS-1$ // ------------------------- @@ -147,12 +147,12 @@ public interface ISystemFileConstants // ------------------------------- // Enter or select file form // ------------------------------- - 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$ + 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_VERBIAGE_LABEL = RESID_ENTER_OR_SELECT_FILE_PREFIX + "verbiage.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"; } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java index 8ce6063996f..97dbf62bed7 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemEnterOrSelectRemoteFileDialog.java @@ -69,12 +69,12 @@ public class SystemEnterOrSelectRemoteFileDialog extends SystemSelectRemoteFileO } /** - * Creates the select or enter file form. Sets the verbage of the form. + * Creates the select or enter file form. Sets the verbiage of the form. * @see org.eclipse.rse.files.ui.dialogs.SystemSelectRemoteFileOrFolderDialog#getForm(boolean) */ protected SystemSelectRemoteFileOrFolderForm getForm(boolean fileMode) { form = new SystemEnterOrSelectRemoteFileForm(getMessageLine(), this, fileMode); - form.setMessage(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_VERBAGE_LABEL); + form.setMessage(SystemFileResources.RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL); setOutputObject(null); return form; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java index 9af974d555f..8778e987271 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteArchiveDialog.java @@ -57,9 +57,9 @@ public class SystemRemoteArchiveDialog extends SystemRemoteFileDialog } - public String getVerbage() + public String getVerbiage() { - return SystemFileResources.RESID_SELECTFILE_VERBAGE; + return SystemFileResources.RESID_SELECTFILE_VERBIAGE; } public String getTreeTip() diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java index 4993d7fd5af..d238a5f1e3e 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFileDialog.java @@ -41,9 +41,9 @@ public class SystemRemoteFileDialog extends SystemRemoteResourceDialog } - public String getVerbage() + public String getVerbiage() { - return SystemFileResources.RESID_SELECTFILE_VERBAGE; + return SystemFileResources.RESID_SELECTFILE_VERBIAGE; } public String getTreeTip() diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java index 0a96eaf0047..683e0cdb8c3 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/dialogs/SystemRemoteFolderDialog.java @@ -56,9 +56,9 @@ public class SystemRemoteFolderDialog extends SystemRemoteFileDialog } - public String getVerbage() + public String getVerbiage() { - return SystemFileResources.RESID_SELECTDIRECTORY_VERBAGE; + return SystemFileResources.RESID_SELECTDIRECTORY_VERBIAGE; } public String getTreeTip() diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index 22b5f90a189..8962bc455d3 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -103,7 +103,7 @@ public class SystemSelectRemoteFileOrFolderForm protected static final int PROMPT_WIDTH = 400; // The maximum width of the dialog's prompt, in pixels. // GUI widgets - protected Label verbageLabel, spacer1, spacer2; + protected Label verbiageLabel, spacer1, spacer2; protected Text nameEntryValue; protected SystemViewForm tree; protected SystemPropertySheetForm ps; @@ -111,7 +111,7 @@ public class SystemSelectRemoteFileOrFolderForm protected Composite outerParent, ps_composite; // inputs protected ISystemRegistry sr = null; - protected String verbage = null; + protected String verbiage = null; protected String treeTip = null; protected String locationPrompt = ""; //$NON-NLS-1$ protected String fileTypes; @@ -171,7 +171,7 @@ public class SystemSelectRemoteFileOrFolderForm sr = RSEUIPlugin.getTheSystemRegistry(); // set default GUI - verbage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBAGE; + verbiage = fileMode ? SystemFileResources.RESID_SELECTFILE_VERBIAGE: SystemFileResources.RESID_SELECTDIRECTORY_VERBIAGE; treeTip = fileMode ? SystemFileResources.RESID_SELECTFILE_SELECT_TOOLTIP : SystemFileResources.RESID_SELECTDIRECTORY_SELECT_TOOLTIP; // create the input provider that drives the contents of the tree @@ -256,9 +256,9 @@ public class SystemSelectRemoteFileOrFolderForm */ public void setMessage(String message) { - this.verbage = message; - if (verbageLabel != null) - verbageLabel.setText(message); + this.verbiage = message; + if (verbiageLabel != null) + verbiageLabel.setText(message); } /** * Set the tooltip text for the remote systems tree from which an item is selected. @@ -698,9 +698,9 @@ public class SystemSelectRemoteFileOrFolderForm //((GridLayout)composite_prompts.getLayout()).margin... } - // MESSAGE/VERBAGE TEXT AT TOP - verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH); - //verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns); + // MESSAGE/VERBIAGE TEXT AT TOP + verbiageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbiage, gridColumns, false, PROMPT_WIDTH); + //verbiageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbiage, gridColumns); // SPACER LINE SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns); //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemFileNewConnectionWizardPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemFileNewConnectionWizardPage.java index 072548fe3aa..756830ac4d0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemFileNewConnectionWizardPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemFileNewConnectionWizardPage.java @@ -106,9 +106,9 @@ public class SystemFileNewConnectionWizardPage extends AbstractSystemNewConnecti Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns); - // Instructional verbage + // Instructional verbiage String text = null; - text = SystemResources.RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE1; + text = SystemResources.RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE1; //, // the following is default English text to use if the string is not found in the mri" // "To connect to your remote system, you must first copy and expand the supplied Java server code jar file on that system, and either manually start that server or the supplied daemon. You will find the instructions for this in the Help perspective. "); @@ -120,7 +120,7 @@ public class SystemFileNewConnectionWizardPage extends AbstractSystemNewConnecti SystemWidgetHelpers.createSpacerLine(composite_prompts, span, false); - text = SystemResources.RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE2; + text = SystemResources.RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE2; //, // the following is default English text to use if the string is not found in the mri" // "If you manually start the communications server, you will need to set the port number property for this connection. To do this, expand your newly created connection in the Remote System Explorer perspective. Right click on the Files subsystem and select Properties. You can specify the port to match the port you specified or were assigned for the server."); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java index a4010137105..c110b374dfe 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.java @@ -87,19 +87,19 @@ public class SystemFileResources extends NLS // Select Directory dialog... public static String RESID_SELECTDIRECTORY_TITLE; - public static String RESID_SELECTDIRECTORY_VERBAGE; + public static String RESID_SELECTDIRECTORY_VERBIAGE; public static String RESID_SELECTDIRECTORY_SELECT_LABEL; public static String RESID_SELECTDIRECTORY_SELECT_TOOLTIP; // Select File dialog... public static String RESID_SELECTFILE_TITLE; - public static String RESID_SELECTFILE_VERBAGE; + public static String RESID_SELECTFILE_VERBIAGE; public static String RESID_SELECTFILE_SELECT_LABEL; public static String RESID_SELECTFILE_SELECT_TOOLTIP; // Prompt for home folder dialog... public static String RESID_HOMEPROMPT_TITLE; - public static String RESID_HOMEPROMPT_VERBAGE; + public static String RESID_HOMEPROMPT_VERBIAGE; public static String RESID_HOMEPROMPT_PROMPT_LABEL; public static String RESID_HOMEPROMPT_PROMPT_TOOLTIP; @@ -165,7 +165,7 @@ public class SystemFileResources extends NLS // Enter or select file form // ------------------------------- public static String RESID_ENTER_OR_SELECT_FILE_TITLE; - public static String RESID_ENTER_OR_SELECT_FILE_VERBAGE_LABEL; + public static String RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL; public static String RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL; public static String RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP; public static String RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties index 508cba09c4e..b73033b1510 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/SystemFileResources.properties @@ -86,7 +86,7 @@ RESID_CHGFILEFILTERSTRING_TITLE=Change File Filter String # SELECT DIRECTORY DIALOG... #============================================================= RESID_SELECTDIRECTORY_TITLE=Browse For Folder -RESID_SELECTDIRECTORY_VERBAGE=Select a folder +RESID_SELECTDIRECTORY_VERBIAGE=Select a folder RESID_SELECTDIRECTORY_SELECT_LABEL=Selected folder: RESID_SELECTDIRECTORY_SELECT_TOOLTIP=Expand tree and select folder @@ -94,7 +94,7 @@ RESID_SELECTDIRECTORY_SELECT_TOOLTIP=Expand tree and select folder # SELECT FILE DIALOG... #============================================================= RESID_SELECTFILE_TITLE=Browse For File -RESID_SELECTFILE_VERBAGE=Select a file +RESID_SELECTFILE_VERBIAGE=Select a file RESID_SELECTFILE_SELECT_LABEL=Selected file: RESID_SELECTFILE_SELECT_TOOLTIP=Expand tree and select file @@ -103,7 +103,7 @@ RESID_SELECTFILE_SELECT_TOOLTIP=Expand tree and select file #============================================================= RESID_HOMEPROMPT_TITLE=Prompt For Home Folder -RESID_HOMEPROMPT_VERBAGE=Please enter or select your personal home folder for this remote system +RESID_HOMEPROMPT_VERBIAGE=Please enter or select your personal home folder for this remote system RESID_HOMEPROMPT_PROMPT_LABEL=Home folder RESID_HOMEPROMPT_PROMPT_TOOLTIP=Enter or select the folder assigned to your user ID @@ -128,7 +128,7 @@ RESID_PP_FILE_SIZE_VALUE=&1 bytes # ENTER OR SELECT FILE DIALOG... #============================================================= RESID_ENTER_OR_SELECT_FILE_TITLE= Specify File -RESID_ENTER_OR_SELECT_FILE_VERBAGE_LABEL= Enter or select a file +RESID_ENTER_OR_SELECT_FILE_VERBIAGE_LABEL= Enter or select a file RESID_ENTER_OR_SELECT_FILE_ENTER_LABEL= Enter parent folder: RESID_ENTER_OR_SELECT_FILE_ENTER_TOOLTIP= Enter the path of the parent folder RESID_ENTER_OR_SELECT_FILE_SELECT_TOOLTIP= Expand tree and select file or parent folder diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java index 724d6c5cef5..5d2a4e2c4c1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemProfileForm.java @@ -46,7 +46,7 @@ public class SystemProfileForm // GUI widgets protected Label profileLabel; - protected Control verbage; + protected Control verbiage; //protected Combo profileCombo; protected Text profileName; protected ISystemMessageLine msgLine; @@ -59,7 +59,7 @@ public class SystemProfileForm protected static final int profileNameLength = ValidatorProfileName.MAX_PROFILENAME_LENGTH; // state protected ISystemProfile profile; - private boolean showVerbage = true; + private boolean showVerbiage = true; private SystemMessage errorMessage = null; /** @@ -67,14 +67,14 @@ public class SystemProfileForm * @param msgLine A GUI widget capable of writing error messages to. * @param caller The wizardpage or dialog hosting this form. * @param profile The existing profile being updated, or null for New action. - * @param showVerbage Specify true to show first-time-user verbage. + * @param showVerbiage Specify true to show first-time-user verbiage. */ - public SystemProfileForm(ISystemMessageLine msgLine, Object caller, ISystemProfile profile, boolean showVerbage) + public SystemProfileForm(ISystemMessageLine msgLine, Object caller, ISystemProfile profile, boolean showVerbiage) { this.msgLine = msgLine; this.caller = caller; this.profile = profile; - this.showVerbage = showVerbage; + this.showVerbiage = showVerbiage; callerInstanceOfWizardPage = (caller instanceof WizardPage); callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); @@ -121,11 +121,11 @@ public class SystemProfileForm int nbrColumns = 2; Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns); - // VERBAGE LABEL - if (showVerbage) + // VERBIAGE LABEL + if (showVerbiage) { - verbage = SystemWidgetHelpers.createVerbiage( - composite_prompts, SystemResources.RESID_PROFILE_PROFILENAME_VERBAGE, nbrColumns, false, 200); + verbiage = SystemWidgetHelpers.createVerbiage( + composite_prompts, SystemResources.RESID_PROFILE_PROFILENAME_VERBIAGE, nbrColumns, false, 200); SystemWidgetHelpers.createLabel(composite_prompts, "", nbrColumns); // dummy line for spacing //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java index fc38e7293fc..6fdc5f6996a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.java @@ -72,13 +72,13 @@ public class SystemResources extends NLS // GENERIC MULTI-SELECT RENAME DIALOG... public static String RESID_RENAME_TITLE; public static String RESID_RENAME_SINGLE_TITLE; - public static String RESID_RENAME_VERBAGE; + public static String RESID_RENAME_VERBIAGE; public static String RESID_RENAME_COLHDG_OLDNAME; public static String RESID_RENAME_COLHDG_NEWNAME; public static String RESID_RENAME_COLHDG_TYPE; // SPECIALIZED PROMPTS FOR GENERIC RENAME DIALOG... - public static String RESID_MULTI_RENAME_PROFILE_VERBAGE; + public static String RESID_MULTI_RENAME_PROFILE_VERBIAGE; // GENERIC SINGLE-SELECT RENAME DIALOG... @@ -145,13 +145,13 @@ public class SystemResources extends NLS // GENERIC RESOURCE NAME COLLISION DIALOG... public static String RESID_COLLISION_RENAME_TITLE; - public static String RESID_COLLISION_RENAME_VERBAGE; + public static String RESID_COLLISION_RENAME_VERBIAGE; public static String RESID_COLLISION_RENAME_LABEL; public static String RESID_COLLISION_RENAME_TOOLTIP; // GENERIC SELECT CONNECTION DIALOG... public static String RESID_SELECTCONNECTION_TITLE; - public static String RESID_SELECTCONNECTION_VERBAGE; + public static String RESID_SELECTCONNECTION_VERBIAGE; // ------------------------- // WIZARD AND DIALOG STRINGS @@ -164,7 +164,7 @@ public class SystemResources extends NLS public static String RESID_NEWPROFILE_NAME_TOOLTIP; public static String RESID_NEWPROFILE_MAKEACTIVE_LABEL; public static String RESID_NEWPROFILE_MAKEACTIVE_TOOLTIP; - public static String RESID_NEWPROFILE_VERBAGE; + public static String RESID_NEWPROFILE_VERBIAGE; // RENAME DEFAULT PROFILE WIZARD PAGE... public static String RESID_RENAMEDEFAULTPROFILE_PAGE1_TITLE; @@ -173,7 +173,7 @@ public class SystemResources extends NLS public static String RESID_PROFILE_PROFILENAME_LABEL; public static String RESID_PROFILE_PROFILENAME_TIP; - public static String RESID_PROFILE_PROFILENAME_VERBAGE; + public static String RESID_PROFILE_PROFILENAME_VERBIAGE; // COPY SYSTEM PROFILE DIALOG... @@ -194,8 +194,8 @@ public class SystemResources extends NLS public static String RESID_NEWCONN_PAGE1_DESCRIPTION; public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_DESCRIPTION; public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_TITLE; - public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE1; - public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE2; + public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE1; + public static String RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE2; public static String RESID_NEWCONN_SUBSYSTEMPAGE_DESCRIPTION; public static String RESID_CONNECTION_TYPE_LABEL; @@ -293,13 +293,13 @@ public class SystemResources extends NLS // NAME PAGE (page 2) OF NEW FILTER WIZARD... public static String RESID_NEWFILTER_PAGE2_DESCRIPTION; - public static String RESID_NEWFILTER_PAGE2_NAME_VERBAGE; + public static String RESID_NEWFILTER_PAGE2_NAME_VERBIAGE; - public static String RESID_NEWFILTER_PAGE2_POOL_VERBAGE; + public static String RESID_NEWFILTER_PAGE2_POOL_VERBIAGE; - public static String RESID_NEWFILTER_PAGE2_POOL_VERBAGE_TIP; + public static String RESID_NEWFILTER_PAGE2_POOL_VERBIAGE_TIP; - public static String RESID_NEWFILTER_PAGE2_PROFILE_VERBAGE; + public static String RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE; public static String RESID_NEWFILTER_PAGE2_NAME_LABEL; public static String RESID_NEWFILTER_PAGE2_NAME_TOOLTIP; @@ -315,8 +315,8 @@ public class SystemResources extends NLS // INFO PAGE (page 3) OF NEW FILTER WIZARD... public static String RESID_NEWFILTER_PAGE3_DESCRIPTION; - public static String RESID_NEWFILTER_PAGE3_STRINGS_VERBAGE; - public static String RESID_NEWFILTER_PAGE3_POOLS_VERBAGE; + public static String RESID_NEWFILTER_PAGE3_STRINGS_VERBIAGE; + public static String RESID_NEWFILTER_PAGE3_POOLS_VERBIAGE; public static String RESID_FILTERALIAS_LABEL; public static String RESID_FILTERALIAS_TIP; @@ -392,7 +392,7 @@ public class SystemResources extends NLS // WORK WITH HISTORY DIALOG... public static String RESID_WORKWITHHISTORY_TITLE; - public static String RESID_WORKWITHHISTORY_VERBAGE; + public static String RESID_WORKWITHHISTORY_VERBIAGE; public static String RESID_WORKWITHHISTORY_PROMPT; public static String RESID_WORKWITHHISTORY_BUTTON_LABEL; public static String RESID_WORKWITHHISTORY_BUTTON_TIP; @@ -647,7 +647,7 @@ public class SystemResources extends NLS public static String RESID_PP_SUBSYSFACTORY_TYPES_LABEL; public static String RESID_PP_SUBSYSFACTORY_TYPES_TOOLTIP; - public static String RESID_PP_SUBSYSFACTORY_VERBAGE; + public static String RESID_PP_SUBSYSFACTORY_VERBIAGE; // REMOTE SERVER LAUNCH PROPERTIES PAGE... public static String RESID_PROP_SERVERLAUNCHER_MEANS; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties index e07d382a874..bf8e676eca8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemResources.properties @@ -158,13 +158,13 @@ RESID_SIMPLE_RENAME_PROFILE_PROMPT_TIP=Enter unique new name for this profile # MULTI-SELECT RENAME DIALOG... #============================================================= RESID_RENAME_TITLE=Rename Resources -RESID_RENAME_VERBAGE=Enter a unique new name for each resource. You can Tab between the names. +RESID_RENAME_VERBIAGE=Enter a unique new name for each resource. You can Tab between the names. #column headings... RESID_RENAME_COLHDG_OLDNAME=Resource RESID_RENAME_COLHDG_NEWNAME=New name RESID_RENAME_COLHDG_TYPE=Resource Type # SPECIALIZED PROMPTS FOR SPECIFIC TYPES OF RESOURCES... -RESID_MULTI_RENAME_PROFILE_VERBAGE=Enter unique new names for each profile +RESID_MULTI_RENAME_PROFILE_VERBIAGE=Enter unique new names for each profile #============================================================= # GENERIC DELETE DIALOG... @@ -212,7 +212,7 @@ RESID_MOVE_TARGET_FILTER_PROMPT=Select the filter to move into # GENERIC COPY/MOVE NAME-COLLISION DIALOG... #============================================================= RESID_COLLISION_RENAME_TITLE=Duplicate Name Collision -RESID_COLLISION_RENAME_VERBAGE=A resource named "&1" already exists. +RESID_COLLISION_RENAME_VERBIAGE=A resource named "&1" already exists. RESID_COLLISION_RENAME_LABEL=Rename to RESID_COLLISION_RENAME_TOOLTIP=Enter unique new resource name @@ -231,7 +231,7 @@ RESID_USERID_PER_SYSTEMTYPE_TOOLTIP=Enter default user ID to use for all connect # SELECT CONNECTION DIALOG... #============================================================= RESID_SELECTCONNECTION_TITLE=Select Connection -RESID_SELECTCONNECTION_VERBAGE=Select a connection +RESID_SELECTCONNECTION_VERBIAGE=Select a connection #============================================================= # NEW PROFILE WIZARD... @@ -239,7 +239,7 @@ RESID_SELECTCONNECTION_VERBAGE=Select a connection RESID_NEWPROFILE_TITLE=New RESID_NEWPROFILE_PAGE1_TITLE=Remote System Profile RESID_NEWPROFILE_PAGE1_DESCRIPTION=Define profile to hold connections -RESID_NEWPROFILE_VERBAGE=Profiles enable team support. They contain all the connections, filters, user actions and compile commands. Whenever these items are created, you are prompted for the profile to create them in. Whenever they are shown, the total from all active profiles are shown. By default, team members only have active their own profiles and the Team profile. +RESID_NEWPROFILE_VERBIAGE=Profiles enable team support. They contain all the connections, filters, user actions and compile commands. Whenever these items are created, you are prompted for the profile to create them in. Whenever they are shown, the total from all active profiles are shown. By default, team members only have active their own profiles and the Team profile. RESID_NEWPROFILE_NAME_LABEL=Name RESID_NEWPROFILE_NAME_TOOLTIP=Unique profile name RESID_NEWPROFILE_MAKEACTIVE_LABEL=Make active @@ -268,8 +268,8 @@ RESID_NEWCONN_PAGE1_DESCRIPTION=Define connection information RESID_NEWCONN_SUBSYSTEMPAGE_DESCRIPTION=Define subsystem information RESID_NEWCONN_SUBSYSTEMPAGE_FILES_TITLE=Communications Server RESID_NEWCONN_SUBSYSTEMPAGE_FILES_DESCRIPTION=How to install server support -RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE1=To connect to your remote system, you must first copy and expand the supplied Java server code jar file on that system, and either manually start that server or the supplied daemon. You will find the instructions for this in the Help. -RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBAGE2=If you manually start the communications server, you will need to set the port number property for this connection. To do this, expand your newly created connection in the Remote System Explorer perspective. Right click on the Files subsystem and select Properties. You can specify the port to match the port you specified or were assigned for the server. +RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE1=To connect to your remote system, you must first copy and expand the supplied Java server code jar file on that system, and either manually start that server or the supplied daemon. You will find the instructions for this in the Help. +RESID_NEWCONN_SUBSYSTEMPAGE_FILES_VERBIAGE2=If you manually start the communications server, you will need to set the port number property for this connection. To do this, expand your newly created connection in the Remote System Explorer perspective. Right click on the Files subsystem and select Properties. You can specify the port to match the port you specified or were assigned for the server. #============================================================= # RENAME PROFILE PAGE... @@ -278,7 +278,7 @@ RESID_RENAMEDEFAULTPROFILE_PAGE1_TITLE=Name personal profile RESID_RENAMEDEFAULTPROFILE_PAGE1_DESCRIPTION=Uniquely name user profile RESID_PROFILE_PROFILENAME_LABEL=Profile RESID_PROFILE_PROFILENAME_TIP=New name for the profile -RESID_PROFILE_PROFILENAME_VERBAGE=Welcome to Remote Systems. Connections can be sharable by the team or private to you. Enter a profile name to uniquely identify you from your team members. You will decide for each new connection whether it is owned by the team profile or your profile. +RESID_PROFILE_PROFILENAME_VERBIAGE=Welcome to Remote Systems. Connections can be sharable by the team or private to you. Enter a profile name to uniquely identify you from your team members. You will decide for each new connection whether it is owned by the team profile or your profile. #============================================================= # DUPLICATE PROFILE DIALOG... @@ -530,7 +530,7 @@ RESID_PP_FILTERSTRING_PROFILE_TOOLTIP=The profile that contains the filter pool # SUBSYSTEMFACTORY PROPERTIES PAGE... #============================================================= RESID_PP_SUBSYSFACTORY_TITLE=Properties for SubSystem Factory -RESID_PP_SUBSYSFACTORY_VERBAGE=A subsystem factory is responsible for creating and owning subsystem instances, one per connection typically. They may also contain, per profile, team-sharable artifacts. +RESID_PP_SUBSYSFACTORY_VERBIAGE=A subsystem factory is responsible for creating and owning subsystem instances, one per connection typically. They may also contain, per profile, team-sharable artifacts. RESID_PP_SUBSYSFACTORY_ID_LABEL=Identifier RESID_PP_SUBSYSFACTORY_ID_TOOLTIP=Unique identifier for this subsystem factory @@ -550,15 +550,15 @@ RESID_NEWFILTER_PAGE_TITLE=Filter RESID_NEWFILTER_PAGE1_DESCRIPTION=Create a new filter # PAGE 2 OF NEW FILTER WIZARD... RESID_NEWFILTER_PAGE2_DESCRIPTION=Name the new filter -RESID_NEWFILTER_PAGE2_NAME_VERBAGE=Filters are saved for easy re-use. Specify a unique name for this filter. This name will appear in the Remote Systems view, and will be expandable. -RESID_NEWFILTER_PAGE2_POOL_VERBAGE=Filters are created in filter pools, which are re-usable in multiple connections. Select the pool to create this filter in. The pool names are qualified by their profile name. -RESID_NEWFILTER_PAGE2_PROFILE_VERBAGE=Select a profile to own the new filter. This determines if it is unique to you, or sharable by the team. It will be placed in the default filter pool for that profile. -RESID_NEWFILTER_PAGE2_POOL_VERBAGE_TIP=Tip: too many filters? Turn on "Show filter pools in Remote Systems view". Select Preferences from the Window pulldown, then Remote Systems +RESID_NEWFILTER_PAGE2_NAME_VERBIAGE=Filters are saved for easy re-use. Specify a unique name for this filter. This name will appear in the Remote Systems view, and will be expandable. +RESID_NEWFILTER_PAGE2_POOL_VERBIAGE=Filters are created in filter pools, which are re-usable in multiple connections. Select the pool to create this filter in. The pool names are qualified by their profile name. +RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE=Select a profile to own the new filter. This determines if it is unique to you, or sharable by the team. It will be placed in the default filter pool for that profile. +RESID_NEWFILTER_PAGE2_POOL_VERBIAGE_TIP=Tip: too many filters? Turn on "Show filter pools in Remote Systems view". Select Preferences from the Window pulldown, then Remote Systems # PAGE 3 OF NEW FILTER WIZARD... RESID_NEWFILTER_PAGE3_DESCRIPTION=Additional Information -RESID_NEWFILTER_PAGE3_STRINGS_VERBAGE=Tip: Filters can contain multiple filter strings, although this wizard only prompts for one. To add more filter strings, select the filter in the Remote Systems view, and select the Change action from its pop-up menu. -RESID_NEWFILTER_PAGE3_POOLS_VERBAGE=Tip: Too many filters? Turn on "Show filter pools in Remote Systems view." Select Preferences from the Window pulldown, then Remote Systems. +RESID_NEWFILTER_PAGE3_STRINGS_VERBIAGE=Tip: Filters can contain multiple filter strings, although this wizard only prompts for one. To add more filter strings, select the filter in the Remote Systems view, and select the Change action from its pop-up menu. +RESID_NEWFILTER_PAGE3_POOLS_VERBIAGE=Tip: Too many filters? Turn on "Show filter pools in Remote Systems view." Select Preferences from the Window pulldown, then Remote Systems. RESID_FILTERALIAS_LABEL=Filter name: RESID_FILTERALIAS_TIP=Enter filter name unique for this filter pool @@ -692,7 +692,7 @@ RESID_WORKWITHFILTERPOOLS_PROMPT=Work with filter pools # WORK WITH HISTORY DIALOG... #============================================================= RESID_WORKWITHHISTORY_TITLE=Work With History -RESID_WORKWITHHISTORY_VERBAGE=Remove or re-order history for this GUI control +RESID_WORKWITHHISTORY_VERBIAGE=Remove or re-order history for this GUI control RESID_WORKWITHHISTORY_PROMPT=History RESID_WORKWITHHISTORY_BUTTON_LABEL=... RESID_WORKWITHHISTORY_BUTTON_TIP=Bring up the Work With History dialog diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java index 633eef2b7f6..fdf3e80f03a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemWidgetHelpers.java @@ -344,7 +344,7 @@ public class SystemWidgetHelpers { } /** - * Create a labeled verbage (wrappable label) field and insert it into a GridLayout, and assign tooltip text. + * Create a labeled verbiage (wrappable label) field and insert it into a GridLayout, and assign tooltip text. * After calling this, you must call setText on the result to set its contents. *
* If you need a handle to the prompting label, immediately call {@link #getLastLabel()} @@ -353,16 +353,16 @@ public class SystemWidgetHelpers { * @param labelText * @param tooltip * @param span Horizontal span - * @param border true if you want a border around the verbage + * @param border true if you want a border around the verbiage * @param widthHint number of pixels to limit width to before wrapping. 200 is a reasonable number * @return Label created. */ - public static Label createLabeledVerbage(Composite parent, String labelText, String tooltip, int span, boolean border, int widthHint) { + public static Label createLabeledVerbiage(Composite parent, String labelText, String tooltip, int span, boolean border, int widthHint) { previousLabel = createLabel(parent, appendColon(labelText)); - Label verbage = createVerbiage(parent, labelText, span, border, widthHint); + Label verbiage = createVerbiage(parent, labelText, span, border, widthHint); setToolTipText(previousLabel, tooltip); - setToolTipText(verbage, tooltip); - return verbage; + setToolTipText(verbiage, tooltip); + return verbiage; } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java index 265854371d2..cf9f4a31d83 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemBaseCopyAction.java @@ -141,7 +141,7 @@ public abstract class SystemBaseCopyAction extends SystemBaseDialogAction protected abstract String[] getOldNames(); protected abstract Object[] getOldObjects(); /** - * Get the verbage prompt to show on line one of the copy dialog + * Get the verbiage prompt to show on line one of the copy dialog */ protected String getPromptString() { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java index 387c842b93a..deefe438033 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCommonRenameAction.java @@ -55,7 +55,7 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction private boolean copyCollisionMode = false; private String newNames[]; private ISystemValidator nameValidator; - private String singleSelectionHelp, multiSelectionHelp, promptLabel, promptTip, verbage; + private String singleSelectionHelp, multiSelectionHelp, promptLabel, promptTip, verbiage; /** * Constructor when using a rename target @@ -105,11 +105,11 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction this.promptTip = tooltip; } /** - * Set the verbage to show at the top of the table, used when multi things are selected. The default is "Enter a new name for each resource" + * Set the verbiage to show at the top of the table, used when multi things are selected. The default is "Enter a new name for each resource" */ - public void setMultiSelectVerbage(String verbage) + public void setMultiSelectVerbiage(String verbiage) { - this.verbage = verbage; + this.verbiage = verbiage; } /** @@ -123,7 +123,7 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction /** * Indicate this dialog is the result of a copy/move name collision. - * Affects the title, verbage at the top of the dialog, and context help. + * Affects the title, verbiage at the top of the dialog, and context help. */ public void setCopyCollisionMode(boolean copyCollisionMode) { @@ -131,7 +131,7 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction } /** * Query if this dialog is the result of a copy/move name collision. - * Affects the title, verbage at the top of the dialog, and context help. + * Affects the title, verbiage at the top of the dialog, and context help. */ public boolean getCopyCollisionMode() { @@ -171,8 +171,8 @@ public class SystemCommonRenameAction extends SystemBaseDialogAction dlg.setNameValidator(nameValidator); if (multiSelectionHelp != null) dlg.setHelp(multiSelectionHelp); - if (verbage != null) - dlg.setVerbage(verbage); + if (verbiage != null) + dlg.setVerbiage(verbiage); return dlg; } // single-select diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java index 8fda6dee2f9..c2cd357f13c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRemoteResourceDialog.java @@ -48,7 +48,7 @@ public abstract class SystemRemoteResourceDialog extends SystemPromptDialog protected Control createInner(Composite parent) { - _form = new SystemResourceSelectionForm(getShell(), parent, this, _inputProvider, getVerbage(), _multipleSelectionMode, getMessageLine()); + _form = new SystemResourceSelectionForm(getShell(), parent, this, _inputProvider, getVerbiage(), _multipleSelectionMode, getMessageLine()); initForm(); createMessageLine(parent); return _form.getInitialFocusControl(); @@ -264,6 +264,6 @@ public abstract class SystemRemoteResourceDialog extends SystemPromptDialog } public abstract SystemActionViewerFilter getViewerFilter(); - public abstract String getVerbage(); + public abstract String getVerbiage(); public abstract String getTreeTip(); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java index f2b2931d66c..65c51b9acb3 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameDialog.java @@ -99,7 +99,7 @@ public class SystemRenameDialog extends SystemPromptDialog private boolean ignoreSelection = false; private Hashtable uniqueNameValidatorPerParent = new Hashtable(); - private String verbage; + private String verbiage; private SystemRenameTableProvider srtp; private Table table; @@ -187,11 +187,11 @@ public class SystemRenameDialog extends SystemPromptDialog setHelp(RSEUIPlugin.HELPPREFIX+"drnm0000"); //$NON-NLS-1$ } /** - * Set the verbage to show above the table. The default is "Enter new name for each resource" + * Set the verbiage to show above the table. The default is "Enter new name for each resource" */ - public void setVerbage(String verbage) + public void setVerbiage(String verbiage) { - this.verbage = verbage; + this.verbiage = verbiage; } /** * Set the validator for the new name,as supplied by the adaptor for name checking. @@ -230,10 +230,10 @@ public class SystemRenameDialog extends SystemPromptDialog int nbrColumns = 1; Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns); - if (verbage != null) - SystemWidgetHelpers.createVerbiage(composite, verbage, nbrColumns, false, 200); + if (verbiage != null) + SystemWidgetHelpers.createVerbiage(composite, verbiage, nbrColumns, false, 200); else - SystemWidgetHelpers.createVerbiage(composite, SystemResources.RESID_RENAME_VERBAGE, nbrColumns, false, 200); + SystemWidgetHelpers.createVerbiage(composite, SystemResources.RESID_RENAME_VERBIAGE, nbrColumns, false, 200); table = createTable(composite); tableViewer = new TableViewer(table); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java index 49fdbf32bba..2391ef46bc8 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.java @@ -89,7 +89,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog private String promptLabel, promptTip; private String newNameString; private String inputName = ""; //$NON-NLS-1$ - private Label resourceTypePrompt, resourceTypeValue, verbageLabel, renameLabel; + private Label resourceTypePrompt, resourceTypeValue, verbiageLabel, renameLabel; private SystemMessage errorMessage; private ISystemValidator nameValidator; private ValidatorUniqueString uniqueNameValidator; @@ -150,7 +150,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog /** * Indicate this dialog is the result of a copy/move name collision. - * Affects the title, verbage at the top of the dialog, and context help. + * Affects the title, verbiage at the top of the dialog, and context help. */ public void setCopyCollisionMode(boolean copyCollisionMode) { @@ -179,7 +179,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog } /** * Query if this dialog is the result of a copy/move name collision. - * Affects the title, verbage at the top of the dialog, and context help. + * Affects the title, verbiage at the top of the dialog, and context help. */ public boolean getCopyCollisionMode() { @@ -229,14 +229,14 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if (copyCollisionMode) { - // VERBAGE - verbageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //$NON-NLS-1$ + // VERBIAGE + verbiageLabel = SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //$NON-NLS-1$ SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$ } else if (description != null) { - // VERBAGE - verbageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns); + // VERBIAGE + verbiageLabel = SystemWidgetHelpers.createLabel(composite, description, nbrColumns); SystemWidgetHelpers.createLabel(composite, " ", nbrColumns); //filler //$NON-NLS-1$ } @@ -337,7 +337,7 @@ public class SystemRenameSingleDialog extends SystemPromptDialog if (copyCollisionMode) { - verbageLabel.setText(SystemMessage.sub(SystemResources.RESID_COLLISION_RENAME_VERBAGE, "&1", inputName)); //$NON-NLS-1$ + verbiageLabel.setText(SystemMessage.sub(SystemResources.RESID_COLLISION_RENAME_VERBIAGE, "&1", inputName)); //$NON-NLS-1$ } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWorkWithHistoryDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWorkWithHistoryDialog.java index 5352a9d5292..4fd02ec1851 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWorkWithHistoryDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemWorkWithHistoryDialog.java @@ -52,7 +52,7 @@ public class SystemWorkWithHistoryDialog extends SystemPromptDialog implements I private String[] historyInput; private String[] historyOutput; private String[] defaultHistory; - //private Label verbage; + //private Label verbiage; private List historyList; private Button rmvButton, clearButton, mupButton, mdnButton; private Group group; @@ -125,8 +125,8 @@ public class SystemWorkWithHistoryDialog extends SystemPromptDialog implements I int nbrColumns = 2; Composite composite = SystemWidgetHelpers.createComposite(parent, nbrColumns); - // verbage - /*verbage =*/ SystemWidgetHelpers.createLabel(composite,SystemResources.RESID_WORKWITHHISTORY_VERBAGE, nbrColumns); + // verbiage + /*verbiage =*/ SystemWidgetHelpers.createLabel(composite,SystemResources.RESID_WORKWITHHISTORY_VERBIAGE, nbrColumns); // History list init(composite, nbrColumns); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.java index c6ad81c1b4e..36b24b3b050 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.java @@ -61,7 +61,7 @@ public class SystemNewFilterAction protected boolean fromRSE = false; protected String[] defaultFilterStrings; protected String type = null; - protected String verbage = null; + protected String verbiage = null; protected String page1Description; protected String namePageHelp; protected ISystemFilterPoolSelectionValidator filterPoolSelectionValidator; @@ -158,7 +158,7 @@ public class SystemNewFilterAction * display name that is shown in the dropdown. *
* Of course, if you want to do this, then you will likely want to offer a different
- * label and tooltip for the prompt, and different verbage above the prompt. The
+ * label and tooltip for the prompt, and different verbiage above the prompt. The
* object this method accepts as a parameter encapsulates all that information, and
* there is a default class you can use for this.
*/
@@ -223,7 +223,7 @@ public class SystemNewFilterAction
/**
* Configuration method. Do not override.
* Call in order to not show the final info-only page of the wizard. Default is true.
- * @see #setVerbage(String)
+ * @see #setVerbiage(String)
*/
public void setShowInfoPage(boolean show)
{
@@ -231,12 +231,12 @@ public class SystemNewFilterAction
}
/**
* Configuration method. Do not override.
- * Set the verbage to show on the final page. By default, it shows a tip about creating multiple
+ * Set the verbiage to show on the final page. By default, it shows a tip about creating multiple
* filter strings via the Change action. Use this method to change that default.
*/
- public void setVerbage(String verbage)
+ public void setVerbiage(String verbiage)
{
- this.verbage = verbage;
+ this.verbiage = verbiage;
}
/**
* Configuration method. Do not override.
@@ -351,8 +351,8 @@ public class SystemNewFilterAction
wizard.setShowNamePrompt(showNamePrompt);
wizard.setShowInfoPage(showInfoPage);
wizard.setFromRSE(fromRSE);
- if (verbage != null)
- wizard.setVerbage(verbage);
+ if (verbiage != null)
+ wizard.setVerbiage(verbiage);
if (page1Description != null)
wizard.setPage1Description(page1Description);
if (filterPoolSelectionValidator != null)
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java
index 5b7ff29e868..474b895cf46 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/ISystemNewFilterWizardConfigurator.java
@@ -56,17 +56,17 @@ public interface ISystemNewFilterWizardConfigurator
*/
public String getPage2HelpID();
/**
- * Return the verbage for the name prompt on page 2
+ * Return the verbiage for the name prompt on page 2
*/
- public String getPage2NameVerbage();
+ public String getPage2NameVerbiage();
/**
- * Return the verbage for the pool prompt on page 3
+ * Return the verbiage for the pool prompt on page 3
*/
- public String getPage2PoolVerbage();
+ public String getPage2PoolVerbiage();
/**
- * Return the verbage tooltip for the name prompt on page 2
+ * Return the verbiage tooltip for the name prompt on page 2
*/
- public String getPage2PoolVerbageTip();
+ public String getPage2PoolVerbiageTip();
/**
* Return the label for the filter name
* prompt on page 2.
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java
index 516610a6488..060dcbaee50 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.java
@@ -80,7 +80,7 @@ public class SystemNewFilterWizard
protected ISystemFilterPool[] poolsToSelectFrom;
protected String type;
protected String[] defaultFilterStrings;
- //protected String verbage;
+ //protected String verbiage;
//protected String page1Description;
protected boolean showFilterStrings = true;
protected boolean showNamePrompt = true;
@@ -154,7 +154,7 @@ public class SystemNewFilterWizard
* display name that is shown in the dropdown.
*
* Of course, if you want to do this, then you will likely want to offer a different - * label and tooltip for the prompt, and different verbage above the prompt. The + * label and tooltip for the prompt, and different verbiage above the prompt. The * object this method accepts as a parameter encapsulates all that information, and * there is a default class you can use for this. */ @@ -262,13 +262,13 @@ public class SystemNewFilterWizard //RSEUIPlugin.logDebugMessage(this.getClass().getName(),"Inside setSystemFilterPoolReferenceManagerProvider. null? " + (provider==null)); } /** - * Set the verbage to show on the final page. By default, it shows a tip about creating multiple + * Set the verbiage to show on the final page. By default, it shows a tip about creating multiple * filter strings via the Change action. Use this method to change that default. */ - public void setVerbage(String verbage) + public void setVerbiage(String verbiage) { if (configurator instanceof SystemNewFilterWizardConfigurator) - ((SystemNewFilterWizardConfigurator)configurator).setPage3Tip1(verbage); + ((SystemNewFilterWizardConfigurator)configurator).setPage3Tip1(verbiage); } /** * Set the wizard page title. Using this makes it possible to avoid subclassing. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java index a3f9a7a6296..2757d0cdb8d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardConfigurator.java @@ -52,8 +52,8 @@ public class SystemNewFilterWizardConfigurator super(); this.pageTitle = pageTitle; this.page1Description = SystemResources.RESID_NEWFILTER_PAGE1_DESCRIPTION; - this.page3Tip1 = SystemResources.RESID_NEWFILTER_PAGE3_STRINGS_VERBAGE; - this.page3Tip2 = SystemResources.RESID_NEWFILTER_PAGE3_POOLS_VERBAGE; + this.page3Tip1 = SystemResources.RESID_NEWFILTER_PAGE3_STRINGS_VERBIAGE; + this.page3Tip2 = SystemResources.RESID_NEWFILTER_PAGE3_POOLS_VERBIAGE; this.page2Help = RSEUIPlugin.HELPPREFIX + "nfp20000"; //$NON-NLS-1$ } @@ -110,25 +110,25 @@ public class SystemNewFilterWizardConfigurator return page2Help; } /** - * Return the verbage for the name prompt on page 2 + * Return the verbiage for the name prompt on page 2 */ - public String getPage2NameVerbage() + public String getPage2NameVerbiage() { - return SystemResources.RESID_NEWFILTER_PAGE2_NAME_VERBAGE; + return SystemResources.RESID_NEWFILTER_PAGE2_NAME_VERBIAGE; } /** - * Return the verbage for the name prompt on page 2 + * Return the verbiage for the name prompt on page 2 */ - public String getPage2PoolVerbage() + public String getPage2PoolVerbiage() { - return SystemResources.RESID_NEWFILTER_PAGE2_POOL_VERBAGE; + return SystemResources.RESID_NEWFILTER_PAGE2_POOL_VERBIAGE; } /** - * Return the verbage tooltip for the name prompt on page 2 + * Return the verbiage tooltip for the name prompt on page 2 */ - public String getPage2PoolVerbageTip() + public String getPage2PoolVerbiageTip() { - return SystemResources.RESID_NEWFILTER_PAGE2_POOL_VERBAGE_TIP; + return SystemResources.RESID_NEWFILTER_PAGE2_POOL_VERBIAGE_TIP; } public String getPage2NamePromptLabel() diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java index 4a551373fa5..1a879d3ab85 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizardNamePage.java @@ -47,7 +47,7 @@ public class SystemNewFilterWizardNamePage protected Text nameText; protected Button uniqueCB; - protected Label poolVerbage; + protected Label poolVerbiage; protected Label poolComboLabel; protected Combo poolWrapperCombo; protected Combo poolCombo; @@ -118,7 +118,7 @@ public class SystemNewFilterWizardNamePage * display name that is shown in the dropdown. *
* Of course, if you want to do this, then you will likely want to offer a different - * label and tooltip for the prompt, and different verbage above the prompt. The + * label and tooltip for the prompt, and different verbiage above the prompt. The * object this method accepts as a parameter encapsulates all that information, and * there is a default class you can use for this. */ @@ -152,7 +152,7 @@ public class SystemNewFilterWizardNamePage int nbrColumns = 2; Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns); - SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2NameVerbage(), nbrColumns, false, 200); + SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2NameVerbiage(), nbrColumns, false, 200); nameText = SystemWidgetHelpers.createLabeledTextField(composite_prompts, null, configurator.getPage2NamePromptLabel(), configurator.getPage2NamePromptTooltip()); addSeparatorLine(composite_prompts, nbrColumns); @@ -174,8 +174,8 @@ public class SystemNewFilterWizardNamePage if (poolsToSelectFrom != null) { - poolVerbage = SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2PoolVerbage(), nbrColumns, false, 200); - poolVerbage.setToolTipText(configurator.getPage2PoolVerbageTip()); + poolVerbiage = SystemWidgetHelpers.createVerbiage(composite_prompts, configurator.getPage2PoolVerbiage(), nbrColumns, false, 200); + poolVerbiage.setToolTipText(configurator.getPage2PoolVerbiageTip()); poolCombo = SystemWidgetHelpers.createLabeledReadonlyCombo(composite_prompts, null, configurator.getPage2PoolPromptLabel(), configurator.getPage2PoolPromptTooltip()); poolComboLabel = SystemWidgetHelpers.getLastLabel(); String[] poolNames = new String[poolsToSelectFrom.length]; @@ -194,14 +194,14 @@ public class SystemNewFilterWizardNamePage poolCombo.addSelectionListener(this); if ((uniqueCB!=null) && uniqueCB.getSelection()) { - poolVerbage.setEnabled(false); + poolVerbiage.setEnabled(false); poolComboLabel.setEnabled(false); poolCombo.setEnabled(false); } } else if (poolWrapperInformation != null) { - poolVerbage = SystemWidgetHelpers.createVerbiage(composite_prompts, poolWrapperInformation.getVerbageLabel(), nbrColumns, false, 200); + poolVerbiage = SystemWidgetHelpers.createVerbiage(composite_prompts, poolWrapperInformation.getVerbiageLabel(), nbrColumns, false, 200); //poolWrapperCombo = SystemWidgetHelpers.createLabeledCombo(composite_prompts, null, poolWrapperInformation.getResourceBundle(), poolWrapperInformation.getPromptRBKey()); // d47323 poolWrapperCombo = SystemWidgetHelpers.createLabeledReadonlyCombo(composite_prompts, null, poolWrapperInformation.getPromptLabel(), poolWrapperInformation.getPromptTooltip()); poolComboLabel = SystemWidgetHelpers.getLastLabel(); @@ -221,7 +221,7 @@ public class SystemNewFilterWizardNamePage poolWrapperCombo.addSelectionListener(this); if ((uniqueCB!=null) && uniqueCB.getSelection()) { - poolVerbage.setEnabled(false); + poolVerbiage.setEnabled(false); poolComboLabel.setEnabled(false); poolWrapperCombo.setEnabled(false); } @@ -317,8 +317,8 @@ public class SystemNewFilterWizardNamePage else if (src == uniqueCB) { boolean selected = uniqueCB.getSelection(); - if (poolVerbage != null) - poolVerbage.setEnabled(!selected); + if (poolVerbiage != null) + poolVerbiage.setEnabled(!selected); if (poolCombo != null) poolCombo.setEnabled(!selected); if (poolWrapperCombo != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java index b9004933370..14d05211c62 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.java @@ -412,21 +412,21 @@ public abstract class SystemBasePropertyPage extends PropertyPage return field; } /** - * Create a labeled verbage field, where the field on the right grabs excess space and has an indent so it + * Create a labeled verbiage field, where the field on the right grabs excess space and has an indent so it * isn't smashed up against the prompt on the left. * @see SystemWidgetHelpers#createLabeledTextField(Composite, Listener, String, String) * @see #grabExcessSpace(Control) */ - protected Label createLabeledVerbage(Composite c, String label, String tooltip) + protected Label createLabeledVerbiage(Composite c, String label, String tooltip) { - Label verbage = SystemWidgetHelpers.createLabeledVerbage(c, label, tooltip, 1, false, 200); - GridData gd = (GridData)verbage.getLayoutData(); + Label verbiage = SystemWidgetHelpers.createLabeledVerbiage(c, label, tooltip, 1, false, 200); + GridData gd = (GridData)verbiage.getLayoutData(); if (gd != null) { gd.grabExcessHorizontalSpace = true; gd.horizontalIndent = 10; } - return verbage; + return verbiage; } // ----------------------------- // ISystemMessageLine methods... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java index 3ab5e3e464f..f5d5b5c1deb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java @@ -74,7 +74,7 @@ public class SystemTeamViewSubSystemConfigurationPropertyPage extends SystemBase // description addFillerLine(composite_prompts, nbrColumns); addSeparatorLine(composite_prompts, nbrColumns); - SystemWidgetHelpers.createVerbiage(composite_prompts, SystemResources.RESID_PP_SUBSYSFACTORY_VERBAGE, nbrColumns, false, 200); + SystemWidgetHelpers.createVerbiage(composite_prompts, SystemResources.RESID_PP_SUBSYSFACTORY_VERBIAGE, nbrColumns, false, 200); if (!initDone) doInitializeFields(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java index 6e925e6e34e..14798153529 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java @@ -667,7 +667,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda protected SystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation() { return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, - SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBAGE); + SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE); } /** * Overridable entry for child classes to supply their own "new" action(s) for creating a diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java index 065715bf887..87a0bd603fd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemResourceSelectionForm.java @@ -74,8 +74,8 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener protected Object caller; protected boolean callerInstanceOfWizardPage, callerInstanceOfSystemPromptDialog; - protected String _verbage = null; - protected Label verbageLabel; + protected String _verbiage = null; + protected Label verbiageLabel; private Composite _container; // history @@ -87,7 +87,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener public SystemResourceSelectionForm(Shell shell, Composite parent, Object caller, - SystemResourceSelectionInputProvider inputProvider, String verbage, + SystemResourceSelectionInputProvider inputProvider, String verbiage, boolean multipleSelection, ISystemMessageLine msgLine) { @@ -96,7 +96,7 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener _inputProvider = inputProvider; _multipleSelection = multipleSelection; _shell = shell; - _verbage = verbage; + _verbiage = verbiage; this.caller = caller; callerInstanceOfWizardPage = (caller instanceof WizardPage); callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); @@ -145,8 +145,8 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener } - // MESSAGE/VERBAGE TEXT AT TOP - verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, _verbage, gridColumns, false, PROMPT_WIDTH); + // MESSAGE/VERBIAGE TEXT AT TOP + verbiageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, _verbiage, gridColumns, false, PROMPT_WIDTH); boolean allowMultipleConnnections = _inputProvider.allowMultipleConnections(); @@ -297,9 +297,9 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener } } - public void setVerbage(String verbage) + public void setVerbiage(String verbiage) { - _verbage = verbage; + _verbiage = verbiage; } public boolean setPreSelection(Object selection) @@ -600,9 +600,9 @@ public class SystemResourceSelectionForm implements ISelectionChangedListener */ public void setMessage(String message) { - this._verbage = message; - if (verbageLabel != null) - verbageLabel.setText(message); + this._verbiage = message; + if (verbiageLabel != null) + verbiageLabel.setText(message); } /** * Set the tooltip text for the remote systems tree from which an item is selected. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java index ecc273c7e51..f3cc80e2d1e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewProfileAdapter.java @@ -123,7 +123,7 @@ public class SystemTeamViewProfileAdapter renameAction.setDialogMultiSelectionHelp(RSEUIPlugin.HELPPREFIX+"drnmprfl"); //$NON-NLS-1$ renameAction.setSingleSelectPromptLabel(SystemResources.RESID_SIMPLE_RENAME_PROFILE_PROMPT_LABEL, SystemResources.RESID_SIMPLE_RENAME_PROFILE_PROMPT_TIP); - renameAction.setMultiSelectVerbage(SystemResources.RESID_MULTI_RENAME_PROFILE_VERBAGE); + renameAction.setMultiSelectVerbiage(SystemResources.RESID_MULTI_RENAME_PROFILE_VERBIAGE); actionsCreated = true; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java index 33e2e7e6fc2..b4292988f9b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java @@ -73,14 +73,14 @@ public class SystemSelectConnectionForm extends SystemBaseForm protected static final int PROMPT_WIDTH = 200; // The maximum width of the dialog's prompt, in pixels. // GUI widgets - protected Label verbageLabel, spacer1, spacer2; + protected Label verbiageLabel, spacer1, spacer2; protected Text nameEntryValue; protected SystemViewForm tree; protected SystemPropertySheetForm ps; //protected ISystemMessageLine msgLine; protected Composite outerParent, ps_composite; // inputs - protected String verbage = null; + protected String verbiage = null; protected String[] systemTypes = null; protected IHost defaultConn; protected boolean allowNew = true; @@ -119,7 +119,7 @@ public class SystemSelectConnectionForm extends SystemBaseForm //callerInstanceOfSystemPromptDialog = (caller instanceof SystemPromptDialog); // set default GUI - verbage = SystemResources.RESID_SELECTCONNECTION_VERBAGE; + verbiage = SystemResources.RESID_SELECTCONNECTION_VERBIAGE; } // --------------------------------- @@ -166,9 +166,9 @@ public class SystemSelectConnectionForm extends SystemBaseForm */ public void setMessage(String message) { - this.verbage = message; - if (verbageLabel != null) - verbageLabel.setText(message); + this.verbiage = message; + if (verbiageLabel != null) + verbiageLabel.setText(message); } /** * Show the property sheet on the right hand side, to show the properties of the @@ -354,9 +354,9 @@ public class SystemSelectConnectionForm extends SystemBaseForm //((GridLayout)composite_prompts.getLayout()).margin... } - // MESSAGE/VERBAGE TEXT AT TOP - verbageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbage, gridColumns, false, PROMPT_WIDTH); - //verbageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbage, gridColumns); + // MESSAGE/VERBIAGE TEXT AT TOP + verbiageLabel = SystemWidgetHelpers.createVerbiage(composite_prompts, verbiage, gridColumns, false, PROMPT_WIDTH); + //verbiageLabel = SystemWidgetHelpers.createLabel(composite_prompts, verbiage, gridColumns); // SPACER LINE SystemWidgetHelpers.createLabel(composite_prompts, "", gridColumns); //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java index a830e066f8b..611f7a9218e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ConnectorServicesForm.java @@ -44,7 +44,7 @@ public class ConnectorServicesForm extends SystemBaseForm { private TreeViewer _serviceViewer; private SystemPropertySheetForm _propertiesViewer; - private Text _descriptionVerbage; + private Text _descriptionVerbiage; private String _serviceTooltip = SystemResources.RESID_SERVICESFORM_CONNECTORSERVICES_TOOLTIP; private String _propertiesTooltip = SystemResources.RESID_SERVICESFORM_PROPERTIES_TOOLTIP; @@ -96,15 +96,15 @@ public class ConnectorServicesForm extends SystemBaseForm descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); Label descriptionLabel = new Label(descriptionComposite, SWT.NONE); descriptionLabel.setText(SystemResources.RESID_PROPERTIES_DESCRIPTION_LABEL); - _descriptionVerbage = new Text(descriptionComposite, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP); - _descriptionVerbage.setText(getCurrentVerbage()); - _descriptionVerbage.setEditable(false); + _descriptionVerbiage = new Text(descriptionComposite, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP); + _descriptionVerbiage.setText(getCurrentVerbiage()); + _descriptionVerbiage.setEditable(false); GridData gridData = new GridData(); gridData.horizontalAlignment = GridData.FILL; gridData.grabExcessHorizontalSpace = true; gridData.widthHint = 150; gridData.verticalAlignment = GridData.BEGINNING; - _descriptionVerbage.setLayoutData(data); + _descriptionVerbiage.setLayoutData(data); sashComposite.setWeights(new int[] { 20, 30, 10 }); @@ -115,7 +115,7 @@ public class ConnectorServicesForm extends SystemBaseForm { ISelection selection = event.getSelection(); _propertiesViewer.selectionChanged(selection); - _descriptionVerbage.setText(getCurrentVerbage()); + _descriptionVerbiage.setText(getCurrentVerbiage()); } }); @@ -154,7 +154,7 @@ public class ConnectorServicesForm extends SystemBaseForm return true; } - protected String getCurrentVerbage() + protected String getCurrentVerbiage() { if (_serviceViewer == null) return ""; //$NON-NLS-1$ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java index 32ee34c3061..a5b2e3218a7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServicesForm.java @@ -58,7 +58,7 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener private String _serviceTooltip = SystemResources.RESID_SERVICESFORM_SERVICES_TOOLTIP; private String _propertiesTooltip = SystemResources.RESID_SERVICESFORM_PROPERTIES_TOOLTIP; - private Text _descriptionVerbage; + private Text _descriptionVerbiage; public ServicesForm(Shell shell, ISystemMessageLine msgLine) { @@ -121,12 +121,12 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener descriptionComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); Label descriptionLabel = new Label(descriptionComposite, SWT.NONE); descriptionLabel.setText(SystemResources.RESID_PROPERTIES_DESCRIPTION_LABEL); - _descriptionVerbage = new Text(parent, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP); - _descriptionVerbage.setText(getCurrentVerbage()); - _descriptionVerbage.setEditable(false); + _descriptionVerbiage = new Text(parent, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP); + _descriptionVerbiage.setText(getCurrentVerbiage()); + _descriptionVerbiage.setEditable(false); GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true); gridData.widthHint = 150; - _descriptionVerbage.setLayoutData(gridData); + _descriptionVerbiage.setLayoutData(gridData); _factoryViewer.addSelectionChangedListener(new ISelectionChangedListener() { @@ -139,7 +139,7 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener _factoryViewer.setChecked(ss.getFirstElement(), true); unCheckOthers((ServiceElement) ss.getFirstElement()); _serviceViewer.setInput(ss.getFirstElement()); - _descriptionVerbage.setText(getCurrentVerbage()); + _descriptionVerbiage.setText(getCurrentVerbiage()); } } }); @@ -150,7 +150,7 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener { ISelection selection = event.getSelection(); _propertiesViewer.selectionChanged(selection); - _descriptionVerbage.setText(getCurrentVerbage()); + _descriptionVerbiage.setText(getCurrentVerbiage()); } }); @@ -255,7 +255,7 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener _factoryViewer.setSelection(new StructuredSelection(element)); unCheckOthers(element); - _descriptionVerbage.setText(getCurrentVerbage()); + _descriptionVerbiage.setText(getCurrentVerbiage()); } protected void unCheckOthers(ServiceElement checkedElement) @@ -283,7 +283,7 @@ public class ServicesForm extends SystemBaseForm implements ICheckStateListener return _factoryViewer.getCheckedElements().length > 0; } - protected String getCurrentVerbage() + protected String getCurrentVerbiage() { String description = null; if (_serviceViewer != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java index e3c4b349eca..3311d7a102e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewProfileWizardMainPage.java @@ -90,10 +90,10 @@ public class SystemNewProfileWizardMainPage //SystemWidgetHelpers.setHelp(makeActiveCB, HELPID_PREFIX+"0002", HELPID_PREFIX+"0000"); SystemWidgetHelpers.setHelp(makeActiveCB, HELPID_PREFIX+"0002"); //$NON-NLS-1$ - // Verbage + // Verbiage addGrowableFillerLine(composite_prompts, nbrColumns); addSeparatorLine(composite_prompts, nbrColumns); - SystemWidgetHelpers.createVerbiage(composite_prompts, SystemResources.RESID_NEWPROFILE_VERBAGE, nbrColumns, false, 200); + SystemWidgetHelpers.createVerbiage(composite_prompts, SystemResources.RESID_NEWPROFILE_VERBIAGE, nbrColumns, false, 200); textName.addModifyListener( new ModifyListener() { diff --git a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java index b45e222d1ca..fc8f45013b6 100644 --- a/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java +++ b/rse/plugins/org.eclipse.rse.ui/filters/org/eclipse/rse/filters/SystemFilterPoolWrapperInformation.java @@ -27,7 +27,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation; * for the user to select a filter pool. Effectively, this prompting for * euphamisms to filter pools. This requires an array of wrapper objects, * and requires replacement mri for the pool prompt and tooltip text, and - * the verbage above it. + * the verbiage above it. *
* This is all encapsulated in this class. The information is set via setters * or constructor parameters. @@ -35,7 +35,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPoolWrapperInformation; public class SystemFilterPoolWrapperInformation implements ISystemFilterPoolWrapperInformation { - private String promptLabel, promptTooltip, verbageLabel; + private String promptLabel, promptTooltip, verbiageLabel; private Vector wrappers; private ISystemFilterPoolWrapper[] wrapperArray; private ISystemFilterPoolWrapper preSelectWrapper; @@ -43,11 +43,11 @@ public class SystemFilterPoolWrapperInformation /** * Constructor for SystemFilterPoolWrapperInformation. */ - public SystemFilterPoolWrapperInformation(String promptLabel, String promptTooltip, String verbageLabel) + public SystemFilterPoolWrapperInformation(String promptLabel, String promptTooltip, String verbiageLabel) { super(); this.promptLabel= promptLabel; - this.verbageLabel = verbageLabel; + this.verbiageLabel = verbiageLabel; this.promptLabel= promptTooltip; wrappers = new Vector(); } @@ -89,9 +89,9 @@ public class SystemFilterPoolWrapperInformation return promptTooltip; } - public String getVerbageLabel() + public String getVerbiageLabel() { - return verbageLabel; + return verbiageLabel; } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 3c7d10510d0..1db0f93fde5 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -1717,7 +1717,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration protected SystemFilterPoolWrapperInformation getNewFilterWizardPoolWrapperInformation() { return new SystemFilterPoolWrapperInformation(SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_LABEL, SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_TOOLTIP, - SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBAGE); + SystemResources.RESID_NEWFILTER_PAGE2_PROFILE_VERBIAGE); } /**