Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.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/gsdl3/util/GS2MacroResolver.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GS2MacroResolver.java

@@ -26 +26 @@
 // Apache Commons
 import org.apache.commons.lang3.*;
+import org.greenstone.gsdl3.util.MacroResolver.Macro;
 
 import java.util.Stack;
@@ -65 +66 @@
     } 
 
-    Stack macros = new Stack();//ArrayList macros;
+    Stack<Macro> macros = new Stack<Macro>();//ArrayList macros;
     if (scope.equals(SCOPE_TEXT)) {
         macros.addAll(text_macros);
@@ -74 +75 @@
     while(!macros.empty()) {
         String new_text = null;
-        Macro m = (Macro)macros.pop();//.get(i);
+        Macro m = macros.pop();//.get(i);
         switch (m.type) {
         case TYPE_DICT: