From 4a9fb5a754be46a2f6a0f1d113b0251425c479d7 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 7 Dec 2006 19:19:44 +0000 Subject: [PATCH] [142968] getting rid of IBM strings --- .../dstore/RexecDstoreServer.java | 2 +- .../model/ISystemPreferenceChangeEvents.java | 6 +- .../performance/PerformanceLogger.java | 1 - .../ISystemFileTransferModeRegistry.java | 1 - .../org.eclipse.rse.ui/HelpContexts.xml | 8 +- .../org.eclipse.rse.ui/schema/popupMenus.exsd | 82 ++------- .../schema/propertyPages.exsd | 51 +----- rse/tests/org.eclipse.rse.tests/test.xml | 172 +++++++++--------- 8 files changed, 109 insertions(+), 214 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java index 521336d74f0..54e601ecb4b 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java @@ -393,7 +393,7 @@ public class RexecDstoreServer implements IServerLauncher * @return port number as String */ /* - * There used to be a problem in IBM Communications Server for z/OS and + * There used to be a problem in Communications Server for z/OS and * the message from the REXEC daemon was in EBCDIC. see APAR PQ76782. * Since this problem was fixed in Communication Server, there is no need to convert EBCDIC to ASCII */ diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java index e938d0b17a1..cd3fca8eaf7 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemPreferenceChangeEvents.java @@ -41,9 +41,5 @@ public interface ISystemPreferenceChangeEvents * A connection type has been enabled or disabled */ public static final int EVENT_ENABLED_CONNECTIONS_CHANGED = 25; - - /** - * The range 10000-10999 is reserved for IBM product use. We'll find a way to - * register these eventually. - */ + } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.logging/src/org/eclipse/rse/logging/performance/PerformanceLogger.java b/rse/plugins/org.eclipse.rse.logging/src/org/eclipse/rse/logging/performance/PerformanceLogger.java index e69f2e7f5b4..ed771b7db6b 100644 --- a/rse/plugins/org.eclipse.rse.logging/src/org/eclipse/rse/logging/performance/PerformanceLogger.java +++ b/rse/plugins/org.eclipse.rse.logging/src/org/eclipse/rse/logging/performance/PerformanceLogger.java @@ -85,7 +85,6 @@ import org.w3c.dom.Element; public class PerformanceLogger { - public final static boolean _ENABLE_PERFORMANCE_LOGGING_IBM_INTERNAL_ = false; public final static int OPTION_GET_ALL = 1; public final static int OPTION_GET_FEATURE = 2; public final static int OPTION_GET_VERSION = 3; diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileTransferModeRegistry.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileTransferModeRegistry.java index 1478d110529..46799713f13 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileTransferModeRegistry.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/ISystemFileTransferModeRegistry.java @@ -28,7 +28,6 @@ public interface ISystemFileTransferModeRegistry extends ISystemFileTypes // Default text file names public static final String[] DEFAULT_TEXT_FILE_NAMES = {"application.xml", "build.properties", "fragment.xml", - "ibm-application-bnd.xmi", "ibm-application-ext.xmi", "install.xml", "plugin.xml", "server-cfg.xml", "web.xml"}; // Default text file types diff --git a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml index 1508f849218..c32bab0b85c 100644 --- a/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml +++ b/rse/plugins/org.eclipse.rse.ui/HelpContexts.xml @@ -701,8 +701,8 @@ The list on the left shows the existing user actions: The list on the left shows the existing named types: - To create a new type, select the "New" node at the top of the list, enter information in the edit pane on the right, and press the Create button. - To edit an existing type, select the type in the list, update the information in the edit pane on the right, and press the Apply button. -- To copy, paste, delete or re-order existing types, use the pop-up menu. -IBM-supplied types cannot be edited, but you can create a new type based on them by using copy and paste. +- To copy, paste, delete or re-order existing types, use the pop-up menu. +Supplied types cannot be edited, but you can create a new type based on them by using copy and paste. Enter a comma-separated list of file extensions or file names. For file names that have no extension, such as "makefile", specify ".null" for the extension, as in "makefile.null". @@ -717,7 +717,7 @@ IBM-supplied types cannot be edited, but you can create a new type based on them Move the selected action or type down in the list. -Restore the action or type to its values as originally supplied by IBM. +Restore the action or type to its original values. Use this dialog to create or edit compile commands that appear in the Compile pop-up menu for remote resources. Each active profile can contain unique compile commands, and all applicable commands from all active profiles are shown in the Compile menu. @@ -738,7 +738,7 @@ The list on the left shows the existing compile commands: Move the selected compile command down in the list. -Restore the compile command to its values as originally supplied by IBM. +Restore the compile command to its original values. diff --git a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd index 25ee07edc06..d3480ceac08 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/popupMenus.exsd @@ -198,19 +198,7 @@ declared defined with the specified category. <p> This category can be scalar, or it can be generic to match on -multiple subsystem configuration categories. The -categories of the IBM-supplied subsystem factories that display -remote resources in the Remote -Systems view are: -</p> -<ul> -<li><b>files</b>. For subsystems that list hierarchical file -system resources, such as folders and files. -<li><b>nativefiles</b>. For subsystems that list non-hierarchical file -system resources, such as in the iSeries QSYS file system. -<li><b>commands</b>. For subsystems that list remote commands. -<li><b>jobs</b>. For subsystems that list remote jobs. -</ul> +multiple subsystem configuration categories. <br> @@ -255,28 +243,7 @@ Specify as many of these optional filters like this as needed to explicitly scop This filter specifies a type category. Normally the subsystemconfigurationid is sufficient, but some subsystems display multiple types of resources, and these are categorized by a type name that can -be used to scope property pages. Here are the type categories supported by IBM- -supplied subsystems: -</p> -<ul> -<li><b>files</b>. For hierarchical file systems resources. -<li><b>commands</b>. For remote commands. -<li><b>jobs</b>. For remote jobs. -</ul> -<br> -The IBM-supplied subsystem for iSeries native file system objects also supports -these type categories: -<ul> -<li><b>LIBRARIES</b>. Set for libraries. -<li><b>OBJECTS</b>. Set for objects, excluding files. -<li><b>OBJECTFILES</b>. Set for file objects. Use <samp>OBJECTS*</samp> -to match on all objects. -<li><b>MEMBERS</b>. Set for data and source file members. -<li><b>RECORDS</b>. Set for record formats within files. -<li><b>FIELDS</b>. Set for fields within record formats. -<li><b>MESSAGE_DESCRIPTIONS</b>. Set for messages within message -files. -</ul> +be used to scope property pages. <br> @@ -291,18 +258,7 @@ all the actions defined in this objectContribution element. <p> This filter specifies a resource type, either simple or generic. -The resource types depends on the subsystem. The types -for IBM-supplied subsystems which support them are: -</p> -<ul> -<li><b>filesXXX</b>. Either <i>folder</i> or <i>file</i>. -<li><b>files400</b>. This is the object's type (for objects), -such as <i>*PGM</i>, or member's type (for members), -such as <i>RPGLE</i>. Since * is a valid character in an iSeries -object type, use %ast. instead of * to prevent wildcard matching. -For example, to prevent matching on both *PGM and *SRVPGM, use %ast.PGM -for the type. -</ul> +The resource types depends on the subsystem. <br> @@ -318,16 +274,6 @@ all the actions defined in this objectContribution element. <p> This filter specifies a simple or generic resource subtype to match. Not all subsystems support subtypes for their resources. -The IBM-supplied subsystems that do support this are: -</p> -<ul> -<li>FilesXXX. This can be either <i>subfolder</i> for nested -folders only, or -<i>root</i> for the root folder or Windows' drives. -<li>Files400. For iSeries objects within a library, this is the -object's attribute. For members, it is either <i>DTA</i> or <i>SRC</i>. -For fields, it is the field's datatype (a single character). -</ul> <br> @@ -341,8 +287,7 @@ Specify as many of these optional filters like this as needed to explicitly scop all the actions defined in this objectContribution element. <p> This filter specifies a simple or generic resource sub-subtype -to match. No IBM-supplied subsystems support sub-subtypes for -their resources today. +to match. </p> @@ -439,8 +384,8 @@ such as move up or move down. </ul> <p> -You may also desire to place your action in an IBM-supplied cascading menu. -To do this, for the ID-part, specify one of the following IBM-supplied menu IDs: +You may also desire to place your action in an supplied cascading menu. +To do this, for the ID-part, specify one of the following supplied menu IDs: <ul> <li><b>"menu.new"</b>. This is the cascading "New->" menu. <li><b>"menu.goto"</b>. This is the cascading "Goto->" menu. @@ -454,7 +399,7 @@ To do this, for the ID-part, specify one of the following IBM-supplied menu IDs: - + @@ -507,12 +452,12 @@ directory. A slash-delimited path that is used to specify the location of the the action in the popup menu. Each token in the path, except the last one, represents an existing submenu in the hierarchy, as defined via the <samp>id</samp> -attribute of a <samp>menu</samp> element previously defined. Alternatively, the ID of an IBM-supplied cascading +attribute of a <samp>menu</samp> element previously defined. Alternatively, the ID of a supplied cascading menu can be specified. The last token represents the named separator group into which the action will be added. -If no path is given, this must be an IBM-supplied group. +If no path is given, this must be a supplied group. <p> -See the comments for the path attribute of the menu element for a list of the IBM-supplied cascading menus, -and IBM-supplied separator groups. +See the comments for the path attribute of the menu element for a list of the supplied cascading menus, +and supplied separator groups. </p> <p> If a path is given, then this must match the name attribute of a <samp>separator</samp> sub-element @@ -562,7 +507,7 @@ F1 while the menu item is highlighted will display help for the given context ID Your action class that implements <samp>org.eclipse.ui.IObjectActionDelegate</samp>. -Typically you will extend one of the IBM-supplied classes, described in the API Information section. +Typically you will extend one of the supplied classes, described in the API Information section. @@ -724,8 +669,7 @@ are unrelated to each other: </extension> </pre> </p> -The following example shows how to place actions within an -IBM-supplied cascading menu: +The following example shows how to place actions within a supplied cascading menu: <h3>Example Five</h3> <p> diff --git a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd index 37353ea4316..89ecb3fb4db 100644 --- a/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd +++ b/rse/plugins/org.eclipse.rse.ui/schema/propertyPages.exsd @@ -139,7 +139,7 @@ You can specify multiple values if you comma-separate them. a fully qualified name of the class that implements <code>org.eclipse.ui.IWorkbenchPropertyPage</code>. -Or better yet, extends one of the IBM-supplied base classes, described in the API Information section. +Or better yet, extends one of the supplied base classes, described in the API Information section. @@ -242,28 +242,7 @@ Specify as many of these optional filters like this as needed to explicitly scop This filter specifies a type category. Normally the subsystemconfigurationid is sufficient, but some subsystems display multiple types of resources, and these are categorized by a type name that can -be used to scope property pages. Here are the type categories supported by IBM- -supplied subsystems: -</p> -<ul> -<li><b>files</b>. For hierarchical file systems resources. -<li><b>commands</b>. For remote commands. -<li><b>jobs</b>. For remote jobs. -</ul> -<br> -The IBM-supplied subsystem for iSeries native file system objects also supports -these type categories: -<ul> -<li><b>LIBRARIES</b>. Set for libraries. -<li><b>OBJECTS</b>. Set for objects, excluding files. -<li><b>OBJECTFILES</b>. Set for file objects. Use <samp>OBJECTS*</samp> -to match on all objects. -<li><b>MEMBERS</b>. Set for data and source file members. -<li><b>RECORDS</b>. Set for record formats within files. -<li><b>FIELDS</b>. Set for fields within record formats. -<li><b>MESSAGE_DESCRIPTIONS</b>. Set for messages within message -files. -</ul> +be used to scope property pages. <br> @@ -278,18 +257,7 @@ this property page element. <p> This filter specifies a resource type, either simple or generic. -The resource types depends on the subsystem. The types -for IBM-supplied subsystems which support them are: -</p> -<ul> -<li><b>filesXXX</b>. Either <i>folder</i> or <i>file</i>. -<li><b>files400</b>. This is the object's type (for objects), -such as <i>*PGM</i>, or member's type (for members), -such as <i>RPGLE</i>. Since * is a valid character in an iSeries -object type, use %ast. instead of * to prevent wildcard matching. -For example, to prevent matching on both *PGM and *SRVPGM, use %ast.PGM -for the type. -</ul> +The resource types depends on the subsystem. <br> @@ -305,16 +273,6 @@ this property page element. <p> This filter specifies a simple or generic resource subtype to match. Not all subsystems support subtypes for their resources. -The IBM-supplied subsystems that do support this are: -</p> -<ul> -<li>FilesXXX. This can be either <i>subfolder</i> for nested -folders only, or -<i>root</i> for the root folder or Windows' drives. -<li>Files400. For iSeries objects within a library, this is the -object's attribute. For members, this is either <i>DTA</i> or <i>SRC</i>. -For fields, this is the field's datatype (a single character). -</ul> <br> @@ -329,8 +287,7 @@ this property page element. <p> This filter specifies a simple or generic resource sub-subtype -to match. No IBM-supplied subsystems support sub-subtypes for -their resources today. +to match. </p> diff --git a/rse/tests/org.eclipse.rse.tests/test.xml b/rse/tests/org.eclipse.rse.tests/test.xml index f719961b5b1..5989bf7d283 100644 --- a/rse/tests/org.eclipse.rse.tests/test.xml +++ b/rse/tests/org.eclipse.rse.tests/test.xml @@ -1,86 +1,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +