From c58c969211c63d185838b7aaa2cc63300e84f34c Mon Sep 17 00:00:00 2001
From: David Dykstal <david_dykstal@us.ibm.com>
Date: Tue, 10 Mar 2009 21:25:32 +0000
Subject: [PATCH] [261486] [api] Interfaces declaring constants should be
 marked @noextend

---
 .../src/org/eclipse/rse/core/filters/ISystemFilter.java       | 2 ++
 .../org/eclipse/rse/core/filters/ISystemFilterContainer.java  | 2 ++
 .../rse/core/filters/ISystemFilterContainerReference.java     | 2 ++
 .../src/org/eclipse/rse/core/filters/ISystemFilterPool.java   | 2 ++
 .../eclipse/rse/core/filters/ISystemFilterPoolManager.java    | 2 ++
 .../rse/core/filters/ISystemFilterPoolManagerProvider.java    | 2 ++
 .../eclipse/rse/core/filters/ISystemFilterPoolReference.java  | 2 ++
 .../rse/core/filters/ISystemFilterPoolReferenceManager.java   | 2 ++
 .../filters/ISystemFilterPoolReferenceManagerProvider.java    | 2 ++
 .../rse/core/filters/ISystemFilterPoolSelectionValidator.java | 3 ++-
 .../eclipse/rse/core/filters/ISystemFilterPoolWrapper.java    | 2 ++
 .../rse/core/filters/ISystemFilterPoolWrapperInformation.java | 2 ++
 .../org/eclipse/rse/core/filters/ISystemFilterReference.java  | 2 ++
 .../org/eclipse/rse/core/filters/ISystemFilterStartHere.java  | 2 ++
 .../src/org/eclipse/rse/core/filters/ISystemFilterString.java | 2 ++
 .../rse/core/filters/ISystemFilterStringReference.java        | 2 ++
 .../src/org/eclipse/rse/core/model/IHost.java                 | 2 ++
 .../src/org/eclipse/rse/core/model/IPropertySetContainer.java | 2 ++
 .../src/org/eclipse/rse/core/model/IRSEModelObject.java       | 2 ++
 .../org/eclipse/rse/core/model/IRSEPersistableContainer.java  | 2 ++
 .../src/org/eclipse/rse/core/model/ISystemContainer.java      | 4 +++-
 .../src/org/eclipse/rse/core/model/ISystemContentsType.java   | 2 ++
 .../src/org/eclipse/rse/core/model/ISystemHostPool.java       | 2 ++
 .../eclipse/rse/core/model/ISystemModifiableContainer.java    | 2 ++
 .../src/org/eclipse/rse/core/model/ISystemResourceSet.java    | 2 ++
 .../core/references/IRSEBasePersistableReferenceManager.java  | 2 ++
 .../core/references/IRSEBasePersistableReferencedObject.java  | 2 ++
 .../core/references/IRSEBasePersistableReferencingObject.java | 2 ++
 .../eclipse/rse/core/references/IRSEBaseReferencedObject.java | 2 ++
 .../rse/core/references/IRSEBaseReferencingObject.java        | 2 ++
 .../rse/core/references/IRSEPersistableReferencedObject.java  | 2 ++
 .../rse/core/references/IRSEPersistableReferencingObject.java | 2 ++
 .../org/eclipse/rse/core/references/IRSEReferencedObject.java | 2 ++
 .../eclipse/rse/core/references/IRSEReferencingObject.java    | 2 ++
 .../org/eclipse/rse/core/subsystems/IConnectorService.java    | 2 ++
 .../eclipse/rse/core/subsystems/IConnectorServiceManager.java | 2 ++
 .../UI/org/eclipse/rse/ui/view/IContextObject.java            | 2 ++
 37 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
index fc7017112df..2abfa1f8603 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilter.java
@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -33,6 +34,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  * 
  * @noimplement This interface is not intended to be implemented by clients. The
  *              allowable implementations already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 
 public interface ISystemFilter extends IRSEReferencedObject, ISystemFilterContainer, IRSEModelObject {
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
index beb582b31f6..97847970649 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainer.java
@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 package org.eclipse.rse.core.filters;
 
@@ -24,6 +25,7 @@ import org.eclipse.rse.core.model.IRSEPersistableContainer;
  * This includes filter pools and filters themselves.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterContainer extends IRSEPersistableContainer {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
index a1d00bd1160..c60cd6d1448 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterContainerReference.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -33,6 +34,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  * implement this interface and hence these methods.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterContainerReference {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
index 521f1f2cb1d..67b620afce1 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPool.java
@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
  * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -28,6 +29,7 @@ import org.eclipse.rse.core.references.IRSEPersistableReferencedObject;
  * grouping filters to be referenced together.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPool extends IRSEPersistableReferencedObject, ISystemFilterContainer, IRSEModelObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
index 1734aa44a82..db25441150a 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManager.java
@@ -18,6 +18,7 @@
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
  * David Dykstal (IBM) - [235800] Document naming restriction for profiles and filter pools
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -35,6 +36,7 @@ import org.eclipse.rse.core.model.ISystemProfile;
  * all changes are saved to disk, and events are fired properly.
  * 
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolManager extends IRSEPersistableContainer {
 	// ---------------------------------
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
index 4965bdf03c4..4bece5864d8 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolManagerProvider.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -33,6 +34,7 @@ import org.eclipse.core.runtime.IAdaptable;
  * callbacks that done to the provider for every interesting event. Should you 
  * not care about these, supply empty shells for these methods.
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolManagerProvider extends IAdaptable {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
index 08bef15678c..15ad55df801 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReference.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -27,6 +28,7 @@ import org.eclipse.rse.core.references.IRSEPersistableReferencingObject;
  * of their reference count.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolReference extends IRSEPersistableReferencingObject, ISystemFilterContainerReference, IRSEModelObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
index e1a69ad495d..ee68c943879 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManager.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -27,6 +28,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  * classes in the filters framework.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolReferenceManager extends IRSEBasePersistableReferenceManager {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
index b5471a45658..c87a469f603 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolReferenceManagerProvider.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -32,6 +33,7 @@ package org.eclipse.rse.core.filters;
  * not care about these, supply empty shells for these methods.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolReferenceManagerProvider {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
index d47db9deb37..af643f0c6f8 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolSelectionValidator.java
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -23,7 +24,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
  * An interface required if you wish to be called back by the system filter
  * wizard, when the user selects a target filter pool.
  * 
- * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolSelectionValidator {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
index efdf03d80d3..948b7ab729c 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapper.java
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -22,6 +23,7 @@ package org.eclipse.rse.core.filters;
  * the user to select a filter pool.
  * 
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolWrapper {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
index ead44d69ada..823ec0ff35c 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterPoolWrapperInformation.java
@@ -14,6 +14,7 @@
  * Contributors:
  * David McKnight   (IBM)        - [225506] [api][breaking] RSE UI leaks non-API types
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -29,6 +30,7 @@ package org.eclipse.rse.core.filters;
  * that implements all this and is populated via setters.
  * 
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterPoolWrapperInformation {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
index 1c5b8cca870..9f7062137fe 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterReference.java
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -28,6 +29,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  *
  * @noimplement This interface is not intended to be implemented by clients. The
  *              allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterReference extends IRSEReferencingObject, ISystemFilterContainerReference, ISystemContainer {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
index 940fc5a1d4b..362e843f439 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStartHere.java
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 package org.eclipse.rse.core.filters;
 
@@ -18,6 +19,7 @@ import org.eclipse.rse.logging.Logger;
 /**
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterStartHere {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
index 10362d2f891..61500111fcc 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterString.java
@@ -14,6 +14,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - Cleanup Javadoc.
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -30,6 +31,7 @@ import org.eclipse.rse.core.references.IRSEBaseReferencedObject;
  *  string in a domain-friendly way.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterString extends IRSEBaseReferencedObject, IAdaptable, IRSEModelObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java
index 32770f65726..1478fcd7d57 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/filters/ISystemFilterStringReference.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE Javadocs where extend / implement is allowed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.filters;
@@ -24,6 +25,7 @@ import org.eclipse.rse.core.references.IRSEBaseReferencingObject;
  * Needed so the UI can show the same filter string multiple times.
  * @noimplement This interface is not intended to be implemented by clients.
  * The allowable implementations are already present in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemFilterStringReference extends IRSEBaseReferencingObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
index 912f64afaa1..16923695d5f 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IHost.java
@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [206742] Make SystemHostPool thread-safe
  * David Dykstal (IBM) - [197036] cleaned javddoc for getConnectorServices()
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -33,6 +34,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  * object oriented containment.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IHost extends IAdaptable, IRSEModelObject {
 	
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
index d19416f1f89..37ae1225344 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IPropertySetContainer.java
@@ -14,6 +14,7 @@
  * Contributors:
  * Johann Draschwandtner (Wind River) - [227509][apidoc] Add note how to persist property sets
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -24,6 +25,7 @@ package org.eclipse.rse.core.model;
  * one container.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IPropertySetContainer {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
index f490fe1d34c..05a457e4de9 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEModelObject.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -21,6 +22,7 @@ package org.eclipse.rse.core.model;
 /**
  * IRSEModelObject is the root type of all objects in the RSE model.
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  * The standard implementations are included in the framework. 
  */
 public interface IRSEModelObject extends IPropertySetContainer, IRSEPersistableContainer {
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
index dc24359c398..08ea7a55eb7 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/IRSEPersistableContainer.java
@@ -14,6 +14,7 @@
  * David Dykstal (IBM) - adding new persistence support
  * David Dykstal (IBM) - 142806: refactoring persistence framework
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -27,6 +28,7 @@ package org.eclipse.rse.core.model;
  * in the parent chain from SystemFilterPool to SystemProfile.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework. 
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEPersistableContainer {
 	
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
index 20fedfacde2..69a4ef8169c 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContainer.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -21,7 +22,8 @@ package org.eclipse.rse.core.model;
  * ISystemContainer is an interface implemented by objects that can contain remote resources.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
- * These can be extended by clients.
+ * These implementations can be extended by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemContainer {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
index 2ec0698d1ce..3d512c7a913 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemContentsType.java
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -22,6 +23,7 @@ package org.eclipse.rse.core.model;
  * can be stored in an IRemoteContainer.
  * 
  * @noimplement This interface is not intended to be implemented by clients.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemContentsType {
 	/*
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
index a778552e3fc..e3e05167239 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemHostPool.java
@@ -15,6 +15,7 @@
  * Martin Oberhuber (Wind River) - [210534] Remove ISystemHostPool.getHostList() and setName()
  * David Dykstal (IBM) - [210537] removed exception signalling from this interface, no longer needed
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -32,6 +33,7 @@ import org.eclipse.rse.core.IRSEUserIdConstants;
  * </p>
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemHostPool extends IRSEPersistableContainer {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java
index 2afd3de4991..16ca9d1ee1d 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemModifiableContainer.java
@@ -7,6 +7,7 @@
  * Contributors:
  * David Dykstal (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *********************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -16,6 +17,7 @@ package org.eclipse.rse.core.model;
  * 
  * @noimplement This interface is not intended to be implemented by clients. The
  *              standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  *
  * @since org.eclipse.rse.core 3.0
  */
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
index 80d5b96c442..90d74ad01c5 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemResourceSet.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup to RSE javadocs for extend / implement
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.model;
@@ -27,6 +28,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessage;
  * may be remote RSE resources, or local workspace resources. 
  * @noimplement This interface is not intended to be implemented by clients.
  * Extend {@link AbstractSystemResourceSet} instead.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface ISystemResourceSet {
 	
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java
index 6558e01655a..7d152252211 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferenceManager.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -50,6 +51,7 @@ package org.eclipse.rse.core.references;
  * your containing class instance.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEBasePersistableReferenceManager {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
index 8e024144dd3..00054aa2905 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencedObject.java
@@ -12,6 +12,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -41,6 +42,7 @@ package org.eclipse.rse.core.references;
  *
  * @noimplement This interface is not intended to be implemented by clients. The
  *              standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEBasePersistableReferencedObject extends IRSEBaseReferencedObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java
index f01dbdae0e9..dafbde07f78 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBasePersistableReferencingObject.java
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -41,6 +42,7 @@ package org.eclipse.rse.core.references;
  *
  * @noimplement This interface is not intended to be implemented by clients. The
  *              standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEBasePersistableReferencingObject extends IRSEBaseReferencingObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
index d9e1728a72f..4bba4c0aa83 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencedObject.java
@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - Cleanup Javadoc.
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -21,6 +22,7 @@ package org.eclipse.rse.core.references;
  * Interface that any master object that is referenced must implement.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEBaseReferencedObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
index 6fb93c2f646..a8d72c9aa4e 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEBaseReferencingObject.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -26,6 +27,7 @@ package org.eclipse.rse.core.references;
  * This interface captures the simple set of methods such a shadow must implement.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEBaseReferencingObject {
 	/**
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java
index 1610d264091..a977babc2d2 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencedObject.java
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -21,6 +22,7 @@ package org.eclipse.rse.core.references;
  * point to this object, and a copy of this object's unique name or key (for storing on disk).
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 
 public interface IRSEPersistableReferencedObject extends IRSEReferencedObject, IRSEBasePersistableReferencedObject {
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java
index b018a29413f..9e913d4e4cd 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEPersistableReferencingObject.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -36,6 +37,7 @@ package org.eclipse.rse.core.references;
  * <b>YOU MUST OVERRIDE resolveReferencesAfterRestore IN YOUR REFERENCE MANAGER SUBCLASS</b>
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEPersistableReferencingObject extends IRSEReferencingObject, IRSEBasePersistableReferencingObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
index e51907bf68e..ce3d6dfd567 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencedObject.java
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -27,6 +28,7 @@ package org.eclipse.rse.core.references;
  * by the subtype IRSEPersistableReferencedObject.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEReferencedObject extends IRSEBaseReferencedObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java
index bd22ed2b154..fa79e3f5098 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/references/IRSEReferencingObject.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David Dykstal (IBM) - [226561] Add API markup for noextend / noimplement where needed
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.references;
@@ -29,6 +30,7 @@ package org.eclipse.rse.core.references;
  * by the subclass SystemPersistableReferencingObject.
  * @noimplement This interface is not intended to be implemented by clients.
  * The standard implementations are included in the framework.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IRSEReferencingObject extends IRSEBaseReferencingObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
index 7d8eda577d2..5e791fc87c5 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorService.java
@@ -18,6 +18,7 @@
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
  * David Dykstal (IBM) - [210474] Deny save password function missing
  * David Dykstal (IBM) - [225089][ssh][shells][api] Canceling connection leads to exception
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  ********************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
@@ -50,6 +51,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
  * @noimplement This interface is not intended to be implemented by clients.
  *              Clients should subclass {@link AbstractConnectorService}
  *              instead.
+ * @noextend This interface is not intended to be extended by clients.
  */
 public interface IConnectorService extends IRSEModelObject {
 
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorServiceManager.java
index 33619c855e0..a016207613f 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorServiceManager.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IConnectorServiceManager.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * Martin Oberhuber (Wind River) - [cleanup] Add API "since" Javadoc tags
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 
 package org.eclipse.rse.core.subsystems;
@@ -25,6 +26,7 @@ import org.eclipse.rse.core.model.IHost;
  * @noimplement This interface is not intended to be implemented by clients.
  *              Clients should subclass {@link AbstractConnectorServiceManager}
  *              instead.
+ * @noextend This interface is not intended to be extended by clients.       
  */
 public interface IConnectorServiceManager {
 	IConnectorService getConnectorService(IHost host, Class commonSSinterface);
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/IContextObject.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/IContextObject.java
index effa3680fac..99f500fd053 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/IContextObject.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/IContextObject.java
@@ -11,6 +11,7 @@
  *
  * Contributors:
  * David McKnight   (IBM)        - [187739] [refresh] Sub Directories are collapsed when Parent Directory is Refreshed on Remote Systems
+ * David Dykstal (IBM) - [261486][api] add noextend to interfaces that require it
  *******************************************************************************/
 package org.eclipse.rse.ui.view;
 
@@ -29,6 +30,7 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
  *
  * @noimplement This interface is not intended to be implemented by clients
  *              (this message added in RSE 3.0.1).
+ * @noextend This interface is not intended to be extended by clients.      
  */
 public interface IContextObject
 {