Revision: 613
Author: mr0...@mro.name
Date: Wed Jul 29 03:03:31 2009
Log: issue#61 - repair compiler errors.
http://code.google.com/p/piccolo2d/source/detail?r=613

Modified:
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PathParser.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PointParser.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgLoader.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgSaxHandler.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/TrafoParser.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSSelectorBuilderXPath.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSStyleDeclaration.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssParser.java
   
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java
  /piccolo2d.java/branches/svg2009/svg/src/main/ragel/CssSelectorToXPath.rl
  /piccolo2d.java/branches/svg2009/svg/src/main/ragel/PointParser.rl
  /piccolo2d.java/branches/svg2009/svg/src/main/ragel/TrafoParser.rl
  /piccolo2d.java/branches/svg2009/svg/src/main/ragel/rl2java.sh
   
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/SvgSaxHandlerTest.java
   
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/TrafoParserTest.java
   
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/batik/BatikSvgNode.java
   
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/cssmini/CssSelectorToXPathTest.java

=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PathParser.java
     
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PathParser.java
     
Wed Jul 29 03:03:31 2009
@@ -1,3 +1,4 @@
+
  // line 1 "src/main/ragel/PathParser.rl"
  /*
   * Copyright (c) 2008, Piccolo2D project, http://piccolo2d.org
@@ -41,11 +42,12 @@
   * See also  
https://lib2geom.svn.sourceforge.net/svnroot/lib2geom/lib2geom/trunk/src/2geom/svg-path-parser.rl
   */
  class PathParser implements RagelParser {
+
  // line 267 "src/main/ragel/PathParser.rl"



-// line 49 "src/main/java/org/piccolo2d/svg/PathParser.java"
+// line 51 "src/main/java/org/piccolo2d/svg/PathParser.java"
  private static byte[] init__path_actions_0()
  {
        return new byte [] {
@@ -802,6 +804,7 @@

  static final int path_en_main = 232;

+
  // line 270 "src/main/ragel/PathParser.rl"

        final GeneralPath parse(final CharSequence data) throws ParseException {
@@ -832,13 +835,14 @@
                int top;


-// line 836 "src/main/java/org/piccolo2d/svg/PathParser.java"
+// line 839 "src/main/java/org/piccolo2d/svg/PathParser.java"
        {
        cs = path_start;
        }
+
  // line 299 "src/main/ragel/PathParser.rl"

-// line 842 "src/main/java/org/piccolo2d/svg/PathParser.java"
+// line 846 "src/main/java/org/piccolo2d/svg/PathParser.java"
        {
        int _klen;
        int _trans = 0;
@@ -1027,7 +1031,7 @@
                pb.closePath();
        }
        break;
-// line 1031 "src/main/java/org/piccolo2d/svg/PathParser.java"
+// line 1035 "src/main/java/org/piccolo2d/svg/PathParser.java"
                        }
                }
        }
@@ -1125,7 +1129,7 @@
                pb.closePath();
        }
        break;
-// line 1129 "src/main/java/org/piccolo2d/svg/PathParser.java"
+// line 1133 "src/main/java/org/piccolo2d/svg/PathParser.java"
                }
        }
        }
@@ -1134,6 +1138,7 @@
        }
        break; }
        }
+
  // line 300 "src/main/ragel/PathParser.rl"

                if ( cs < path_first_final )
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PointParser.java
    
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/PointParser.java
    
Wed Jul 29 03:03:31 2009
@@ -1,3 +1,4 @@
+
  // line 1 "src/main/ragel/PointParser.rl"
  /*
   * Copyright (c) 2008, Piccolo2D project, http://piccolo2d.org
@@ -40,11 +41,12 @@
   * </p>
   */
  class PointParser implements RagelParser {
+
  // line 93 "src/main/ragel/PointParser.rl"



-// line 48 "src/main/java/org/piccolo2d/svg/PointParser.java"
+// line 50 "src/main/java/org/piccolo2d/svg/PointParser.java"
  private static byte[] init__points_actions_0()
  {
        return new byte [] {
@@ -198,6 +200,7 @@

  static final int points_en_main = 28;

+
  // line 96 "src/main/ragel/PointParser.rl"

        final GeneralPath parse(final CharSequence data) throws ParseException {
@@ -209,7 +212,7 @@
                if(data == null)
                        return gp;
                // high-level buffers
-               final StringBuilder buf = new StringBuilder();
+               final StringBuffer buf = new StringBuffer();
                final float[] argv = new float[2];
                int argc = 0;

@@ -220,13 +223,14 @@
                int top;


-// line 224 "src/main/java/org/piccolo2d/svg/PointParser.java"
+// line 227 "src/main/java/org/piccolo2d/svg/PointParser.java"
        {
        cs = points_start;
        }
+
  // line 117 "src/main/ragel/PointParser.rl"

-// line 230 "src/main/java/org/piccolo2d/svg/PointParser.java"
+// line 234 "src/main/java/org/piccolo2d/svg/PointParser.java"
        {
        int _klen;
        int _trans = 0;
@@ -339,7 +343,7 @@
                argc = 0;
        }
        break;
-// line 343 "src/main/java/org/piccolo2d/svg/PointParser.java"
+// line 347 "src/main/java/org/piccolo2d/svg/PointParser.java"
                        }
                }
        }
@@ -381,7 +385,7 @@
                argc = 0;
        }
        break;
-// line 385 "src/main/java/org/piccolo2d/svg/PointParser.java"
+// line 389 "src/main/java/org/piccolo2d/svg/PointParser.java"
                }
        }
        }
@@ -390,6 +394,7 @@
        }
        break; }
        }
+
  // line 118 "src/main/ragel/PointParser.rl"

                if ( cs < points_first_final )
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgLoader.java
      
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgLoader.java
      
Wed Jul 29 03:03:31 2009
@@ -64,7 +64,7 @@
          final SAXParserFactory spf = SAXParserFactory.newInstance();
          spf.setNamespaceAware(true);
          spf.setValidating(false);
-        spf.setXIncludeAware(false);
+        // spf.setXIncludeAware(false);
          try {
              // final SchemaFactory sf =
              //  
SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema";);
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgSaxHandler.java
  
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/SvgSaxHandler.java
  
Wed Jul 29 03:03:31 2009
@@ -507,7 +507,7 @@
      private static CharSequence appendXPath(final CharSequence parent,  
final CharSequence localName,
              final CharSequence classes) {
          // get the current xpath incl. @class attribute
-        final StringBuilder txt = new StringBuilder(parent);
+        final StringBuffer txt = new StringBuffer(parent.toString());
          // append the element name
          txt.append('/');
          txt.append(localName);
@@ -569,7 +569,7 @@
      // <CssManager.Style>
      private final Stack inherited = new Stack();
      private PNode root = null;
-    private final StringBuilder txt = new StringBuilder();
+    private final StringBuffer txt = new StringBuffer();

      // <String>
      private final Stack xpath = new Stack();
@@ -654,7 +654,7 @@
          return style;
      }

-    public InputSource resolveEntity(final String publicId, final String  
systemId) throws IOException, SAXException {
+    public InputSource resolveEntity(final String publicId, final String  
systemId) throws SAXException {
          if ("-//W3C//DTD SVG 1.1//EN".equals(publicId)
                   
&& "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd".equals(systemId)) {
              // return new
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/TrafoParser.java
    
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/TrafoParser.java
    
Wed Jul 29 03:03:31 2009
@@ -1,3 +1,4 @@
+
  // line 1 "src/main/ragel/TrafoParser.rl"
  /*
   * Copyright (c) 2008, Piccolo2D project, http://piccolo2d.org
@@ -40,11 +41,12 @@
   * </p>
   */
  class TrafoParser implements RagelParser {
+
  // line 141 "src/main/ragel/TrafoParser.rl"



-// line 48 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
+// line 50 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
  private static byte[] init__trafo_actions_0()
  {
        return new byte [] {
@@ -395,6 +397,7 @@

  static final int trafo_en_main = 168;

+
  // line 144 "src/main/ragel/TrafoParser.rl"

        final AffineTransform parse(final CharSequence data, final  
AffineTransform t) throws ParseException {
@@ -408,7 +411,7 @@
                        return t;
                // high-level buffers
                boolean two = false;
-               final StringBuilder buf = new StringBuilder();
+               final StringBuffer buf = new StringBuffer();
                final double[] argv = new double[6];
                int argc = 0;

@@ -419,13 +422,14 @@
                int top;


-// line 423 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
+// line 426 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
        {
        cs = trafo_start;
        }
+
  // line 167 "src/main/ragel/TrafoParser.rl"

-// line 429 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
+// line 433 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
        {
        int _klen;
        int _trans = 0;
@@ -577,7 +581,7 @@
                t.preConcatenate(new AffineTransform(argv));
        }
        break;
-// line 581 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
+// line 585 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
                        }
                }
        }
@@ -644,7 +648,7 @@
                t.preConcatenate(new AffineTransform(argv));
        }
        break;
-// line 648 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
+// line 652 "src/main/java/org/piccolo2d/svg/TrafoParser.java"
                }
        }
        }
@@ -653,6 +657,7 @@
        }
        break; }
        }
+
  // line 168 "src/main/ragel/TrafoParser.rl"

                if ( cs < trafo_first_final )
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSSelectorBuilderXPath.java
        
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSSelectorBuilderXPath.java
        
Wed Jul 29 03:03:31 2009
@@ -57,9 +57,9 @@
      private static final CssSelectorToXPath sel2xpath = new  
CssSelectorToXPath();
      private final List classes = new ArrayList();
      private final Collection selector = new ArrayList();
-    private final StringBuilder selectorPattern = new StringBuilder();
-    private final StringBuilder xpath = new StringBuilder();
-    private final StringBuilder xpathPattern = new StringBuilder();
+    private final StringBuffer selectorPattern = new StringBuffer();
+    private final StringBuffer xpath = new StringBuffer();
+    private final StringBuffer xpathPattern = new StringBuffer();

      CSSSelectorBuilderXPath() {
          reset();
@@ -122,7 +122,7 @@

      public CSSSelector finish() {
          try {
-            final StringBuilder sB = new StringBuilder();
+            final StringBuffer sB = new StringBuffer();
              {
                  final Iterator it = selector.iterator();
                  if (it.hasNext()) {
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSStyleDeclaration.java
    
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CSSStyleDeclaration.java
    
Wed Jul 29 03:03:31 2009
@@ -121,7 +121,7 @@
      }

      public CharSequence getCssText() {
-        final StringBuilder s = new StringBuilder();
+        final StringBuffer s = new StringBuffer();
          s.append("{");
          final Iterator it = properties.entrySet().iterator();
          if (it.hasNext()) {
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssParser.java
      
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssParser.java
      
Wed Jul 29 03:03:31 2009
@@ -1,3 +1,4 @@
+
  // line 1 "src/main/ragel/CssParser.rl"
  /*
   * Copyright (c) 2008, Piccolo2D project, http://piccolo2d.org
@@ -46,11 +47,12 @@
   * </ul>
   */
  class CssParser implements RagelParser {
+
  // line 162 "src/main/ragel/CssParser.rl"



-// line 54 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
+// line 56 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
  private static byte[] init__css_actions_0()
  {
        return new byte [] {
@@ -322,6 +324,7 @@

  static final int css_en_main = 86;

+
  // line 165 "src/main/ragel/CssParser.rl"

      // Collection<CSSStyleRule>
@@ -349,13 +352,14 @@
                int cs, p = 0;


-// line 353 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
+// line 356 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
        {
        cs = css_start;
        }
+
  // line 191 "src/main/ragel/CssParser.rl"

-// line 359 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
+// line 363 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
        {
        int _klen;
        int _trans = 0;
@@ -542,7 +546,7 @@
                sel.clear();
        }
        break;
-// line 546 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
+// line 550 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
                        }
                }
        }
@@ -578,7 +582,7 @@
  // line 161 "src/main/ragel/CssParser.rl"
        {if(debug) System.out.println("---");}
        break;
-// line 582 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
+// line 586 "src/main/java/org/piccolo2d/svg/cssmini/CssParser.java"
                }
        }
        }
@@ -587,6 +591,7 @@
        }
        break; }
        }
+
  // line 192 "src/main/ragel/CssParser.rl"

                if ( cs < css_first_final )
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java
     
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java
     
Wed Jul 29 03:03:31 2009
@@ -1,3 +1,4 @@
+
  // line 1 "src/main/ragel/CssSelectorToXPath.rl"
  /*
   * Copyright (c) 2008, Piccolo2D project, http://piccolo2d.org
@@ -47,11 +48,12 @@
   * </ul>
   */
  class CssSelectorToXPath implements RagelParser {
+
  // line 132 "src/main/ragel/CssSelectorToXPath.rl"



-// line  
55 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
+// line  
57 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
  private static byte[] init__selector_actions_0()
  {
        return new byte [] {
@@ -175,6 +177,7 @@

  static final int selector_en_main = 1;

+
  // line 135 "src/main/ragel/CssSelectorToXPath.rl"

      final CharSequence parse(final CharSequence data) throws  
ParseException {
@@ -184,7 +187,7 @@
      final CharSequence parse(final char[] data) throws ParseException {
                // high-level buffers
          final List classes = new LinkedList();
-        final StringBuilder xpath = new StringBuilder();
+        final StringBuffer xpath = new StringBuffer();
          char combinator = ' ';
                int start = -1;

@@ -196,13 +199,14 @@
                int cs, p = 0;


-// line  
200 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
+// line  
203 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
        {
        cs = selector_start;
        }
+
  // line 155 "src/main/ragel/CssSelectorToXPath.rl"

-// line  
206 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
+// line  
210 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
        {
        int _klen;
        int _trans = 0;
@@ -356,7 +360,7 @@
                combinator = ' ';
        }
        break;
-// line  
360 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
+// line  
364 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
                        }
                }
        }
@@ -420,7 +424,7 @@
  // line 131 "src/main/ragel/CssSelectorToXPath.rl"
        {if(debug) System.out.println("---");}
        break;
-// line  
424 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
+// line  
428 "src/main/java/org/piccolo2d/svg/cssmini/CssSelectorToXPath.java"
                }
        }
        }
@@ -429,6 +433,7 @@
        }
        break; }
        }
+
  // line 156 "src/main/ragel/CssSelectorToXPath.rl"

                if (cs < selector_first_final)
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/main/ragel/CssSelectorToXPath.rl       
 
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/main/ragel/CssSelectorToXPath.rl       
 
Wed Jul 29 03:03:31 2009
@@ -140,7 +140,7 @@
      final CharSequence parse(final char[] data) throws ParseException {
                // high-level buffers
          final List classes = new LinkedList();
-        final StringBuilder xpath = new StringBuilder();
+        final StringBuffer xpath = new StringBuffer();
          char combinator = ' ';
                int start = -1;

=======================================
--- /piccolo2d.java/branches/svg2009/svg/src/main/ragel/PointParser.rl  Wed  
Jul 29 02:43:22 2009
+++ /piccolo2d.java/branches/svg2009/svg/src/main/ragel/PointParser.rl  Wed  
Jul 29 03:03:31 2009
@@ -103,7 +103,7 @@
                if(data == null)
                        return gp;
                // high-level buffers
-               final StringBuilder buf = new StringBuilder();
+               final StringBuffer buf = new StringBuffer();
                final float[] argv = new float[2];
                int argc = 0;

=======================================
--- /piccolo2d.java/branches/svg2009/svg/src/main/ragel/TrafoParser.rl  Wed  
Jul 29 02:43:22 2009
+++ /piccolo2d.java/branches/svg2009/svg/src/main/ragel/TrafoParser.rl  Wed  
Jul 29 03:03:31 2009
@@ -153,7 +153,7 @@
                        return t;
                // high-level buffers
                boolean two = false;
-               final StringBuilder buf = new StringBuilder();
+               final StringBuffer buf = new StringBuffer();
                final double[] argv = new double[6];
                int argc = 0;

=======================================
--- /piccolo2d.java/branches/svg2009/svg/src/main/ragel/rl2java.sh      Wed Jul 
 
29 02:43:22 2009
+++ /piccolo2d.java/branches/svg2009/svg/src/main/ragel/rl2java.sh      Wed Jul 
 
29 03:03:31 2009
@@ -21,6 +21,7 @@
  #dot -o $target/$file.png -Tpng $target/$file.dot
  dot -o $target/$file.svg -Tsvg $target/$file.dot
  ragel $opts -s -J -o $target_java/$file.java $src/$file.rl
+echo created `pwd`/$target_java/$file.java

  file=TrafoParser
  opts="-e"
@@ -28,6 +29,7 @@
  #dot -o $target/$file.png -Tpng $target/$file.dot
  dot -o $target/$file.svg -Tsvg $target/$file.dot
  ragel $opts -s -J -o $target_java/$file.java $src/$file.rl
+echo created `pwd`/$target_java/$file.java

  file=PathParser
  opts="-e"
@@ -35,6 +37,7 @@
  #dot -o $target/$file.png -Tpng $target/$file.dot
  #dot -o $target/$file.svg -Tsvg $target/$file.dot
  ragel $opts -s -J -o $target_java/$file.java $src/$file.rl
+echo created `pwd`/$target_java/$file.java

  file=CssParser
  opts="-e"
@@ -42,6 +45,7 @@
  #dot -o $target/$file.png -Tpng $target/$file.dot
  #dot -o $target/$file.svg -Tsvg $target/$file.dot
  ragel $opts -s -J -o $target_java/cssmini/$file.java $src/$file.rl
+echo created `pwd`/$target_java/$file.java

  file=CssSelectorToXPath
  opts="-e"
@@ -49,5 +53,6 @@
  #dot -o $target/$file.png -Tpng $target/$file.dot
  dot -o $target/$file.svg -Tsvg $target/$file.dot
  ragel $opts -s -J -o $target_java/cssmini/$file.java $src/$file.rl
+echo created `pwd`/$target_java/$file.java

  cd $cwd
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/SvgSaxHandlerTest.java
      
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/SvgSaxHandlerTest.java
      
Wed Jul 29 03:03:31 2009
@@ -20,7 +20,7 @@
          final SAXParserFactory spf = SAXParserFactory.newInstance();
          spf.setNamespaceAware(true);
          spf.setValidating(false);
-        spf.setXIncludeAware(false);
+        // spf.setXIncludeAware(false);

          final SAXParser sp = spf.newSAXParser();
          sp.parse(new InputSource(new StringReader(
@@ -39,7 +39,7 @@
          final SAXParserFactory spf = SAXParserFactory.newInstance();
          spf.setNamespaceAware(true);
          spf.setValidating(true);
-        spf.setXIncludeAware(false);
+        // spf.setXIncludeAware(false);

          final SAXParser sp = spf.newSAXParser();
          sp
@@ -49,7 +49,7 @@
                                          "<!DOCTYPE svg PUBLIC  
\"-//W3C//DTD SVG 1.1//EN\"  
\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\";><svg  
xmlns='http://www.w3.org/2000/svg'><circle class='circle-12' /></svg>")),
                          new DefaultHandler() {
                              public InputSource resolveEntity(final String  
publicId, final String systemId)
-                                    throws IOException, SAXException {
+                                    throws SAXException {
                                  if ("-//W3C//DTD SVG  
1.1//EN".equals(publicId)
                                           
&& "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd".equals(systemId)) {
                                      // return new
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/TrafoParserTest.java
        
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/TrafoParserTest.java
        
Wed Jul 29 03:03:31 2009
@@ -38,7 +38,7 @@
          final String s = e.getMessage();
          final int off = e.getErrorOffset();

-        final StringBuilder b = new StringBuilder(s.length() * 2 + 2);
+        final StringBuffer b = new StringBuffer(s.length() * 2 + 2);
          b.append(s).append("\n");
          for (int i = 0; i < s.length(); i++) {
              if (i == off) {
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/batik/BatikSvgNode.java
     
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/batik/BatikSvgNode.java
     
Wed Jul 29 03:03:31 2009
@@ -63,7 +63,7 @@
          if (dst == null) {
              return;
          }
-        final StringBuilder indent = new StringBuilder();
+        final StringBuffer indent = new StringBuffer();
          for (int i = 0; i < nesting; i++) {
              indent.append("\t");
          }
=======================================
---  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/cssmini/CssSelectorToXPathTest.java
         
Wed Jul 29 02:43:22 2009
+++  
/piccolo2d.java/branches/svg2009/svg/src/test/java/org/piccolo2d/svg/cssmini/CssSelectorToXPathTest.java
         
Wed Jul 29 03:03:31 2009
@@ -7,7 +7,7 @@
  public class CssSelectorToXPathTest extends TestCase {

      public void testOk() throws ParseException {
-        final StringBuilder s = new StringBuilder();
+        final StringBuffer s = new StringBuffer();

          final CssSelectorToXPath c = new CssSelectorToXPath();
          assertEquals("/root/e...@class='c1 c2']/e2", c.parse("root >  
e1 .c2 .c1 > e2"));

--~--~---------~--~----~------------~-------~--~----~
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to