Bug 225155 What happened to the "classic update" capability?

3 files changed, 18 insertions, 42 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
index 3facd5d4f..d672014d2 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF
@@ -35,8 +35,7 @@ Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true,
  org.eclipse.equinox.internal.p2.ui.sdk.prefs;x-internal:=true,
  org.eclipse.equinox.internal.p2.ui.sdk.updates;x-internal:=true
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.expressions;bundle-version="3.4.0"
+ org.eclipse.core.runtime
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
  CDC-1.1/Foundation-1.1
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
index f12bbbdbe..fd1060122 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.properties
@@ -23,3 +23,5 @@ automaticUpdatesPrefPage = Automatic Updates
 externalFilesPrefPage = Updating from the File System
 preferenceKeywords.general=automatic update schedule download software install import bundle
 preferences=Update and Install Preferences
+classicCategoryName=Classic Update
+classicCategoryDesc=Enables classic update functionality
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
index 040a27b51..be78b8d85 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/plugin.xml
@@ -116,16 +116,9 @@
    <extension
          point="org.eclipse.ui.activities">
       <activity
-            description="Enables classic update functionality"
+            description="%classicCategoryDesc"
             id="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
-            name="Classic Update">
-         <enabledWhen>
-            <not>
-               <reference
-                     definitionId="org.eclipse.equinox.p2.ui.sdk.profileExists">
-               </reference>
-            </not>
-         </enabledWhen>
+            name="%classicCategoryName">
       </activity>
       <activityPatternBinding
             activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
@@ -137,39 +130,21 @@
             isEqualityPattern="false"
             pattern=".*org\.eclipse\.ui\.update.*">
       </activityPatternBinding>
+      <category
+            description="%classicCategoryDesc"
+            id="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate"
+            name="%classicCategoryName">
+      </category>
+      <categoryActivityBinding
+            activityId="org.eclipse.equinox.p2.ui.sdk.classicUpdate"
+            categoryId="org.eclipse.equinox.p2.ui.sdk.category.classicUpdate">
+      </categoryActivityBinding>
    </extension>
    <extension
-         point="org.eclipse.ui.activities">
-      <activity
-            description="Enables p2 update functionality"
-            id="org.eclipse.equinox.p2.ui.sdk.p2SoftwareUpdates"
-            name="p2 Software Updates">
-         <enabledWhen>
-            <reference
-                  definitionId="org.eclipse.equinox.p2.ui.sdk.profileExists">
-            </reference>
-         </enabledWhen>
-      </activity>
-      <activityPatternBinding
-            activityId="org.eclipse.equinox.p2.ui.sdk.p2SoftwareUpdates"
-            isEqualityPattern="false"
-            pattern=".*org\.eclipse\.equinox\.p2\.ui\.sdk.*">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.equinox.p2.ui.sdk.p2SoftwareUpdates"
-            isEqualityPattern="false"
-            pattern=".*org\.eclipse\.equinox\.internal\.p2\.ui\.sdk.*">
-      </activityPatternBinding>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.definitions">
-      <definition
-            id="org.eclipse.equinox.p2.ui.sdk.profileExists">
-         <systemTest
-               property="org.eclipse.update.reconcile"
-               value="false">
-         </systemTest>
-      </definition>
+         point="org.eclipse.core.runtime.preferences">
+      <initializer
+            class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.ClassicUpdateInitializer">
+      </initializer>
    </extension>
 
 </plugin>