Rollback to restore workspace selection

groovy · Jul 22, 2017 · 5f15fe9 · 5f15fe9
1 parent 9721ded
commit 5f15fe9
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/...ovy.eclipse.compilerResolver/src/org/codehaus/groovy/eclipse/chooser/CompilerChooser.java b/...ovy.eclipse.compilerResolver/src/org/codehaus/groovy/eclipse/chooser/CompilerChooser.java
@@ -164,15 +164,10 @@ public void storeVersion(SpecifiedVersion version) throws BackingStoreException
     public void start(BundleContext bundleContext) throws Exception {
         this.bundleContext = bundleContext;
 
-        // There is a small window where the chooser can be initialized.
-        // It has to be after the workspace has started (in order to ensure
-        // the choose workspace dialog still shows) but before JDT is initialized
-        // (so that the groovy bundles aren't loaded).
-
-        if (Platform.getBundle("org.eclipse.core.resources").getState() == Bundle.STARTING) {
-            initializeNoThrow();
-            return;
-        }
+        // There is a small window where the chooser can be initialized. It has
+        // to be after the workspace has started (in order to ensure the choose
+        // workspace dialog still shows) but before JDT is initialized (so that
+        // the Groovy bundles aren't fully loaded).
 
         // the service listener is called synchronously as the resources bundle is actived
         String filter = "(" + Constants.OBJECTCLASS + "=org.eclipse.core.resources.IWorkspace)";
@@ -190,8 +185,7 @@ public void serviceChanged(ServiceEvent event) {
     }
 
     public void stop(BundleContext bundleContext) throws Exception {
-        if (serviceListener != null)
-            bundleContext.removeServiceListener(serviceListener);
+        this.bundleContext.removeServiceListener(serviceListener);
         this.bundleContext = null;
         serviceListener = null;
         initialized = false;
@@ -258,12 +252,12 @@ public CompilerChooser initialize() throws BundleException {
                     Bundle bundle = bundles[i];
                     if (i != activeIndex) {
                         System.out.println("Avoided bundle version " + bundle.getVersion());
-                        bundle.uninstall(); //refreshPackages(bundle);
+                        bundle.uninstall(); refreshPackages(bundle);
                     } else {
                         System.out.println("Blessed bundle version " + bundle.getVersion());
                     }
                 }
-                refreshPackages(bundles);
+                //refreshPackages(bundles);
             } else {
                 System.out.println("Specified version not found, using " + allVersions[0] + " instead.");
             }