Permalink
Browse files

Fixed issue 21 (duplicate LICENSE and NOTICE files in Soy jar.)

Also updated Guice snapshots.



git-svn-id: http://closure-templates.googlecode.com/svn/trunk@16 ba6e359a-b4f9-11de-880b-11b4e8d67c75
  • Loading branch information...
kai.huang
kai.huang committed Jul 8, 2010
1 parent d17e80b commit 4ee7583d3dd67aa5675cf9cfc4fd903d45ebf8b1
View
@@ -83,8 +83,10 @@ Author: Robert Bowdidge
<zipfileset src="${java.lib.dir}/guava-r03.jar" />
<zipfileset src="${java.lib.dir}/aopalliance.jar" />
<zipfileset src="${java.lib.dir}/guice-snapshot.jar" />
<zipfileset src="${java.lib.dir}/guice-multibindings-snapshot.jar" />
<zipfileset src="${java.lib.dir}/guice-assistedinject-snapshot.jar" />
<zipfileset src="${java.lib.dir}/guice-multibindings-snapshot.jar"
excludes="LICENSE,NOTICE" />
<zipfileset src="${java.lib.dir}/guice-assistedinject-snapshot.jar"
excludes="LICENSE,NOTICE" />
<zipfileset src="${java.lib.dir}/args4j-2.0.12.jar" />
</jar>
</target>
View
Binary file not shown.
View
Binary file not shown.
View
BIN +8.4 KB (100%) java/lib/guice-snapshot.jar
Binary file not shown.
View
Binary file not shown.
@@ -71,14 +71,17 @@ public static SoyData createFromExistingData(Object obj) {
return new BooleanData((Boolean) obj);
} else if (obj instanceof Integer) {
return new IntegerData((Integer) obj);
} else if (obj instanceof Double) {
return new FloatData((Double) obj);
} else if (obj instanceof Map) {
@SuppressWarnings("unchecked")
Map<String, ?> objCast = (Map<String, ?>) obj;
return new SoyMapData(objCast);
} else if (obj instanceof List) {
return new SoyListData((List<?>) obj);
} else if (obj instanceof Double) {
return new FloatData((Double) obj);
} else if (obj instanceof Float) {
// Automatically convert float to double.
return new FloatData((Float) obj);
} else {
throw new SoyDataException(
"Attempting to convert unrecognized object to Soy data (object type " +

0 comments on commit 4ee7583

Please sign in to comment.