summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-09 19:51:53 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-09 19:51:53 +0000
commit442e54ad6b08406c94e1299b5d1427ef92a10b8d (patch)
tree61a8a51bf8b054c6dd34b2b66fd7321136797748
parent1bbe1ee8da0564285875a0f1d3d6bd81eed02b01 (diff)
downloadEssentials-442e54ad6b08406c94e1299b5d1427ef92a10b8d.tar
Essentials-442e54ad6b08406c94e1299b5d1427ef92a10b8d.tar.gz
Essentials-442e54ad6b08406c94e1299b5d1427ef92a10b8d.tar.lz
Essentials-442e54ad6b08406c94e1299b5d1427ef92a10b8d.tar.xz
Essentials-442e54ad6b08406c94e1299b5d1427ef92a10b8d.zip
Time diff: Parse numbers as seconds
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1394 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index b15928590..0044dd61b 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -106,7 +106,7 @@ public class Util
+ "(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?"
+ "(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?"
+ "(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?"
- + "(?:([0-9]+)\\s*s[a-z]*)?", Pattern.CASE_INSENSITIVE);
+ + "(?:([0-9]+)\\s*(?:s[a-z]*)?)?", Pattern.CASE_INSENSITIVE);
public static long parseDateDiff(String time, boolean future) throws Exception
{