DroidFish: Fixed warnings in SVG code.

This commit is contained in:
Peter Osterlund
2012-06-06 19:55:33 +00:00
parent 7c37f8f5ed
commit 436579fe20
2 changed files with 13 additions and 5 deletions

View File

@@ -7,6 +7,8 @@ package com.larvalabs.svgandroid;
*/ */
public class SVGParseException extends RuntimeException { public class SVGParseException extends RuntimeException {
private static final long serialVersionUID = 1L;
public SVGParseException(String s) { public SVGParseException(String s) {
super(s); super(s);
} }

View File

@@ -3,7 +3,6 @@ package com.larvalabs.svgandroid;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.*; import android.graphics.*;
import android.graphics.drawable.PictureDrawable;
import android.util.Log; import android.util.Log;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
@@ -176,7 +175,7 @@ public class SVGParser {
private static SVG parse(InputStream in, Integer searchColor, Integer replaceColor, boolean whiteMode) throws SVGParseException { private static SVG parse(InputStream in, Integer searchColor, Integer replaceColor, boolean whiteMode) throws SVGParseException {
// Util.debug("Parsing SVG..."); // Util.debug("Parsing SVG...");
try { try {
long start = System.currentTimeMillis(); // long start = System.currentTimeMillis();
SAXParserFactory spf = SAXParserFactory.newInstance(); SAXParserFactory spf = SAXParserFactory.newInstance();
SAXParser sp = spf.newSAXParser(); SAXParser sp = spf.newSAXParser();
XMLReader xr = sp.getXMLReader(); XMLReader xr = sp.getXMLReader();
@@ -606,6 +605,7 @@ public class SVGParser {
} }
} }
/*
private static Integer getHexAttr(String name, Attributes attributes) { private static Integer getHexAttr(String name, Attributes attributes) {
String v = getStringAttr(name, attributes); String v = getStringAttr(name, attributes);
//Util.debug("Hex parsing '" + name + "=" + v + "'"); //Util.debug("Hex parsing '" + name + "=" + v + "'");
@@ -620,24 +620,28 @@ public class SVGParser {
} }
} }
} }
*/
private static class NumberParse { private static class NumberParse {
private ArrayList<Float> numbers; private ArrayList<Float> numbers;
private int nextCmd; // private int nextCmd;
public NumberParse(ArrayList<Float> numbers, int nextCmd) { public NumberParse(ArrayList<Float> numbers, int nextCmd) {
this.numbers = numbers; this.numbers = numbers;
this.nextCmd = nextCmd; // this.nextCmd = nextCmd;
} }
/*
public int getNextCmd() { public int getNextCmd() {
return nextCmd; return nextCmd;
} }
*/
/*
public float getNumber(int index) { public float getNumber(int index) {
return numbers.get(index); return numbers.get(index);
} }
*/
} }
private static class Gradient { private static class Gradient {
@@ -737,6 +741,7 @@ public class SVGParser {
} }
} }
/*
public Float getFloat(String name, float defaultValue) { public Float getFloat(String name, float defaultValue) {
Float v = getFloat(name); Float v = getFloat(name);
if (v == null) { if (v == null) {
@@ -745,6 +750,7 @@ public class SVGParser {
return v; return v;
} }
} }
*/
public Float getFloat(String name) { public Float getFloat(String name) {
String v = getAttr(name); String v = getAttr(name);