[Releng] Deprecate redundant methods in cdo.ui.OM

5 files changed, 26 insertions, 49 deletions

diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index eeee3aeeb3..c67206fb01 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.dawn"
       label="%featureName"
-      version="2.4.4.qualifier"
+      version="2.5.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
index 7d9a38816f..f496db77aa 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.dawn</artifactId>
-  <version>2.4.4-SNAPSHOT</version>
+  <version>2.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
index 723210ca5c..8bdf58b9bb 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ui;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.ui.bundle.OM$Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,15 +14,15 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.2.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.composites;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.handlers;version="2.2.0";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui.helper;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.icons;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.messages;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.views;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.wizards;version="2.2.0",
- org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.2.0"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.3.0";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.composites;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.handlers;version="2.3.0";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui.helper;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.icons;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.messages;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.views;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.wizards;version="2.3.0",
+ org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.3.0"
 Automatic-Module-Name: org.eclipse.emf.cdo.dawn.ui
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml b/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
index ff56323a46..9ccf35b405 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.dawn.ui</artifactId>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 07bde96efc..517de6bb55 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.internal.ui.views.UserInfo;
 import org.eclipse.emf.cdo.ui.CDOEditorOpener;
 import org.eclipse.emf.cdo.ui.CDOLabelDecorator;
 import org.eclipse.emf.cdo.ui.OverlayImage;
+import org.eclipse.emf.cdo.ui.Support;
 
 import org.eclipse.net4j.util.om.OMBundle;
 import org.eclipse.net4j.util.om.OMPlatform;
@@ -24,7 +25,6 @@ import org.eclipse.net4j.util.om.pref.OMPreferences;
 import org.eclipse.net4j.util.om.trace.OMTracer;
 import org.eclipse.net4j.util.ui.UIActivator;
 
-import org.eclipse.emf.common.CommonPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.provider.ComposedImage;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
@@ -64,9 +64,6 @@ public abstract class OM
   public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTRY = //
       PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$
 
-  public static final OMPreference<Boolean> PREF_LEGACY_MODE_DEFAULT = //
-      PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$
-
   public static final OMPreference<Boolean> PREF_EDITOR_AUTO_RELOAD = //
       PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$
 
@@ -85,42 +82,22 @@ public abstract class OM
   public static final OMPreference<String> PREF_USER_DISPLAY_NAME = //
       PREFS.init("PREF_USER_DISPLAY_NAME", System.getProperty("user.name")); //$NON-NLS-1$
 
-  private static Boolean historySupportAvailable;
-
-  private static Boolean compareSupportAvailable;
-
+  /**
+   * @deprecated As of 4.13 use {@link Support#HISTORY Support.HISTORY.isAvailable()}.
+   */
+  @Deprecated
   public static boolean isHistorySupportAvailable()
   {
-    if (historySupportAvailable == null)
-    {
-      try
-      {
-        historySupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.team", "org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryPage") != null;
-      }
-      catch (Throwable ex)
-      {
-        historySupportAvailable = false;
-      }
-    }
-
-    return historySupportAvailable;
+    return Support.HISTORY.isAvailable();
   }
 
+  /**
+   * @deprecated As of 4.13 use {@link Support#COMPARE Support.COMPARE.isAvailable()}.
+   */
+  @Deprecated
   public static boolean isCompareSupportAvailable()
   {
-    if (compareSupportAvailable == null)
-    {
-      try
-      {
-        compareSupportAvailable = CommonPlugin.loadClass("org.eclipse.emf.cdo.ui.compare", "org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil") != null;
-      }
-      catch (Throwable ex)
-      {
-        compareSupportAvailable = false;
-      }
-    }
-
-    return compareSupportAvailable;
+    return Support.COMPARE.isAvailable();
   }
 
   public static Image getOverlayImage(Object image, Object overlayImage, int x, int y)