Copied: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimeInterval.java (from r605435, tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimePeriod.java) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimeInterval.java?p2=tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimeInterval.java&p1=tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimePeriod.java&r1=605435&r2=610090&rev=610090&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimePeriod.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimeInterval.java Tue Jan 8 10:18:27 2008 @@ -39,7 +39,7 @@ * <p> Example: "2 h 30 m". By convention, terms are specified largest to smallest. A term without a unit is assumed to be milliseconds. Units are case insensitive ("h" or "H" * are treated the same). */ -public class TimePeriod +public class TimeInterval { private static final Map<String, Long> UNITS = CollectionFactory.newCaseInsensitiveMap(); @@ -59,11 +59,11 @@ private final long _milliseconds; /** - * Creates a TimePeriod for a string. + * Creates a TimeInterval for a string. * * @param input the string specifying the amount of time in the period */ - public TimePeriod(String input) + public TimeInterval(String input) { _milliseconds = parseMilliseconds(input); } @@ -97,7 +97,7 @@ if (lastMatchEnd + 1 < start) { String invalid = input.substring(lastMatchEnd + 1, start); - throw new RuntimeException(UtilMessages.invalidTimePeriodInput(invalid, input)); + throw new RuntimeException(UtilMessages.invalidTimeIntervalInput(invalid, input)); } lastMatchEnd = matcher.end(); @@ -114,7 +114,7 @@ Long unitValue = UNITS.get(units); if (unitValue == null) - throw new RuntimeException(UtilMessages.invalidTimePeriodUnit(units, input, UNITS.keySet())); + throw new RuntimeException(UtilMessages.invalidTimeIntervalUnit(units, input, UNITS.keySet())); milliseconds += count * unitValue; } @@ -122,7 +122,7 @@ if (lastMatchEnd + 1 < input.length()) { String invalid = input.substring(lastMatchEnd + 1); - throw new RuntimeException(UtilMessages.invalidTimePeriodInput(invalid, input)); + throw new RuntimeException(UtilMessages.invalidTimeIntervalInput(invalid, input)); } return milliseconds; @@ -131,7 +131,7 @@ @Override public String toString() { - return String.format("TimePeriod[%d ms]", _milliseconds); + return String.format("TimeInterval[%d ms]", _milliseconds); } @Override @@ -139,9 +139,9 @@ { if (obj == null) return false; - if (obj instanceof TimePeriod) + if (obj instanceof TimeInterval) { - TimePeriod tp = (TimePeriod) obj; + TimeInterval tp = (TimeInterval) obj; return _milliseconds == tp._milliseconds; }
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java?rev=610090&r1=610089&r2=610090&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java Tue Jan 8 10:18:27 2008 @@ -42,13 +42,13 @@ return MESSAGES.get("stack-is-empty"); } - static String invalidTimePeriodUnit(String unit, String input, Collection<String> units) + static String invalidTimeIntervalUnit(String unit, String input, Collection<String> units) { - return MESSAGES.format("invalid-time-period-unit", unit, input, InternalUtils.joinSorted(units)); + return MESSAGES.format("invalid-time-interval-unit", unit, input, InternalUtils.joinSorted(units)); } - static String invalidTimePeriodInput(String invalid, String input) + static String invalidTimeIntervalInput(String invalid, String input) { - return MESSAGES.format("invalid-time-period-input", invalid, input); + return MESSAGES.format("invalid-time-interval-input", invalid, input); } } Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties?rev=610090&r1=610089&r2=610090&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties Tue Jan 8 10:18:27 2008 @@ -1,18 +1,18 @@ -# Copyright 2006 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - +# Copyright 2006 The Apache Software Foundation +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + no-strategy-adapter=No adapter from type %s to type %s is available (registered types are %s). stack-is-empty=Stack is empty. -invalid-time-period-unit=Unknown time period unit '%s' (in '%s'). Defined units: %s. -invalid-time-period-input=Unexpected string '%s' (in time period '%s'). \ No newline at end of file +invalid-time-interval-unit=Unknown time interval unit '%s' (in '%s'). Defined units: %s. +invalid-time-interval-input=Unexpected string '%s' (in time interval '%s'). \ No newline at end of file Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java?rev=610090&r1=610089&r2=610090&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java Tue Jan 8 10:18:27 2008 @@ -16,7 +16,7 @@ import org.apache.tapestry.ioc.internal.IOCInternalTestCase; import org.apache.tapestry.ioc.services.TypeCoercer; -import org.apache.tapestry.ioc.util.TimePeriod; +import org.apache.tapestry.ioc.util.TimeInterval; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; @@ -174,8 +174,8 @@ {"foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt")}, - {new TimePeriod("2 h"), Long.class, 2 * 60 * 60 * 1000l}, - {"2 h", TimePeriod.class, new TimePeriod("120 m")}, + {new TimeInterval("2 h"), Long.class, 2 * 60 * 60 * 1000l}, + {"2 h", TimeInterval.class, new TimeInterval("120 m")}, {null, Long.class, 0l}, {null, Short.class, (short) 0}, {null, Byte.class, (byte) 0}, {null, BigDecimal.class, BigDecimal.ZERO}, {null, Float.class, 0f}, Copied: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimeIntervalTest.java (from r605435, tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimePeriodTest.java) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimeIntervalTest.java?p2=tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimeIntervalTest.java&p1=tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimePeriodTest.java&r1=605435&r2=610090&rev=610090&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimePeriodTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/util/TimeIntervalTest.java Tue Jan 8 10:18:27 2008 @@ -18,17 +18,17 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -public class TimePeriodTest extends TestBase +public class TimeIntervalTest extends TestBase { @Test public void use_constructor() { - TimePeriod p = new TimePeriod("30 s"); + TimeInterval p = new TimeInterval("30 s"); assertEquals(p.seconds(), 30); assertEquals(p.milliseconds(), 30 * 1000); - assertEquals(p.toString(), "TimePeriod[30000 ms]"); + assertEquals(p.toString(), "TimeInterval[30000 ms]"); } @Test @@ -36,13 +36,13 @@ { try { - TimePeriod.parseMilliseconds("30s 500mz"); + TimeInterval.parseMilliseconds("30s 500mz"); unreachable(); } catch (RuntimeException ex) { assertEquals(ex.getMessage(), - "Unknown time period unit 'mz' (in '30s 500mz'). Defined units: d, h, m, ms, s."); + "Unknown time interval unit 'mz' (in '30s 500mz'). Defined units: d, h, m, ms, s."); } } @@ -51,12 +51,12 @@ { try { - TimePeriod.parseMilliseconds("30s z 500ms"); + TimeInterval.parseMilliseconds("30s z 500ms"); unreachable(); } catch (RuntimeException ex) { - assertEquals(ex.getMessage(), "Unexpected string 'z' (in time period '30s z 500ms')."); + assertEquals(ex.getMessage(), "Unexpected string 'z' (in time interval '30s z 500ms')."); } } @@ -65,19 +65,19 @@ { try { - TimePeriod.parseMilliseconds("30s 500ms xyz"); + TimeInterval.parseMilliseconds("30s 500ms xyz"); unreachable(); } catch (RuntimeException ex) { - assertEquals(ex.getMessage(), "Unexpected string 'xyz' (in time period '30s 500ms xyz')."); + assertEquals(ex.getMessage(), "Unexpected string 'xyz' (in time interval '30s 500ms xyz')."); } } @Test(dataProvider = "mix_of_units_data") public void mix_of_units(String input, long expected) { - assertEquals(TimePeriod.parseMilliseconds(input), expected); + assertEquals(TimeInterval.parseMilliseconds(input), expected); } @DataProvider(name = "mix_of_units_data")
