Removed marketplace wizard and added default p2 discovery ui

bioclipse · Jan 9, 2012 · c341390 · c341390
1 parent 6f2e1f0
commit c341390
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 60 deletions.
diff --git a/plugins/net.bioclipse.ui.install/.classpath b/plugins/net.bioclipse.ui.install/.classpath
@@ -2,6 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/net.bioclipse.ui.install/META-INF/MANIFEST.MF b/plugins/net.bioclipse.ui.install/META-INF/MANIFEST.MF
@@ -4,11 +4,10 @@ Bundle-Name: Install
 Bundle-SymbolicName: net.bioclipse.ui.install;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.equinox.p2.discovery;bundle-version="1.0.0",
- org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.1",
- org.eclipse.equinox.p2.ui.discovery;bundle-version="1.0.0",
- org.eclipse.ui;bundle-version="3.6.2",
- org.eclipse.epp.mpc.ui;bundle-version="1.0.1"
+Require-Bundle: org.eclipse.equinox.p2.discovery;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.discovery.compatibility;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.equinox.p2.ui.discovery;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.ui;bundle-version="[3.6.2,4.0.0)"
 Import-Package: org.slf4j;version="1.5.11"
 Eclipse-RegisterBuddy: org.eclipse.equinox.p2.ui.discovery
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/net.bioclipse.ui.install/build.properties b/plugins/net.bioclipse.ui.install/build.properties
@@ -1,4 +1,3 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\

diff --git a/plugins/net.bioclipse.ui.install/plugin.xml b/plugins/net.bioclipse.ui.install/plugin.xml
@@ -1,39 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            id="openInstallDialog"
-            name="Install Feature">
-         <defaultHandler
-               class="net.bioclipse.ui.install.handler.OpenDiscoveryDialog">
-            <parameter
-                  name="net.bioclipse.ui.install.parameter1"
-                  value="net.bioclipse.ui.install.parameter1">
-            </parameter>
-         </defaultHandler>
-      </command>
-   </extension>
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
             locationURI="menu:help?after=net.bioclipse.data.openWizard">
          <command
-               commandId="openInstallDialog"
-               label="Install Feature"
+               commandId="org.eclipse.equinox.p2.ui.discovery.commands.ShowRepositoryCatalog"
+               label="Install New Bioclipse Feature"
                style="push">
+            <parameter
+                  name="org.eclipse.equinox.p2.ui.discovery.commands.RepositoryParameter"
+                  value="http://pele.farmbio.uu.se/bioclipse/2.5/nightly">
+            </parameter>
          </command>
       </menuContribution>
    </extension>
-<extension
-        point="org.eclipse.epp.mpc.ui.catalog">
-     <catalog
-           description="Discover modular features for Bioclipse"
-           icon="icon_16-32bit.bmp"
-           label="Bioclipse Discovery"
-           url="http://localhost:8080/marketplace_0.4/">
-     </catalog>
-  </extension>
 </plugin>
diff --git a/...ns/net.bioclipse.ui.install/src/net/bioclipse/ui/install/handler/OpenDiscoveryDialog.java b/...ns/net.bioclipse.ui.install/src/net/bioclipse/ui/install/handler/OpenDiscoveryDialog.java