Author: tv
Date: Sun Jun 22 02:35:12 2008
New Revision: 670329
URL: http://svn.apache.org/viewvc?rev=670329&view=rev
Log:
Major code cleanup, formatting and styling
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/BaseValueParserTest.java
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java?rev=670329&r1=670328&r2=670329&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DataStreamParser.java
Sun Jun 22 02:35:12 2008
@@ -114,6 +114,7 @@
}
catch (ClassCastException e)
{
+ // ignore
}
}
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java?rev=670329&r1=670328&r2=670329&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultParameterParser.java
Sun Jun 22 02:35:12 2008
@@ -227,7 +227,7 @@
else
{
paramValue = URLDecoder.decode(st.nextToken(),
getCharacterEncoding());
- if (paramName.length() > 0)
+ if (paramName != null && paramName.length() > 0)
{
add(paramName, paramValue);
}
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java?rev=670329&r1=670328&r2=670329&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/StringValueParser.java
Sun Jun 22 02:35:12 2008
@@ -33,8 +33,6 @@
public class StringValueParser
extends BaseValueParser
{
- public StringValueParser() {}
-
/**
* Parses a String using a single delimiter.
*
@@ -67,7 +65,7 @@
else
{
pathPart = tok;
- if (key.length() > 0)
+ if (key != null && key.length() > 0)
{
add (convert(key), pathPart);
}
Modified:
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/BaseValueParserTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/BaseValueParserTest.java?rev=670329&r1=670328&r2=670329&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/BaseValueParserTest.java
(original)
+++
turbine/fulcrum/trunk/parser/src/test/org/apache/fulcrum/parser/BaseValueParserTest.java
Sun Jun 22 02:35:12 2008
@@ -760,8 +760,8 @@
assertEquals("Wrong number of keys", 1, parser.keySet().size());
assertEquals("Wrong string value", "2.2", parser.getString("foo"));
- assertEquals("Wrong double value", (double) testValue,
parser.getDouble("foo"), 0.001);
- assertEquals("Wrong Double value", (double) testValue,
parser.getDoubleObject("foo").doubleValue(), 0.001);
+ assertEquals("Wrong double value", testValue, parser.getDouble("foo"),
0.001);
+ assertEquals("Wrong Double value", testValue,
parser.getDoubleObject("foo").doubleValue(), 0.001);
double [] doubles = parser.getDoubles("foo");
assertEquals("Wrong Array Size", 1, doubles.length);
@@ -798,8 +798,8 @@
assertEquals("Wrong number of keys", 1, parser.keySet().size());
assertEquals("Wrong string value", "123", parser.getString("foo"));
- assertEquals("Wrong int value", (int) testValue, parser.getInt("foo"));
- assertEquals("Wrong Int value", (int) testValue,
parser.getIntObject("foo").intValue());
+ assertEquals("Wrong int value", testValue, parser.getInt("foo"));
+ assertEquals("Wrong Int value", testValue,
parser.getIntObject("foo").intValue());
int [] ints = parser.getInts("foo");
assertEquals("Wrong Array Size", 1, ints.length);
@@ -825,8 +825,8 @@
assertEquals("Wrong number of keys", 1, parser.keySet().size());
assertEquals("Wrong string value", "123", parser.getString("foo"));
- assertEquals("Wrong int value", (int) testValue.intValue(),
parser.getInt("foo"));
- assertEquals("Wrong Int value", (int) testValue.intValue(),
parser.getIntObject("foo").intValue());
+ assertEquals("Wrong int value", testValue.intValue(),
parser.getInt("foo"));
+ assertEquals("Wrong Int value", testValue.intValue(),
parser.getIntObject("foo").intValue());
int [] ints = parser.getInts("foo");
assertEquals("Wrong Array Size", 1, ints.length);
@@ -852,8 +852,8 @@
assertEquals("Wrong number of keys", 1, parser.keySet().size());
assertEquals("Wrong string value", "9223372036854775807",
parser.getString("foo"));
- assertEquals("Wrong long value", (long) testValue,
parser.getLong("foo"));
- assertEquals("Wrong Long value", (long) testValue,
parser.getLongObject("foo").longValue());
+ assertEquals("Wrong long value", testValue, parser.getLong("foo"));
+ assertEquals("Wrong Long value", testValue,
parser.getLongObject("foo").longValue());
long [] longs = parser.getLongs("foo");
assertEquals("Wrong Array Size", 1, longs.length);
