From e3f114f45b28e2b6c3bbf01b4f7a3f0d2ad0717e Mon Sep 17 00:00:00 2001 From: Xuan Chen Date: Thu, 11 Sep 2008 01:33:16 +0000 Subject: [PATCH] [246807] fix: [useractions] - Command Command property set from different os and subsystem are all shown as "Compile Commands" in Team view --- .../useractions/files/uda/UDActionSubsystemFiles.java | 3 ++- .../internal/useractions/ui/compile/SystemCompileProfile.java | 4 +++- .../rse/internal/useractions/ui/uda/SystemUDBaseManager.java | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDActionSubsystemFiles.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDActionSubsystemFiles.java index 92b16e9a73e..f96f6135819 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDActionSubsystemFiles.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/files/uda/UDActionSubsystemFiles.java @@ -11,6 +11,7 @@ package org.eclipse.rse.internal.useractions.files.uda; * IBM Corporation - initial API and implementation * Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View (cleanup some use action stuff) * Kevin Doyle (IBM) - [222830] ArrayIndexOutOfBoundsException on Restore Defaults on Folder User Actions + * Xuan Chen (IBM) - [246807] [useractions] - Command Command property set from different os and subsystem are all shown as "Compile Commands" in Team view *******************************************************************************/ import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -453,7 +454,7 @@ public class UDActionSubsystemFiles extends SystemUDActionSubsystem { if (null == userDefinedActionPropertySet) { userDefinedActionPropertySet = profile.createPropertySet(userDefinedActionPropertySetName); - userDefinedActionPropertySet.addProperty(ISystemUDAConstants.NAME_ATTR, ISystemUDAConstants.USER_DEFINED_ACTION_PROPRERTY_SET_Name); + userDefinedActionPropertySet.addProperty(ISystemUDAConstants.NAME_ATTR, ISystemUDAConstants.USER_DEFINED_ACTION_PROPRERTY_SET_Name + " - " + osType); //$NON-NLS-1$ userDefinedActionPropertySet.addProperty(ISystemUDAConstants.RELEASE_ATTR, ISystemUDAConstants.RELEASE_VALUE); userDefinedActionPropertySet.addProperty(ISystemUDAConstants.UDA_ROOT_ATTR, actionMgr.getDocumentRootTagName()); } diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java index 6f76b43aa31..b69bffa8fa2 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/compile/SystemCompileProfile.java @@ -12,6 +12,7 @@ * Xuan Chen (IBM) - [222263] Need to provide a PropertySet Adapter for System Team View (cleanup some use action stuff) * Xuan Chen (IBM) - [225617] [useraction][api] Remove Team view support inside user action. * Kevin Doyle (IBM) - [239701] [useractions] Compile types show up multiple times after adding a command + * Xuan Chen (IBM) - [246807] [useractions] - Command Command property set from different os and subsystem are all shown as "Compile Commands" in Team view *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.compile; @@ -496,7 +497,8 @@ public abstract class SystemCompileProfile { { compileCommandPropertySet = systemProfile.createPropertySet(compileCommandPropertySetName); //Set its name and type attributes - compileCommandPropertySet.addProperty(ISystemCompileXMLConstants.LABEL_ATTRIBUTE, ISystemCompileXMLConstants.COMPILE_COMMAND_NAME); + String compileCommandPropertySetLabel = ISystemCompileXMLConstants.COMPILE_COMMAND_NAME + " - " + osType; //$NON-NLS-1$ + compileCommandPropertySet.addProperty(ISystemCompileXMLConstants.LABEL_ATTRIBUTE, compileCommandPropertySetLabel); } // write type and compile commands for each for (int i = 0; i < types.size(); i++) { diff --git a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java index 2f7197e604e..1dd75639b06 100644 --- a/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java +++ b/rse/plugins/org.eclipse.rse.useractions/src/org/eclipse/rse/internal/useractions/ui/uda/SystemUDBaseManager.java @@ -17,6 +17,7 @@ * Kevin Doyle (IBM) - [240725] Add Null Pointer checking when there are no default user actions * Kevin Doyle (IBM) - [239702] Copy/Paste doesn't work with User Defined Actions and Named Types * Kevin Doyle (IBM) - [222829] MoveUp/Down Broken in Work with User Actions Dialog + * Xuan Chen (IBM) - [246807] [useractions] - Command Command property set from different os and subsystem are all shown as "Compile Commands" in Team view *******************************************************************************/ package org.eclipse.rse.internal.useractions.ui.uda; @@ -1039,7 +1040,7 @@ public abstract class SystemUDBaseManager implements IResourceChangeListener, IS if (udaRootPropertySet == null) { udaRootPropertySet = profile.createPropertySet(udaRootPropertySetName); - udaRootPropertySet.addProperty(ISystemUDAConstants.NAME_ATTR, ISystemUDAConstants.ACTION_FILETYPES); + udaRootPropertySet.addProperty(ISystemUDAConstants.NAME_ATTR, ISystemUDAConstants.ACTION_FILETYPES + " - " + osType); //$NON-NLS-1$ udaRootPropertySet.addProperty(ISystemUDAConstants.RELEASE_ATTR, CURRENT_RELEASE_NAME); udaRootPropertySet.addProperty(ISystemUDAConstants.UDA_ROOT_ATTR, getDocumentRootTagName()); }