Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/SequenceList.java

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/SequenceList.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/SequenceList.java

@@ -16 +16 @@
 public class SequenceList
 {
-    protected ArrayList _steps = new ArrayList();
+    protected ArrayList<Step> _steps = new ArrayList<Step>();
     protected ExtensionInformation _parent = null;
     protected Properties _dependencies = null;
@@ -77 +77 @@
     public Step[] getSteps()
     {
-    return (Step[])(_steps.toArray(new Step[0]));
+    return (_steps.toArray(new Step[0]));
     }
 
@@ -89 +89 @@
     JButton[] buttons = new JButton[_steps.size()];
     for(int i = 0; i < _steps.size(); i++){
-        buttons[i] = ((Step)_steps.get(i)).getButton();
+        buttons[i] = _steps.get(i).getButton();
     }
     
@@ -152 +152 @@
     {
     Step rollbackStep = null;
-    ArrayList dependsSteps = new ArrayList();
-    for(int i = 0; i < _steps.size(); i++){
-        if(((Step)(_steps.get(i))).getId().equals(id)){
-        rollbackStep = (Step)_steps.get(i);
+    ArrayList<String> dependsSteps = new ArrayList<String>();
+    for(int i = 0; i < _steps.size(); i++){
+        if((_steps.get(i)).getId().equals(id)){
+        rollbackStep = _steps.get(i);
         }
         
-        String[] depends = ((Step)_steps.get(i)).getDependsOn().split(",");
+        String[] depends = _steps.get(i).getDependsOn().split(",");
 
         for(int j = 0; j < depends.length; j++){
         if(depends[j].equals(id)){
-            dependsSteps.add(((Step)_steps.get(i)).getId());
+            dependsSteps.add(_steps.get(i).getId());
         }
         }
@@ -170 +170 @@
 
     for(int i = 0; i < dependsSteps.size(); i++){
-        rollbackToRecursive((String)dependsSteps.get(i));
+        rollbackToRecursive(dependsSteps.get(i));
     }
     }
@@ -177 +177 @@
     {
     for(int i = 0; i < _steps.size(); i++){
-        Step currentStep = (Step)_steps.get(i);
+        Step currentStep = _steps.get(i);
         if(currentStep instanceof PropertiesStep){
         ((PropertiesStep)currentStep).setPropertiesToDefaults();
@@ -211 +211 @@
     
     for(int i = 0; i < _steps.size(); i++){
-        Step currentStep = (Step)_steps.get(i);
+        Step currentStep = _steps.get(i);
         JButton currentButton = currentStep.getButton();