[Barcode4j-cvs] barcode4j/examples/webapp/java/org/krysalis/barcode4j/webapp BarcodeRequestBean.java, 1.5, 1.6 BarcodeErrorServlet.java, 1.2, 1.3

[Jeremias M. <jm...@us...>]

Update of /cvsroot/barcode4j/barcode4j/examples/webapp/java/org/krysalis/barcode4j/webapp
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv12858/examples/webapp/java/org/krysalis/barcode4j/webapp

Modified Files:
	BarcodeRequestBean.java BarcodeErrorServlet.java 
Log Message:
Dropped Java 1.3 compatibility and fixed some compiler and FindBugs warnings.

Index: BarcodeErrorServlet.java
===================================================================
RCS file: /cvsroot/barcode4j/barcode4j/examples/webapp/java/org/krysalis/barcode4j/webapp/BarcodeErrorServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BarcodeErrorServlet.java	4 Sep 2004 20:25:57 -0000	1.2
--- BarcodeErrorServlet.java	25 Oct 2010 09:28:47 -0000	1.3
***************
*** 1,11 ****
  /*
   * Copyright 2002-2004 Jeremias Maerki.
!  * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 1,11 ----
  /*
   * Copyright 2002-2004 Jeremias Maerki.
!  *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 40,44 ****
  /**
   * Error handler servlet for Barcode exceptions.
!  * 
   * @author Jeremias Maerki
   * @version $Id$
--- 40,44 ----
  /**
   * Error handler servlet for Barcode exceptions.
!  *
   * @author Jeremias Maerki
   * @version $Id$
***************
*** 46,50 ****
  public class BarcodeErrorServlet extends HttpServlet {
  
!     private Logger log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  
      /**
--- 46,52 ----
  public class BarcodeErrorServlet extends HttpServlet {
  
!     private static final long serialVersionUID = 6515981491896593768L;
! 
!     private transient Logger log = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
  
      /**
***************
*** 78,82 ****
                  bout.close();
              }
!     
              response.setContentLength(bout.size());
              response.getOutputStream().write(bout.toByteArray());
--- 80,84 ----
                  bout.close();
              }
! 
              response.setContentLength(bout.size());
              response.getOutputStream().write(bout.toByteArray());
***************
*** 95,105 ****
              throw new NullPointerException("ContentHandler not set");
          }
!     
          handler.startDocument();
          generateSAXForException(t, handler, "exception");
          handler.endDocument();
      }
!     
!     private void generateSAXForException(Throwable t, 
                  ContentHandler handler, String elName) throws SAXException {
          AttributesImpl attr = new AttributesImpl();
--- 97,107 ----
              throw new NullPointerException("ContentHandler not set");
          }
! 
          handler.startDocument();
          generateSAXForException(t, handler, "exception");
          handler.endDocument();
      }
! 
!     private void generateSAXForException(Throwable t,
                  ContentHandler handler, String elName) throws SAXException {
          AttributesImpl attr = new AttributesImpl();
***************
*** 111,120 ****
          handler.characters(chars, 0, chars.length);
          handler.endElement(null, "msg", "msg");
!         
          if (t instanceof CascadingException) {
              Throwable nested = ((CascadingException)t).getCause();
              generateSAXForException(nested, handler, "nested");
          }
!         
          handler.endElement(null, elName, elName);
      }
--- 113,122 ----
          handler.characters(chars, 0, chars.length);
          handler.endElement(null, "msg", "msg");
! 
          if (t instanceof CascadingException) {
              Throwable nested = ((CascadingException)t).getCause();
              generateSAXForException(nested, handler, "nested");
          }
! 
          handler.endElement(null, elName, elName);
      }

Index: BarcodeRequestBean.java
===================================================================
RCS file: /cvsroot/barcode4j/barcode4j/examples/webapp/java/org/krysalis/barcode4j/webapp/BarcodeRequestBean.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BarcodeRequestBean.java	19 Jan 2007 12:47:43 -0000	1.5
--- BarcodeRequestBean.java	25 Oct 2010 09:28:47 -0000	1.6
***************
*** 16,19 ****
--- 16,21 ----
  package org.krysalis.barcode4j.webapp;
  
+ import java.io.UnsupportedEncodingException;
+ 
  import org.krysalis.barcode4j.servlet.BarcodeServlet;
  import org.krysalis.barcode4j.tools.MimeTypes;
***************
*** 21,25 ****
  /**
   * This is just a little helper bean for the JSP page.
!  * 
   * @version $Id$
   */
--- 23,27 ----
  /**
   * This is just a little helper bean for the JSP page.
!  *
   * @version $Id$
   */
***************
*** 131,135 ****
      public boolean isSVG() {
          return MimeTypes.MIME_SVG.equals(MimeTypes.expandFormat(getFormat()))
!             || (getFormat() == null) 
              || (getFormat().length() == 0);
      }
--- 133,137 ----
      public boolean isSVG() {
          return MimeTypes.MIME_SVG.equals(MimeTypes.expandFormat(getFormat()))
!             || (getFormat() == null)
              || (getFormat().length() == 0);
      }
***************
*** 146,150 ****
          return MimeTypes.isBitmapFormat(getFormat());
      }
!     
      public void setFormat(String string) {
          this.format = string;
--- 148,152 ----
          return MimeTypes.isBitmapFormat(getFormat());
      }
! 
      public void setFormat(String string) {
          this.format = string;
***************
*** 170,174 ****
          StringBuffer sb = new StringBuffer(64);
          sb.append("genbc?");
!     
          //Type
          String type = getType();
--- 172,176 ----
          StringBuffer sb = new StringBuffer(64);
          sb.append("genbc?");
! 
          //Type
          String type = getType();
***************
*** 179,183 ****
          sb.append("=");
          sb.append(type);
!     
          //Message
          String msg = getMsg();
--- 181,185 ----
          sb.append("=");
          sb.append(type);
! 
          //Message
          String msg = getMsg();
***************
*** 188,194 ****
          sb.append(BarcodeServlet.BARCODE_MSG);
          sb.append("=");
!         sb.append(java.net.URLEncoder.encode(msg));
!         //sb.append(java.net.URLEncoder.encode(msg, "UTF-8")); //works for JDK 1.4 only
!     
          //Height
          String height = getHeight();
--- 190,195 ----
          sb.append(BarcodeServlet.BARCODE_MSG);
          sb.append("=");
!         sb.append(encode(msg));
! 
          //Height
          String height = getHeight();
***************
*** 235,239 ****
              sb.append(humanReadable);
          }
!         
          //Output Format
          String fmt = getFormat();
--- 236,240 ----
              sb.append(humanReadable);
          }
! 
          //Output Format
          String fmt = getFormat();
***************
*** 244,248 ****
              sb.append(fmt);
          }
!     
          String humanReadableSize = getHumanReadableSize();
          if (humanReadableSize != null) {
--- 245,249 ----
              sb.append(fmt);
          }
! 
          String humanReadableSize = getHumanReadableSize();
          if (humanReadableSize != null) {
***************
*** 258,262 ****
              sb.append(BarcodeServlet.BARCODE_HUMAN_READABLE_FONT);
              sb.append("=");
!             sb.append(java.net.URLEncoder.encode(humanReadableFont));
          }
  
--- 259,263 ----
              sb.append(BarcodeServlet.BARCODE_HUMAN_READABLE_FONT);
              sb.append("=");
!             sb.append(encode(humanReadableFont));
          }
  
***************
*** 268,272 ****
              sb.append(hrPattern);
          }
!         
          //Output Format
          String res = getResolution();
--- 269,273 ----
              sb.append(hrPattern);
          }
! 
          //Output Format
          String res = getResolution();
***************
*** 277,281 ****
              sb.append(res);
          }
!         
          //Output Format
          boolean gray = isGray();
--- 278,282 ----
              sb.append(res);
          }
! 
          //Output Format
          boolean gray = isGray();
***************
*** 286,292 ****
              sb.append((isGray() ? "true" : "false"));
          }
!         
          return sb.toString();
      }
  
  }
--- 287,301 ----
              sb.append((isGray() ? "true" : "false"));
          }
! 
          return sb.toString();
      }
  
+     private String encode(String text) {
+         try {
+             return java.net.URLEncoder.encode(humanReadableFont, "UTF-8");
+         } catch (UnsupportedEncodingException e) {
+             throw new RuntimeException("Incompatible JVM: " + e.getMessage(), e);
+         }
+     }
+ 
  }