From: <dav...@us...> - 2011-03-12 19:09:43
|
Revision: 12015 http://wonder.svn.sourceforge.net/wonder/?rev=12015&view=rev Author: davidleber Date: 2011-03-12 19:09:36 +0000 (Sat, 12 Mar 2011) Log Message: ----------- Merge from trunk Modified Paths: -------------- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOTextField.java branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXTimeDurationFormatter.java Property Changed: ---------------- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder:11280-11973 + /trunk/Wonder:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox:11280-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox:11280-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.css:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.extras.js:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/ibox.js:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images:11280-11768,11769-11827*,11828-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images:11280-11768,11769-11827*,11828-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/bg.png:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/images/indicator.gif:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins:11280-11768,11769-11827*,11828-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins:11280-11768,11769-11827*,11828-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox:11280-11768,11769-11827*,11828-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox:11280-11768,11769-11827*,11828-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/darkbox/darkbox.css:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox:11280-11768,11769-11827*,11828-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox:11280-11768,11769-11827*,11828-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images:11280-11768,11769-11827*,11828-11837,11838-11973* + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images:11280-11768,11769-11827*,11828-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/closelabel.gif:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/images/loading.gif:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css:11280-11973 + /trunk/Wonder/Frameworks/Ajax/Ajax/WebServerResources/ibox/skins/lightbox/lightbox.css:11280-12014 Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOTextField.java =================================================================== --- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOTextField.java 2011-03-09 21:04:20 UTC (rev 12014) +++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/_private/ERXWOTextField.java 2011-03-12 19:09:36 UTC (rev 12015) @@ -136,7 +136,8 @@ result = format.parseObject(reformatedObject); } catch(ParseException parseexception) { String keyPath = _value.keyPath(); - ERXValidationException validationexception = new ERXValidationException(parseexception.getMessage(), stringValue, keyPath); component.validationFailedWithException(validationexception, stringValue, keyPath); + ERXValidationException validationexception = new ERXValidationException(ERXValidationException.InvalidValueException, parseexception, keyPath, stringValue); + component.validationFailedWithException(validationexception, stringValue, keyPath); return; } finally { tsFormat.setDefaultFormatTimeZone(formatZone); @@ -150,7 +151,8 @@ result = format.parseObject(reformatedObject); } catch(ParseException parseexception) { String keyPath = _value.keyPath(); - ERXValidationException validationexception = new ERXValidationException(parseexception.getMessage(), stringValue, keyPath); component.validationFailedWithException(validationexception, stringValue, keyPath); + ERXValidationException validationexception = new ERXValidationException(ERXValidationException.InvalidValueException, parseexception, keyPath, stringValue); + component.validationFailedWithException(validationexception, stringValue, keyPath); return; } } Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXTimeDurationFormatter.java =================================================================== --- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXTimeDurationFormatter.java 2011-03-09 21:04:20 UTC (rev 12014) +++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/formatters/ERXTimeDurationFormatter.java 2011-03-12 19:09:36 UTC (rev 12015) @@ -10,6 +10,17 @@ /** * User-presentable time duration format as days, hours, minutes and seconds. * + * Usage example: + * <code> + * StopWatch w = new StopWatch(); + * w.start(); + * ... perform long task ... + * w.stop(); + * ERXTimeDurationFormatter f = new ERXTimeDurationFormatter(TimeUnit.MILLISECONDS); + * + * String message = "The task took " + f.format(w.getTime()); + * </code> + * * @author kieran * */ Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er:11280-11837,11838-11884*,11885-11908,11909-11973* + /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er:11280-11837,11838-11884*,11885-11908,11909-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel:11280-11837,11838-11973* + /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel:11280-11837,11838-11973*,11974-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java:11280-11973 + /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestClientThread.java:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java:11280-11973 + /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERTestWorkUnit.java:11280-12014 Property changes on: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java:11280-11973 + /trunk/Wonder/Frameworks/Misc/ERWorkerChannel/Tests/er/workerchannel/ERWorkerThredsTestCase.java:11280-12014 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |