Changeset 835 for trunk/src/jlatexeditor/tools/SVN.java

Timestamp:

09/04/10 09:06:26 (21 months ago)

Author:

stefan

Message:

added error popup

Files:

• trunk/src/jlatexeditor/tools/SVN.java (modified) (3 diffs)

trunk/src/jlatexeditor/tools/SVN.java

@@ -26 +26 @@
 
     Process svn;
-    try {
-      svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "update"}, dir);
-    } catch (Exception e) {
-      e.printStackTrace();
-      throw new Exception("SVN update failed!", e);
-    }
+    svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "update"}, dir);
 
     BufferedReader in = new BufferedReader(new InputStreamReader(svn.getInputStream()), 100000);
@@ -67 +62 @@
   }
 
-  /**
-   * Check if the return code of the svn process is OK.
-   *
-   * @param process svn process
-   */
-  private void checkProcessResult(Process process, String action) throws Exception {
-
-    try {
-      String errorString = new String(StreamUtils.readBytesFromInputStream(process.getErrorStream()));
-      throw new Exception(action + " failed due to the following error:\n" + errorString);
-    } catch (IOException e) {
-      e.printStackTrace();
-      throw new Exception(action + " failed!", e);
-    }
-  }
-
   public synchronized Pair<Boolean, String> commit(File dir, String message) throws Exception {
     message = message.replace('"', ' ');
     message = message.replace('\\', ' ');
 
-    Process svn;
-    try {
-      svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "commit", "-m", message}, dir);
-    } catch (Exception e) {
-      e.printStackTrace();
-      throw new Exception("SVN update failed!", e);
-//      return new Pair<Boolean, String>(false, "<font color=red><b>Exception: " + e.getMessage() + "</b></font>");
-    }
-
-    boolean success = true;
+    Process svn = ProcessUtil.exec(new String[]{"svn", "--non-interactive", "commit", "-m", message}, dir);
+
+    boolean success = true;
 
     StringBuilder builder = new StringBuilder();
@@ -181 +153 @@
   }
 
+  /**
+   * Check if the return code of the svn process is OK.
+   *
+   * @param process svn process
+   */
+  private void checkProcessResult(Process process, String action) throws Exception {
+    String errorString = new String(StreamUtils.readBytesFromInputStream(process.getErrorStream()));
+    if (!errorString.equals("")) {
+      throw new Exception(action + " failed due to the following error:\n" + errorString);
+    }
+  }
+
   public static class UpdateResult {
     public static final int TYPE_UPDATE = 0;