#199538 - Updated PHP Smarty Framework addon breaks Netbeans
authorMartin Fousek <marfous@netbeans.org>
Fri, 08 Jul 2011 10:53:41 +0200
changeset 1751370949fcf86f2
parent 17511 4055d0cc7b95
child 17514 19e2cf7e8a22
child 17524 b160e2055090
#199538 - Updated PHP Smarty Framework addon breaks Netbeans
php.smarty/manifest.mf
php.smarty/src/org/netbeans/modules/php/smarty/SmartyPhpFrameworkProvider.java
     1.1 --- a/php.smarty/manifest.mf	Mon Jul 04 13:49:41 2011 +0200
     1.2 +++ b/php.smarty/manifest.mf	Fri Jul 08 10:53:41 2011 +0200
     1.3 @@ -2,5 +2,5 @@
     1.4  OpenIDE-Module: org.netbeans.modules.php.smarty
     1.5  OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.54
     1.8 +OpenIDE-Module-Specification-Version: 1.55
     1.9  
     2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/SmartyPhpFrameworkProvider.java	Mon Jul 04 13:49:41 2011 +0200
     2.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/SmartyPhpFrameworkProvider.java	Fri Jul 08 10:53:41 2011 +0200
     2.3 @@ -39,6 +39,7 @@
     2.4  package org.netbeans.modules.php.smarty;
     2.5  
     2.6  import java.io.File;
     2.7 +import java.util.concurrent.atomic.AtomicBoolean;
     2.8  import java.util.logging.Level;
     2.9  import java.util.logging.Logger;
    2.10  import org.netbeans.api.progress.ProgressUtils;
    2.11 @@ -150,7 +151,7 @@
    2.12              if (fs.isFound()) {
    2.13                  return true;
    2.14              } else {
    2.15 -                ProgressUtils.showProgressDialogAndRun(new Runnable() {
    2.16 +                ProgressUtils.runOffEventDispatchThread(new Runnable() {
    2.17                      @Override
    2.18                      public void run() {
    2.19                          FileObject sourceDirectory = phpModule.getSourceDirectory();
    2.20 @@ -159,8 +160,8 @@
    2.21                              fs.setFound(true);
    2.22                          }
    2.23                      }
    2.24 -                }, NbBundle.getMessage(SmartyPhpFrameworkProvider.class, "MSG_SearchingForSmartyExt"));
    2.25 -                
    2.26 +                }, NbBundle.getMessage(SmartyPhpFrameworkProvider.class, "MSG_SearchingForSmartyExt"), 
    2.27 +                   new AtomicBoolean(false), false, 1000, 10000);
    2.28              }
    2.29              return fs.isFound();
    2.30          } finally {