Author: twerner Date: 2011-08-29 21:47:10 +0000 (Mon, 29 Aug 2011) New Revision: 14595
Added: tags/libskinlf-java/6.7-7/ tags/libskinlf-java/6.7-7/debian/changelog tags/libskinlf-java/6.7-7/debian/compat tags/libskinlf-java/6.7-7/debian/control tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch tags/libskinlf-java/6.7-7/debian/patches/series tags/libskinlf-java/6.7-7/debian/rules tags/libskinlf-java/6.7-7/debian/source/ Removed: tags/libskinlf-java/6.7-7/debian/changelog tags/libskinlf-java/6.7-7/debian/compat tags/libskinlf-java/6.7-7/debian/control tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch tags/libskinlf-java/6.7-7/debian/rules Log: [svn-buildpackage] Tagging libskinlf-java 6.7-7 Deleted: tags/libskinlf-java/6.7-7/debian/changelog =================================================================== --- trunk/libskinlf-java/debian/changelog 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/changelog 2011-08-29 21:47:10 UTC (rev 14595) @@ -1,49 +0,0 @@ -libskinlf-java (6.7-6) unstable; urgency=low - - * Change of my email address since I am now DD - * Standards-Version updated to 3.8.3 - * DM-Upload-Allowed removed - * openjdk-6-jdk => default-jdk - - -- Sylvestre Ledru <sylves...@debian.org> Fri, 27 Nov 2009 10:37:44 +0100 - -libskinlf-java (6.7-5) unstable; urgency=low - - [ Sylvestre Ledru ] - * Build with openjdk instead of gcj - - [ Torsten Werner ] - * Change Maintainer: Debian Java Maintainers. - * Change Section: java. - * Add missing Depends: ${misc:Depends}. - * Update Standards-Version: 3.8.2 (no changes). - - -- Torsten Werner <twer...@debian.org> Mon, 29 Jun 2009 20:30:52 +0200 - -libskinlf-java (6.7-4) unstable; urgency=low - - * Lintian warning removed (refers to the file - /usr/share/common-licenses/Apache-2.0) - * Updated to Standards-Version: 3.8.0 - - -- Sylvestre Ledru <sylvestre.le...@inria.fr> Wed, 25 Jun 2008 10:37:14 +0200 - -libskinlf-java (6.7-3) unstable; urgency=low - - * Add DM-Upload-Allowed: yes to enable uploads by Sylvestre. - - -- Torsten Werner <twer...@debian.org> Tue, 29 Apr 2008 20:37:18 +0200 - -libskinlf-java (6.7-2) unstable; urgency=low - - * Updated to Standards-Version: 3.7.3 (no changes needed). - * Update of the descriptions to make lintian happy. - - -- Sylvestre Ledru <sylvestre.le...@inria.fr> Sat, 22 Dec 2007 12:56:27 +0100 - -libskinlf-java (6.7-1) unstable; urgency=low - - * Initial Release (Closes: #454652) - - -- Sylvestre Ledru <sylvestre.le...@inria.fr> Sun, 30 Sep 2007 00:32:33 +0100 - Copied: tags/libskinlf-java/6.7-7/debian/changelog (from rev 14594, trunk/libskinlf-java/debian/changelog) =================================================================== --- tags/libskinlf-java/6.7-7/debian/changelog (rev 0) +++ tags/libskinlf-java/6.7-7/debian/changelog 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,58 @@ +libskinlf-java (6.7-7) unstable; urgency=low + + * Switch to debhelper level 7. + * Update Standards-Version: 3.9.1. + * Remove Java runtime from Depends. + * Switch to source format 3.0. + + -- Torsten Werner <twer...@debian.org> Mon, 29 Aug 2011 23:43:34 +0200 + +libskinlf-java (6.7-6) unstable; urgency=low + + * Change of my email address since I am now DD + * Standards-Version updated to 3.8.3 + * DM-Upload-Allowed removed + * openjdk-6-jdk => default-jdk + + -- Sylvestre Ledru <sylves...@debian.org> Fri, 27 Nov 2009 10:37:44 +0100 + +libskinlf-java (6.7-5) unstable; urgency=low + + [ Sylvestre Ledru ] + * Build with openjdk instead of gcj + + [ Torsten Werner ] + * Change Maintainer: Debian Java Maintainers. + * Change Section: java. + * Add missing Depends: ${misc:Depends}. + * Update Standards-Version: 3.8.2 (no changes). + + -- Torsten Werner <twer...@debian.org> Mon, 29 Jun 2009 20:30:52 +0200 + +libskinlf-java (6.7-4) unstable; urgency=low + + * Lintian warning removed (refers to the file + /usr/share/common-licenses/Apache-2.0) + * Updated to Standards-Version: 3.8.0 + + -- Sylvestre Ledru <sylvestre.le...@inria.fr> Wed, 25 Jun 2008 10:37:14 +0200 + +libskinlf-java (6.7-3) unstable; urgency=low + + * Add DM-Upload-Allowed: yes to enable uploads by Sylvestre. + + -- Torsten Werner <twer...@debian.org> Tue, 29 Apr 2008 20:37:18 +0200 + +libskinlf-java (6.7-2) unstable; urgency=low + + * Updated to Standards-Version: 3.7.3 (no changes needed). + * Update of the descriptions to make lintian happy. + + -- Sylvestre Ledru <sylvestre.le...@inria.fr> Sat, 22 Dec 2007 12:56:27 +0100 + +libskinlf-java (6.7-1) unstable; urgency=low + + * Initial Release (Closes: #454652) + + -- Sylvestre Ledru <sylvestre.le...@inria.fr> Sun, 30 Sep 2007 00:32:33 +0100 + Deleted: tags/libskinlf-java/6.7-7/debian/compat =================================================================== --- trunk/libskinlf-java/debian/compat 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/compat 2011-08-29 21:47:10 UTC (rev 14595) @@ -1 +0,0 @@ -5 Copied: tags/libskinlf-java/6.7-7/debian/compat (from rev 14594, trunk/libskinlf-java/debian/compat) =================================================================== --- tags/libskinlf-java/6.7-7/debian/compat (rev 0) +++ tags/libskinlf-java/6.7-7/debian/compat 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1 @@ +7 Deleted: tags/libskinlf-java/6.7-7/debian/control =================================================================== --- trunk/libskinlf-java/debian/control 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/control 2011-08-29 21:47:10 UTC (rev 14595) @@ -1,44 +0,0 @@ -Source: libskinlf-java -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Sylvestre Ledru <sylves...@debian.org>, - Torsten Werner <twer...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, - default-jdk, liblaf-plugin-java, libxalan2-java, imagemagick -Standards-Version: 3.8.3 -Homepage: http://skinlf.l2fprod.com -Vcs-Svn: https://bollin.googlecode.com/svn/libskinlf-java/trunk -Vcs-Browser: http://bollin.googlecode.com/svn/libskinlf-java/trunk - -Package: libskinlf-java -Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime, - liblaf-plugin-java, libxalan2-java, ${misc:Depends} -Suggests: libskinlf-java-demo -Description: Skin Look and Feel - Skinning Engine for the Swing toolkit - Skin Look And Feel allows Java developers to write skinnable application - using the Swing toolkit. Skin Look And Feel is able to load themepacks - (a bundle of GTK+ - The Gimp Toolkit - and KDE - The K Desktop - Environment - skins) to enhance your application GUI controls such as - Buttons, Checks, Radios, Scrollbars, Progress Bar, Lists, Tables, - Internal Frames, Colors, Background Textures, Regular Windows. - . - Skin Look And Feel (aka SkinLF) also includes NativeSkin to create irregular - windows. - -Package: libskinlf-java-demo -Architecture: all -Depends: libskinlf-java, ${misc:Depends} -Description: Swing Java docking framework - demos and examples - Skin Look And Feel allows Java developers to write skinnable application - using the Swing toolkit. Skin Look And Feel is able to load themepacks - (a bundle of GTK+ - The Gimp Toolkit - and KDE - The K Desktop - Environment - skins) to enhance your application GUI controls such as Buttons, - Checks, Radios, Scrollbars, Progress Bar, Lists, Tables, Internal Frames, - Colors, Background Textures, Regular Windows. - . - Skin Look And Feel (aka SkinLF) also includes NativeSkin to create irregular - windows. - . - This package contains the examples and demonstration files. Copied: tags/libskinlf-java/6.7-7/debian/control (from rev 14594, trunk/libskinlf-java/debian/control) =================================================================== --- tags/libskinlf-java/6.7-7/debian/control (rev 0) +++ tags/libskinlf-java/6.7-7/debian/control 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,43 @@ +Source: libskinlf-java +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Sylvestre Ledru <sylves...@debian.org>, + Torsten Werner <twer...@debian.org> +Build-Depends: debhelper (>= 7), cdbs, ant, ant-optional, + default-jdk, liblaf-plugin-java, libxalan2-java, imagemagick +Standards-Version: 3.9.1 +Homepage: http://skinlf.l2fprod.com +Vcs-Svn: https://bollin.googlecode.com/svn/libskinlf-java/trunk +Vcs-Browser: http://bollin.googlecode.com/svn/libskinlf-java/trunk + +Package: libskinlf-java +Architecture: all +Depends: liblaf-plugin-java, libxalan2-java, ${misc:Depends} +Suggests: libskinlf-java-demo +Description: Skin Look and Feel - Skinning Engine for the Swing toolkit + Skin Look And Feel allows Java developers to write skinnable application + using the Swing toolkit. Skin Look And Feel is able to load themepacks + (a bundle of GTK+ - The Gimp Toolkit - and KDE - The K Desktop + Environment - skins) to enhance your application GUI controls such as + Buttons, Checks, Radios, Scrollbars, Progress Bar, Lists, Tables, + Internal Frames, Colors, Background Textures, Regular Windows. + . + Skin Look And Feel (aka SkinLF) also includes NativeSkin to create irregular + windows. + +Package: libskinlf-java-demo +Architecture: all +Depends: libskinlf-java, ${misc:Depends} +Description: Swing Java docking framework - demos and examples + Skin Look And Feel allows Java developers to write skinnable application + using the Swing toolkit. Skin Look And Feel is able to load themepacks + (a bundle of GTK+ - The Gimp Toolkit - and KDE - The K Desktop + Environment - skins) to enhance your application GUI controls such as Buttons, + Checks, Radios, Scrollbars, Progress Bar, Lists, Tables, Internal Frames, + Colors, Background Textures, Regular Windows. + . + Skin Look And Feel (aka SkinLF) also includes NativeSkin to create irregular + windows. + . + This package contains the examples and demonstration files. Deleted: tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch =================================================================== --- trunk/libskinlf-java/debian/patches/GtkParser.jj.patch 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch 2011-08-29 21:47:10 UTC (rev 14595) @@ -1,408 +0,0 @@ ---- skinlf-6.7.orig/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj.orig 1970-01-01 01:00:00.000000000 +0100 -+++ skinlf-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj 2007-12-08 15:59:11.000000000 +0100 -@@ -0,0 +1,405 @@ -+PARSER_BEGIN(GtkParser) -+ -+/* ==================================================================== -+ * -+ * @PROJECT.FULLNAME@ @VERSION@ License. -+ * -+ * Copyright (c) @YEAR@ L2FProd.com. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 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 end-user documentation included with the redistribution, if -+ * any, must include the following acknowlegement: -+ * "This product includes software developed by L2FProd.com -+ * (http://www.L2FProd.com/)." -+ * Alternately, this acknowlegement may appear in the software itself, -+ * if and wherever such third-party acknowlegements normally appear. -+ * -+ * 4. The names "@PROJECT.FULLNAME@", "SkinLF" and "L2FProd.com" must not -+ * be used to endorse or promote products derived from this software -+ * without prior written permission. For written permission, please -+ * contact i...@l2fprod.com. -+ * -+ * 5. Products derived from this software may not be called "SkinLF" -+ * nor may "SkinLF" appear in their names without prior written -+ * permission of L2FProd.com. -+ * -+ * THIS SOFTWARE IS PROVIDED ``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 L2FPROD.COM 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 com.l2fprod.gui.plaf.skin.impl.gtk.parser; -+ -+import java.io.File; -+import java.io.FileInputStream; -+import java.net.URL; -+import java.util.Hashtable; -+import java.util.Enumeration; -+import com.l2fprod.gui.plaf.skin.impl.gtk.*; -+import com.l2fprod.gui.plaf.skin.*; -+ -+public class GtkParser { -+ -+ Hashtable styleTable, classTable; -+ URL directory; -+ -+ public static void main(String[] args) throws Exception { -+ GtkParser parser = new GtkParser(new FileInputStream(args[0])); -+ parser.buildStructure(); -+ } -+ -+ -+ public GtkParser(String filename) throws Exception { -+ this(new File(filename)); -+ } -+ -+ public GtkParser(File file) throws Exception { -+ this(SkinUtils.toURL(file)); -+ } -+ -+ public GtkParser(URL url) throws Exception { -+ this(url.openStream()); -+ directory = url; -+ /* String urlpath = url.toString(); -+ int index = urlpath.lastIndexOf("/"); -+ -+ if (index != -1) -+ directory = new URL(urlpath.substring(0, index) + "/"); -+ else -+ directory = new URL(urlpath + "/../"); -+ */ -+ //PENDING(fred): we could use directly the URL given because it could act as an url context... -+ // need testing... -+ } -+ -+ public URL getDirectory() { -+ return directory; -+ } -+ -+ /** -+ * Sets the Directory attribute of the GtkParser object -+ * -+ * @param dir The new Directory value -+ */ -+ public void setDirectory(URL dir) { -+ directory = dir; -+ } -+ -+ public Hashtable getStyles() { -+ return styleTable; -+ } -+ -+ public Hashtable getClasses() { -+ return classTable; -+ } -+ -+ public GtkStyle getStyle(String name) { -+ return (GtkStyle)getStyles().get(name); -+ } -+ -+ public GtkClass getClass(String name) { -+ return (GtkClass)getClasses().get(name); -+ } -+ -+} -+ -+PARSER_END(GtkParser) -+ -+SKIP: { " " | "\t" | "\n" | "\r" | "\f" } -+ -+MORE : -+{ -+ "#" : IN_SINGLE_LINE_COMMENT -+ | -+ <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT -+ | -+ "/*" : IN_MULTI_LINE_COMMENT -+ } -+<IN_SINGLE_LINE_COMMENT> -+ SPECIAL_TOKEN : -+{ -+ <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : DEFAULT -+ } -+ -+<IN_FORMAL_COMMENT> -+ SPECIAL_TOKEN : -+{ -+ <FORMAL_COMMENT: "*/" > : DEFAULT -+ } -+ -+<IN_MULTI_LINE_COMMENT> -+ SPECIAL_TOKEN : -+{ -+ <MULTI_LINE_COMMENT: "*/" > : DEFAULT -+ } -+ -+<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> -+ MORE : -+{ -+ < ~[] > -+ } -+ -+TOKEN : -+{ -+< DECIMAL_LITERAL: ((["0"-"9"])+ ("."(["0"-"9"])+)? )> -+| < STRING_LITERAL: -+ "\"" -+ ( (~["\"","\\","\n","\r"]) -+ | ("\\" -+ ( ["n","t","b","r","f","\\","'","\""] -+ | ["0"-"7"] ( ["0"-"7"] )? -+ | ["0"-"3"] ["0"-"7"] ["0"-"7"] -+ ) -+ ) -+ )* -+ "\"" -+ > -+} -+ -+TOKEN: { -+ <BOOLEAN: "TRUE" | "FALSE"> -+ | <EXTRA: "bg_pixmap" | "bg" | "fg" | "base" | "text"> -+ | <FONT: "font"> -+ | <STYLE: "style"> -+ | <CLASS: "class"> -+ | <ENGINE: "engine"> -+ | <IMAGE: "image"> -+ | <FUNCTION: "function"> -+ | <RECOLORABLE: "recolorable"> -+ | <FILE: "file"> -+ | <BORDER: "border"> -+ | <STRETCH: "stretch"> -+ | <SHADOW: "shadow"> -+ | <STATE: "state"> -+ | <DETAIL: "detail"> -+ | <GAP_SIDE: "gap_side"> -+ | <GAP_FILE: "gap_file"> -+ | <GAP_BORDER: "gap_border"> -+ | <GAP_START_FILE: "gap_start_file"> -+ | <GAP_START_BORDER: "gap_start_border"> -+ | <GAP_END_FILE: "gap_end_file"> -+ | <GAP_END_BORDER: "gap_end_border"> -+ | <OVERLAY_FILE: "overlay_file"> -+ | <OVERLAY_BORDER: "overlay_border"> -+ | <OVERLAY_STRETCH: "overlay_stretch"> -+ | <ORIENTATION: "orientation"> -+ | <ARROW_DIRECTION: "arrow_direction"> -+} -+ -+TOKEN: { -+ <FUNCTION_TYPE: "ARROW" | "BOX" | "BOX_GAP" | "CHECK" | "EXTENSION" | "FLAT_BOX" -+ | "FOCUS" | "HANDLE" | "HLINE" | "OPTION" | "SHADOW" | "SHADOW_GAP" -+ | "SLIDER" | "VLINE" | "EXTENSION" | "TAB"> -+| <STATE_TYPE: "ACTIVE" | "INSENSITIVE" | "NORMAL" | "PRELIGHT" | "SELECTED"> -+| <SHADOW_TYPE: "ETCHED_IN" | "ETCHED_OUT" | "IN" | "OUT"> -+| <ORIENTATION_TYPE: "HORIZONTAL" | "VERTICAL"> -+| <DIRECTION: "DOWN" | "LEFT" | "RIGHT" | "UP" | "BOTTOM" | "TOP" > -+} -+ -+TOKEN: { -+ <LCROC: "["> -+ | <RCROC: "]"> -+ | <LBRACK: "{" > -+ | <RBRACK: "}" > -+ | <ASSIGN: "=" > -+ | <COMMA: "," > -+} -+ -+TOKEN: { -+ <OTHER_TOKEN: "module_path" | "include" | "pixmap_path"> -+ | <WIDGET_CLASS: "widget_class"> -+ | <WIDGET: "widget"> -+ | < PROPERTY_KEY: ( (["a"-"z"])+ )> -+} -+ -+void buildStructure(): { -+ styleTable = new Hashtable(); -+ classTable = new Hashtable(); -+} { -+ (styleDefinition() -+ | classDefinition() -+ | whatever() -+ | widgetClassDefinition() -+ | widgetDefinition())* -+ { -+ for (Enumeration e = getClasses().keys(); e.hasMoreElements(); ) { -+ Object key = e.nextElement(); -+ GtkClass clas = (GtkClass)getClasses().get(key); -+ for (int i = 0, c = clas.styles.size(); i < c; i++) -+ clas.styles.(i,(GtkStyle)getStyles().get(clas.styles.elementAt(i))); -+ } -+ } -+ -+} -+ -+void whatever(): { -+} { -+ <OTHER_TOKEN> readString() -+} -+ -+void widgetClassDefinition(): { -+} { -+ <WIDGET_CLASS> readString() <STYLE> readString() -+} -+ -+void widgetDefinition(): { -+} { -+ <WIDGET> readString() <STYLE> readString() -+} -+ -+void styleDefinition(): { -+ GtkStyle style = new GtkStyle(); -+ style.parser = this; -+ Token property, state = null; -+ String value = null; -+} { -+ <STYLE> style.name=readString() <LBRACK> -+ (<FONT> <ASSIGN> readString())* -+ (property=<EXTRA> <LCROC> state=<STATE_TYPE> <RCROC> <ASSIGN> -+ (value=readString() | -+ (<LBRACK> { value="{"; value = value + readFloat() + ","; } <COMMA> -+ { value = value + readFloat() + ","; } <COMMA> -+ { value = value + readFloat(); } -+ { value += "}"; } -+ <RBRACK>)) -+ {style.setProperty(property.image + "[" + state + "]", -+ value); -+ })* -+ (<ENGINE> readString() <LBRACK> -+ { GtkEngine engine = new GtkEngine(); -+ style.engine = engine; -+ engine.style = style; } -+ (imageDefinition(engine))* -+ <RBRACK>)? -+ <RBRACK> -+ { -+ styleTable.put(style.name, style); -+ } -+} -+ -+void imageDefinition(GtkEngine engine): { -+ GtkImage image = new GtkImage(); -+ Token property = null; -+ Token value = null; -+} { -+ <IMAGE> <LBRACK> -+ ((property=<FUNCTION> <ASSIGN> value=<FUNCTION_TYPE>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<RECOLORABLE> <ASSIGN> value=<BOOLEAN>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<STATE> <ASSIGN> value=<STATE_TYPE>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<DETAIL> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<FILE> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<BORDER> <ASSIGN> -+ { image.setProperty(property.image, borderDefinition()); }) -+ | (property=<STRETCH> <ASSIGN> value=<BOOLEAN>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<OVERLAY_FILE> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<OVERLAY_BORDER> <ASSIGN> -+ { image.setProperty(property.image, borderDefinition()); }) -+ | (property=<OVERLAY_STRETCH> <ASSIGN> value=<BOOLEAN>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<SHADOW> <ASSIGN> value=<SHADOW_TYPE>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<GAP_START_FILE> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<GAP_START_BORDER> <ASSIGN> -+ { image.setProperty(property.image, borderDefinition()); }) -+ | (property=<GAP_END_FILE> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<GAP_END_BORDER> <ASSIGN> -+ { image.setProperty(property.image, borderDefinition()); }) -+ | (property=<GAP_SIDE> <ASSIGN> value=<DIRECTION>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<GAP_FILE> <ASSIGN> -+ { image.setProperty(property.image, readString()); }) -+ | (property=<GAP_BORDER> <ASSIGN> -+ { image.setProperty(property.image, borderDefinition()); }) -+ | (property=<ORIENTATION> <ASSIGN> value=<ORIENTATION_TYPE>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<ARROW_DIRECTION> <ASSIGN> value=<DIRECTION>) -+ { image.setProperty(property.image, value.image); } -+ | (property=<PROPERTY_KEY> <ASSIGN>) -+ { image.setProperty(property.image, readString()); } -+ )+ -+ <RBRACK> -+ { engine.addImage(image); } -+} -+ -+GtkBorder borderDefinition(): { -+ GtkBorder border = new GtkBorder(); -+ Token tok = null; -+} { -+ // left, right, top, bottom -+ <LBRACK> tok=<DECIMAL_LITERAL> { border.left = Integer.parseInt(tok.image); } <COMMA> -+ tok=<DECIMAL_LITERAL> { border.right = Integer.parseInt(tok.image); } <COMMA> -+ tok=<DECIMAL_LITERAL> { border.top = Integer.parseInt(tok.image); } <COMMA> -+ tok=<DECIMAL_LITERAL> { border.bottom = Integer.parseInt(tok.image); } <RBRACK> { -+ return border; -+ } -+} -+ -+void classDefinition(): { -+ GtkClass clas; -+} { -+ <CLASS> { String name = readString(); -+ clas = (GtkClass)classTable.get(name); -+ if (clas == null) { -+ clas = new GtkClass(); -+ clas.setName(name); -+ classTable.put(clas.name, clas); -+ } -+ } <STYLE> -+ { -+ clas.addStyleName(readString()); -+ } -+} -+ -+String readString(): { -+ String value = null; -+ Token toks = null; -+} { -+ toks=<STRING_LITERAL> { -+ value = new String(); -+ for (int i=1; i < toks.image.length()-1; i++) { -+ if (toks.image.charAt(i) == '\\') { -+ if ((toks.image.charAt(i+1) == '\\') || (toks.image.charAt(i+1) == '"')) { -+ i++; -+ } -+ } -+ value = value + toks.image.charAt(i); -+ } -+ return(value); -+ } -+} -+ -+float readFloat(): { -+ Token toks = null; -+} { -+ toks = <DECIMAL_LITERAL> { -+ return Float.valueOf(token.image).floatValue(); -+ } -+} Copied: tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch (from rev 14594, trunk/libskinlf-java/debian/patches/GtkParser.jj.patch) =================================================================== --- tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch (rev 0) +++ tags/libskinlf-java/6.7-7/debian/patches/GtkParser.jj.patch 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,410 @@ +Index: libskinlf-java-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ libskinlf-java-6.7/src/com/l2fprod/gui/plaf/skin/impl/gtk/parser/GtkParser.jj 2011-08-29 23:42:10.000000000 +0200 +@@ -0,0 +1,405 @@ ++PARSER_BEGIN(GtkParser) ++ ++/* ==================================================================== ++ * ++ * @PROJECT.FULLNAME@ @VERSION@ License. ++ * ++ * Copyright (c) @YEAR@ L2FProd.com. All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * ++ * 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 end-user documentation included with the redistribution, if ++ * any, must include the following acknowlegement: ++ * "This product includes software developed by L2FProd.com ++ * (http://www.L2FProd.com/)." ++ * Alternately, this acknowlegement may appear in the software itself, ++ * if and wherever such third-party acknowlegements normally appear. ++ * ++ * 4. The names "@PROJECT.FULLNAME@", "SkinLF" and "L2FProd.com" must not ++ * be used to endorse or promote products derived from this software ++ * without prior written permission. For written permission, please ++ * contact i...@l2fprod.com. ++ * ++ * 5. Products derived from this software may not be called "SkinLF" ++ * nor may "SkinLF" appear in their names without prior written ++ * permission of L2FProd.com. ++ * ++ * THIS SOFTWARE IS PROVIDED ``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 L2FPROD.COM 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 com.l2fprod.gui.plaf.skin.impl.gtk.parser; ++ ++import java.io.File; ++import java.io.FileInputStream; ++import java.net.URL; ++import java.util.Hashtable; ++import java.util.Enumeration; ++import com.l2fprod.gui.plaf.skin.impl.gtk.*; ++import com.l2fprod.gui.plaf.skin.*; ++ ++public class GtkParser { ++ ++ Hashtable styleTable, classTable; ++ URL directory; ++ ++ public static void main(String[] args) throws Exception { ++ GtkParser parser = new GtkParser(new FileInputStream(args[0])); ++ parser.buildStructure(); ++ } ++ ++ ++ public GtkParser(String filename) throws Exception { ++ this(new File(filename)); ++ } ++ ++ public GtkParser(File file) throws Exception { ++ this(SkinUtils.toURL(file)); ++ } ++ ++ public GtkParser(URL url) throws Exception { ++ this(url.openStream()); ++ directory = url; ++ /* String urlpath = url.toString(); ++ int index = urlpath.lastIndexOf("/"); ++ ++ if (index != -1) ++ directory = new URL(urlpath.substring(0, index) + "/"); ++ else ++ directory = new URL(urlpath + "/../"); ++ */ ++ //PENDING(fred): we could use directly the URL given because it could act as an url context... ++ // need testing... ++ } ++ ++ public URL getDirectory() { ++ return directory; ++ } ++ ++ /** ++ * Sets the Directory attribute of the GtkParser object ++ * ++ * @param dir The new Directory value ++ */ ++ public void setDirectory(URL dir) { ++ directory = dir; ++ } ++ ++ public Hashtable getStyles() { ++ return styleTable; ++ } ++ ++ public Hashtable getClasses() { ++ return classTable; ++ } ++ ++ public GtkStyle getStyle(String name) { ++ return (GtkStyle)getStyles().get(name); ++ } ++ ++ public GtkClass getClass(String name) { ++ return (GtkClass)getClasses().get(name); ++ } ++ ++} ++ ++PARSER_END(GtkParser) ++ ++SKIP: { " " | "\t" | "\n" | "\r" | "\f" } ++ ++MORE : ++{ ++ "#" : IN_SINGLE_LINE_COMMENT ++ | ++ <"/**" ~["/"]> { input_stream.backup(1); } : IN_FORMAL_COMMENT ++ | ++ "/*" : IN_MULTI_LINE_COMMENT ++ } ++<IN_SINGLE_LINE_COMMENT> ++ SPECIAL_TOKEN : ++{ ++ <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : DEFAULT ++ } ++ ++<IN_FORMAL_COMMENT> ++ SPECIAL_TOKEN : ++{ ++ <FORMAL_COMMENT: "*/" > : DEFAULT ++ } ++ ++<IN_MULTI_LINE_COMMENT> ++ SPECIAL_TOKEN : ++{ ++ <MULTI_LINE_COMMENT: "*/" > : DEFAULT ++ } ++ ++<IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> ++ MORE : ++{ ++ < ~[] > ++ } ++ ++TOKEN : ++{ ++< DECIMAL_LITERAL: ((["0"-"9"])+ ("."(["0"-"9"])+)? )> ++| < STRING_LITERAL: ++ "\"" ++ ( (~["\"","\\","\n","\r"]) ++ | ("\\" ++ ( ["n","t","b","r","f","\\","'","\""] ++ | ["0"-"7"] ( ["0"-"7"] )? ++ | ["0"-"3"] ["0"-"7"] ["0"-"7"] ++ ) ++ ) ++ )* ++ "\"" ++ > ++} ++ ++TOKEN: { ++ <BOOLEAN: "TRUE" | "FALSE"> ++ | <EXTRA: "bg_pixmap" | "bg" | "fg" | "base" | "text"> ++ | <FONT: "font"> ++ | <STYLE: "style"> ++ | <CLASS: "class"> ++ | <ENGINE: "engine"> ++ | <IMAGE: "image"> ++ | <FUNCTION: "function"> ++ | <RECOLORABLE: "recolorable"> ++ | <FILE: "file"> ++ | <BORDER: "border"> ++ | <STRETCH: "stretch"> ++ | <SHADOW: "shadow"> ++ | <STATE: "state"> ++ | <DETAIL: "detail"> ++ | <GAP_SIDE: "gap_side"> ++ | <GAP_FILE: "gap_file"> ++ | <GAP_BORDER: "gap_border"> ++ | <GAP_START_FILE: "gap_start_file"> ++ | <GAP_START_BORDER: "gap_start_border"> ++ | <GAP_END_FILE: "gap_end_file"> ++ | <GAP_END_BORDER: "gap_end_border"> ++ | <OVERLAY_FILE: "overlay_file"> ++ | <OVERLAY_BORDER: "overlay_border"> ++ | <OVERLAY_STRETCH: "overlay_stretch"> ++ | <ORIENTATION: "orientation"> ++ | <ARROW_DIRECTION: "arrow_direction"> ++} ++ ++TOKEN: { ++ <FUNCTION_TYPE: "ARROW" | "BOX" | "BOX_GAP" | "CHECK" | "EXTENSION" | "FLAT_BOX" ++ | "FOCUS" | "HANDLE" | "HLINE" | "OPTION" | "SHADOW" | "SHADOW_GAP" ++ | "SLIDER" | "VLINE" | "EXTENSION" | "TAB"> ++| <STATE_TYPE: "ACTIVE" | "INSENSITIVE" | "NORMAL" | "PRELIGHT" | "SELECTED"> ++| <SHADOW_TYPE: "ETCHED_IN" | "ETCHED_OUT" | "IN" | "OUT"> ++| <ORIENTATION_TYPE: "HORIZONTAL" | "VERTICAL"> ++| <DIRECTION: "DOWN" | "LEFT" | "RIGHT" | "UP" | "BOTTOM" | "TOP" > ++} ++ ++TOKEN: { ++ <LCROC: "["> ++ | <RCROC: "]"> ++ | <LBRACK: "{" > ++ | <RBRACK: "}" > ++ | <ASSIGN: "=" > ++ | <COMMA: "," > ++} ++ ++TOKEN: { ++ <OTHER_TOKEN: "module_path" | "include" | "pixmap_path"> ++ | <WIDGET_CLASS: "widget_class"> ++ | <WIDGET: "widget"> ++ | < PROPERTY_KEY: ( (["a"-"z"])+ )> ++} ++ ++void buildStructure(): { ++ styleTable = new Hashtable(); ++ classTable = new Hashtable(); ++} { ++ (styleDefinition() ++ | classDefinition() ++ | whatever() ++ | widgetClassDefinition() ++ | widgetDefinition())* ++ { ++ for (Enumeration e = getClasses().keys(); e.hasMoreElements(); ) { ++ Object key = e.nextElement(); ++ GtkClass clas = (GtkClass)getClasses().get(key); ++ for (int i = 0, c = clas.styles.size(); i < c; i++) ++ clas.styles.(i,(GtkStyle)getStyles().get(clas.styles.elementAt(i))); ++ } ++ } ++ ++} ++ ++void whatever(): { ++} { ++ <OTHER_TOKEN> readString() ++} ++ ++void widgetClassDefinition(): { ++} { ++ <WIDGET_CLASS> readString() <STYLE> readString() ++} ++ ++void widgetDefinition(): { ++} { ++ <WIDGET> readString() <STYLE> readString() ++} ++ ++void styleDefinition(): { ++ GtkStyle style = new GtkStyle(); ++ style.parser = this; ++ Token property, state = null; ++ String value = null; ++} { ++ <STYLE> style.name=readString() <LBRACK> ++ (<FONT> <ASSIGN> readString())* ++ (property=<EXTRA> <LCROC> state=<STATE_TYPE> <RCROC> <ASSIGN> ++ (value=readString() | ++ (<LBRACK> { value="{"; value = value + readFloat() + ","; } <COMMA> ++ { value = value + readFloat() + ","; } <COMMA> ++ { value = value + readFloat(); } ++ { value += "}"; } ++ <RBRACK>)) ++ {style.setProperty(property.image + "[" + state + "]", ++ value); ++ })* ++ (<ENGINE> readString() <LBRACK> ++ { GtkEngine engine = new GtkEngine(); ++ style.engine = engine; ++ engine.style = style; } ++ (imageDefinition(engine))* ++ <RBRACK>)? ++ <RBRACK> ++ { ++ styleTable.put(style.name, style); ++ } ++} ++ ++void imageDefinition(GtkEngine engine): { ++ GtkImage image = new GtkImage(); ++ Token property = null; ++ Token value = null; ++} { ++ <IMAGE> <LBRACK> ++ ((property=<FUNCTION> <ASSIGN> value=<FUNCTION_TYPE>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<RECOLORABLE> <ASSIGN> value=<BOOLEAN>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<STATE> <ASSIGN> value=<STATE_TYPE>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<DETAIL> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<FILE> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<BORDER> <ASSIGN> ++ { image.setProperty(property.image, borderDefinition()); }) ++ | (property=<STRETCH> <ASSIGN> value=<BOOLEAN>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<OVERLAY_FILE> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<OVERLAY_BORDER> <ASSIGN> ++ { image.setProperty(property.image, borderDefinition()); }) ++ | (property=<OVERLAY_STRETCH> <ASSIGN> value=<BOOLEAN>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<SHADOW> <ASSIGN> value=<SHADOW_TYPE>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<GAP_START_FILE> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<GAP_START_BORDER> <ASSIGN> ++ { image.setProperty(property.image, borderDefinition()); }) ++ | (property=<GAP_END_FILE> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<GAP_END_BORDER> <ASSIGN> ++ { image.setProperty(property.image, borderDefinition()); }) ++ | (property=<GAP_SIDE> <ASSIGN> value=<DIRECTION>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<GAP_FILE> <ASSIGN> ++ { image.setProperty(property.image, readString()); }) ++ | (property=<GAP_BORDER> <ASSIGN> ++ { image.setProperty(property.image, borderDefinition()); }) ++ | (property=<ORIENTATION> <ASSIGN> value=<ORIENTATION_TYPE>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<ARROW_DIRECTION> <ASSIGN> value=<DIRECTION>) ++ { image.setProperty(property.image, value.image); } ++ | (property=<PROPERTY_KEY> <ASSIGN>) ++ { image.setProperty(property.image, readString()); } ++ )+ ++ <RBRACK> ++ { engine.addImage(image); } ++} ++ ++GtkBorder borderDefinition(): { ++ GtkBorder border = new GtkBorder(); ++ Token tok = null; ++} { ++ // left, right, top, bottom ++ <LBRACK> tok=<DECIMAL_LITERAL> { border.left = Integer.parseInt(tok.image); } <COMMA> ++ tok=<DECIMAL_LITERAL> { border.right = Integer.parseInt(tok.image); } <COMMA> ++ tok=<DECIMAL_LITERAL> { border.top = Integer.parseInt(tok.image); } <COMMA> ++ tok=<DECIMAL_LITERAL> { border.bottom = Integer.parseInt(tok.image); } <RBRACK> { ++ return border; ++ } ++} ++ ++void classDefinition(): { ++ GtkClass clas; ++} { ++ <CLASS> { String name = readString(); ++ clas = (GtkClass)classTable.get(name); ++ if (clas == null) { ++ clas = new GtkClass(); ++ clas.setName(name); ++ classTable.put(clas.name, clas); ++ } ++ } <STYLE> ++ { ++ clas.addStyleName(readString()); ++ } ++} ++ ++String readString(): { ++ String value = null; ++ Token toks = null; ++} { ++ toks=<STRING_LITERAL> { ++ value = new String(); ++ for (int i=1; i < toks.image.length()-1; i++) { ++ if (toks.image.charAt(i) == '\\') { ++ if ((toks.image.charAt(i+1) == '\\') || (toks.image.charAt(i+1) == '"')) { ++ i++; ++ } ++ } ++ value = value + toks.image.charAt(i); ++ } ++ return(value); ++ } ++} ++ ++float readFloat(): { ++ Token toks = null; ++} { ++ toks = <DECIMAL_LITERAL> { ++ return Float.valueOf(token.image).floatValue(); ++ } ++} Deleted: tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch =================================================================== --- trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch 2011-08-29 21:47:10 UTC (rev 14595) @@ -1,77 +0,0 @@ -diff -ru skinlf-1.2.12-orig/src/com/l2fprod/tools/ImageUtils.java skinlf-1.2.12/src/com/l2fprod/tools/ImageUtils.java ---- src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:09:36.000000000 +0100 -+++ src/com/l2fprod/tools/ImageUtils.java 2006-01-24 20:19:19.000000000 +0100 -@@ -6,15 +6,12 @@ - - import javax.swing.ImageIcon; - --import com.ibm.imageconversion.*; --import com.sun.jimi.core.*; -+import javax.imageio.*; - - public class ImageUtils { - - public static Component bitmapCreator = new javax.swing.JLabel(); - -- static BMPDecoder decoder = new BMPDecoder(); -- static BMPEncoder encoder = new BMPEncoder(); - - public static Image loadPng(String pathToImage) throws Exception { - ImageIcon icon = new ImageIcon(new File(pathToImage).toURL()); -@@ -22,29 +19,33 @@ - } - - public static void savePng(Image image, String pathToImage) throws Exception { -- Jimi.putImage(image, pathToImage); -+ ImageIO.write((RenderedImage)image, "png", new File(pathToImage)); - } - -+ private static String getFileFmt(String pathToImage) throws Exception { -+ String fmt; -+ if (pathToImage.toLowerCase().endsWith(".png")) { -+ return "png"; -+ } -+ if (pathToImage.toLowerCase().endsWith(".gif")) { -+ return "gif"; -+ } -+ if (pathToImage.toLowerCase().endsWith(".bmp")) { -+ return "bmp"; -+ } -+ return ""; -+ } -+ - public static void createPicture(String pathToImage, int index, int maxParts, - String filename, boolean horizontal) { - try { - System.out.println("working with " + pathToImage); - Image image = null; -- -- if (pathToImage.toLowerCase().endsWith(".png") || -- pathToImage.toLowerCase().endsWith(".gif")) { -- image = loadPng(pathToImage); -- } else if (pathToImage.toLowerCase().endsWith(".bmp")) { -- decoder.setInputFilename(pathToImage); -- decoder.triggerAction(); -- image = decoder.getResult(); -- } else { -- throw new Error("do not know how to load " + pathToImage); -- } -+ image = Toolkit.getDefaultToolkit().getImage(pathToImage); - - // if only one image, dump it as it -- if (index == 0 && maxParts == 1) { -- Jimi.putImage(image, filename); -+ if (index == 0 && maxParts == 1) { -+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage)); - } else { - if (horizontal) { - int partHeight = image.getHeight(bitmapCreator) / maxParts; -@@ -55,7 +56,7 @@ - image = grab(image, partWidth * index, 0, - partWidth, image.getHeight(bitmapCreator)); - } -- Jimi.putImage(image, filename); -+ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage)); - } - } catch (Exception e) { - System.out.println("error while working with " + pathToImage); Copied: tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch (from rev 14594, trunk/libskinlf-java/debian/patches/image-utils-without-jimi.patch) =================================================================== --- tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch (rev 0) +++ tags/libskinlf-java/6.7-7/debian/patches/image-utils-without-jimi.patch 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,78 @@ +Index: libskinlf-java-6.7/src/com/l2fprod/tools/ImageUtils.java +=================================================================== +--- libskinlf-java-6.7.orig/src/com/l2fprod/tools/ImageUtils.java 2006-07-22 13:46:18.000000000 +0200 ++++ libskinlf-java-6.7/src/com/l2fprod/tools/ImageUtils.java 2011-08-29 23:42:22.000000000 +0200 +@@ -6,15 +6,12 @@ + + import javax.swing.ImageIcon; + +-import com.ibm.imageconversion.*; +-import com.sun.jimi.core.*; ++import javax.imageio.*; + + public class ImageUtils { + + public static Component bitmapCreator = new javax.swing.JLabel(); + +- static BMPDecoder decoder = new BMPDecoder(); +- static BMPEncoder encoder = new BMPEncoder(); + + public static Image loadPng(String pathToImage) throws Exception { + ImageIcon icon = new ImageIcon(new File(pathToImage).toURL()); +@@ -22,29 +19,33 @@ + } + + public static void savePng(Image image, String pathToImage) throws Exception { +- Jimi.putImage(image, pathToImage); ++ ImageIO.write((RenderedImage)image, "png", new File(pathToImage)); + } + ++ private static String getFileFmt(String pathToImage) throws Exception { ++ String fmt; ++ if (pathToImage.toLowerCase().endsWith(".png")) { ++ return "png"; ++ } ++ if (pathToImage.toLowerCase().endsWith(".gif")) { ++ return "gif"; ++ } ++ if (pathToImage.toLowerCase().endsWith(".bmp")) { ++ return "bmp"; ++ } ++ return ""; ++ } ++ + public static void createPicture(String pathToImage, int index, int maxParts, + String filename, boolean horizontal) { + try { + System.out.println("working with " + pathToImage); + Image image = null; +- +- if (pathToImage.toLowerCase().endsWith(".png") || +- pathToImage.toLowerCase().endsWith(".gif")) { +- image = loadPng(pathToImage); +- } else if (pathToImage.toLowerCase().endsWith(".bmp")) { +- decoder.setInputFilename(pathToImage); +- decoder.triggerAction(); +- image = decoder.getResult(); +- } else { +- throw new Error("do not know how to load " + pathToImage); +- } ++ image = Toolkit.getDefaultToolkit().getImage(pathToImage); + + // if only one image, dump it as it +- if (index == 0 && maxParts == 1) { +- Jimi.putImage(image, filename); ++ if (index == 0 && maxParts == 1) { ++ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage)); + } else { + if (horizontal) { + int partHeight = image.getHeight(bitmapCreator) / maxParts; +@@ -55,7 +56,7 @@ + image = grab(image, partWidth * index, 0, + partWidth, image.getHeight(bitmapCreator)); + } +- Jimi.putImage(image, filename); ++ ImageIO.write((RenderedImage)image, getFileFmt(pathToImage), new File(pathToImage)); + } + } catch (Exception e) { + System.out.println("error while working with " + pathToImage); Copied: tags/libskinlf-java/6.7-7/debian/patches/series (from rev 14594, trunk/libskinlf-java/debian/patches/series) =================================================================== --- tags/libskinlf-java/6.7-7/debian/patches/series (rev 0) +++ tags/libskinlf-java/6.7-7/debian/patches/series 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,2 @@ +GtkParser.jj.patch +image-utils-without-jimi.patch Deleted: tags/libskinlf-java/6.7-7/debian/rules =================================================================== --- trunk/libskinlf-java/debian/rules 2011-08-29 21:35:07 UTC (rev 14593) +++ tags/libskinlf-java/6.7-7/debian/rules 2011-08-29 21:47:10 UTC (rev 14595) @@ -1,29 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk - -JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := ant-nodeps laf-plugin xalan2 -DEB_ANT_BUILD_TARGET := dist.pre -BUILDDIR := build - -makebuilddir/libskinlf-java-demo:: -# The source package does not ship those two images (mandatory for the demo) - convert debian/skinlfdemo.xpm src/examples/skinlfdemo.gif - convert debian/windowicon.xpm src/examples/windowicon.gif - -install/libskinlf-java:: - install -m 644 -D $(BUILDDIR)/skinlf.jar debian/libskinlf-java/usr/share/java/skinlf-$(DEB_UPSTREAM_VERSION).jar - ln -s skinlf-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/skinlf.jar - install -m 644 -D $(BUILDDIR)/nativeskin.jar debian/libskinlf-java/usr/share/java/nativeskin-$(DEB_UPSTREAM_VERSION).jar - ln -s nativeskin-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/nativeskin.jar - -install/libskinlf-java-demo:: - install -m 644 -D $(BUILDDIR)/examples.jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo-$(DEB_UPSTREAM_VERSION).jar - ln -s skinlf-demo-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo.jar - -get-orig-source: - -uscan --upstream-version 0 --rename Copied: tags/libskinlf-java/6.7-7/debian/rules (from rev 14594, trunk/libskinlf-java/debian/rules) =================================================================== --- tags/libskinlf-java/6.7-7/debian/rules (rev 0) +++ tags/libskinlf-java/6.7-7/debian/rules 2011-08-29 21:47:10 UTC (rev 14595) @@ -0,0 +1,28 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ +DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := ant-nodeps laf-plugin xalan2 +DEB_ANT_BUILD_TARGET := dist.pre +BUILDDIR := build + +makebuilddir/libskinlf-java-demo:: +# The source package does not ship those two images (mandatory for the demo) + convert debian/skinlfdemo.xpm src/examples/skinlfdemo.gif + convert debian/windowicon.xpm src/examples/windowicon.gif + +install/libskinlf-java:: + install -m 644 -D $(BUILDDIR)/skinlf.jar debian/libskinlf-java/usr/share/java/skinlf-$(DEB_UPSTREAM_VERSION).jar + ln -s skinlf-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/skinlf.jar + install -m 644 -D $(BUILDDIR)/nativeskin.jar debian/libskinlf-java/usr/share/java/nativeskin-$(DEB_UPSTREAM_VERSION).jar + ln -s nativeskin-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java/usr/share/java/nativeskin.jar + +install/libskinlf-java-demo:: + install -m 644 -D $(BUILDDIR)/examples.jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo-$(DEB_UPSTREAM_VERSION).jar + ln -s skinlf-demo-$(DEB_UPSTREAM_VERSION).jar debian/libskinlf-java-demo/usr/share/java/skinlf-demo.jar + +get-orig-source: + -uscan --upstream-version 0 --rename _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits