[jcharts] - remove legacy code
Markus Mayer
lotharlutz at fedoraproject.org
Thu Jan 19 14:12:08 UTC 2012
commit 6c0560a5073f7f8913af0299e3d28386ff49a73b
Author: Markus Mayer <markus at thinking-guy.(none)>
Date: Thu Jan 19 15:11:40 2012 +0100
- remove legacy code
jcharts.spec | 7 ++-
jcharts_remove_legacy.patch | 156 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 162 insertions(+), 1 deletions(-)
---
diff --git a/jcharts.spec b/jcharts.spec
index 5833dca..0b966bd 100644
--- a/jcharts.spec
+++ b/jcharts.spec
@@ -1,12 +1,13 @@
Name: jcharts
Version: 0.7.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A java based charts library
Group: Applications/Publishing
License: BSD
URL: http://jcharts.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/%{name}/jCharts-%{version}.zip
+Patch1: jcharts_remove_legacy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -37,6 +38,7 @@ Javadoc for %{name}.
%prep
%setup -q -n jCharts-%{version}
+%patch1
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
sed -i 's/\r//' docs/jCharts_license.txt
@@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 19 2012 Markus Mayer <lotharlutz at gmx.de> 0.7.5-7
+- Remove legacy code
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/jcharts_remove_legacy.patch b/jcharts_remove_legacy.patch
new file mode 100644
index 0000000..21a7173
--- /dev/null
+++ b/jcharts_remove_legacy.patch
@@ -0,0 +1,156 @@
+diff -rupN ../jCharts-0.7.5_ori/src/org/jCharts/encoders/JPEGEncoder13.java ./src/org/jCharts/encoders/JPEGEncoder13.java
+--- ../jCharts-0.7.5_ori/src/org/jCharts/encoders/JPEGEncoder13.java 2003-11-02 08:29:14.000000000 +0100
++++ ./src/org/jCharts/encoders/JPEGEncoder13.java 1970-01-01 01:00:00.000000000 +0100
+@@ -1,106 +0,0 @@
+-/***********************************************************************************************
+- * File Info: $Id: JPEGEncoder13.java,v 1.6 2003/03/14 03:22:42 nathaniel_auvil Exp $
+- * Copyright (C) 2002
+- * Author: Nathaniel G. Auvil
+- * Contributor(s):
+- *
+- * Copyright 2002 (C) Nathaniel G. Auvil. All Rights Reserved.
+- *
+- * Redistribution and use of this software and associated documentation ("Software"), with or
+- * without modification, are permitted provided that the following conditions are met:
+- *
+- * 1. Redistributions of source code must retain copyright statements and notices.
+- * Redistributions must also contain a copy of this document.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
+- * conditions and the following disclaimer in the documentation and/or other materials
+- * provided with the distribution.
+- *
+- * 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or promote
+- * products derived from this Software without prior written permission of Nathaniel G.
+- * Auvil. For written permission, please contact nathaniel_auvil at users.sourceforge.net
+- *
+- * 4. Products derived from this Software may not be called "jCharts" nor may "jCharts" appear
+- * in their names without prior written permission of Nathaniel G. Auvil. jCharts is a
+- * registered trademark of Nathaniel G. Auvil.
+- *
+- * 5. Due credit should be given to the jCharts Project (http://jcharts.sourceforge.net/).
+- *
+- * THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``AS IS'' AND ANY
+- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+- * jCharts OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,STRICT LIABILITY, OR TORT
+- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+- ************************************************************************************************/
+-
+-package org.jCharts.encoders;
+-
+-
+-import com.sun.image.codec.jpeg.*;
+-import org.jCharts.Chart;
+-import org.jCharts.chartData.ChartDataException;
+-import org.jCharts.properties.PropertyException;
+-
+-import java.awt.image.*;
+-import java.io.IOException;
+-import java.io.OutputStream;
+-
+-
+-/*******************************************************************************************
+- * Provided for backwards compatibility for jdk 1.3
+- *
+- *********************************************************************************************/
+-public final class JPEGEncoder13
+-{
+-
+- /******************************************************************************************
+- *
+- *
+- ******************************************************************************************/
+- private JPEGEncoder13() throws Exception
+- {
+- throw new Exception( "No need to create an instance of this class!" );
+- }
+-
+-
+- /******************************************************************************************
+- * Encodes the chart to a JPEG format. If you are generating large dimension images, the file
+- * size can get quite large. You can try decreasing the quality to decrease the file size.
+- *
+- * @param outputStream
+- * @param quality float value from 0.0f(worst image quality) - 1.0f(best image quality)
+- * @throws ChartDataException
+- * @throws PropertyException
+- * @throws IOException
+- *******************************************************************************************/
+- public static final void encode( Chart chart,
+- float quality,
+- OutputStream outputStream ) throws ChartDataException, PropertyException, IOException
+- {
+- BufferedImage bufferedImage = BinaryEncoderUtil.render( chart );
+-
+- float[] sharpKernel = {0.0f, -1.0f, 0.0f,
+- -1.0f, 5.0f, -1.0f,
+- 0.0f, -1.0f, 0.0f};
+-
+- BufferedImageOp sharpen = new ConvolveOp( new Kernel( 3, 3, sharpKernel ), ConvolveOp.EDGE_NO_OP, null );
+- BufferedImage sharp = sharpen.filter( bufferedImage, null );
+-
+- //---create an encoder object for the BufferedImage.
+- JPEGEncodeParam jpegParam = JPEGCodec.getDefaultJPEGEncodeParam( sharp );
+- jpegParam.setQuality( quality, false );
+-
+- JPEGImageEncoder jpeg = JPEGCodec.createJPEGEncoder( outputStream, jpegParam );
+-
+- //---encode the BufferedImage.
+- jpeg.encode( bufferedImage );
+-
+- }
+-}
+-
+-
+-
+diff -rupN ../jCharts-0.7.5_ori/src/org/jCharts/encoders/ServletEncoderHelper.java ./src/org/jCharts/encoders/ServletEncoderHelper.java
+--- ../jCharts-0.7.5_ori/src/org/jCharts/encoders/ServletEncoderHelper.java 2003-11-02 08:29:14.000000000 +0100
++++ ./src/org/jCharts/encoders/ServletEncoderHelper.java 2012-01-19 14:16:49.253002846 +0100
+@@ -81,30 +81,6 @@ public class ServletEncoderHelper
+ * Convenience method to call from a Servlet or JSP. This method will set the appropriate
+ * mime type and then export the chart as the response.
+ *
+- * We cannot overload encode(...) as it will create a compile time dependency with the
+- * HttpServletResponse Class which will require the J2EE libraries.
+- *
+- * @param chart
+- * @param quality float value from 0.0f(worst image quality) - 1.0f(best image quality)
+- * @param httpServletResponse
+- * @throws ChartDataException
+- * @throws PropertyException
+- * @throws IOException
+- * @since 0.7
+- ******************************************************************************************/
+- public static final void encodeJPEG13( Chart chart,
+- float quality,
+- HttpServletResponse httpServletResponse ) throws ChartDataException, PropertyException, IOException
+- {
+- httpServletResponse.setContentType( JPEG_MIME_TYPE );
+- JPEGEncoder13.encode( chart, quality, httpServletResponse.getOutputStream() );
+- }
+-
+-
+- /******************************************************************************************
+- * Convenience method to call from a Servlet or JSP. This method will set the appropriate
+- * mime type and then export the chart as the response.
+- *
+ * @param chart
+ * @param quality float value from 0.0f(worst image quality) - 1.0f(best image quality)
+ * @param httpServletResponse
+diff -rupN ../jCharts-0.7.5_ori/src/org/jCharts/test/ChartTestDriver.java ./src/org/jCharts/test/ChartTestDriver.java
+--- ../jCharts-0.7.5_ori/src/org/jCharts/test/ChartTestDriver.java 2003-11-02 08:29:14.000000000 +0100
++++ ./src/org/jCharts/test/ChartTestDriver.java 2012-01-19 14:17:24.957997867 +0100
+@@ -182,7 +182,7 @@ public final class ChartTestDriver
+ }
+ else if( EXTENSION.equals( JPEG_LEGACY ) )
+ {
+- JPEGEncoder13.encode( chart, 1.0f, fileOutputStream );
++ JPEGEncoder.encode( chart, 1.0f, fileOutputStream );
+ }
+ else
+ {
More information about the scm-commits
mailing list