Bug 546820 - Mark deprecated observable factory classes for deletion

The observable factory classes have been obsolete since the databinding
framework was transitioned to work with property classes in 2014.

* This change marks those classes for deletion
* It also deprecates some classes that was overlooked in 2014
* Minor version of the affected bundles are updated
* API problem filters for the resulting build issues are added

Change-Id: I4589d79c70c983c7e52bb13fb8a1bb62a46d3953
Signed-off-by: Jens Lidestrom <jens@lidestrom.se>
diff --git a/bundles/org.eclipse.core.databinding.beans/.settings/.api_filters b/bundles/org.eclipse.core.databinding.beans/.settings/.api_filters
index b6e97a3..323bf6e 100644
--- a/bundles/org.eclipse.core.databinding.beans/.settings/.api_filters
+++ b/bundles/org.eclipse.core.databinding.beans/.settings/.api_filters
@@ -1,12 +1,266 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.core.databinding.beans" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="Bug 546820 -  Mark deprecated observable factory classes for deletion" id="923795461">
+            <message_arguments>
+                <message_argument value="1.7.0"/>
+                <message_argument value="1.6.100"/>
+            </message_arguments>
+        </filter>
         <filter comment="Bug 549659 - API change was not detected by tooling" id="926941240">
             <message_arguments>
                 <message_argument value="1.6.100"/>
                 <message_argument value="1.5.100"/>
             </message_arguments>
         </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="926941240">
+            <message_arguments>
+                <message_argument value="1.7.0"/>
+                <message_argument value="1.6.100"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/core/databinding/beans/BeansObservables.java" type="org.eclipse.core.databinding.beans.BeansObservables">
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="listFactory(Realm, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="listFactory(String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="mapPropertyFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="mapPropertyFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailList(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailList(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailMap(IObservableValue, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailMap(Realm, IObservableValue, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailSet(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailSet(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailValue(IObservableValue, Class, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailValue(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailValue(Realm, IObservableValue, Class, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeDetailValue(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeList(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeList(Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeList(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeList(Realm, Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(IObservableSet, Class, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(IObservableSet, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(Object, String, Class, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMap(Realm, Object, String, Class, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMaps(IObservableSet, Class, String[])"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeMaps(IObservableSet, String[])"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeSet(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeSet(Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeSet(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeSet(Realm, Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeValue(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="observeValue(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="setFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="setFactory(Realm, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="setFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="setFactory(String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="setToMapFactory(Class, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="valueFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="valueFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338948223">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.BeansObservables"/>
+                <message_argument value="BeansObservables()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/core/databinding/beans/IBeanListProperty.java" type="org.eclipse.core.databinding.beans.IBeanListProperty">
         <filter comment="Extending interface in accordance with the API specification." id="574619656">
@@ -74,6 +328,230 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/core/databinding/beans/PojoObservables.java" type="org.eclipse.core.databinding.beans.PojoObservables">
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="listFactory(Realm, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="listFactory(String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="mapPropertyFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="mapPropertyFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailList(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailList(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailMap(IObservableValue, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailMap(Realm, IObservableValue, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailSet(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailSet(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailValue(IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeDetailValue(Realm, IObservableValue, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeList(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeList(Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeList(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeList(Realm, Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(IObservableSet, Class, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(IObservableSet, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(Object, String, Class, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMap(Realm, Object, String, Class, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMaps(IObservableSet, Class, String[])"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeMaps(IObservableSet, String[])"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeSet(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeSet(Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeSet(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeSet(Realm, Object, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeValue(Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="observeValue(Realm, Object, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="setFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="setFactory(Realm, String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="setFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="setFactory(String, Class)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="valueFactory(Realm, String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="valueFactory(String)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - [DataBinding] Mark deprecated observable factory classes for deletion" id="338948223">
+            <message_arguments>
+                <message_argument value="org.eclipse.core.databinding.beans.PojoObservables"/>
+                <message_argument value="PojoObservables()"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/core/databinding/beans/typed/BeanProperties.java" type="org.eclipse.core.databinding.beans.typed.BeanProperties">
         <filter comment="Bug 549659 - Fix BeanProperties#list. This is an acceptable very small API breakage, so minor version is increased instead of major version." id="420679712">
             <message_arguments>
diff --git a/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF
index 1200929..dc67ad4 100644
--- a/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.databinding.beans/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.databinding.beans
-Bundle-Version: 1.6.200.qualifier
+Bundle-Version: 1.7.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
index 1725ae8..4d3b4a6 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
@@ -46,7 +46,10 @@
  *
  * @since 1.1
  *
- * @deprecated use <code>BeanProperties</code> instead
+ * @noreference
+ * @deprecated This class will be removed in a future release. See
+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=546820 for more
+ *             information. Use <code>BeanProperties</code> instead.
  */
 @Deprecated
 @SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java
index 1a2f9b4..b1216d3 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java
@@ -40,7 +40,10 @@
  *
  * @since 1.1
  *
- * @deprecated use <code>PojoProperties</code> instead
+ * @noreference
+ * @deprecated This class will be removed in a future release. See
+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=546820 for more
+ *             information. Use <code>PojoProperties</code> instead.
  */
 @Deprecated
 @SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/bundles/org.eclipse.jface.databinding/.settings/.api_filters b/bundles/org.eclipse.jface.databinding/.settings/.api_filters
index 3578653..4a1a13d 100644
--- a/bundles/org.eclipse.jface.databinding/.settings/.api_filters
+++ b/bundles/org.eclipse.jface.databinding/.settings/.api_filters
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.jface.databinding" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="923795461">
+            <message_arguments>
+                <message_argument value="1.12.0"/>
+                <message_argument value="1.11.0"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="926941240">
+            <message_arguments>
+                <message_argument value="1.12.0"/>
+                <message_argument value="1.11.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jface/databinding/swt/ISWTObservableList.java" type="org.eclipse.jface.databinding.swt.ISWTObservableList">
         <filter comment="Extending interface in accordance with the API specification." id="574619656">
             <message_arguments>
@@ -32,6 +46,176 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jface/databinding/swt/SWTObservables.java" type="org.eclipse.jface.databinding.swt.SWTObservables">
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="getRealm(Display)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeBackground(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeBounds(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeDelayedValue(int, ISWTObservableValue)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeEditable(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeEnabled(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeEnabled(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeFocus(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeFont(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeForeground(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeImage(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeItems(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeLocation(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeMax(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeMessage(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeMin(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeSelection(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeSelection(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeSingleSelectionIndex(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeSize(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeText(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeText(Control, int)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeText(Control, int[])"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeText(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeTooltipText(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeTooltipText(Widget)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="observeVisible(Control)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338948223">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.swt.SWTObservables"/>
+                <message_argument value="SWTObservables()"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jface/databinding/swt/WidgetListProperty.java" type="org.eclipse.jface.databinding.swt.WidgetListProperty">
         <filter comment="Extending interface in accordance with the API specification." id="576725006">
             <message_arguments>
@@ -136,4 +320,96 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jface/databinding/viewers/ViewersObservables.java" type="org.eclipse.jface.databinding.viewers.ViewersObservables">
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeCheckedElements(CheckboxTableViewer, Object)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeCheckedElements(CheckboxTreeViewer, Object)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeCheckedElements(ICheckable, Object)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeDelayedValue(int, IViewerObservableValue&lt;T&gt;)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeFilters(StructuredViewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeInput(Viewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeMultiPostSelection(IPostSelectionProvider)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeMultiPostSelection(StructuredViewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeMultiSelection(ISelectionProvider)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeMultiSelection(Viewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeSinglePostSelection(IPostSelectionProvider)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeSinglePostSelection(StructuredViewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeSingleSelection(ISelectionProvider)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="observeSingleSelection(Viewer)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338948223">
+            <message_arguments>
+                <message_argument value="org.eclipse.jface.databinding.viewers.ViewersObservables"/>
+                <message_argument value="ViewersObservables()"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
index 21b9b23..467b730 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/swt/SWTObservables.java
@@ -41,7 +41,10 @@
  * A factory for creating observables for SWT widgets
  *
  * @since 1.1
- * @deprecated
+ * @noreference
+ * @deprecated This class will be removed in a future release. See
+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=546820 for more
+ *             information. Use <code>WidgetProperties</code> instead.
  */
 @Deprecated
 @SuppressWarnings("rawtypes")
diff --git a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ViewersObservables.java b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ViewersObservables.java
index 142ef1b..eafcf62 100644
--- a/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ViewersObservables.java
+++ b/bundles/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/viewers/ViewersObservables.java
@@ -36,7 +36,12 @@
  * Factory methods for creating observables for JFace viewers
  *
  * @since 1.1
+ * @noreference
+ * @deprecated This class will be removed in a future release. See
+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=546820 for more
+ *             information. Use <code>ViewerProperties</code> instead.
  */
+@Deprecated
 @SuppressWarnings("rawtypes")
 public class ViewersObservables {
 	private static void checkNull(Object obj) {
@@ -80,10 +85,7 @@
 	 * @param selectionProvider provider to get selection from; not <code>null</code>
 	 * @return the observable value tracking the (single) selection of the given
 	 *         selection provider
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableValue observeSingleSelection(
 			ISelectionProvider selectionProvider) {
 		checkNull(selectionProvider);
@@ -104,10 +106,7 @@
 	 *         of the given post selection provider
 	 *
 	 * @since 1.4
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableValue observeSinglePostSelection(
 			IPostSelectionProvider selectionProvider) {
 		checkNull(selectionProvider);
@@ -132,10 +131,7 @@
 	 *         selection provider
 	 *
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableList observeMultiSelection(
 			ISelectionProvider selectionProvider) {
 		checkNull(selectionProvider);
@@ -161,10 +157,7 @@
 	 *         of the given post selection provider
 	 *
 	 * @since 1.4
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableList observeMultiPostSelection(
 			IPostSelectionProvider selectionProvider) {
 		checkNull(selectionProvider);
@@ -184,10 +177,7 @@
 	 * @return the observable value tracking the (single) selection of the given
 	 *         viewer
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableValue observeSingleSelection(Viewer viewer) {
 		checkNull(viewer);
 		return ViewerProperties.singleSelection().observe(viewer);
@@ -206,10 +196,7 @@
 	 *         of the given structured viewer
 	 *
 	 * @since 1.4
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableValue observeSinglePostSelection(
 			StructuredViewer viewer) {
 		checkNull(viewer);
@@ -233,10 +220,7 @@
 	 *         selection provider
 	 *
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableList observeMultiSelection(Viewer viewer) {
 		checkNull(viewer);
 		return ViewerProperties.multipleSelection().observe(viewer);
@@ -259,10 +243,7 @@
 	 *         of the given structured viewer
 	 *
 	 * @since 1.4
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableList observeMultiPostSelection(
 			StructuredViewer viewer) {
 		checkNull(viewer);
@@ -279,10 +260,7 @@
 	 *            the viewer to observe
 	 * @return an observable value tracking the input of the given viewer
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableValue observeInput(Viewer viewer) {
 		checkNull(viewer);
 		return ViewerProperties.<StructuredViewer, Object>input().observe(viewer);
@@ -299,10 +277,7 @@
 	 * @return an observable set tracking the checked elements of the given
 	 *         checkable.
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IObservableSet observeCheckedElements(ICheckable checkable,
 			Object elementType) {
 		checkNull(checkable);
@@ -321,10 +296,7 @@
 	 * @return an observable set that tracks the checked elements of the given
 	 *         viewer.
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableSet observeCheckedElements(CheckboxTableViewer viewer, Object elementType) {
 		checkNull(viewer);
 		return ViewerProperties.checkedElements(elementType).observe((Viewer) viewer);
@@ -342,10 +314,7 @@
 	 * @return an observable set that tracks the checked elements of the given
 	 *         viewer.
 	 * @since 1.2
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableSet observeCheckedElements(CheckboxTreeViewer viewer, Object elementType) {
 		checkNull(viewer);
 		return ViewerProperties.checkedElements(elementType).observe((Viewer) viewer);
@@ -367,10 +336,7 @@
 	 *            viewer containing the filters to be tracked
 	 * @return an observable set that tracks the filters of the given viewer.
 	 * @since 1.3
-	 *
-	 * @deprecated use <code>ViewerProperties</code> instead
 	 */
-	@Deprecated
 	public static IViewerObservableSet observeFilters(StructuredViewer viewer) {
 		checkNull(viewer);
 		return ViewerProperties.filters().observe((Viewer) viewer);
diff --git a/bundles/org.eclipse.ui.workbench/.settings/.api_filters b/bundles/org.eclipse.ui.workbench/.settings/.api_filters
new file mode 100644
index 0000000..dfd9e55
--- /dev/null
+++ b/bundles/org.eclipse.ui.workbench/.settings/.api_filters
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.ui.workbench" version="2">
+    <resource path="Eclipse UI/org/eclipse/ui/databinding/WorkbenchObservables.java" type="org.eclipse.ui.databinding.WorkbenchObservables">
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeActiveEditor(IPartService)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeActivePart(IPartService)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeActiveWorkbenchPage(IWorkbenchWindow)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeActiveWorkbenchWindow(IWorkbench)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeAdaptedSingleSelection(IServiceLocator, Class&lt;T&gt;)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeDetailAdaptedValue(IObservableValue&lt;?&gt;, Class&lt;T&gt;)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338944126">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="observeEditorInput(IEditorPart)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="338948223">
+            <message_arguments>
+                <message_argument value="org.eclipse.ui.databinding.WorkbenchObservables"/>
+                <message_argument value="WorkbenchObservables()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="Bug 546820 - Mark deprecated observable factory classes for deletion" id="923795461">
+            <message_arguments>
+                <message_argument value="3.120.0"/>
+                <message_argument value="3.118.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchObservables.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchObservables.java
index a04a75b..0bdff9b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchObservables.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/databinding/WorkbenchObservables.java
@@ -37,7 +37,12 @@
  * Factory methods for creating observables for Workbench objects
  *
  * @since 3.5
+ * @noreference
+ * @deprecated This class will be removed in a future release. See
+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=546820 for more
+ *             information. Use <code>WorkbenchProperties</code> instead.
  */
+@Deprecated
 public class WorkbenchObservables {
 	/**
 	 * Returns an observable with values of the given target type. If the wrapped