Modified code to remove some warnings at compile time.

diff --git a/4.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java b/4.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java
index e9282f7da55389c4b88816564b82fa63d95dd013..31b7b266fef79745f4392c03fb7329c5ae3f2dbe 100644 (file)
--- a/4.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java
+++ b/4.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java
@@ -57,9 +57,9 @@ public class MDateConverter extends MObject {
             throw new IllegalArgumentException("Invalid 'dateFormats': null.");
         }
         else {
-            Iterator i = dateFormats.iterator();
+            Iterator<String> i = dateFormats.iterator();
             while (i.hasNext()) {
-                MDateConverter.checkDateFormat((String)i.next());
+                MDateConverter.checkDateFormat(i.next());
             }
         }
         //
@@ -187,7 +187,7 @@ public class MDateConverter extends MObject {
         Date y = null;
         for (String dateFormat: this.getDateFormats()) {
             try {
-                y = this.getDateFromStringByParameters(x, dateFormat, this.getLocale(), this.getTimeZone());
+                y = MDateConverter.getDateFromStringByParameters(x, dateFormat, this.getLocale(), this.getTimeZone());
                 return y;
             }
             catch (MInvalidConversionFormatException exception) {
@@ -200,7 +200,7 @@ public class MDateConverter extends MObject {
     }
 
     public String getStringFromDate(Date x) {
-        return this.getStringFromDateByParameters(x, this.getDefaultDateFormat(), this.getLocale(), this.getTimeZone());
+        return MDateConverter.getStringFromDateByParameters(x, this.getDefaultDateFormat(), this.getLocale(), this.getTimeZone());
     }
 
     /* Helpers. */

diff --git a/4.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java b/4.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java
index a266afac81835165c34875d32d588fe73ef99c9e..c4e6e2c33c0b7c76e19ed50eac58660234a381c9 100644 (file)
--- a/4.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java
+++ b/4.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java
@@ -48,9 +48,9 @@ public class MNumberConverter extends MObject {
             throw new IllegalArgumentException("Invalid 'numberFormats': null.");
         }
         else {
-            Iterator i = numberFormats.iterator();
+            Iterator<String> i = numberFormats.iterator();
             while (i.hasNext()) {
-                MNumberConverter.checkNumberFormat((String)i.next());
+                MNumberConverter.checkNumberFormat(i.next());
             }
         }
         //
@@ -142,7 +142,7 @@ public class MNumberConverter extends MObject {
         BigDecimal y = null;
         for (String numberFormat: this.getNumberFormats()) {
             try {
-                y = this.getNumberFromStringByParameters(x, numberFormat, this.getLocale());
+                y = MNumberConverter.getNumberFromStringByParameters(x, numberFormat, this.getLocale());
                 return y;
             }
             catch (MInvalidConversionFormatException exception) {
@@ -155,7 +155,7 @@ public class MNumberConverter extends MObject {
     }
 
     public String getStringFromNumber(BigDecimal x) {
-        return this.getStringFromNumberByParameters(x, this.getDefaultNumberFormat(), this.getLocale());
+        return MNumberConverter.getStringFromNumberByParameters(x, this.getDefaultNumberFormat(), this.getLocale());
     }
 
 }