From 19628a60a133ecb1421ae2b0ac09ec9791239c8f Mon Sep 17 00:00:00 2001
From: kitfox
Date: Sat, 9 Mar 2013 15:51:42 +0000
Subject: Error handling now sends warnings to Logger.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@149 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b
---
 src/main/java/com/kitfox/svg/app/SVGPlayer.java    | 14 +++++++----
 src/main/java/com/kitfox/svg/app/SVGViewer.java    | 29 ++++++----------------
 .../java/com/kitfox/svg/app/VersionDialog.java     |  5 +++-
 src/main/java/com/kitfox/svg/app/data/Handler.java | 12 ++++++---
 4 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'src/main/java/com/kitfox/svg/app')

diff --git a/src/main/java/com/kitfox/svg/app/SVGPlayer.java b/src/main/java/com/kitfox/svg/app/SVGPlayer.java
index bd2a8ec..0d38798 100644
--- a/src/main/java/com/kitfox/svg/app/SVGPlayer.java
+++ b/src/main/java/com/kitfox/svg/app/SVGPlayer.java
@@ -37,6 +37,7 @@
 package com.kitfox.svg.app;
 
 
+import com.kitfox.svg.SVGConst;
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGDisplayPanel;
 import com.kitfox.svg.SVGElement;
@@ -55,6 +56,8 @@ import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.JFileChooser;
@@ -146,7 +149,8 @@ public class SVGPlayer extends javax.swing.JFrame
                 }
                 catch (SVGException ex)
                 {
-                    ex.printStackTrace();
+                    Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, 
+                        "Could not pick", ex);
                 }
             }
         }
@@ -186,7 +190,7 @@ public class SVGPlayer extends javax.swing.JFrame
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
     }
 
@@ -221,7 +225,7 @@ public class SVGPlayer extends javax.swing.JFrame
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
             }
         }
 
@@ -361,7 +365,7 @@ public class SVGPlayer extends javax.swing.JFrame
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
 
     }//GEN-LAST:event_cm_loadUrlActionPerformed
@@ -405,7 +409,7 @@ public class SVGPlayer extends javax.swing.JFrame
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
 
     }//GEN-LAST:event_cm_loadFileActionPerformed
diff --git a/src/main/java/com/kitfox/svg/app/SVGViewer.java b/src/main/java/com/kitfox/svg/app/SVGViewer.java
index 4a17eb9..35f9433 100644
--- a/src/main/java/com/kitfox/svg/app/SVGViewer.java
+++ b/src/main/java/com/kitfox/svg/app/SVGViewer.java
@@ -37,6 +37,7 @@
 package com.kitfox.svg.app;
 
 import com.kitfox.svg.SVGCache;
+import com.kitfox.svg.SVGConst;
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGDisplayPanel;
 import com.kitfox.svg.SVGElement;
@@ -54,6 +55,8 @@ import java.security.AccessControlException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.JFileChooser;
@@ -159,7 +162,7 @@ public class SVGViewer extends javax.swing.JFrame
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
                 return;
             }
         }
@@ -315,7 +318,7 @@ is.close();
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
 
     }//GEN-LAST:event_cm_loadUrlActionPerformed
@@ -328,9 +331,9 @@ is.close();
         {
             pickedElements = diagram.pick(new Point(evt.getX(), evt.getY()), null);
         } 
-        catch (SVGException ex)
+        catch (SVGException e)
         {
-            ex.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
             return;
         }
         
@@ -386,25 +389,9 @@ is.close();
                 loadURL(url);
             }
         }
-        /*
-        catch (IOException ioe)
-        {
-            try
-            {
-                //We may be in a WebStart app.  Try again with a FileOpenService
-                FileContents fc = fileOpenService.openFileDialog(null, new String[]{"svg"});
-                InputStream is = fc.getInputStream();
-                String name = fc.getName();
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-        }
-         */
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
 
     }//GEN-LAST:event_cm_loadFileActionPerformed
diff --git a/src/main/java/com/kitfox/svg/app/VersionDialog.java b/src/main/java/com/kitfox/svg/app/VersionDialog.java
index 65f330e..80344fe 100644
--- a/src/main/java/com/kitfox/svg/app/VersionDialog.java
+++ b/src/main/java/com/kitfox/svg/app/VersionDialog.java
@@ -36,9 +36,12 @@
 
 package com.kitfox.svg.app;
 
+import com.kitfox.svg.SVGConst;
 import java.net.*;
 import java.io.*;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.event.*;
 import javax.swing.*;
 import javax.swing.text.html.*;
@@ -85,7 +88,7 @@ public class VersionDialog extends javax.swing.JDialog
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
         }
         
     }
diff --git a/src/main/java/com/kitfox/svg/app/data/Handler.java b/src/main/java/com/kitfox/svg/app/data/Handler.java
index 26c10f2..806dcd9 100644
--- a/src/main/java/com/kitfox/svg/app/data/Handler.java
+++ b/src/main/java/com/kitfox/svg/app/data/Handler.java
@@ -34,12 +34,15 @@
 
 package com.kitfox.svg.app.data;
 
+import com.kitfox.svg.SVGConst;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -64,10 +67,13 @@ public class Handler extends URLStreamHandler
             if (content.startsWith("base64,"))
             {
                 content = content.substring(7);
-                try {
+                try
+                {
                     buf = new sun.misc.BASE64Decoder().decodeBuffer(content);
-                } catch (IOException ex) {
-                    ex.printStackTrace();
+                }
+                catch (IOException e)
+                {
+                    Logger.getLogger(SVGConst.SVG_LOGGER).log(Level.WARNING, null, e);
                 }
             }
         }
-- 
cgit v1.2.3-55-g7522