component.xml and API fine-tuning

5 files changed, 5 insertions, 8 deletions

diff --git a/org.eclipse.core.filebuffers/component.xml b/org.eclipse.core.filebuffers/component.xml
index b596871dfbc..73cee3cbb41 100644
--- a/org.eclipse.core.filebuffers/component.xml
+++ b/org.eclipse.core.filebuffers/component.xml
@@ -3,7 +3,7 @@
 <component xmlns="http://eclipse.org/component"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
-   name="Eclipse File Buffers">
+   name="File Buffers">
  <plugin id="org.eclipse.core.filebuffers"/>
 
  <package name="org.eclipse.core.filebuffers">
diff --git a/org.eclipse.jface.text/component.xml b/org.eclipse.jface.text/component.xml
index 6685aade63e..3ef6a852ecc 100644
--- a/org.eclipse.jface.text/component.xml
+++ b/org.eclipse.jface.text/component.xml
@@ -3,7 +3,7 @@
 <component xmlns="http://eclipse.org/component"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
-   name="Eclipse JFace Text">
+   name="JFace Text">
  <plugin id="org.eclipse.jface.text"/>
 
  <package name="org.eclipse.jface.contentassist">
@@ -86,7 +86,6 @@
    <type name="LineRange" subclass="false"/>
    <type name="MatchingCharacterPainter" subclass="false"/>
    <type name="OverviewRulerHoverManager" subclass="false" instantiate="false"/>
-   <type name="SourceViewer" subclass="false"/>
    <type name="VerticalRuler" subclass="false"/>
    <type name="VerticalRulerEvent"/>
    <type name="VisualAnnotationModel" subclass="false" instantiate="false"/>
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
index 5c359613679..0cabef61ea6 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
@@ -89,8 +89,7 @@ import org.eclipse.jface.text.projection.ChildDocumentManager;
  * in the widget token negotiation between the text viewer and all its potential
  * widget token keepers.
  * <p>
- * Clients should not subclass this class as it is rather likely that subclasses
- * will be broken by future releases.</p>
+ * This class is not intended to be subclassed outside the JFace Text component.</p>
  */
 public class TextViewer extends Viewer implements
 					ITextViewer, ITextViewerExtension, ITextViewerExtension2, ITextViewerExtension4, ITextViewerExtension6, IEditingSupportRegistry,
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
index 630ac045d93..2963424f610 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
@@ -65,8 +65,7 @@ import org.eclipse.jface.text.reconciler.IReconciler;
  * communicate with it exclusively using the <code>ISourceViewer</code>
  * interface.</p>
  * <p>
- * Clients should not subclass this class as it is rather likely that subclasses
- * will be broken by future releases.</p>
+ * Clients may subclass this class but should expect some breakage by future releases.</p>
  */
 public class SourceViewer extends TextViewer implements ISourceViewer, ISourceViewerExtension, ISourceViewerExtension2 {
 
diff --git a/org.eclipse.text/component.xml b/org.eclipse.text/component.xml
index bbd7cbb51a6..c7f766e422f 100644
--- a/org.eclipse.text/component.xml
+++ b/org.eclipse.text/component.xml
@@ -3,7 +3,7 @@
 <component xmlns="http://eclipse.org/component"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://eclipse.org/component ../component.xsd "
-   name="Eclipse Text">
+   name="Text">
  <plugin id="org.eclipse.text"/>
 
  <package name="org.eclipse.jface.text">