Author: michiel
Date: 2010-01-08 15:45:30 +0100 (Fri, 08 Jan 2010)
New Revision: 40436
Modified:
mmbase/branches/MMBase-1_8/src/org/mmbase/module/builders/DayMarkers.java
mmbase/branches/MMBase-1_8/src/org/mmbase/util/Casting.java
mmbase/branches/MMBase-1_8/src/org/mmbase/util/ResourceLoader.java
Log:
made it compile with java 1.4 again
Modified:
mmbase/branches/MMBase-1_8/src/org/mmbase/module/builders/DayMarkers.java
===================================================================
--- mmbase/branches/MMBase-1_8/src/org/mmbase/module/builders/DayMarkers.java
2010-01-08 14:45:09 UTC (rev 40435)
+++ mmbase/branches/MMBase-1_8/src/org/mmbase/module/builders/DayMarkers.java
2010-01-08 14:45:30 UTC (rev 40436)
@@ -94,7 +94,7 @@
addFunction(new AbstractFunction("ageForNumber", new Parameter[] { new
Parameter("nodenumber", Integer.class)}, ReturnType.INTEGER) {
public Object getFunctionValue(Parameters parameters) {
int nodeNumber =
Casting.toInt(parameters.get("nodenumber"));
- return Integer.valueOf(DayMarkers.this.getAge(nodeNumber));
+ return new Integer(DayMarkers.this.getAge(nodeNumber));
}
});
Modified: mmbase/branches/MMBase-1_8/src/org/mmbase/util/Casting.java
===================================================================
--- mmbase/branches/MMBase-1_8/src/org/mmbase/util/Casting.java 2010-01-08
14:45:09 UTC (rev 40435)
+++ mmbase/branches/MMBase-1_8/src/org/mmbase/util/Casting.java 2010-01-08
14:45:30 UTC (rev 40436)
@@ -849,17 +849,17 @@
return (BigDecimal) i;
} else if (i instanceof CharSequence) {
try {
- return new BigDecimal("" + i).stripTrailingZeros();
+ return new BigDecimal("" + i);
} catch (NumberFormatException nfe) {
if(i instanceof String){
String s = ((String)i).toLowerCase();
if (s.equals("true") || s.equals("yes")) {
- return BigDecimal.ONE;
+ return new BigDecimal(1);
} else if(s.equals("false") || s.equals("no")) {
- return BigDecimal.ZERO;
+ return new BigDecimal(0);
}
}
- return BigDecimal.ONE.negate();
+ return new BigDecimal(-1);
}
} else if (i instanceof Long) {
return new BigDecimal(((Long) i).longValue());
@@ -870,7 +870,7 @@
} else if (i instanceof Float) {
return new BigDecimal(((Float) i).floatValue());
} else {
- return new BigDecimal(toDouble(i)).stripTrailingZeros();
+ return new BigDecimal(toDouble(i));
}
}
Modified: mmbase/branches/MMBase-1_8/src/org/mmbase/util/ResourceLoader.java
===================================================================
--- mmbase/branches/MMBase-1_8/src/org/mmbase/util/ResourceLoader.java
2010-01-08 14:45:09 UTC (rev 40435)
+++ mmbase/branches/MMBase-1_8/src/org/mmbase/util/ResourceLoader.java
2010-01-08 14:45:30 UTC (rev 40436)
@@ -1686,16 +1686,24 @@
}
) {
protected Map.Entry getEntry(org.mmbase.util.xml.DocumentReader
reader, String key, String value) {
- String u = reader.getDocument().getDocumentURI();
- String[] parts = u.split("!", 2);
- log.info(u + "-> " + Arrays.asList(parts));
- if (parts.length == 2) {
- if (key.startsWith("!")) {
- key = "\\A" +
ReplacingLocalizedString.makeLiteral(parts[0]) + key + "\\z"; // should escape
'.' and so one.
+ try {
+ java.lang.reflect.Method m =
reader.getDocument().getClass().getMethod("getDocumentURI", null);
+ if (m != null) {
+ String u = (String) m.invoke(reader.getDocument(),
null);
+ String[] parts = u.split("!", 2);
+ log.info(u + "-> " + Arrays.asList(parts));
+ if (parts.length == 2) {
+ if (key.startsWith("!")) {
+ key = "\\A" +
ReplacingLocalizedString.makeLiteral(parts[0]) + key + "\\z"; // should escape
'.' and so one.
+ }
+ }
}
+ } catch (Exception e) {
+ log.debug(e);
}
return new Entry(key, value);
}
+
}.getMaps();
private static final Map classWeights = new ConcurrentHashMap();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
