diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html index 2e5c379bb48..7ff8df528df 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/other.html @@ -73,7 +73,7 @@ the information needed to enable them to in Remote System Explorer. class="samples.ui.propertypages.TeamFilterPropertyPage" id="samples.ui.pp.filter.team" objectClass="org.eclipse.rse.core.filters.ISystemFilterReference" > - <filter name="subsystemFactoryId" value="samples.subsystems.factory"/> + <filter name="subsystemConfigurationId" value="samples.subsystems.factory"/> </page> </extension> @@ -116,7 +116,7 @@ the information needed to enable them to in Remote System Explorer. <objectContribution id ="samples.ui.actions.TeamFilterActions" objectClass="org.eclipse.rse.core.filters.ISystemFilterReference"> - <filter name="subsystemFactoryId" value="samples.subsystems.factory"/> + <filter name="subsystemConfigurationId" value="samples.subsystems.factory"/> <action id="samples.ui.actions.TeamFilterAction1" label="Sample Team Filter Action" class="samples.ui.actions.ShowJarContents"> @@ -156,10 +156,10 @@ adapter reports that it has children or "false" if it doesn't have children.
  • "systemType". Will test the value for an exact match on the system type of this object's parent SystemConnection object. You can specify multiple values if you comma-separate them. -
  • "subsystemFactoryId". Will test the value for an exact match on the +
  • "subsystemConfigurationId". Will test the value for an exact match on the ID of the subsystem factory that created this object's subsystem. Returns false for SystemConnection objects. You can specify multiple values if you comma-separate them. -
  • "subsystemFactoryCategory". Will test the value for an exact match +
  • "subsystemConfigurationCategory". Will test the value for an exact match on the category of the subsystem factory that created this object's subsystem. You can specify multiple values if you comma-separate them. diff --git a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html index 5104abb0e3a..687e8620b76 100755 --- a/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html +++ b/rse/doc/org.eclipse.rse.doc.isv/guide/plugin/popup.html @@ -51,7 +51,7 @@ which scopes the remote objects to which the child elements apply: <objectContribution id ="samples.ui.actions.TeamFilterActions" objectClass="org.eclipse.rse.core.filters.ISystemFilterReference"> - <filter name="subsystemFactoryId" value="samples.subsystems.factory"/> + <filter name="subsystemConfigurationId" value="samples.subsystems.factory"/> <action id="samples.ui.actions.TeamFilterAction1" label="Sample Team Filter Action" class="samples.ui.actions.ShowJarContents"> diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 2be807c1663..6a5a49fdc78 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -18,6 +18,7 @@ * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() * Martin Oberhuber (Wind River) - [186748] Move ISubSystemConfigurationAdapter from UI/rse.core.subsystems.util + * Martin Oberhuber (Wind River) - [189163] Update IActionFilter constants from subsystemFactory to subsystemConfiguration ********************************************************************************/ package org.eclipse.rse.ui.view; @@ -1382,10 +1383,10 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda * returns true if the subsystem is offline. *
  • name="systemType". The given value is a system type, and this returns true if this object's connection is of that * type. You can specify multiple values by comma-separating them, and this returns if there is a match on any them. - *
  • name="subsystemFactoryId". The given value is a subsystem factory Id, and this returns true if this object's + *
  • name="subsystemConfigurationId". The given value is a subsystem factory Id, and this returns true if this object's * subsystem is from that subsystem factory. For connections, returns false. * You can specify multiple values by comma-separating them, and this returns if there is a match on any them. - *
  • name="subsystemFactoryCategory". The given value is a subsystem category, and this returns true if this object's + *
  • name="subsystemConfigurationCategory". The given value is a subsystem category, and this returns true if this object's * subsystem is from a subsystem factory of that category. For connections, returns false. * You can specify multiple values by comma-separating them, and this returns if there is a match on any them. * @@ -1476,7 +1477,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda } return false; } - else if (name.equalsIgnoreCase("subsystemFactoryId")) //$NON-NLS-1$ + else if (name.equalsIgnoreCase("subsystemConfigurationId")) //$NON-NLS-1$ { ISubSystem ss = getSubSystem(target); //System.out.println("ss null? " + (ss == null)); @@ -1494,7 +1495,7 @@ public abstract class AbstractSystemViewAdapter implements ISystemViewElementAda //System.out.println("Returning: " + ok); return ok; } - else if (name.equalsIgnoreCase("subsystemFactoryCategory")) //$NON-NLS-1$ + else if (name.equalsIgnoreCase("subsystemConfigurationCategory")) //$NON-NLS-1$ { ISubSystem ss = getSubSystem(target); if (ss == null)