Revision: 6104
http://sourceforge.net/p/jump-pilot/code/6104
Author: ma15569
Date: 2019-01-19 08:30:02 +0000 (Sat, 19 Jan 2019)
Log Message:
-----------
added monitoring to build KLEM project. Added language key to warning message
Modified Paths:
--------------
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/HydrographKlemPlugin.java
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/ParamsTab.java
Modified:
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/HydrographKlemPlugin.java
===================================================================
---
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/HydrographKlemPlugin.java
2019-01-19 08:10:42 UTC (rev 6103)
+++
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/HydrographKlemPlugin.java
2019-01-19 08:30:02 UTC (rev 6104)
@@ -55,10 +55,15 @@
import com.geomaticaeambiente.openjump.klem.grid.FlowDirBasicGrid;
import com.geomaticaeambiente.openjump.klem.upslopearea.UpslopeAreaCalculator;
import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jump.task.TaskMonitor;
import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.model.Layer;
+import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.workbench.plugin.ThreadedBasePlugIn;
import com.vividsolutions.jump.workbench.ui.ErrorDialog;
+import com.vividsolutions.jump.workbench.ui.task.TaskMonitorManager;
/**
*
@@ -102,10 +107,44 @@
"MainPanel.ExecuteButton.text"), true,
MainPanel.ExtraSubPanelPosition.INITIAL, layerablesList) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Override
public void rightButton() {
try {
- setNextButton(componentsWithActions);
+
+ AbstractPlugIn.toActionListener(new ThreadedBasePlugIn() {
+ @Override
+ public String getName() {
+ return null;
+ }
+
+ @Override
+ public boolean execute(PlugInContext context)
+ throws Exception {
+ return true;
+ }
+
+ @Override
+ public void run(TaskMonitor monitor,
+ PlugInContext context) throws Exception {
+ monitor.report(PluginUtils.getResources()
+ .getString("OpenKlem.executing-process"));
+ // monitor.allowCancellationRequests();
+ reportNothingToUndoYet(context);
+ try {
+ setNextButton(componentsWithActions);
+ } catch (final Exception ex) {
+ Logger.error(getName(), ex);
+ }
+ }
+ }, context.getWorkbenchContext(), new TaskMonitorManager())
+ .actionPerformed(null);
+
+ // setNextButton(componentsWithActions);
} catch (final Exception ex) {
ErrorDialog.show(super.getInitialDialog(),
PluginUtils.plugInName, ex.toString(),
Modified:
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/ParamsTab.java
===================================================================
---
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/ParamsTab.java
2019-01-19 08:10:42 UTC (rev 6103)
+++
plug-ins/OpenKLEM/OpenKLEMOpenJUMP/trunk/src/com/geomaticaeambiente/klemgui/plugin/hydrology/hydrographs/klem/ParamsTab.java
2019-01-19 08:30:02 UTC (rev 6104)
@@ -4,7 +4,6 @@
import it.geomaticaeambiente.klem.LsppCalculator;
import it.geomaticaeambiente.klem.SimulationOutput;
-import java.awt.Cursor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
@@ -24,8 +23,6 @@
import javax.xml.parsers.ParserConfigurationException;
import com.geomaticaeambiente.klemgui.exceptions.WarningException;
-import
com.geomaticaeambiente.klemgui.plugin.hydrology.hydrographs.klem.KlemUtils;
-import
com.geomaticaeambiente.klemgui.plugin.hydrology.hydrographs.klem.OutputTab;
import
com.geomaticaeambiente.klemgui.plugin.hydrology.hydrographs.klem.KlemProperties.RainfallType;
import com.geomaticaeambiente.klemgui.ui.GUIUtils;
import com.geomaticaeambiente.klemgui.ui.InitialDialog;
@@ -95,9 +92,7 @@
// mainTabelPane.setEnabledAt(2, true);
mainTabelPane.setSelectedIndex(3);
}
-
-
-
+
@Override
public JPanel buildPluginPanel(final ComponentsTreeMap
componentsWithActions) {
@@ -120,37 +115,48 @@
public void rightButton() { // OUTPUT
try {
- AbstractPlugIn.toActionListener(new ThreadedBasePlugIn() {
- @Override
- public String getName() {
- return null;
- }
+ AbstractPlugIn
+ .toActionListener(
+ new ThreadedBasePlugIn() {
+ @Override
+ public String getName() {
+ return null;
+ }
- @Override
- public boolean execute(PlugInContext context)
- throws Exception {
- return true;
- }
+ @Override
+ public boolean execute(
+ PlugInContext context)
+ throws Exception {
+ return true;
+ }
- @Override
- public void run(TaskMonitor monitor,
- PlugInContext context) throws Exception {
- monitor.report(PluginUtils.getResources()
- .getString("OpenKlem.executing-process"));
- reportNothingToUndoYet(context);
- try {
- calculateParameters(componentsWithActions);
- } catch (final Exception ex) {
- JOptionPane.showMessageDialog(
- getInitialDialog().getTabbedPane(),
- PluginUtils.getResources().getString(
- "Process interrupted"),
- PluginUtils.plugInName,
- JOptionPane.INFORMATION_MESSAGE);
+ @Override
+ public void run(TaskMonitor monitor,
+ PlugInContext context)
+ throws Exception {
+ monitor.report(PluginUtils
+ .getResources()
+ .getString(
+
"OpenKlem.executing-process"));
+ reportNothingToUndoYet(context);
+ try {
+
calculateParameters(componentsWithActions);
+ } catch (final Exception ex) {
+ JOptionPane
+ .showMessageDialog(
+
getInitialDialog()
+
.getTabbedPane(),
+ PluginUtils
+
.getResources()
+
.getString(
+
"OpenKlem.process-interrupted"),
+
PluginUtils.plugInName,
+
JOptionPane.INFORMATION_MESSAGE);
- }
- }
- }, context.getWorkbenchContext(), new TaskMonitorManager())
+ }
+ }
+ }, context.getWorkbenchContext(),
+ new TaskMonitorManager())
.actionPerformed(null);
} catch (final Exception ex) {
ErrorDialog.show(super.getInitialDialog(),
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
