Changeset 23126 in osm for applications/editors/josm/plugins/ext_tools

Timestamp:

2010-09-12T18:33:47+02:00 (14 years ago)

Author:

upliner

Message:

'show stderr contents in debug window'

Location:

applications/editors/josm/plugins/ext_tools

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/ext_tools/ExtTool.java (modified) (8 diffs)

applications/editors/josm/plugins/ext_tools/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="output" path="build"/>
 </classpath>

applications/editors/josm/plugins/ext_tools/build.xml

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="update to josm latest" />
+        <property name="commit.message" value="show stderr contents in debug window" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3403" />

applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java

@@ -4 +4 @@
 
 import java.awt.Cursor;
+import java.awt.GridBagLayout;
 import java.io.File;
 import java.io.IOException;
@@ -14 +15 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
 import javax.swing.SwingUtilities;
 
@@ -22 +26 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -27 +32 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.io.OsmReader;
+import org.openstreetmap.josm.tools.GBC;
 
 public class ExtTool {
@@ -110 +116 @@
     }
 
+    protected void showErrorMessage(String message, String details) {
+        JPanel p = new JPanel(new GridBagLayout());
+        p.add(new JMultilineLabel(message),GBC.eol());
+        if (details != null) {
+            JTextArea info = new JTextArea(details, 20, 60);
+            info.setCaretPosition(0);
+            info.setEditable(false);
+            p.add(new JScrollPane(info), GBC.eop());
+        }
+        JOptionPane.showMessageDialog(Main.parent, p, tr("External tool error"), JOptionPane.ERROR_MESSAGE);
+    }
+
     public void runTool(LatLon pos) {
         Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
@@ -138 +156 @@
         builder.directory(new File(ExtToolsPlugin.plugin.getPluginDir()));
 
+        final StringBuilder debugstr = new StringBuilder();
+
         // debug: print resulting cmdline
         for (String s : builder.command())
-            System.out.print(s + " ");
-        System.out.print("\n");
+            debugstr.append(s + " ");
+        debugstr.append("\n");
+        System.out.print(debugstr.toString());
 
         final ToolProcess tp = new ToolProcess();
@@ -159 +180 @@
                     int len;
                     while ((len = errStream.read(buffer)) > 0) {
+                        synchronized (debugstr) {
+                            debugstr.append(new String(buffer, 0, len));
+                        }
                         System.err.write(buffer, 0, len);
                     }
@@ -185 +209 @@
                         SwingUtilities.invokeLater(new Runnable() {
                             public void run() {
-                                JOptionPane.showMessageDialog(Main.parent,
-                                        tr("Child script have returned invalid data."));
+                                synchronized (debugstr) {
+                                    showErrorMessage(
+                                            tr("Child script have returned invalid data.\n\nstderr contents:"),
+                                            debugstr.toString());
+                                }
                             }
                         });