use generics

JumpMind · Jun 29, 2010 · e6ebb13 · e6ebb13
1 parent 61b6270
commit e6ebb13
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/SqlBuilder.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/SqlBuilder.java
@@ -537,7 +537,7 @@ public boolean evaluate(Object obj)
      */
     protected void processChanges(Database           currentModel,
                                   Database           desiredModel,
-                                  List               changes,
+                                  List<TableChange>               changes,
                                   CreationParameters params) throws IOException
     {
         CallbackClosure callbackClosure = new CallbackClosure(this,
@@ -725,7 +725,7 @@ protected void processChange(Database           currentModel,
     protected void processTableStructureChanges(Database           currentModel,
                                                 Database           desiredModel,
                                                 CreationParameters params,
-                                                Collection         changes) throws IOException
+                                                Collection<TableChange>         changes) throws IOException
     {
         ListOrderedMap changesPerTable = new ListOrderedMap();
         ListOrderedMap unchangedFKs    = new ListOrderedMap();
@@ -734,21 +734,21 @@ protected void processTableStructureChanges(Database           currentModel,
         // we first sort the changes for the tables
         // however since the changes might contain source or target tables
         // we use the names rather than the table objects
-        for (Iterator changeIt = changes.iterator(); changeIt.hasNext();)
+        for (Iterator<TableChange> changeIt = changes.iterator(); changeIt.hasNext();)
         {
-            TableChange change = (TableChange)changeIt.next();
+            TableChange change = changeIt.next();
             String      name   = change.getChangedTable().getName();
 
             if (!caseSensitive)
             {
                 name = name.toUpperCase();
             }
 
-            List changesForTable = (ArrayList)changesPerTable.get(name);
+            List<TableChange> changesForTable = (List<TableChange>)changesPerTable.get(name);
 
             if (changesForTable == null)
             {
-                changesForTable = new ArrayList();
+                changesForTable = new ArrayList<TableChange>();
                 changesPerTable.put(name, changesForTable);
                 unchangedFKs.put(name, getUnchangedForeignKeys(currentModel, desiredModel, name));
             }

diff --git a/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Builder.java b/symmetric/symmetric-ddl/src/main/java/org/jumpmind/symmetric/ddl/platform/h2/H2Builder.java
@@ -56,7 +56,6 @@
  * >https://issues.apache.org/jira/browse/DDLUTILS-185</a>
  * 
  * @author knaas@users.sourceforge.net
- * @version $Revision: 518485 $
  */
 public class H2Builder extends SqlBuilder {
 
@@ -86,13 +85,12 @@ public void writeExternalIndexDropStmt(Table table, Index index) throws IOExcept
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     protected void processTableStructureChanges(Database currentModel, Database desiredModel,
-            CreationParameters params, Collection changes) throws IOException {
+            CreationParameters params, Collection<TableChange> changes) throws IOException {
 
         // Only drop columns that are not part of a primary key
-        for (Iterator changeIt = changes.iterator(); changeIt.hasNext();) {
-            TableChange change = (TableChange) changeIt.next();
+        for (Iterator<TableChange> changeIt = changes.iterator(); changeIt.hasNext();) {
+            TableChange change = changeIt.next();
             if ((change instanceof RemoveColumnChange) && ((RemoveColumnChange) change).getColumn().isPrimaryKey()) {
                 changeIt.remove();
             }
@@ -103,24 +101,24 @@ protected void processTableStructureChanges(Database currentModel, Database desi
         // thus we first gather all add column changes and then execute them
         // Since we get them in target table column order, we can simply
         // iterate backwards
-        ArrayList addColumnChanges = new ArrayList();
+        ArrayList<AddColumnChange> addColumnChanges = new ArrayList<AddColumnChange>();
 
-        for (Iterator changeIt = changes.iterator(); changeIt.hasNext();) {
-            TableChange change = (TableChange) changeIt.next();
+        for (Iterator<TableChange> changeIt = changes.iterator(); changeIt.hasNext();) {
+            TableChange change = changeIt.next();
             if (change instanceof AddColumnChange) {
-                addColumnChanges.add(change);
+                addColumnChanges.add((AddColumnChange)change);
                 changeIt.remove();
             }
         }
 
-        for (ListIterator changeIt = addColumnChanges.listIterator(addColumnChanges.size()); changeIt.hasPrevious();) {
+        for (ListIterator<AddColumnChange> changeIt = addColumnChanges.listIterator(addColumnChanges.size()); changeIt.hasPrevious();) {
             AddColumnChange addColumnChange = (AddColumnChange) changeIt.previous();
             processChange(currentModel, desiredModel, addColumnChange);
             changeIt.remove();
         }
 
-        for (Iterator changeIt = changes.iterator(); changeIt.hasNext();) {
-            TableChange change = (TableChange) changeIt.next();
+        for (Iterator<TableChange> changeIt = changes.iterator(); changeIt.hasNext();) {
+            TableChange change = changeIt.next();
             if (change instanceof RemoveColumnChange) {
                 RemoveColumnChange removeColumnChange = (RemoveColumnChange) change;
                 processChange(currentModel, desiredModel, removeColumnChange);