Rename CalendricalRule.getReifiedType() to getType()

git-svn-id: https://threeten.svn.sourceforge.net/svnroot/threeten/trunk/threeten@1473 291d795c-afe8-5c46-8ee5-bf9dd72e1864
ThreeTen · May 28, 2011 · 6bc1a86 · 6bc1a86
1 parent 8b50a63
commit 6bc1a86
Show file tree

Hide file tree

Showing 29 changed files with 68 additions and 67 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -79,6 +79,7 @@
 - Add ofInstantUTC factories to ZDT, ODT, OD, OT
 - Remove Comparable, PeriodUnit, PeriodRange, ID and Chronology from CalendricalRule
 - Remove isXxx() methods from enums
+- Rename CalendricalRule.getReifiedType() to getType()
 
 0.6.3
 ===============================================================================

diff --git a/src-oracle/test/java/javax/time/i18n/TestHijrahChronology.java b/src-oracle/test/java/javax/time/i18n/TestHijrahChronology.java
@@ -64,7 +64,7 @@ public void testImmutable() throws Exception {
     @Test
     public void testEra() throws Exception {
         DateTimeRule rule = HijrahChronology.eraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(0, 1));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodEras());
@@ -75,7 +75,7 @@ public void testEra() throws Exception {
     @Test
     public void testYearOfEra() throws Exception {
         DateTimeRule rule = HijrahChronology.yearOfEraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahYearOfEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(HijrahDate.MIN_YEAR_OF_ERA, HijrahDate.MAX_YEAR_OF_ERA));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodYears());
@@ -86,7 +86,7 @@ public void testYearOfEra() throws Exception {
     @Test
     public void testMonthOfYear() throws Exception {
         DateTimeRule rule = HijrahChronology.monthOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahMonthOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 12));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodMonths());
@@ -96,7 +96,7 @@ public void testMonthOfYear() throws Exception {
     @Test
     public void testDayOfMonth() throws Exception {
         DateTimeRule rule = HijrahChronology.dayOfMonthRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahDayOfMonth");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 29, 30));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodDays());
@@ -107,7 +107,7 @@ public void testDayOfMonth() throws Exception {
     @Test
     public void testDayOfYear() throws Exception {
         DateTimeRule rule = HijrahChronology.dayOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahDayOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 354, 355));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodDays());
@@ -119,7 +119,7 @@ public void testDayOfYear() throws Exception {
     @Test
     public void testDayOfWeek() throws Exception {
         DateTimeRule rule = HijrahChronology.dayOfWeekRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "HijrahDayOfWeek");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 7));
         assertEquals(rule.getPeriodUnit(), HijrahChronology.periodDays());

diff --git a/src-oracle/test/java/javax/time/i18n/TestJapaneseChronology.java b/src-oracle/test/java/javax/time/i18n/TestJapaneseChronology.java
@@ -64,7 +64,7 @@ public void testImmutable() throws Exception {
     @Test
     public void testEra() throws Exception {
         DateTimeRule rule = JapaneseChronology.eraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(-3, 2));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodEras());
@@ -75,7 +75,7 @@ public void testEra() throws Exception {
     @Test
     public void testYearOfEra() throws Exception {
         DateTimeRule rule = JapaneseChronology.yearOfEraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseYearOfEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(JapaneseDate.MIN_YEAR_OF_ERA, JapaneseDate.MAX_YEAR_OF_ERA));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodYears());
@@ -86,7 +86,7 @@ public void testYearOfEra() throws Exception {
     @Test
     public void testMonthOfYear() throws Exception {
         DateTimeRule rule = JapaneseChronology.monthOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseMonthOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 12));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodMonths());
@@ -96,7 +96,7 @@ public void testMonthOfYear() throws Exception {
     @Test
     public void testDayOfMonth() throws Exception {
         DateTimeRule rule = JapaneseChronology.dayOfMonthRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseDayOfMonth");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 28, 31));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodDays());
@@ -107,7 +107,7 @@ public void testDayOfMonth() throws Exception {
     @Test
     public void testDayOfYear() throws Exception {
         DateTimeRule rule = JapaneseChronology.dayOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseDayOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 365, 366));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodDays());
@@ -119,7 +119,7 @@ public void testDayOfYear() throws Exception {
     @Test
     public void testDayOfWeek() throws Exception {
         DateTimeRule rule = JapaneseChronology.dayOfWeekRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "JapaneseDayOfWeek");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 7));
         assertEquals(rule.getPeriodUnit(), JapaneseChronology.periodDays());

diff --git a/src-oracle/test/java/javax/time/i18n/TestMinguoChronology.java b/src-oracle/test/java/javax/time/i18n/TestMinguoChronology.java
@@ -64,7 +64,7 @@ public void testImmutable() throws Exception {
     @Test
     public void testEra() throws Exception {
         DateTimeRule rule = MinguoChronology.eraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(0, 1));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodEras());
@@ -75,7 +75,7 @@ public void testEra() throws Exception {
     @Test
     public void testYearOfEra() throws Exception {
         DateTimeRule rule = MinguoChronology.yearOfEraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoYearOfEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(MinguoDate.MIN_YEAR_OF_ERA, MinguoDate.MAX_YEAR_OF_ERA));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodYears());
@@ -86,7 +86,7 @@ public void testYearOfEra() throws Exception {
     @Test
     public void testMonthOfYear() throws Exception {
         DateTimeRule rule = MinguoChronology.monthOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoMonthOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 12));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodMonths());
@@ -96,7 +96,7 @@ public void testMonthOfYear() throws Exception {
     @Test
     public void testDayOfMonth() throws Exception {
         DateTimeRule rule = MinguoChronology.dayOfMonthRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoDayOfMonth");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 28, 31));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodDays());
@@ -107,7 +107,7 @@ public void testDayOfMonth() throws Exception {
     @Test
     public void testDayOfYear() throws Exception {
         DateTimeRule rule = MinguoChronology.dayOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoDayOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 365, 366));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodDays());
@@ -119,7 +119,7 @@ public void testDayOfYear() throws Exception {
     @Test
     public void testDayOfWeek() throws Exception {
         DateTimeRule rule = MinguoChronology.dayOfWeekRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "MinguoDayOfWeek");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 7));
         assertEquals(rule.getPeriodUnit(), MinguoChronology.periodDays());

diff --git a/src-oracle/test/java/javax/time/i18n/TestThaiBuddhistChronology.java b/src-oracle/test/java/javax/time/i18n/TestThaiBuddhistChronology.java
@@ -64,7 +64,7 @@ public void testImmutable() throws Exception {
     @Test
     public void testEra() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.eraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(0, 1));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodEras());
@@ -75,7 +75,7 @@ public void testEra() throws Exception {
     @Test
     public void testYearOfEra() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.yearOfEraRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistYearOfEra");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(ThaiBuddhistDate.MIN_YEAR_OF_ERA, ThaiBuddhistDate.MAX_YEAR_OF_ERA));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodYears());
@@ -86,7 +86,7 @@ public void testYearOfEra() throws Exception {
     @Test
     public void testMonthOfYear() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.monthOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistMonthOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 12));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodMonths());
@@ -96,7 +96,7 @@ public void testMonthOfYear() throws Exception {
     @Test
     public void testDayOfMonth() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.dayOfMonthRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistDayOfMonth");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 28, 31));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodDays());
@@ -107,7 +107,7 @@ public void testDayOfMonth() throws Exception {
     @Test
     public void testDayOfYear() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.dayOfYearRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistDayOfYear");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 365, 366));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodDays());
@@ -119,7 +119,7 @@ public void testDayOfYear() throws Exception {
     @Test
     public void testDayOfWeek() throws Exception {
         DateTimeRule rule = ThaiBuddhistChronology.dayOfWeekRule();
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "ThaiBuddhistDayOfWeek");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(1, 7));
         assertEquals(rule.getPeriodUnit(), ThaiBuddhistChronology.periodDays());

diff --git a/src/main/java/javax/time/calendar/CalendricalRule.java b/src/main/java/javax/time/calendar/CalendricalRule.java
@@ -44,7 +44,7 @@
  * <p>
  * Each rule uses an underlying type to represent the data.
  * This is captured in the generic type of the rule.
- * The underlying type is reified and made available via {@link #getReifiedType()}.
+ * The underlying type is reified and made available via {@link #getType()}.
  * It is expected, but not enforced, that the underlying type is {@link Comparable}.
  * <p>
  * CalendricalRule is an abstract class and must be implemented with care to
@@ -65,7 +65,7 @@ public abstract class CalendricalRule<T>
     private static final long serialVersionUID = 1L;
 
     /** The reified class for the generic type. */
-    private final Class<T> reified;
+    private final Class<T> type;
     /** The name of the rule, not null. */
     private final String name;
 
@@ -85,7 +85,7 @@ protected CalendricalRule(
         if (name == null) {
             throw new NullPointerException("Name must not be null");
         }
-        this.reified = type;
+        this.type = type;
         this.name = name;
     }
 
@@ -106,7 +106,7 @@ public final String getName() {
 
     //-----------------------------------------------------------------------
     /**
-     * Gets the reified class representing the underlying type of the rule.
+     * Gets the type of the rule, which is a reification of the generic type.
      * <p>
      * Each rule uses an underlying type to represent the data.
      * This is captured in the generic type of the rule.
@@ -116,8 +116,8 @@ public final String getName() {
      *
      * @return the reified type of values of the rule, not null
      */
-    public final Class<T> getReifiedType() {
-        return reified;
+    public final Class<T> getType() {
+        return type;
     }
 
     /**
@@ -139,10 +139,10 @@ public final T reify(Object value) {
         if (value == null) {
             return null;
         }
-        if (reified.isInstance(value)) {
+        if (type.isInstance(value)) {
             return (T) value;
         }
-        throw new ClassCastException("Value of type " + value.getClass().getName() + " cannot be cast to type " + reified.getName());
+        throw new ClassCastException("Value of type " + value.getClass().getName() + " cannot be cast to type " + type.getName());
     }
 
     //-----------------------------------------------------------------------
@@ -281,7 +281,7 @@ protected T derive(Calendrical calendrical) {
      * @param value  the value to interpret, not null
      */
     final T interpretValue(CalendricalMerger merger, Object value) {
-        if (reified.isInstance(value)) {
+        if (type.isInstance(value)) {
             return reify(value);
         }
         T result = interpret(merger, value);

diff --git a/src/main/java/javax/time/i18n/HistoricEra.java b/src/main/java/javax/time/i18n/HistoricEra.java
@@ -120,7 +120,7 @@ public int getValue() {
      * @return the value for the rule, null if the value cannot be returned
      */
     public <T> T get(CalendricalRule<T> rule) {
-        if (rule.getReifiedType() != HistoricEra.class) {
+        if (rule.getType() != HistoricEra.class) {
             return null;
         }
         return rule.reify(this);

diff --git a/src/test/java/javax/time/calendar/TestCalendricalRule.java b/src/test/java/javax/time/calendar/TestCalendricalRule.java
@@ -87,10 +87,10 @@ public void test_serialization() throws IOException, ClassNotFoundException {
     }
 
     //-----------------------------------------------------------------------
-    // getReifiedType()
+    // getType()
     //-----------------------------------------------------------------------
-    public void test_getReifiedType() {
-        assertEquals(new MockBigYearRule().getReifiedType(), BigInteger.class);
+    public void test_getType() {
+        assertEquals(new MockBigYearRule().getType(), BigInteger.class);
     }
 
     //-----------------------------------------------------------------------

diff --git a/src/test/java/javax/time/calendar/TestISOAmPmOfDayRule.java b/src/test/java/javax/time/calendar/TestISOAmPmOfDayRule.java
@@ -57,7 +57,7 @@ protected DateTimeRule rule() {
     //-----------------------------------------------------------------------
     public void test_basics() throws Exception {
         DateTimeRule rule = ISODateTimeRule.AMPM_OF_DAY;
-        assertEquals(rule.getReifiedType(), DateTimeField.class);
+        assertEquals(rule.getType(), DateTimeField.class);
         assertEquals(rule.getName(), "AmPmOfDay");
         assertEquals(rule.getRange(), DateTimeRuleRange.of(0, 1));
         assertEquals(rule.getPeriodUnit(), ISOPeriodUnit._12_HOURS);