Bug 495567 - promoted ISecondarySaveableSource to public APIM20160817-0420

Also updated API filters for org.eclipse.ui.workbench and
org.eclipse.ui.views, see bug 495567 comment  68 and bug 499164.

Change-Id: I95276209c199b1aadd250ff806d50ad8843a914a
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

6 files changed, 36 insertions, 8 deletions

diff --git a/bundles/org.eclipse.ui.views/.settings/.api_filters b/bundles/org.eclipse.ui.views/.settings/.api_filters
index beab339bd86..0919a26419f 100644
--- a/bundles/org.eclipse.ui.views/.settings/.api_filters
+++ b/bundles/org.eclipse.ui.views/.settings/.api_filters
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.ui.views" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="see bug 495567 comment  68 and bug 499164" id="924844039">
+            <message_arguments>
+                <message_argument value="3.8.101"/>
+                <message_argument value="3.8.100"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/ui/views/properties/PropertySheet.java" type="org.eclipse.ui.views.properties.PropertySheet">
-        <filter comment="See bug 495567" id="576725006">
+        <filter comment="see bug 495567 comment  68 and bug 499164" id="1141899266">
             <message_arguments>
-                <message_argument value="ISecondarySaveableSource"/>
-                <message_argument value="PropertySheet"/>
+                <message_argument value="3.9"/>
+                <message_argument value="3.8"/>
+                <message_argument value="isDirtyStateSupported()"/>
             </message_arguments>
         </filter>
     </resource>
diff --git a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
index 19cb34944e9..8210591305e 100644
--- a/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
+++ b/bundles/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheet.java
@@ -38,6 +38,7 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.ISaveablePart;
 import org.eclipse.ui.ISaveablesLifecycleListener;
+import org.eclipse.ui.ISecondarySaveableSource;
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewReference;
@@ -51,7 +52,6 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.Saveable;
 import org.eclipse.ui.SaveablesLifecycleEvent;
 import org.eclipse.ui.internal.DefaultSaveable;
-import org.eclipse.ui.internal.ISecondarySaveableSource;
 import org.eclipse.ui.internal.SaveablesList;
 import org.eclipse.ui.internal.views.properties.PropertiesMessages;
 import org.eclipse.ui.part.IContributedContentsView;
@@ -504,7 +504,8 @@ public class PropertySheet extends PageBookView
 	 * {@link IAdaptable} and return adapter to
 	 * {@link ISecondarySaveableSource}.
 	 *
-	 * @return returns {@code false} by default.
+	 * @return returns {@code false} if the dirty state indication behavior is
+	 *         not desired.
 	 * @since 3.9
 	 */
 	@Override
diff --git a/bundles/org.eclipse.ui.workbench/.settings/.api_filters b/bundles/org.eclipse.ui.workbench/.settings/.api_filters
index 660de6d5e07..d8c2028447e 100644
--- a/bundles/org.eclipse.ui.workbench/.settings/.api_filters
+++ b/bundles/org.eclipse.ui.workbench/.settings/.api_filters
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.ui.workbench" version="2">
+    <resource path="Eclipse UI/org/eclipse/ui/ISecondarySaveableSource.java" type="org.eclipse.ui.ISecondarySaveableSource">
+        <filter comment="see bug 495567 comment  68 and bug 499164" id="1108344834">
+            <message_arguments>
+                <message_argument value="3.109"/>
+                <message_argument value="3.108"/>
+                <message_argument value="org.eclipse.ui.ISecondarySaveableSource"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="Eclipse UI/org/eclipse/ui/dialogs/FileEditorMappingContentProvider.java" type="org.eclipse.ui.dialogs.FileEditorMappingContentProvider">
         <filter comment="Error in the API tooling" id="338792546">
             <message_arguments>
@@ -21,4 +30,12 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="see bug 495567 comment  68 and bug 499164" id="924844039">
+            <message_arguments>
+                <message_argument value="3.108.1"/>
+                <message_argument value="3.108.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ISecondarySaveableSource.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISecondarySaveableSource.java
index 499d8c63a50..f20830ad346 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ISecondarySaveableSource.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/ISecondarySaveableSource.java
@@ -9,10 +9,9 @@
  *     Andrey Loskutov <loskutov@gmx.de> - initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.ui.internal;
+package org.eclipse.ui;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ui.ISaveablePart;
 
 /**
  * Interface for parts providing an adapter to {@link ISaveablePart} objects
@@ -35,6 +34,7 @@ import org.eclipse.ui.ISaveablePart;
  * <p>
  * Per default, dirty state of "secondary" parts is ignored by the framework.
  *
+ * @since 3.109
  */
 public interface ISecondarySaveableSource {
 
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
index 058bcfac3f2..7e414b2f592 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
@@ -41,6 +41,7 @@ import org.eclipse.ui.ISaveablePart;
 import org.eclipse.ui.ISaveablePart2;
 import org.eclipse.ui.ISaveablesLifecycleListener;
 import org.eclipse.ui.ISaveablesSource;
+import org.eclipse.ui.ISecondarySaveableSource;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java
index b30948248bf..fb915e6033b 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/propertysheet/DirtyStatePropertySheetTest.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.ISaveablePart;
-import org.eclipse.ui.internal.ISecondarySaveableSource;
+import org.eclipse.ui.ISecondarySaveableSource;
 import org.eclipse.ui.views.properties.PropertySheet;
 import org.eclipse.ui.views.properties.PropertySheetPage;
 import org.junit.Test;