From: David G. <mu...@us...> - 2006-01-10 15:53:39
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8513/source/org/jfree/chart/servlet Modified Files: Tag: STABLE_1-0-0 ServletUtilities.java Log Message: 2006-01-10 David Gilbert <dav...@ob...> * source/org/jfree/chart/servlet/ServletUtilities.java: Updated API docs and reformatted source code. Index: ServletUtilities.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/servlet/ServletUtilities.java,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** ServletUtilities.java 25 Oct 2005 20:58:06 -0000 1.3.2.1 --- ServletUtilities.java 10 Jan 2006 15:53:30 -0000 1.3.2.2 *************** *** 3,7 **** * =========================================================== * ! * (C) Copyright 2000-2005, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html --- 3,7 ---- * =========================================================== * ! * (C) Copyright 2000-2006, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html *************** *** 28,32 **** * ServletUtilities.java * --------------------- ! * (C) Copyright 2002-2005, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; --- 28,32 ---- * ServletUtilities.java * --------------------- ! * (C) Copyright 2002-2006, by Richard Atkinson and Contributors. * * Original Author: Richard Atkinson; *************** *** 50,53 **** --- 50,55 ---- * 24-Mar-2004 : Added temp filename prefix attribute (DG); * 09-Mar-2005 : Added "one time" file option (DG); + * ------------- JFREECHART 1.0.0 RELEASED ------------------------------------ + * 10-Jan-2006 : Updated API docs and reformatted (DG); * */ *************** *** 55,58 **** --- 57,61 ---- package org.jfree.chart.servlet; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; *************** *** 74,79 **** /** * Utility class used for servlet related JFreeChart operations. - * - * @author Richard Atkinson */ public class ServletUtilities { --- 77,80 ---- *************** *** 145,154 **** */ public static String saveChartAsPNG(JFreeChart chart, int width, int height, ! HttpSession session) ! throws IOException { ! ! return ServletUtilities.saveChartAsPNG( ! chart, width, height, null, session ! ); } --- 146,153 ---- */ public static String saveChartAsPNG(JFreeChart chart, int width, int height, ! HttpSession session) throws IOException { ! ! return ServletUtilities.saveChartAsPNG(chart, width, height, null, ! session); } *************** *** 174,180 **** */ public static String saveChartAsPNG(JFreeChart chart, int width, int height, ! ChartRenderingInfo info, ! HttpSession session) ! throws IOException { if (chart == null) { --- 173,177 ---- */ public static String saveChartAsPNG(JFreeChart chart, int width, int height, ! ChartRenderingInfo info, HttpSession session) throws IOException { if (chart == null) { *************** *** 186,192 **** prefix = ServletUtilities.tempOneTimeFilePrefix; } ! File tempFile = File.createTempFile( ! prefix, ".png", new File(System.getProperty("java.io.tmpdir")) ! ); ChartUtilities.saveChartAsPNG(tempFile, chart, width, height, info); if (session != null) { --- 183,188 ---- prefix = ServletUtilities.tempOneTimeFilePrefix; } ! File tempFile = File.createTempFile(prefix, ".png", ! new File(System.getProperty("java.io.tmpdir"))); ChartUtilities.saveChartAsPNG(tempFile, chart, width, height, info); if (session != null) { *************** *** 199,203 **** /** * Saves the chart as a JPEG format file in the temporary directory. ! * * @param chart the JFreeChart to be saved. * @param width the width of the chart. --- 195,204 ---- /** * Saves the chart as a JPEG format file in the temporary directory. ! * <p> ! * SPECIAL NOTE: Please avoid using JPEG as an image format for charts, ! * it is a "lossy" format that introduces visible distortions in the ! * resulting image - use PNG instead. In addition, note that JPEG output ! * is supported by JFreeChart only for JRE 1.4.2 or later. ! * * @param chart the JFreeChart to be saved. * @param width the width of the chart. *************** *** 216,222 **** throws IOException { ! return ServletUtilities.saveChartAsJPEG( ! chart, width, height, null, session ! ); } --- 217,222 ---- throws IOException { ! return ServletUtilities.saveChartAsJPEG(chart, width, height, null, ! session); } *************** *** 224,229 **** /** * Saves the chart as a JPEG format file in the temporary directory and ! * populates the ChartRenderingInfo object which can be used to generate ! * an HTML image map. * * @param chart the chart to be saved (<code>null</code> not permitted). --- 224,234 ---- /** * Saves the chart as a JPEG format file in the temporary directory and ! * populates the <code>ChartRenderingInfo</code> object which can be used ! * to generate an HTML image map. ! * <p> ! * SPECIAL NOTE: Please avoid using JPEG as an image format for charts, ! * it is a "lossy" format that introduces visible distortions in the ! * resulting image - use PNG instead. In addition, note that JPEG output ! * is supported by JFreeChart only for JRE 1.4.2 or later. * * @param chart the chart to be saved (<code>null</code> not permitted). *************** *** 241,246 **** */ public static String saveChartAsJPEG(JFreeChart chart, int width, ! int height, ChartRenderingInfo info, ! HttpSession session) throws IOException { --- 246,250 ---- */ public static String saveChartAsJPEG(JFreeChart chart, int width, ! int height, ChartRenderingInfo info, HttpSession session) throws IOException { *************** *** 254,260 **** prefix = ServletUtilities.tempOneTimeFilePrefix; } ! File tempFile = File.createTempFile( ! prefix, ".jpeg", new File(System.getProperty("java.io.tmpdir")) ! ); ChartUtilities.saveChartAsJPEG(tempFile, chart, width, height, info); if (session != null) { --- 258,263 ---- prefix = ServletUtilities.tempOneTimeFilePrefix; } ! File tempFile = File.createTempFile(prefix, ".jpeg", ! new File(System.getProperty("java.io.tmpdir"))); ChartUtilities.saveChartAsJPEG(tempFile, chart, width, height, info); if (session != null) { *************** *** 277,283 **** String tempDirName = System.getProperty("java.io.tmpdir"); if (tempDirName == null) { ! throw new RuntimeException( ! "Temporary directory system property (java.io.tmpdir) is null." ! ); } --- 280,285 ---- String tempDirName = System.getProperty("java.io.tmpdir"); if (tempDirName == null) { ! throw new RuntimeException("Temporary directory system property " ! + "(java.io.tmpdir) is null."); } *************** *** 298,302 **** */ protected static void registerChartForDeletion(File tempFile, ! HttpSession session) { // Add chart to deletion list in session --- 300,304 ---- */ protected static void registerChartForDeletion(File tempFile, ! HttpSession session) { // Add chart to deletion list in session *************** *** 325,330 **** */ public static void sendTempFile(String filename, ! HttpServletResponse response) ! throws IOException { File file = new File(System.getProperty("java.io.tmpdir"), filename); --- 327,331 ---- */ public static void sendTempFile(String filename, ! HttpServletResponse response) throws IOException { File file = new File(System.getProperty("java.io.tmpdir"), filename); *************** *** 372,377 **** if (file.exists()) { BufferedInputStream bis = new BufferedInputStream( ! new FileInputStream(file) ! ); // Set HTTP headers --- 373,377 ---- if (file.exists()) { BufferedInputStream bis = new BufferedInputStream( ! new FileInputStream(file)); // Set HTTP headers *************** *** 381,394 **** response.setHeader("Content-Length", String.valueOf(file.length())); SimpleDateFormat sdf = new SimpleDateFormat( ! "EEE, dd MMM yyyy HH:mm:ss z" ! ); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); ! response.setHeader( ! "Last-Modified", sdf.format(new Date(file.lastModified())) ! ); BufferedOutputStream bos = new BufferedOutputStream( ! response.getOutputStream() ! ); byte[] input = new byte[1024]; boolean eof = false; --- 381,391 ---- response.setHeader("Content-Length", String.valueOf(file.length())); SimpleDateFormat sdf = new SimpleDateFormat( ! "EEE, dd MMM yyyy HH:mm:ss z"); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); ! response.setHeader("Last-Modified", ! sdf.format(new Date(file.lastModified()))); BufferedOutputStream bos = new BufferedOutputStream( ! response.getOutputStream()); byte[] input = new byte[1024]; boolean eof = false; *************** *** 434,441 **** r += inputString.substring(0, i) + replaceString; if (i + searchString.length() < inputString.length()) { ! r += searchReplace( ! inputString.substring(i + searchString.length()), ! searchString, replaceString ! ); } --- 431,436 ---- r += inputString.substring(0, i) + replaceString; if (i + searchString.length() < inputString.length()) { ! r += searchReplace(inputString.substring(i + searchString.length()), ! searchString, replaceString); } |