Permalink
Browse files

Merge pull request #167 from dizzzz/develop

Remove JFreeChart extension
  • Loading branch information...
2 parents 47f5c2b + 6f92960 commit 3eb078d344587f035b1faee8497f501f91e05263 @wolfgangmm wolfgangmm committed Mar 13, 2014
Showing with 1 addition and 2,242 deletions.
  1. +0 −4 extensions/build.properties
  2. +1 −29 extensions/modules/build.xml
  3. +0 −200 extensions/modules/src/org/exist/xquery/modules/jfreechart/Colour.java
  4. +0 −594 extensions/modules/src/org/exist/xquery/modules/jfreechart/Configuration.java
  5. +0 −455 extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeChartFactory.java
  6. +0 −77 extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeChartModule.java
  7. +0 −240 extensions/modules/src/org/exist/xquery/modules/jfreechart/JFreeCharting.java
  8. +0 −44 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/categorydata-advanced.xml
  9. +0 −26 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/categorydata-advanced.xq
  10. +0 −44 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/categorydata.xml
  11. +0 −18 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/categorydata.xq
  12. +0 −24 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/piedata-advanced.xml
  13. +0 −23 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/piedata-advanced.xq
  14. +0 −24 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/piedata.xml
  15. +0 −18 extensions/modules/src/org/exist/xquery/modules/jfreechart/examples/piedata.xq
  16. +0 −62 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/JPGrenderer.java
  17. +0 −62 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/PNGrenderer.java
  18. +0 −72 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/Renderer.java
  19. +0 −76 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/RendererFactory.java
  20. +0 −64 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/SVGZrenderer.java
  21. +0 −86 extensions/modules/src/org/exist/xquery/modules/jfreechart/render/SVGrenderer.java
@@ -124,10 +124,6 @@ include.module.ftpclient = true
# Image manipulation module
include.module.image = true
-# Provides functions to generate graphs using JFreechart
-include.module.jfreechart = false
-include.module.jfreechart.url = http://prdownloads.sourceforge.net/jfreechart/jfreechart-1.0.14.zip
-
# Provides functions to query a JNDI Directory
include.module.jndi = false
@@ -27,13 +27,6 @@
<property file="../build.properties"/>
<!-- Modules (in alphabetical order) -->
-
- <condition property="include.module.jfreechart_svg">
- <and>
- <istrue value="${include.module.jfreechart}"/>
- <istrue value="${include.module.xslfo}"/>
- </and>
- </condition>
<condition property="include.module.oracle_ext">
<and>
@@ -143,25 +136,6 @@
</target>
<!--
- Special targets for jfreechart module unless="jfreechart-present"
- -->
- <target name="prepare-jfreechart" if="${include.module.jfreechart}">
- <echo message="-------------------------------------------------------"/>
- <echo message="Downloading libraries required by the jfreechart module"/>
- <echo message="-------------------------------------------------------"/>
-
- <fetch classpathref="classpath.core" dest="${modules.lib}"
- url="${include.module.jfreechart.url}" classname="org.jfree.chart.JFreeChart"
- usecache="true">
- <patternset>
- <include name="**/lib/jfreechart-*.jar"/>
- <include name="**/lib/jcommon-*.jar"/>
- <exclude name="**/lib/jfreechart-*-*.jar"/>
- </patternset>
- </fetch>
- </target>
-
- <!--
Special targets for memcached module
-->
<target name="prepare-memcached" if="${include.module.memcached}">
@@ -222,7 +196,7 @@
<ivy:retrieve xmlns:ivy="antlib:org.apache.ivy.ant" sync="false"/>
</target>
- <target name="prepare" depends="prepare-ivy,prepare-xslfo,prepare-simpleql,prepare-jfreechart,prepare-memcached,prepare-xmpp,prepare-expathrepo,prepare-cqlparser">
+ <target name="prepare" depends="prepare-ivy,prepare-xslfo,prepare-simpleql,prepare-memcached,prepare-xmpp,prepare-expathrepo,prepare-cqlparser">
<mkdir dir="${classes}"/>
</target>
@@ -251,8 +225,6 @@
<exclude name="org/exist/xquery/modules/file/**" unless="${include.module.file}"/>
<exclude name="org/exist/xquery/modules/httpclient/**" unless="${include.module.httpclient}"/>
<exclude name="org/exist/xquery/modules/image/**" unless="${include.module.image}"/>
- <exclude name="org/exist/xquery/modules/jfreechart/**" unless="${include.module.jfreechart}"/>
- <exclude name="org/exist/xquery/modules/jfreechart/render/SVG**" unless="${include.module.jfreechart_svg}"/>
<exclude name="org/exist/xquery/modules/jndi/**" unless="${include.module.jndi}"/>
<exclude name="org/exist/xquery/modules/lib/**" unless="${include.module.lib}"/>
<exclude name="org/exist/xquery/modules/mail/**" unless="${include.module.mail}"/>
@@ -1,200 +0,0 @@
-/*
- * eXist Open Source Native XML Database
- * Copyright (C) 2009 The eXist Project
- * http://exist-db.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * $Id$
- */
-package org.exist.xquery.modules.jfreechart;
-
-import java.awt.Color;
-
-import org.exist.xquery.XPathException;
-
-/**
- * Convenience class for looking up colors
- *
- * @author Andrzej Taramina (andrzej@chaeron.com)
- */
-public class Colour
-{
-
- private static final String[][] colours = {
- { "AliceBlue", "F0F8FF" },
- { "AntiqueWhite", "FAEBD7" },
- { "Aqua", "00FFFF" },
- { "Aquamarine", "7FFFD4" },
- { "Azure", "F0FFFF" },
- { "Beige", "F5F5DC" },
- { "Bisque", "FFE4C4" },
- { "Black", "000000" },
- { "BlanchedAlmond", "FFEBCD" },
- { "Blue", "0000FF" },
- { "BlueViolet", "8A2BE2" },
- { "Brown", "A52A2A" },
- { "BurlyWood", "DEB887" },
- { "CadetBlue", "5F9EA0" },
- { "Chartreuse", "7FFF00" },
- { "Chocolate", "D2691E" },
- { "Coral", "FF7F50" },
- { "CornflowerBlue", "6495ED" },
- { "Cornsilk", "FFF8DC" },
- { "Crimson", "DC143C" },
- { "Cyan", "00FFFF" },
- { "DarkBlue", "00008B" },
- { "DarkCyan", "008B8B" },
- { "DarkGoldenRod", "B8860B" },
- { "DarkGray", "A9A9A9" },
- { "DarkGreen", "006400" },
- { "DarkKhaki", "BDB76B" },
- { "DarkMagenta", "8B008B" },
- { "DarkOliveGreen", "556B2F" },
- { "Darkorange", "FF8C00" },
- { "DarkOrchid", "9932CC" },
- { "DarkRed", "8B0000" },
- { "DarkSalmon", "E9967A" },
- { "DarkSeaGreen", "8FBC8F" },
- { "DarkSlateBlue", "483D8B" },
- { "DarkSlateGray", "2F4F4F" },
- { "DarkTurquoise", "00CED1" },
- { "DarkViolet", "9400D3" },
- { "DeepPink", "FF1493" },
- { "DeepSkyBlue", "00BFFF" },
- { "DimGray", "696969" },
- { "DodgerBlue", "1E90FF" },
- { "FireBrick", "B22222" },
- { "FloralWhite", "FFFAF0" },
- { "ForestGreen", "228B22" },
- { "Fuchsia", "FF00FF" },
- { "Gainsboro", "DCDCDC" },
- { "GhostWhite", "F8F8FF" },
- { "Gold", "FFD700" },
- { "GoldenRod", "DAA520" },
- { "Gray", "808080" },
- { "Green", "008000" },
- { "GreenYellow", "ADFF2F" },
- { "HoneyDew", "F0FFF0" },
- { "HotPink", "FF69B4" },
- { "IndianRed", "CD5C5C" },
- { "Indigo", "4B0082" },
- { "Ivory", "FFFFF0" },
- { "Khaki", "F0E68C" },
- { "Lavender", "E6E6FA" },
- { "LavenderBlush", "FFF0F5" },
- { "LawnGreen", "7CFC00" },
- { "LemonChiffon", "FFFACD" },
- { "LightBlue", "ADD8E6" },
- { "LightCoral", "F08080" },
- { "LightCyan", "E0FFFF" },
- { "LightGoldenRodYellow", "FAFAD2" },
- { "LightGrey", "D3D3D3" },
- { "LightGreen", "90EE90" },
- { "LightPink", "FFB6C1" },
- { "LightSalmon", "FFA07A" },
- { "LightSeaGreen", "20B2AA" },
- { "LightSkyBlue", "87CEFA" },
- { "LightSlateGray", "778899" },
- { "LightSteelBlue", "B0C4DE" },
- { "LightYellow", "FFFFE0" },
- { "Lime", "00FF00" },
- { "LimeGreen", "32CD32" },
- { "Linen", "FAF0E6" },
- { "Magenta", "FF00FF" },
- { "Maroon", "800000" },
- { "MediumAquaMarine", "66CDAA" },
- { "MediumBlue", "0000CD" },
- { "MediumOrchid", "BA55D3" },
- { "MediumPurple", "9370D8" },
- { "MediumSeaGreen", "3CB371" },
- { "MediumSlateBlue", "7B68EE" },
- { "MediumSpringGreen", "00FA9A" },
- { "MediumTurquoise", "48D1CC" },
- { "MediumVioletRed", "C71585" },
- { "MidnightBlue", "191970" },
- { "MintCream", "F5FFFA" },
- { "MistyRose", "FFE4E1" },
- { "Moccasin", "FFE4B5" },
- { "NavajoWhite", "FFDEAD" },
- { "Navy", "000080" },
- { "OldLace", "FDF5E6" },
- { "Olive", "808000" },
- { "OliveDrab", "6B8E23" },
- { "Orange", "FFA500" },
- { "OrangeRed", "FF4500" },
- { "Orchid", "DA70D6" },
- { "PaleGoldenRod", "EEE8AA" },
- { "PaleGreen", "98FB98" },
- { "PaleTurquoise", "AFEEEE" },
- { "PaleVioletRed", "D87093" },
- { "PapayaWhip", "FFEFD5" },
- { "PeachPuff", "FFDAB9" },
- { "Peru", "CD853F" },
- { "Pink", "FFC0CB" },
- { "Plum", "DDA0DD" },
- { "PowderBlue", "B0E0E6" },
- { "Purple", "800080" },
- { "Red", "FF0000" },
- { "RosyBrown", "BC8F8F" },
- { "RoyalBlue", "4169E1" },
- { "SaddleBrown", "8B4513" },
- { "Salmon", "FA8072" },
- { "SandyBrown", "F4A460" },
- { "SeaGreen", "2E8B57" },
- { "SeaShell", "FFF5EE" },
- { "Sienna", "A0522D" },
- { "Silver", "C0C0C0" },
- { "SkyBlue", "87CEEB" },
- { "SlateBlue", "6A5ACD" },
- { "SlateGray", "708090" },
- { "Snow", "FFFAFA" },
- { "SpringGreen", "00FF7F" },
- { "SteelBlue", "4682B4" },
- { "Tan", "D2B48C" },
- { "Teal", "008080" },
- { "Thistle", "D8BFD8" },
- { "Tomato", "FF6347" },
- { "Turquoise", "40E0D0" },
- { "Violet", "EE82EE" },
- { "Wheat", "F5DEB3" },
- { "White", "FFFFFF" },
- { "WhiteSmoke", "F5F5F5" },
- { "Yellow", "FFFF00" },
- { "YellowGreen", "9ACD32" }
- };
-
- public static Color getColor( String value ) throws XPathException
- {
- Color color = null;
-
- for( int i = 0; i < colours.length; i++ ) {
- if( value.equalsIgnoreCase( colours[ i ][ 0 ] ) ) {
- color = new Color( Integer.parseInt( colours[ i ][ 1 ], 16 ) );
- }
- }
-
- if( color == null ) {
- try {
- color = new Color( Integer.parseInt( value, 16 ) );
- }
- catch( NumberFormatException e ) {
- throw( new XPathException( "Cannot create color, value is not a valid color name or hex value: " + value ) );
- }
- }
-
- return( color );
- }
-}
Oops, something went wrong.

0 comments on commit 3eb078d

Please sign in to comment.