python/plugins/sextante/core/Sextante.py

@@ -16,8 +16,6 @@
 *                                                                         *
 ***************************************************************************
 """
-from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
-
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -42,11 +40,8 @@
 from sextante.modeler.Providers import Providers
 from sextante.modeler.ModelerAlgorithmProvider import ModelerAlgorithmProvider
 from sextante.modeler.ModelerOnlyAlgorithmProvider import ModelerOnlyAlgorithmProvider
-
 from sextante.algs.SextanteAlgorithmProvider import SextanteAlgorithmProvider
-
 from sextante.parameters.ParameterSelection import ParameterSelection
-
 from sextante.ftools.FToolsAlgorithmProvider import FToolsAlgorithmProvider
 from sextante.gdal.GdalAlgorithmProvider import GdalAlgorithmProvider
 from sextante.grass.GrassAlgorithmProvider import GrassAlgorithmProvider
@@ -58,6 +53,9 @@
 from sextante.saga.SagaAlgorithmProvider import SagaAlgorithmProvider
 from sextante.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider
 from sextante.taudem.TauDEMAlgorithmProvider import TauDEMAlgorithmProvider
+from sextante.servertools.GeoServerToolsAlgorithmProvider import GeoServerToolsAlgorithmProvider
+
+
 
 class Sextante:
 

python/plugins/sextante/gui/AlgorithmExecutionDialog.py

@@ -252,7 +252,14 @@ def accept(self):
             else:
                 self.setInfo("<b>Algorithm %s starting...</b>" % self.alg.name)
                 if iterateParam:
-                    UnthreadedAlgorithmExecutor.runalgIterating(self.alg, iterateParam, self)
+                    if UnthreadedAlgorithmExecutor.runalgIterating(self.alg, iterateParam, self):   
+                        self.finish()
+                    else:
+                        QApplication.restoreOverrideCursor()
+                        if not keepOpen:
+                            self.close()
+                        else:
+                            self.resetGUI()
                 else:
                     command = self.alg.getAsCommand()
                     if command:

python/plugins/sextante/servertools/CMakeLists.txt

@@ -0,0 +1,6 @@
+FILE(GLOB PY_FILES *.py)
+
+ADD_SUBDIRECTORY(geoserver)
+ADD_SUBDIRECTORY(httplib2)
+
+PLUGIN_INSTALL(sextante servertools ${PY_FILES})

python/plugins/sextante/servertools/geoserver/CMakeLists.txt

@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante servertools/geoserver ${PY_FILES})

python/plugins/sextante/servertools/httplib2/CMakeLists.txt

@@ -0,0 +1,3 @@
+FILE(GLOB PY_FILES *.py)
+
+PLUGIN_INSTALL(sextante servertools/httplib2 ${PY_FILES})