diff --git a/src/org/antlr/works/IDE.java b/src/org/antlr/works/IDE.java
index e6a4088b..cbcac03c 100644
--- a/src/org/antlr/works/IDE.java
+++ b/src/org/antlr/works/IDE.java
@@ -278,7 +278,7 @@ public String getMessage() {
     }
 
     public static String getApplicationPath() {
-        Class c = XJApplication.getAppDelegate().getClass();
+        Class<?> c = XJApplication.getAppDelegate().getClass();
         URL url = c.getProtectionDomain().getCodeSource().getLocation();
         String p;
         if(url == null) {
@@ -332,7 +332,7 @@ public static String getApplicationPath() {
         return p;
     }
 
-    public static void debugVerbose(Console console, Class c, String s) {
+    public static void debugVerbose(Console console, Class<?> c, String s) {
         if(AWPrefs.getDebugVerbose()) {
             String message = c.getName()+": "+s;
             if(console != null)
@@ -398,7 +398,7 @@ public void appWillTerminate() {
         StatisticsAW.shared().close();
     }
 
-    public Class appPreferencesPanelClass() {
+    public Class<? extends XJPanel> appPreferencesPanelClass() {
         return AWPrefsDialog.class;
     }
 
@@ -418,7 +418,7 @@ public boolean useDesktopMode() {
         return AWPrefs.getUseDesktopMode();
     }
 
-    public Class appPreferencesClass() {
+    public Class<?> appPreferencesClass() {
         return IDE.class;
     }
 
diff --git a/src/org/antlr/works/ate/swing/ATERenderingToken.java b/src/org/antlr/works/ate/swing/ATERenderingToken.java
index ac386d10..618643a9 100644
--- a/src/org/antlr/works/ate/swing/ATERenderingToken.java
+++ b/src/org/antlr/works/ate/swing/ATERenderingToken.java
@@ -37,7 +37,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public abstract class ATERenderingToken implements Comparable {
+public abstract class ATERenderingToken implements Comparable<ATERenderingToken> {
 
     protected int index;
 
@@ -52,11 +52,10 @@ public void setIndex(int index) {
     public abstract void drawToken(ATERenderingView view, ATERenderingToken t, Graphics g, FontMetrics metrics,
                           int x, int y, char c, Document doc, AttributeSet attribute, Segment text) throws BadLocationException;
     
-    public int compareTo(Object o) {
-        if(!(o instanceof ATERenderingToken)) return 0;
-        ATERenderingToken other = (ATERenderingToken) o;
-        if(index > other.index) return 1;
-        if(index < other.index) return -1;
+    public int compareTo(ATERenderingToken o) {
+        if(o == null) return 1;
+        if(index > o.index) return 1;
+        if(index < o.index) return -1;
         return 0;
     }
 }
diff --git a/src/org/antlr/works/ate/syntax/generic/ATESyntaxParser.java b/src/org/antlr/works/ate/syntax/generic/ATESyntaxParser.java
index 3370a5e8..58011c2f 100644
--- a/src/org/antlr/works/ate/syntax/generic/ATESyntaxParser.java
+++ b/src/org/antlr/works/ate/syntax/generic/ATESyntaxParser.java
@@ -1,9 +1,9 @@
 package org.antlr.works.ate.syntax.generic;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.antlr.works.ate.syntax.misc.ATEToken;
 
-import java.util.List;
-import java.util.Stack;
 /*
 
 [The "BSD licence"]
@@ -38,7 +38,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public abstract class ATESyntaxParser {
 
     private List<ATEToken> tokens;
-    private Stack<Integer> marks = new Stack<Integer>();
+    private List<Integer> marks = new ArrayList<Integer>();
     private int position;
 
     private ATEToken t0;
@@ -73,11 +73,11 @@ public int getPosition() {
     }
 
     public void mark() {
-        marks.push(position);
+        marks.add(position);
     }
 
     public void rewind() {
-        position = marks.pop();
+        position = marks.remove(marks.size() - 1);
         clearTokenCache();
     }
 
diff --git a/src/org/antlr/works/ate/syntax/misc/ATEToken.java b/src/org/antlr/works/ate/syntax/misc/ATEToken.java
index 3cc7c2c5..d38f416b 100644
--- a/src/org/antlr/works/ate/syntax/misc/ATEToken.java
+++ b/src/org/antlr/works/ate/syntax/misc/ATEToken.java
@@ -31,7 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.works.ate.syntax.misc;
 
-public class ATEToken implements Comparable {
+public class ATEToken implements Comparable<ATEToken> {
 
     public int type;
 
@@ -112,13 +112,12 @@ public boolean equals(Object otherObject) {
         }
     }
 
-    public int compareTo(Object o) {
-        if(o instanceof ATEToken) {
-            ATEToken otherToken = (ATEToken)o;
-            return this.getAttribute().compareTo(otherToken.getAttribute());
-        } else {
+    public int compareTo(ATEToken o) {
+        if (o == null) {
             return 1;
         }
+
+        return this.getAttribute().compareTo(o.getAttribute());
     }
 
     public String toString() {
diff --git a/src/org/antlr/works/components/GrammarDocumentFactory.java b/src/org/antlr/works/components/GrammarDocumentFactory.java
index e8d37025..d0f3b361 100644
--- a/src/org/antlr/works/components/GrammarDocumentFactory.java
+++ b/src/org/antlr/works/components/GrammarDocumentFactory.java
@@ -2,7 +2,9 @@
 
 import org.antlr.works.utils.Localizable;
 import org.antlr.xjlib.appkit.document.XJDataPlainText;
-import org.antlr.xjlib.appkit.document.XJDocumentFactory;/*
+import org.antlr.xjlib.appkit.document.XJDocumentFactory;
+import org.antlr.xjlib.appkit.frame.XJWindow;
+/*
 
 [The "BSD licence"]
 Copyright (c) 2005-07 Jean Bovet
@@ -36,7 +38,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class GrammarDocumentFactory extends XJDocumentFactory {
 
     // todo provide factory?
-    public GrammarDocumentFactory(Class windowClass) {
+    public GrammarDocumentFactory(Class<? extends XJWindow> windowClass) {
         super(GrammarDocument.class,
                 windowClass,
                 XJDataPlainText.class,
diff --git a/src/org/antlr/works/components/GrammarWindow.java b/src/org/antlr/works/components/GrammarWindow.java
index 518805c1..443c87f3 100644
--- a/src/org/antlr/works/components/GrammarWindow.java
+++ b/src/org/antlr/works/components/GrammarWindow.java
@@ -1129,7 +1129,7 @@ public void rulesDidChange() {
         interpreterTab.updateIgnoreTokens(getRules());
     }
 
-    public JPopupMenu rulesGetContextualMenu(List selectedObjects) {
+    public JPopupMenu rulesGetContextualMenu(List<?> selectedObjects) {
         if(selectedObjects.isEmpty())
             return null;
 
diff --git a/src/org/antlr/works/debugger/DebuggerEngine.java b/src/org/antlr/works/debugger/DebuggerEngine.java
index e15f013a..0bb31623 100644
--- a/src/org/antlr/works/debugger/DebuggerEngine.java
+++ b/src/org/antlr/works/debugger/DebuggerEngine.java
@@ -225,10 +225,8 @@ public static String compileFiles(Console console, String[] files, String output
                 System.arraycopy(files, 0, args, 2, files.length);
 
                 Class<?> javac = Class.forName("com.sun.tools.javac.Main");
-                Class[] p = new Class[] { String[].class };
-                Method m = javac.getMethod("compile", p);
-                Object[] a = new Object[] { args };
-                Object r = m.invoke(javac.newInstance(), a);
+                Method m = javac.getMethod("compile", String[].class);
+                Object r = m.invoke(javac.newInstance(), (Object)args);
                 result = (Integer) r;
                 //result = com.sun.tools.javac.Main.compile(args);
             }
diff --git a/src/org/antlr/works/debugger/DebuggerTab.java b/src/org/antlr/works/debugger/DebuggerTab.java
index 973f54e9..5aa7df0a 100644
--- a/src/org/antlr/works/debugger/DebuggerTab.java
+++ b/src/org/antlr/works/debugger/DebuggerTab.java
@@ -563,7 +563,7 @@ public void addEvent(DBEvent event, DBPlayerContextInfo info) {
         eventsPanel.addEvent(event, info);
     }
 
-    public void playEvents(List events, int lastEventPosition, boolean reset) {
+    public void playEvents(List<? extends DBEvent> events, int lastEventPosition, boolean reset) {
         player.playEvents(events, lastEventPosition, reset);
         breaksOnEvent();
     }
diff --git a/src/org/antlr/works/debugger/panels/DBControlPanel.java b/src/org/antlr/works/debugger/panels/DBControlPanel.java
index f15696fd..0dbea848 100644
--- a/src/org/antlr/works/debugger/panels/DBControlPanel.java
+++ b/src/org/antlr/works/debugger/panels/DBControlPanel.java
@@ -7,7 +7,6 @@
 import org.antlr.works.prefs.AWPrefs;
 import org.antlr.works.stats.StatisticsAW;
 import org.antlr.works.utils.IconManager;
-import org.antlr.works.utils.NumberSet;
 import org.antlr.works.utils.Toolbar;
 import org.antlr.xjlib.appkit.swing.XJRollOverButton;
 
@@ -15,6 +14,7 @@
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.HashSet;
 import java.util.Set;
 /*
 
@@ -229,8 +229,8 @@ public JComponent createInfoLabelPanel() {
         return infoLabel;
     }
 
-    public Set getBreakEvent() {
-        NumberSet set = new NumberSet();
+    public Set<Integer> getBreakEvent() {
+        Set<Integer> set = new HashSet<Integer>();
 
         if(breakAllButton.isSelected())
             set.add(DBEvent.ALL);
diff --git a/src/org/antlr/works/debugger/panels/DBEventsPanel.java b/src/org/antlr/works/debugger/panels/DBEventsPanel.java
index 7b49d8e5..906a4598 100644
--- a/src/org/antlr/works/debugger/panels/DBEventsPanel.java
+++ b/src/org/antlr/works/debugger/panels/DBEventsPanel.java
@@ -155,7 +155,7 @@ public String getColumnName(int column) {
             return super.getColumnName(column);
         }
 
-        public Class getColumnClass(int columnIndex) {
+        public Class<?> getColumnClass(int columnIndex) {
             switch(columnIndex) {
                 case INFO_COLUMN_COUNT: return String.class;
                 case INFO_COLUMN_EVENT: return String.class;
diff --git a/src/org/antlr/works/debugger/panels/DBStackPanel.java b/src/org/antlr/works/debugger/panels/DBStackPanel.java
index 374bbed3..a1a3babf 100644
--- a/src/org/antlr/works/debugger/panels/DBStackPanel.java
+++ b/src/org/antlr/works/debugger/panels/DBStackPanel.java
@@ -10,7 +10,8 @@
 import javax.swing.table.AbstractTableModel;
 import java.awt.*;
 import java.util.ArrayList;
-import java.util.Stack;
+import java.util.List;
+
 /*
 
 [The "BSD licence"]
@@ -49,7 +50,7 @@ public class DBStackPanel extends DetachablePanel {
 
     private XJTableView infoTableView;
     private DBStackPanel.RuleTableDataModel ruleTableDataModel;
-    private Stack<DBEventEnterRule> rules = new Stack<DBEventEnterRule>();
+    private List<DBEventEnterRule> rules = new ArrayList<DBEventEnterRule>();
 
     public DBStackPanel(DebuggerTab debuggerTab) {
         super("Stack", debuggerTab);
@@ -89,20 +90,20 @@ public void run() {
     }
 
     public void pushRule(DBEventEnterRule rule) {
-        rules.push(rule);
+        rules.add(rule);
         ruleTableDataModel.add(rule.name);
     }
 
     public void popRule() {
-        ruleTableDataModel.remove(rules.peek().name);
-        rules.pop();
+        ruleTableDataModel.remove(rules.get(rules.size() - 1).name);
+        rules.remove(rules.size() - 1);
     }
 
     public DBEventEnterRule peekRule() {
         if(rules.isEmpty()) {
             return null;
         } else {
-            return rules.peek();            
+            return rules.get(rules.size() - 1);
         }
     }
 
diff --git a/src/org/antlr/works/debugger/tivo/DBPlayer.java b/src/org/antlr/works/debugger/tivo/DBPlayer.java
index 0b3e3cd5..f07804b6 100644
--- a/src/org/antlr/works/debugger/tivo/DBPlayer.java
+++ b/src/org/antlr/works/debugger/tivo/DBPlayer.java
@@ -37,8 +37,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import org.antlr.works.debugger.input.DBInputProcessor;
 import org.antlr.works.debugger.input.DBInputTextTokenInfo;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Stack;
 
 public class DBPlayer {
 
@@ -46,7 +46,7 @@ public class DBPlayer {
     protected DBInputProcessor processor;
 
     protected DBPlayerContextInfo contextInfo;
-    protected Stack<Integer> markStack;
+    protected List<Integer> markStack;
 
     protected int resyncing = 0;
     protected int eventPlayedCount = 0;
@@ -54,7 +54,7 @@ public class DBPlayer {
     public DBPlayer(DebuggerTab debuggerTab) {
         this.debuggerTab = debuggerTab;
         contextInfo = new DBPlayerContextInfo();
-        markStack = new Stack<Integer>();
+        markStack = new ArrayList<Integer>();
     }
 
     public void close() {
@@ -88,13 +88,13 @@ the events are reset (when the debugger starts).
         eventPlayedCount = 0;
     }
 
-    public void playEvents(List events, int lastEventPosition, boolean reset) {
+    public void playEvents(List<? extends DBEvent> events, int lastEventPosition, boolean reset) {
         if(reset)
             resetPlayEvents(false);
 
         int lastIndex = lastEventPosition - 1;
         for(int i=eventPlayedCount; i< lastEventPosition; i++) {
-            DBEvent event = (DBEvent)events.get(i);
+            DBEvent event = events.get(i);
 
             try {
                 playEvent(event);
@@ -317,13 +317,13 @@ public void playLocation() {
 
     public void playMark(DBEventMark event) {
         contextInfo.mark(event.id);
-        markStack.push(processor.getCurrentTokenIndex());
+        markStack.add(processor.getCurrentTokenIndex());
     }
 
     public void playRewind(DBEventRewind event) {
-        processor.rewind(markStack.peek());
+        processor.rewind(markStack.get(markStack.size() - 1));
         if(!event.rewindToLastMark()) {
-            markStack.pop();
+            markStack.remove(markStack.size() - 1);
             contextInfo.rewind();
         }
     }
diff --git a/src/org/antlr/works/debugger/tivo/DBPlayerContextInfo.java b/src/org/antlr/works/debugger/tivo/DBPlayerContextInfo.java
index 8fa3efa4..2876fe8e 100644
--- a/src/org/antlr/works/debugger/tivo/DBPlayerContextInfo.java
+++ b/src/org/antlr/works/debugger/tivo/DBPlayerContextInfo.java
@@ -1,6 +1,8 @@
 package org.antlr.works.debugger.tivo;
 
-import java.util.Stack;
+import java.util.ArrayList;
+import java.util.List;
+
 /*
 
 [The "BSD licence"]
@@ -34,17 +36,17 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public class DBPlayerContextInfo {
 
-    public Stack<Integer> subrule = new Stack<Integer>();
-    public Stack<Integer> decision = new Stack<Integer>();
-    public Stack<Integer> mark = new Stack<Integer>();
-    public Stack<Integer> backtrack = new Stack<Integer>();
+    public List<Integer> subrule = new ArrayList<Integer>();
+    public List<Integer> decision = new ArrayList<Integer>();
+    public List<Integer> mark = new ArrayList<Integer>();
+    public List<Integer> backtrack = new ArrayList<Integer>();
 
     public void enterSubrule(int i) {
-        subrule.push(i);
+        subrule.add(i);
     }
 
     public void exitSubrule() {
-        subrule.pop();
+        subrule.remove(subrule.size() - 1);
     }
 
     public int getSubrule() {
@@ -52,11 +54,11 @@ public int getSubrule() {
     }
 
     public void enterDecision(int i) {
-        decision.push(i);
+        decision.add(i);
     }
 
     public void exitDecision() {
-        decision.pop();
+        decision.remove(decision.size() - 1);
     }
 
     public int getDecision() {
@@ -64,11 +66,11 @@ public int getDecision() {
     }
 
     public void mark(int i) {
-        mark.push(i);
+        mark.add(i);
     }
 
     public void rewind() {
-        mark.pop();
+        mark.remove(mark.size() - 1);
     }
 
     public int getMark() {
@@ -76,11 +78,11 @@ public int getMark() {
     }
 
     public void beginBacktrack(int level) {
-        backtrack.push(level);
+        backtrack.add(level);
     }
 
     public void endBacktrack() {
-        backtrack.pop();
+        backtrack.remove(backtrack.size() - 1);
     }
 
     public int getBacktrack() {
@@ -91,11 +93,11 @@ public boolean isBacktracking() {
         return !backtrack.isEmpty();
     }
 
-    public int getPeekValue(Stack<Integer> s) {
+    public int getPeekValue(List<Integer> s) {
         if(s.isEmpty())
             return -1;
         else
-            return s.peek();
+            return s.get(s.size() - 1);
     }
 
     public void clear() {
diff --git a/src/org/antlr/works/debugger/tivo/DBRecorder.java b/src/org/antlr/works/debugger/tivo/DBRecorder.java
index ee18ac68..dd0a1384 100644
--- a/src/org/antlr/works/debugger/tivo/DBRecorder.java
+++ b/src/org/antlr/works/debugger/tivo/DBRecorder.java
@@ -38,7 +38,6 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import org.antlr.works.debugger.events.*;
 import org.antlr.works.prefs.AWPrefs;
 import org.antlr.works.utils.Console;
-import org.antlr.works.utils.NumberSet;
 import org.antlr.xjlib.appkit.utils.XJAlert;
 import org.antlr.xjlib.appkit.utils.XJDialogProgress;
 import org.antlr.xjlib.appkit.utils.XJDialogProgressDelegate;
@@ -92,7 +91,7 @@ protected void dispatch(String line) {
 
     protected List<DBEvent> events;
     protected int position;
-    protected NumberSet breakEvents = new NumberSet();
+    protected Set<Integer> breakEvents = new HashSet<Integer>();
     protected int stoppedOnEvent = DBEvent.NO_EVENT;
     protected boolean ignoreBreakpoints = false;
     protected StepOver stepOver = new StepOver();
@@ -120,7 +119,7 @@ protected void dispatch(String line) {
     /**
      * Current grammar the recorder is in
      */
-    protected Stack<String> grammarNamesStack = new Stack<String>();
+    protected List<String> grammarNamesStack = new ArrayList<String>();
 
     public DBRecorder(DebuggerTab debuggerTab) {
         this.debuggerTab = debuggerTab;
@@ -199,11 +198,12 @@ public void setPositionToEnd() {
         position = events.size()-1;
     }
 
-    public void setBreakEvents(Set events) {
-        this.breakEvents.replaceAll(events);
+    public void setBreakEvents(Set<Integer> events) {
+        this.breakEvents.clear();
+        this.breakEvents.addAll(events);
     }
 
-    public Set getBreakEvents() {
+    public Set<Integer> getBreakEvents() {
         return breakEvents;
     }
 
@@ -303,7 +303,7 @@ public boolean isAtEnd() {
             return e.getEventType() == DBEvent.TERMINATE;
     }
 
-    public void stepBackward(Set breakEvents) {
+    public void stepBackward(Set<Integer> breakEvents) {
         setIgnoreBreakpoints(false);
         stepContinue(breakEvents);
         stepMove(-1);
@@ -312,7 +312,7 @@ public void stepBackward(Set breakEvents) {
         playEvents(true);
     }
 
-    public synchronized void stepForward(Set breakEvents) {
+    public synchronized void stepForward(Set<Integer> breakEvents) {
         setIgnoreBreakpoints(false);
         stepContinue(breakEvents);
         if(stepMove(1)) {
@@ -334,7 +334,7 @@ public void stepOver() {
         fastForward();
     }
 
-    public void stepContinue(Set breakEvents) {
+    public void stepContinue(Set<Integer> breakEvents) {
         setBreakEvents(breakEvents);
         queryGrammarBreakpoints();
         setStatus(STATUS_RUNNING);
@@ -374,7 +374,7 @@ public void goToStart() {
 
     public void goToEnd() {
         setIgnoreBreakpoints(true);
-        stepContinue(new NumberSet(DBEvent.TERMINATE));
+        stepContinue(Collections.singleton(DBEvent.TERMINATE));
         if(stepMove(1))
             playEvents(false);
         else
@@ -382,7 +382,7 @@ public void goToEnd() {
     }
 
     public void fastForward() {
-        stepForward(new NumberSet(DBEvent.TERMINATE));
+        stepForward(Collections.singleton(DBEvent.TERMINATE));
     }
 
     public void connect(String address, int port) {
@@ -552,15 +552,15 @@ public void recordIndexes(DBEvent event) {
 
     public void handleGrammarName(DBEvent event) {
         if(event instanceof DBEventEnterRule) {
-            grammarNamesStack.push(event.getGrammarName());
+            grammarNamesStack.add(event.getGrammarName());
         }
         if(event instanceof DBEventExitRule) {
-            grammarNamesStack.pop();
+            grammarNamesStack.remove(grammarNamesStack.size() - 1);
         }
         if(grammarNamesStack.isEmpty()) {
             event.setGrammarName(null);
         } else {
-            event.setGrammarName(grammarNamesStack.peek());
+            event.setGrammarName(grammarNamesStack.get(grammarNamesStack.size() - 1));
         }
     }
 
diff --git a/src/org/antlr/works/debugger/tree/DBASTModel.java b/src/org/antlr/works/debugger/tree/DBASTModel.java
index c50ab5f4..70e8e1a6 100644
--- a/src/org/antlr/works/debugger/tree/DBASTModel.java
+++ b/src/org/antlr/works/debugger/tree/DBASTModel.java
@@ -39,7 +39,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class DBASTModel {
 
     /** Stack of rule. Each rule contains a stack of roots */
-    public Stack<Rule> rules = new Stack<Rule>();
+    public List<Rule> rules = new ArrayList<Rule>();
 
     /** Map of nodes */
     public Map<Integer, ASTNode> nodesMap = new HashMap<Integer, ASTNode>();
@@ -92,23 +92,23 @@ public int getRootCount() {
     /* Methods used by the debugger */
 
     public void pushRule(String name) {
-        rules.push(new Rule(name, new Stack<ASTNode>()));
+        rules.add(new Rule(name, new ArrayList<ASTNode>()));
     }
 
     public void popRule() {
         /* Do not pop the start rule: we want to be able to see the AST
         tree at the end of event stream so we keep the start rule on the stack. */
         if(rules.size() > 1)
-            rules.pop();
+            rules.remove(rules.size() - 1);
     }
 
     public void pushRoot(ASTNode node) {
-        getRoots().push(node);
+        getRoots().add(node);
     }
 
     /** Replace a root node by another one */
     public void replaceRoot(ASTNode oldRoot, ASTNode newRoot) {
-        Stack<ASTNode> roots = getRoots();
+        List<ASTNode> roots = getRoots();
         int index = roots.indexOf(oldRoot);
         roots.remove(index);
         roots.add(index, newRoot);
@@ -189,19 +189,19 @@ protected ASTNode getTreeNode(int id) {
         return nodesMap.get(id);
     }
 
-    protected Stack<ASTNode> getRoots() {
+    protected List<ASTNode> getRoots() {
         if(rules.isEmpty())
             return null;
         else
-            return (rules.peek()).roots;
+            return (rules.get(rules.size() - 1)).roots;
     }
 
     public class Rule {
 
         public String name;
-        public Stack<ASTNode> roots;
+        public List<ASTNode> roots;
 
-        public Rule(String name, Stack<ASTNode> roots) {
+        public Rule(String name, List<ASTNode> roots) {
             this.name = name;
             this.roots = roots;
         }
@@ -210,7 +210,7 @@ public ASTNode getRootAtIndex(int index) {
             return roots.get(index);
         }
 
-        public Stack<ASTNode> getRoots() {
+        public List<ASTNode> getRoots() {
             return roots;
         }
     }
@@ -222,13 +222,15 @@ public class ASTNode extends DBTreeNode {
 
         public ASTNode parentNode = null;
 
+        @SuppressWarnings("UseOfObsoleteCollectionType")
         public ASTNode(int id) {
             this.id = id;
-            /** Children is defined in DefaultMutableTreeNode */
-            children = new Vector();
+            /* Children is defined in DefaultMutableTreeNode */
+            children = new Vector<Object>();
         }
 
         /** Add a child */
+        @SuppressWarnings("unchecked")
         public void addChild(ASTNode node) {
             if(node.nil) {
                 /** If the child node is a nil node, add its children only */
@@ -261,6 +263,7 @@ public void becomeParent(ASTNode node) {
         }
 
         /** Replace a child with another one */
+        @SuppressWarnings("unchecked")
         public void replaceChild(ASTNode oldNode, ASTNode newNode) {
             int index = children.indexOf(oldNode);
             children.remove(index);
diff --git a/src/org/antlr/works/debugger/tree/DBASTPanel.java b/src/org/antlr/works/debugger/tree/DBASTPanel.java
index 57cddfa9..eab64489 100644
--- a/src/org/antlr/works/debugger/tree/DBASTPanel.java
+++ b/src/org/antlr/works/debugger/tree/DBASTPanel.java
@@ -15,7 +15,8 @@
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
 import java.awt.*;
-import java.util.Stack;
+import java.util.List;
+
 /*
 
 [The "BSD licence"]
@@ -169,7 +170,7 @@ public void selectToken(Token token) {
         if(rule == null)
             return;
 
-        Stack<DBASTModel.ASTNode> roots = rule.getRoots();
+        List<DBASTModel.ASTNode> roots = rule.getRoots();
         for (int r = 0; r < roots.size(); r++) {
             DBASTModel.ASTNode node = roots.get(r);
             DBTreeNode candidate = node.findNodeWithToken(token);
diff --git a/src/org/antlr/works/debugger/tree/DBParseTreeModel.java b/src/org/antlr/works/debugger/tree/DBParseTreeModel.java
index ff4c89d7..963834d5 100644
--- a/src/org/antlr/works/debugger/tree/DBParseTreeModel.java
+++ b/src/org/antlr/works/debugger/tree/DBParseTreeModel.java
@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Stack;
 /*
 
 [The "BSD licence"]
@@ -49,8 +48,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public class DBParseTreeModel extends AWTreeModel implements XJNotificationObserver {
 
-    public Stack<ParseTreeNode> rules = new Stack<ParseTreeNode>();
-    public Stack<Backtrack> backtrackStack = new Stack<Backtrack>();
+    public List<ParseTreeNode> rules = new ArrayList<ParseTreeNode>();
+    public List<Backtrack> backtrackStack = new ArrayList<Backtrack>();
 
     public Color lookaheadTokenColor;
     public TreeNode lastNode;
@@ -85,7 +84,7 @@ public void fireDataChanged() {
 
     public void initRules() {
         rules.clear();
-        rules.push(new ParseTreeNode("root", null));
+        rules.add(new ParseTreeNode("root", null));
     }
 
     public void initColors() {
@@ -117,10 +116,10 @@ public void setLocation(DBEventLocation location) {
     }
 
     public void pushRule(String name) {
-        ParseTreeNode parentRuleNode = rules.peek();
+        ParseTreeNode parentRuleNode = rules.get(rules.size() - 1);
 
         ParseTreeNode ruleNode = new ParseTreeNode(name, location);
-        rules.push(ruleNode);
+        rules.add(ruleNode);
 
         addNode(parentRuleNode, ruleNode);
         addNodeToCurrentBacktrack(ruleNode);
@@ -129,22 +128,22 @@ public void pushRule(String name) {
     }
 
     public void popRule() {
-        rules.pop();
+        rules.remove(rules.size() - 1);
     }
 
     public TreeNode getRootRule() {
-        return rules.firstElement();
+        return rules.get(0);
     }
 
     public TreeNode peekRule() {
         if(rules.isEmpty())
             return null;
         else
-            return rules.peek();
+            return rules.get(rules.size() - 1);
     }
 
     public void addToken(Token token) {
-        ParseTreeNode ruleNode = rules.peek();
+        ParseTreeNode ruleNode = rules.get(rules.size() - 1);
         ParseTreeNode elementNode = new ParseTreeNode(token, location);
         addNode(ruleNode, elementNode);
         addNodeToCurrentBacktrack(elementNode);
@@ -152,7 +151,7 @@ public void addToken(Token token) {
     }
 
     public void addException(Exception e) {
-        ParseTreeNode ruleNode = rules.peek();
+        ParseTreeNode ruleNode = rules.get(rules.size() - 1);
         ParseTreeNode errorNode = new ParseTreeNode(e, location);
         addNode(ruleNode, errorNode);
         addNodeToCurrentBacktrack(errorNode);
@@ -163,16 +162,16 @@ public void addNodeToCurrentBacktrack(ParseTreeNode node) {
         if(backtrackStack.isEmpty())
             return;
 
-        Backtrack b = backtrackStack.peek();
+        Backtrack b = backtrackStack.get(backtrackStack.size() - 1);
         b.addNode(node);
     }
 
     public void beginBacktrack(int level) {
-        backtrackStack.push(new Backtrack(level, lookaheadTokenColor));
+        backtrackStack.add(new Backtrack(level, lookaheadTokenColor));
     }
 
     public void endBacktrack(int level, boolean success) {
-        Backtrack b = backtrackStack.pop();
+        Backtrack b = backtrackStack.remove(backtrackStack.size() - 1);
         b.end(success);
         setLastNode(b.getLastNode());
     }
diff --git a/src/org/antlr/works/debugger/tree/DBTreeNode.java b/src/org/antlr/works/debugger/tree/DBTreeNode.java
index 13da5f37..3e4b73de 100644
--- a/src/org/antlr/works/debugger/tree/DBTreeNode.java
+++ b/src/org/antlr/works/debugger/tree/DBTreeNode.java
@@ -102,7 +102,7 @@ public DBTreeNode findNodeWithToken(Token t, DBTreeNode lastNodeSoFar) {
             }
         }
 
-        for(Enumeration childrenEnumerator = children(); childrenEnumerator.hasMoreElements(); ) {
+        for(Enumeration<?> childrenEnumerator = children(); childrenEnumerator.hasMoreElements(); ) {
             DBTreeNode node = (DBTreeNode) childrenEnumerator.nextElement();
             DBTreeNode candidate = node.findNodeWithToken(t, lastNodeSoFar);
             if(candidate != null)
diff --git a/src/org/antlr/works/dialog/AWPrefsDialog.java b/src/org/antlr/works/dialog/AWPrefsDialog.java
index 84ff7cdf..4ae5221d 100644
--- a/src/org/antlr/works/dialog/AWPrefsDialog.java
+++ b/src/org/antlr/works/dialog/AWPrefsDialog.java
@@ -588,11 +588,11 @@ private void initComponents() {
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        						new ColumnSpec("max(min;20dlu)"),
+        						ColumnSpec.decode("max(min;20dlu)"),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        						new ColumnSpec("max(min;40dlu)"),
+        						ColumnSpec.decode("max(min;40dlu)"),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(Sizes.dluX(10))
         					},
@@ -685,7 +685,7 @@ private void initComponents() {
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(Sizes.dluX(20)),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        						new ColumnSpec("max(default;45dlu)"),
+        						ColumnSpec.decode("max(default;45dlu)"),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(Sizes.dluX(20)),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
@@ -1131,7 +1131,7 @@ private void initComponents() {
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						new ColumnSpec(ColumnSpec.RIGHT, Sizes.DEFAULT, FormSpec.NO_GROW),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        						new ColumnSpec("max(default;20dlu)"),
+        						ColumnSpec.decode("max(default;20dlu)"),
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         						FormFactory.DEFAULT_COLSPEC,
         						FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
diff --git a/src/org/antlr/works/dialog/DialogAbout.java b/src/org/antlr/works/dialog/DialogAbout.java
index e7bc13fb..747dd587 100644
--- a/src/org/antlr/works/dialog/DialogAbout.java
+++ b/src/org/antlr/works/dialog/DialogAbout.java
@@ -167,13 +167,13 @@ private void initComponents() {
         		FormFactory.LINE_GAP_ROWSPEC,
         		new RowSpec(RowSpec.BOTTOM, Sizes.DEFAULT, FormSpec.NO_GROW),
         		FormFactory.LINE_GAP_ROWSPEC,
-        		new RowSpec("top:max(default;15dlu)"),
+        		RowSpec.decode("top:max(default;15dlu)"),
         		FormFactory.LINE_GAP_ROWSPEC,
-        		new RowSpec("bottom:max(default;10dlu)"),
+        		RowSpec.decode("bottom:max(default;10dlu)"),
         		FormFactory.LINE_GAP_ROWSPEC,
-        		new RowSpec("top:max(default;10dlu)"),
+        		RowSpec.decode("top:max(default;10dlu)"),
         		FormFactory.LINE_GAP_ROWSPEC,
-        		new RowSpec("fill:max(default;60dlu):grow"),
+        		RowSpec.decode("fill:max(default;60dlu):grow"),
         		FormFactory.LINE_GAP_ROWSPEC,
         		new RowSpec(Sizes.dluY(10))
         	}));
diff --git a/src/org/antlr/works/dialog/DialogGenerate.java b/src/org/antlr/works/dialog/DialogGenerate.java
index e222b723..d8899201 100644
--- a/src/org/antlr/works/dialog/DialogGenerate.java
+++ b/src/org/antlr/works/dialog/DialogGenerate.java
@@ -128,7 +128,7 @@ private void initComponents() {
         			new ColumnSpec[] {
         				FormFactory.DEFAULT_COLSPEC,
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        				new ColumnSpec("max(min;200dlu):grow"),
+        				ColumnSpec.decode("max(min;200dlu):grow"),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         				FormFactory.DEFAULT_COLSPEC
         			},
diff --git a/src/org/antlr/works/dialog/DialogPersonalInfo.java b/src/org/antlr/works/dialog/DialogPersonalInfo.java
index 622f3bb0..1025d08b 100644
--- a/src/org/antlr/works/dialog/DialogPersonalInfo.java
+++ b/src/org/antlr/works/dialog/DialogPersonalInfo.java
@@ -163,9 +163,9 @@ private void initComponents() {
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         				new ColumnSpec(Sizes.dluX(50)),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        				new ColumnSpec("max(min;100dlu):grow"),
+        				ColumnSpec.decode("max(min;100dlu):grow"),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        				new ColumnSpec("max(default;30dlu)"),
+        				ColumnSpec.decode("max(default;30dlu)"),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         				FormFactory.DEFAULT_COLSPEC
         			},
diff --git a/src/org/antlr/works/dialog/DialogReports.java b/src/org/antlr/works/dialog/DialogReports.java
index 40cda0fe..4086793c 100644
--- a/src/org/antlr/works/dialog/DialogReports.java
+++ b/src/org/antlr/works/dialog/DialogReports.java
@@ -330,11 +330,11 @@ private void initComponents() {
         			new ColumnSpec[] {
         				FormFactory.DEFAULT_COLSPEC,
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        				new ColumnSpec("max(min;30dlu)"),
+        				ColumnSpec.decode("max(min;30dlu)"),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         				FormFactory.RELATED_GAP_COLSPEC,
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
-        				new ColumnSpec("max(min;30dlu):grow"),
+        				ColumnSpec.decode("max(min;30dlu):grow"),
         				FormFactory.LABEL_COMPONENT_GAP_COLSPEC,
         				new ColumnSpec(ColumnSpec.FILL, Sizes.DEFAULT, FormSpec.DEFAULT_GROW)
         			},
diff --git a/src/org/antlr/works/editor/EditorFoldingManager.java b/src/org/antlr/works/editor/EditorFoldingManager.java
index a8d9d0fb..88db809f 100644
--- a/src/org/antlr/works/editor/EditorFoldingManager.java
+++ b/src/org/antlr/works/editor/EditorFoldingManager.java
@@ -105,12 +105,11 @@ public void provideFoldingEntities() {
         }
     }
 
-    public ATEFoldingEntity getEntityForIdentifier(List entities, String identifier) {
+    public ATEFoldingEntity getEntityForIdentifier(List<? extends ATEFoldingEntity> entities, String identifier) {
         if(entities == null || entities.isEmpty())
             return null;
         // optimize using a map ?
-        for (Object entity1 : entities) {
-            ATEFoldingEntity entity = (ATEFoldingEntity) entity1;
+        for (ATEFoldingEntity entity : entities) {
             if (entity.foldingEntityID().equals(identifier))
                 return entity;
         }
diff --git a/src/org/antlr/works/editor/EditorInspector.java b/src/org/antlr/works/editor/EditorInspector.java
index dcf2bb13..38699aa3 100644
--- a/src/org/antlr/works/editor/EditorInspector.java
+++ b/src/org/antlr/works/editor/EditorInspector.java
@@ -1,5 +1,6 @@
 package org.antlr.works.editor;
 
+import org.antlr.tool.Rule;
 import org.antlr.works.ate.syntax.generic.ATESyntaxLexer;
 import org.antlr.works.ate.syntax.misc.ATEToken;
 import org.antlr.works.editor.idea.IdeaAction;
@@ -11,8 +12,8 @@
 
 import java.awt.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 /*
 
 [The "BSD licence"]
@@ -210,7 +211,7 @@ protected void discoverLeftRecursiveRulesSet(List<EditorInspectorItem> items) {
             return;
 
         for (ElementRule rule : rules) {
-            Set rulesSet = rule.getLeftRecursiveRulesSet();
+            Collection<? extends Rule> rulesSet = rule.getLeftRecursiveRulesSet();
             if (rulesSet == null || rulesSet.size() < 2)
                 continue;
 
diff --git a/src/org/antlr/works/editor/EditorPersistence.java b/src/org/antlr/works/editor/EditorPersistence.java
index 584fa476..fe5b5fce 100644
--- a/src/org/antlr/works/editor/EditorPersistence.java
+++ b/src/org/antlr/works/editor/EditorPersistence.java
@@ -70,7 +70,7 @@ public void restore() {
         }
     }
     
-    public void store(List objects, String key) {
+    public void store(List<? extends EditorPersistentObject> objects, String key) {
         Map<Object,EditorPersistentObject> m = persistence.get(key);
         if(m == null) {
             m = new HashMap<Object, EditorPersistentObject>();
@@ -81,13 +81,12 @@ public void store(List objects, String key) {
         if(objects == null)
             return;
 
-        for (Object object : objects) {
-            EditorPersistentObject o = (EditorPersistentObject) object;
+        for (EditorPersistentObject o : objects) {
             m.put(o.getPersistentID(), o);
         }
     }
 
-    public void restore(List objects, String key) {
+    public void restore(List<? extends EditorPersistentObject> objects, String key) {
         Map<Object,EditorPersistentObject> m = persistence.get(key);
         if(m == null)
             return;
@@ -95,8 +94,7 @@ public void restore(List objects, String key) {
         if(objects == null)
             return;
 
-        for (Object object : objects) {
-            EditorPersistentObject o = (EditorPersistentObject) object;
+        for (EditorPersistentObject o : objects) {
             EditorPersistentObject oldObject = m.get(o.getPersistentID());
             if (oldObject != null)
                 o.persistentAssign(oldObject);
diff --git a/src/org/antlr/works/editor/EditorRules.java b/src/org/antlr/works/editor/EditorRules.java
index 74b6f25c..4b41c0af 100644
--- a/src/org/antlr/works/editor/EditorRules.java
+++ b/src/org/antlr/works/editor/EditorRules.java
@@ -467,7 +467,7 @@ public void selectRuleInTree(ElementRule rule) {
         if(rule == null)
             return;
 
-        Enumeration enumeration = rulesTreeRootNode.depthFirstEnumeration();
+        Enumeration<?> enumeration = rulesTreeRootNode.depthFirstEnumeration();
         while(enumeration.hasMoreElements()) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode)enumeration.nextElement();
             RuleTreeUserObject n = (RuleTreeUserObject)node.getUserObject();
@@ -499,12 +499,12 @@ public void rebuildTree() {
         if(groups.isEmpty()) {
             buildTree(rulesTreeRootNode, rules, 0, rules.size()-1);
         } else {
-            Stack<DefaultMutableTreeNode> parentStack = new Stack<DefaultMutableTreeNode>();
+            List<DefaultMutableTreeNode> parentStack = new ArrayList<DefaultMutableTreeNode>();
             parentStack.add(rulesTreeRootNode);
 
             int ruleIndex = 0;
             for (ElementGroup group : groups) {
-                DefaultMutableTreeNode parentNode = parentStack.peek();
+                DefaultMutableTreeNode parentNode = parentStack.get(parentStack.size() - 1);
                 if (group.ruleIndex >= 0) {
                     buildTree(parentNode, rules, ruleIndex, group.ruleIndex);
                     ruleIndex = group.ruleIndex + 1;
@@ -513,15 +513,15 @@ public void rebuildTree() {
                 if (group.openGroup) {
                     DefaultMutableTreeNode node = new DefaultMutableTreeNode(new RuleTreeUserObject(group));
                     parentNode.add(node);
-                    parentStack.push(node);
+                    parentStack.add(node);
                 } else {
                     if (parentStack.size() > 1)
-                        parentStack.pop();
+                        parentStack.remove(parentStack.size() - 1);
                 }
             }
 
             if(ruleIndex < rules.size()) {
-                DefaultMutableTreeNode parentNode = parentStack.peek();
+                DefaultMutableTreeNode parentNode = parentStack.get(parentStack.size() - 1);
                 buildTree(parentNode, rules, ruleIndex, rules.size()-1);
             }
         }
@@ -556,7 +556,7 @@ public void restoreSelectedTreeItem() {
 
     public void saveExpandedNodes() {
         rulesTreeExpandedNodes.clear();
-        Enumeration e = rulesTreeRootNode.depthFirstEnumeration();
+        Enumeration<?> e = rulesTreeRootNode.depthFirstEnumeration();
         while(e.hasMoreElements()) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode)e.nextElement();
             if(!node.isLeaf() && !node.isRoot() && rulesTree.isExpanded(new TreePath(node.getPath()))) {
@@ -575,7 +575,7 @@ public void restoreExpandedNodes() {
     }
 
     public DefaultMutableTreeNode findNodeWithGroupName(String groupName) {
-        Enumeration e = rulesTreeRootNode.depthFirstEnumeration();
+        Enumeration<?> e = rulesTreeRootNode.depthFirstEnumeration();
         while(e.hasMoreElements()) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode)e.nextElement();
             RuleTreeUserObject n = (RuleTreeUserObject)node.getUserObject();
@@ -586,7 +586,7 @@ public DefaultMutableTreeNode findNodeWithGroupName(String groupName) {
     }
 
     public DefaultMutableTreeNode findNodeWithRuleName(String ruleName) {
-        Enumeration e = rulesTreeRootNode.depthFirstEnumeration();
+        Enumeration<?> e = rulesTreeRootNode.depthFirstEnumeration();
         while(e.hasMoreElements()) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode)e.nextElement();
             RuleTreeUserObject n = (RuleTreeUserObject)node.getUserObject();
diff --git a/src/org/antlr/works/editor/completion/AutoCompletionMenu.java b/src/org/antlr/works/editor/completion/AutoCompletionMenu.java
index f13dfa92..5d41d316 100644
--- a/src/org/antlr/works/editor/completion/AutoCompletionMenu.java
+++ b/src/org/antlr/works/editor/completion/AutoCompletionMenu.java
@@ -57,7 +57,7 @@ public class AutoCompletionMenu extends OverlayObject {
     /** Used to store most recently used during autocompletion
      *  the newest should be stored at the front of the list.
      */
-    protected static List<String> recentlyUsedWords = new LinkedList<String>();
+    protected static LinkedList<String> recentlyUsedWords = new LinkedList<String>();
     protected int maxWordLength;
 
     protected int insertionStartIndex;
@@ -228,7 +228,7 @@ public void autoComplete() {
             String partialWord = words.get(list.getSelectedIndex());
             if (isVStyle())  {
                 recentlyUsedWords.remove(partialWord); //put it at the beginning of the list if it exists
-                ((LinkedList)recentlyUsedWords).addFirst(partialWord);
+                recentlyUsedWords.addFirst(partialWord);
             }
             completePartialWord(partialWord);
         }
diff --git a/src/org/antlr/works/grammar/RefactorEngine.java b/src/org/antlr/works/grammar/RefactorEngine.java
index 06427de1..b61cfa2e 100644
--- a/src/org/antlr/works/grammar/RefactorEngine.java
+++ b/src/org/antlr/works/grammar/RefactorEngine.java
@@ -74,7 +74,7 @@ public boolean renameToken(ATEToken t, String name) {
     public static boolean ignoreScopeForDoubleQuoteLiteral(ATEScope scope) {
         if(scope == null) return false;
 
-        Class c = scope.getClass();
+        Class<? extends ATEScope> c = scope.getClass();
         return c.equals(ElementAction.class) || c.equals(ElementBlock.class) || c.equals(ElementRewriteBlock.class)
                 || c.equals(ElementRewriteFunction.class) || c.equals(ElementArgumentBlock.class);
     }
diff --git a/src/org/antlr/works/grammar/antlr/ANTLRGrammarEngineImpl.java b/src/org/antlr/works/grammar/antlr/ANTLRGrammarEngineImpl.java
index e34c7455..e01a8f50 100644
--- a/src/org/antlr/works/grammar/antlr/ANTLRGrammarEngineImpl.java
+++ b/src/org/antlr/works/grammar/antlr/ANTLRGrammarEngineImpl.java
@@ -33,6 +33,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 package org.antlr.works.grammar.antlr;
 
 import antlr.TokenStreamException;
+import org.antlr.analysis.Label;
 import org.antlr.analysis.NFAState;
 import org.antlr.runtime.RecognitionException;
 import org.antlr.tool.*;
@@ -46,6 +47,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -229,23 +231,20 @@ private void createLexerGrammar() throws TokenStreamException, RecognitionExcept
         lexerGrammar = createNewGrammar();
     }
 
-    private void printLeftRecursionToConsole(List rules) {
+    private void printLeftRecursionToConsole(List<? extends Collection<? extends Rule>> rules) {
         StringBuilder info = new StringBuilder();
         info.append("Aborting because the following rules are mutually left-recursive:");
-        for (Object rule : rules) {
-            Set rulesSet = (Set) rule;
+        for (Collection<? extends Rule> rulesSet : rules) {
             info.append("\n    ");
             info.append(rulesSet);
         }
         engine.reportError(info.toString());
     }
 
-    private void markLeftRecursiveRules(List rules) {
+    private void markLeftRecursiveRules(List<? extends Collection<? extends Rule>> rules) {
         // 'rules' is a list of set of rules given by ANTLR
-        for (Object ruleSet : rules) {
-            final Set rulesSet = (Set) ruleSet;
-            for (Object rule : rulesSet) {
-                final Rule aRule = (Rule) rule;
+        for (Collection<? extends Rule> rulesSet : rules) {
+            for (Rule aRule : rulesSet) {
                 final ElementRule r = engine.getRuleWithName(aRule.name);
                 if (r == null)
                     continue;
@@ -276,7 +275,7 @@ public GrammarResult analyze() throws Exception {
             return analyzeCompleted(el);
         }
 
-        List rules = g.checkAllRulesForLeftRecursion();
+        List<? extends Collection<? extends Rule>> rules = g.checkAllRulesForLeftRecursion();
         if(!rules.isEmpty()) {
             printLeftRecursionToConsole(rules);
             markLeftRecursiveRules(rules);
@@ -385,7 +384,7 @@ private GrammarError buildNonDeterministicError(GrammarNonDeterminismMessage mes
         GrammarError error = new GrammarError();
         error.setLine(message.probe.dfa.getDecisionASTNode().getLine()-1);
 
-        List labels = message.probe.getSampleNonDeterministicInputSequence(message.problemState);
+        List<Label> labels = message.probe.getSampleNonDeterministicInputSequence(message.problemState);
         error.setLabels(labels);
 
         String input = message.probe.getInputSequenceDisplay(labels);
@@ -451,25 +450,24 @@ else if (o instanceof NonRegularDecisionMessage)
     }
 
     private void computeRuleError(GrammarError error, GrammarNonDeterminismMessage message) {
-        List nonDetAlts = message.probe.getNonDeterministicAltsForState(message.problemState);
-        Set disabledAlts = message.probe.getDisabledAlternatives(message.problemState);
+        List<Integer> nonDetAlts = message.probe.getNonDeterministicAltsForState(message.problemState);
+        Set<Integer> disabledAlts = message.probe.getDisabledAlternatives(message.problemState);
 
         int firstAlt = 0;
 
-        for (Object nonDetAlt : nonDetAlts) {
-            Integer displayAltI = (Integer) nonDetAlt;
+        for (Integer nonDetAlt : nonDetAlts) {
             NFAState nfaStart = message.probe.dfa.getNFADecisionStartState();
 
-            int tracePathAlt = nfaStart.translateDisplayAltToWalkAlt(displayAltI);
+            int tracePathAlt = nfaStart.translateDisplayAltToWalkAlt(nonDetAlt);
             if (firstAlt == 0)
                 firstAlt = tracePathAlt;
 
-            List path =
+            List<? extends NFAState> path =
                     message.probe.getNFAPathStatesForAlt(firstAlt,
                             tracePathAlt,
                             error.getLabels());
 
-            error.addPath(path, disabledAlts.contains(displayAltI));
+            error.addPath(path, disabledAlts.contains(nonDetAlt));
             error.addStates(path);
 
             // Find all rules enclosing each state (because a path can extend over multiple rules)
diff --git a/src/org/antlr/works/grammar/antlr/GrammarError.java b/src/org/antlr/works/grammar/antlr/GrammarError.java
index e2805202..02ea2da0 100644
--- a/src/org/antlr/works/grammar/antlr/GrammarError.java
+++ b/src/org/antlr/works/grammar/antlr/GrammarError.java
@@ -31,6 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.works.grammar.antlr;
 
+import org.antlr.analysis.Label;
 import org.antlr.analysis.NFAState;
 import org.antlr.tool.Message;
 
@@ -40,7 +41,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class GrammarError {
 
     /** Array of array of NFAState states */
-    public List<List> paths = new ArrayList<List>();
+    public List<List<? extends NFAState>> paths = new ArrayList<List<? extends NFAState>>();
 
     /** Array describing which path is disabled */
     public List<Boolean> pathsDisabled = new ArrayList<Boolean>();
@@ -52,9 +53,9 @@ public class GrammarError {
     public List<String> rules = new ArrayList<String>();
 
     /** Array of states concerned by the error */
-    public List states = new ArrayList();
+    public List<NFAState> states = new ArrayList<NFAState>();
 
-    public List labels;
+    public List<Label> labels;
 
     public int line;
     public String messageText;
@@ -63,7 +64,7 @@ public class GrammarError {
     public GrammarError() {
     }
 
-    public void addPath(List path, boolean disabled) {
+    public void addPath(List<? extends NFAState> path, boolean disabled) {
         this.paths.add(path);
         this.pathsDisabled.add(disabled);
     }
@@ -81,7 +82,7 @@ public void addStates(NFAState state) {
         this.states.add(state);
     }
 
-    public void addStates(List states) {
+    public void addStates(List<? extends NFAState> states) {
         this.states.addAll(states);
     }
 
@@ -101,11 +102,11 @@ public Message getMessage() {
         return message;
     }
     
-    public void setLabels(List labels) {
+    public void setLabels(List<Label> labels) {
         this.labels = labels;
     }
 
-    public List getLabels() {
+    public List<Label> getLabels() {
         return labels;
     }
 }
diff --git a/src/org/antlr/works/grammar/decisiondfa/DecisionDFA.java b/src/org/antlr/works/grammar/decisiondfa/DecisionDFA.java
index 3fe9ca63..f2a90624 100644
--- a/src/org/antlr/works/grammar/decisiondfa/DecisionDFA.java
+++ b/src/org/antlr/works/grammar/decisiondfa/DecisionDFA.java
@@ -90,12 +90,12 @@ public String getDOTString() throws Exception {
     public int getDecisionColumn(Grammar g) {
         if(g == null) return -1;
         
-        List columns = g.getLookaheadDFAColumnsForLineInFile(line);
+        List<Integer> columns = g.getLookaheadDFAColumnsForLineInFile(line);
         // sort the columns as they appears to be not always in ascending order
         Collections.sort(columns);
         int adjustedColumn = -1;
         for(int index = columns.size()-1; index >=0; index--) {
-            Integer match = (Integer)columns.get(index);
+            Integer match = columns.get(index);
             if(match <= column) {
                 adjustedColumn = match;
                 break;
diff --git a/src/org/antlr/works/grammar/element/ElementImport.java b/src/org/antlr/works/grammar/element/ElementImport.java
index 80b3175a..844d160f 100644
--- a/src/org/antlr/works/grammar/element/ElementImport.java
+++ b/src/org/antlr/works/grammar/element/ElementImport.java
@@ -32,7 +32,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public class ElementImport implements Comparable, Jumpable {
+public class ElementImport implements Comparable<ElementReference>, Jumpable {
 
     public ElementGrammarName name;
     public ATEToken token;
@@ -54,9 +54,8 @@ public int getEndIndex() {
         return token.end;
     }
 
-    public int compareTo(Object o) {
-        ElementReference otherRef = (ElementReference)o;
-        return token.compareTo(otherRef.token);
+    public int compareTo(ElementReference o) {
+        return token.compareTo(o.token);
     }
 
     public boolean containsIndex(int index) {
diff --git a/src/org/antlr/works/grammar/element/ElementReference.java b/src/org/antlr/works/grammar/element/ElementReference.java
index f19a3089..476c7ae0 100644
--- a/src/org/antlr/works/grammar/element/ElementReference.java
+++ b/src/org/antlr/works/grammar/element/ElementReference.java
@@ -32,7 +32,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public class ElementReference implements Comparable, Jumpable {
+public class ElementReference implements Comparable<ElementReference>, Jumpable {
 
     public ElementRule rule;
     public ATEToken token;
@@ -54,9 +54,8 @@ public int getEndIndex() {
         return token.end;
     }
     
-    public int compareTo(Object o) {
-        ElementReference otherRef = (ElementReference)o;
-        return token.compareTo(otherRef.token);
+    public int compareTo(ElementReference o) {
+        return token.compareTo(o.token);
     }
 
     public boolean containsIndex(int index) {
diff --git a/src/org/antlr/works/grammar/element/ElementRule.java b/src/org/antlr/works/grammar/element/ElementRule.java
index 1deb6cec..20b7a96e 100644
--- a/src/org/antlr/works/grammar/element/ElementRule.java
+++ b/src/org/antlr/works/grammar/element/ElementRule.java
@@ -1,5 +1,6 @@
 package org.antlr.works.grammar.element;
 
+import org.antlr.tool.Rule;
 import org.antlr.works.ate.folding.ATEFoldingEntity;
 import org.antlr.works.ate.gutter.ATEGutterItem;
 import org.antlr.works.ate.syntax.misc.ATEToken;
@@ -11,9 +12,9 @@
 
 import javax.swing.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 /*
 
 [The "BSD licence"]
@@ -45,7 +46,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public class ElementRule extends ElementScopable implements Comparable, EditorPersistentObject, ATEFoldingEntity, ATEGutterItem {
+public class ElementRule extends ElementScopable implements Comparable<ElementRule>, EditorPersistentObject, ATEFoldingEntity, ATEGutterItem {
 
     public String name;
     public ATEToken start;
@@ -63,7 +64,7 @@ public class ElementRule extends ElementScopable implements Comparable, EditorPe
     public boolean leftRecursionAnalyzed = false;
 
     // Set of rules that are mutually left recursive (cannot be fixed by ANTLRWorks)
-    public Set leftRecursiveRulesSet;
+    public Collection<? extends Rule> leftRecursiveRulesSet;
 
     public boolean hierarchyAnalyzed = false;
 
@@ -235,11 +236,11 @@ public boolean isExpanded() {
         return expanded;
     }
 
-    public void setLeftRecursiveRulesSet(Set rulesSet) {
+    public void setLeftRecursiveRulesSet(Collection<? extends Rule> rulesSet) {
         leftRecursiveRulesSet = rulesSet;
     }
 
-    public Set getLeftRecursiveRulesSet() {
+    public Collection<? extends Rule> getLeftRecursiveRulesSet() {
         return leftRecursiveRulesSet;
     }
 
@@ -337,9 +338,8 @@ public boolean containsIndex(int index) {
         return index >= getStartIndex() && index <= getEndIndex();
     }
 
-    public int compareTo(Object o) {
-        ElementRule otherRule = (ElementRule) o;
-        return this.name.compareTo(otherRule.name);
+    public int compareTo(ElementRule o) {
+        return this.name.compareTo(o.name);
     }
 
     public int getUniqueIdentifier() {
diff --git a/src/org/antlr/works/interpreter/EditorInterpreterTreeModel.java b/src/org/antlr/works/interpreter/EditorInterpreterTreeModel.java
index 7c70a330..d92be599 100644
--- a/src/org/antlr/works/interpreter/EditorInterpreterTreeModel.java
+++ b/src/org/antlr/works/interpreter/EditorInterpreterTreeModel.java
@@ -97,7 +97,7 @@ public boolean isLeaf() {
             return getChildCount() == 0;
         }
 
-        public Enumeration children() {
+        public Enumeration<?> children() {
             return null;
         }
 
diff --git a/src/org/antlr/works/menu/ExportMenu.java b/src/org/antlr/works/menu/ExportMenu.java
index 44031706..c523aac0 100644
--- a/src/org/antlr/works/menu/ExportMenu.java
+++ b/src/org/antlr/works/menu/ExportMenu.java
@@ -52,6 +52,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ExportMenu {
@@ -103,11 +104,19 @@ public void exportAllRulesAsEPS() {
     }
 
     public void exportAllRules(boolean asImage) {
-        List<String> extensions = null;
+        List<String> descriptions = null;
+        List<List<String>> extensions = null;
         if(asImage) {
-            extensions = lookupAvailableImageFormat();            
+            descriptions = lookupAvailableImageFormat();
+            if (descriptions != null) {
+                extensions = new ArrayList<List<String>>();
+                for (String extension : descriptions) {
+                    extensions.add(Collections.singletonList(extension));
+                }
+            }
         }
-        if(!XJFileChooser.shared().displayChooseDirectory(window.getJavaContainer(), extensions, extensions, !asImage)) {
+
+        if(!XJFileChooser.shared().displayChooseDirectory(window.getJavaContainer(), extensions, descriptions, !asImage)) {
             return;
         }
 
@@ -142,8 +151,16 @@ public void exportGViewAsImage(GView view) {
     }
 
     public void saveImageToDisk(BufferedImage image) {
-        List<String> extensions = lookupAvailableImageFormat();
-        if(XJFileChooser.shared().displaySaveDialog(window.getJavaContainer(), extensions, extensions, false)) {
+        List<String> descriptions = lookupAvailableImageFormat();
+        List<List<String>> extensions = null;
+        if (descriptions != null) {
+            extensions = new ArrayList<List<String>>();
+            for (String extension : descriptions) {
+                extensions.add(Collections.singletonList(extension));
+            }
+        }
+
+        if(XJFileChooser.shared().displaySaveDialog(window.getJavaContainer(), extensions, descriptions, false)) {
             String file = XJFileChooser.shared().getSelectedFilePath();
             try {
                 ImageIO.write(image, file.substring(file.lastIndexOf(".")+1), new File(file));
diff --git a/src/org/antlr/works/prefs/AWPrefs.java b/src/org/antlr/works/prefs/AWPrefs.java
index d2198041..137ca276 100644
--- a/src/org/antlr/works/prefs/AWPrefs.java
+++ b/src/org/antlr/works/prefs/AWPrefs.java
@@ -31,6 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.works.prefs;
 
+import org.antlr.works.utils.Utils;
 import org.antlr.xjlib.appkit.app.XJApplication;
 import org.antlr.xjlib.appkit.app.XJPreferences;
 import org.antlr.xjlib.foundation.XJSystem;
@@ -498,12 +499,12 @@ public static String getServerID() {
         return getPreferences().getString(PREF_SERVER_ID, null);
     }
 
-    public static void setPersonalInfo(Map<String,Object> info) {
+    public static void setPersonalInfo(Map<String, Object> info) {
         getPreferences().setObject(PREF_PERSONAL_INFO, info);
     }
 
-    public static Map getPersonalInfo() {
-        return (Map)getPreferences().getObject(PREF_PERSONAL_INFO, null);
+    public static Map<String, Object> getPersonalInfo() {
+        return Utils.castMap((Map<?, ?>)getPreferences().getObject(PREF_PERSONAL_INFO, null), String.class, Object.class);
     }
 
     public static boolean getPrivateMenu() {
@@ -557,7 +558,7 @@ public static void setAllOpenedDocuments(List<String> documents) {
     }
 
     public static List<String> getAllOpenedDocuments() {
-        return (List<String>) getPreferences().getObject(PREF_ALL_OPENED_DOCUMENTS, null);
+        return Utils.castList((List<?>)getPreferences().getObject(PREF_ALL_OPENED_DOCUMENTS, null), String.class);
     }
 
     public static void setDebuggerEOL(int index) {
diff --git a/src/org/antlr/works/stats/Statistics.java b/src/org/antlr/works/stats/Statistics.java
index a27ed421..e685d434 100644
--- a/src/org/antlr/works/stats/Statistics.java
+++ b/src/org/antlr/works/stats/Statistics.java
@@ -87,7 +87,7 @@ public String appVersionLong() {
         return IDE.VERSION;
     }
 
-    public Class appPreferencesClass() {
+    public Class<?> appPreferencesClass() {
         return IDE.class;
     }
 
diff --git a/src/org/antlr/works/stats/StatisticsAW.java b/src/org/antlr/works/stats/StatisticsAW.java
index 985b3276..18a1ffde 100644
--- a/src/org/antlr/works/stats/StatisticsAW.java
+++ b/src/org/antlr/works/stats/StatisticsAW.java
@@ -32,6 +32,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 package org.antlr.works.stats;
 
 import org.antlr.works.prefs.AWPrefs;
+import org.antlr.works.utils.Utils;
 import org.antlr.xjlib.appkit.app.XJApplication;
 
 import java.util.*;
@@ -255,7 +256,7 @@ protected int getCount(int event) {
     protected synchronized Map<Integer,Integer> getEvents() {
         if(events == null) {
             try {
-                events = (Map<Integer,Integer>)AWPrefs.getPreferences().getObject(PREF_KEY, null);
+                events = Utils.castMap((Map<?, ?>)AWPrefs.getPreferences().getObject(PREF_KEY, null), Integer.class, Integer.class);
             } catch(Exception e) {
                 events = null;
                 System.err.println("Statistics: "+e);
diff --git a/src/org/antlr/works/stats/StatisticsReporter.java b/src/org/antlr/works/stats/StatisticsReporter.java
index fe7e9c00..e7eac770 100644
--- a/src/org/antlr/works/stats/StatisticsReporter.java
+++ b/src/org/antlr/works/stats/StatisticsReporter.java
@@ -66,11 +66,11 @@ public String getError() {
     }
 
     public String fetchIDFromServer() {
-        Map info = AWPrefs.getPersonalInfo();
+        Map<String, Object> info = AWPrefs.getPersonalInfo();
         /** Send null info if we cannot get the personal info */
         if(info == null) {
             System.err.println("No personal info available. Sending blank data to request a new ID from ANTLR's server.");
-            info = new HashMap();
+            info = new HashMap<String, Object>();
         }
 
         StringBuilder s = new StringBuilder(URL_REGISTER);
diff --git a/src/org/antlr/works/stringtemplate/STDocumentFactory.java b/src/org/antlr/works/stringtemplate/STDocumentFactory.java
index c7746174..31d058f9 100644
--- a/src/org/antlr/works/stringtemplate/STDocumentFactory.java
+++ b/src/org/antlr/works/stringtemplate/STDocumentFactory.java
@@ -1,7 +1,9 @@
 package org.antlr.works.stringtemplate;
 
 import org.antlr.xjlib.appkit.document.XJDataPlainText;
-import org.antlr.xjlib.appkit.document.XJDocumentFactory;/*
+import org.antlr.xjlib.appkit.document.XJDocumentFactory;
+import org.antlr.xjlib.appkit.frame.XJWindow;
+/*
 
 [The "BSD licence"]
 Copyright (c) 2005-07 Jean Bovet
@@ -35,7 +37,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class STDocumentFactory extends XJDocumentFactory {
 
     // todo provide factory?
-    public STDocumentFactory(Class windowClass) {
+    public STDocumentFactory(Class<? extends XJWindow> windowClass) {
         super(STDocument.class,
                 windowClass,
                 XJDataPlainText.class,
diff --git a/src/org/antlr/works/stringtemplate/element/ElementTemplateReference.java b/src/org/antlr/works/stringtemplate/element/ElementTemplateReference.java
index b52a69ec..56664f0c 100644
--- a/src/org/antlr/works/stringtemplate/element/ElementTemplateReference.java
+++ b/src/org/antlr/works/stringtemplate/element/ElementTemplateReference.java
@@ -32,7 +32,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public class ElementTemplateReference implements Comparable, Jumpable {
+public class ElementTemplateReference implements Comparable<ElementTemplateReference>, Jumpable {
 
     public ElementTemplateRule rule;
     public ATEToken token;
@@ -54,9 +54,8 @@ public int getEndIndex() {
         return token.end;
     }
 
-    public int compareTo(Object o) {
-        ElementTemplateReference otherRef = (ElementTemplateReference)o;
-        return token.compareTo(otherRef.token);
+    public int compareTo(ElementTemplateReference o) {
+        return token.compareTo(o.token);
     }
 
     public boolean containsIndex(int index) {
diff --git a/src/org/antlr/works/stringtemplate/element/ElementTemplateRule.java b/src/org/antlr/works/stringtemplate/element/ElementTemplateRule.java
index 5dd38229..b0eb45fa 100644
--- a/src/org/antlr/works/stringtemplate/element/ElementTemplateRule.java
+++ b/src/org/antlr/works/stringtemplate/element/ElementTemplateRule.java
@@ -39,7 +39,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 */
 
-public class ElementTemplateRule extends ElementTemplateScopable implements Comparable, ATEFoldingEntity {
+public class ElementTemplateRule extends ElementTemplateScopable implements Comparable<ElementTemplateRule>, ATEFoldingEntity {
 
     public String name;
     public ATEToken start;
@@ -117,9 +117,8 @@ public boolean containsIndex(int index) {
         return index >= getStartIndex() && index <= getEndIndex();
     }
 
-    public int compareTo(Object o) {
-        ElementTemplateRule otherRule = (ElementTemplateRule) o;
-        return this.name.compareTo(otherRule.name);
+    public int compareTo(ElementTemplateRule o) {
+        return this.name.compareTo(o.name);
     }
 
     public int getUniqueIdentifier() {
diff --git a/src/org/antlr/works/utils/NumberSet.java b/src/org/antlr/works/utils/NumberSet.java
deleted file mode 100644
index aa15f6b7..00000000
--- a/src/org/antlr/works/utils/NumberSet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.antlr.works.utils;
-
-import java.util.HashSet;
-import java.util.Set;
-/*
-
-[The "BSD licence"]
-Copyright (c) 2005-2006 Jean Bovet
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-public class NumberSet extends HashSet {
-
-    public NumberSet() {
-        super();
-    }
-
-    public NumberSet(int value) {
-        super();
-        add(new Integer(value));
-    }
-
-    public void add(int value) {
-        add(new Integer(value));
-    }
-    
-    public boolean contains(int value) {
-        return contains(new Integer(value));
-    }
-
-    public void replaceAll(Set s) {
-        clear();
-        addAll(s);
-    }
-}
diff --git a/src/org/antlr/works/utils/Utils.java b/src/org/antlr/works/utils/Utils.java
index 0e9184b5..1b0d1b3c 100644
--- a/src/org/antlr/works/utils/Utils.java
+++ b/src/org/antlr/works/utils/Utils.java
@@ -6,6 +6,10 @@
 import java.awt.*;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /*
 
 [The "BSD licence"]
@@ -157,4 +161,31 @@ public static String[] concat(String[] a, String[] b) {
         System.arraycopy(b, 0, n, a.length, b.length);
         return n;
     }
+
+    public static <K, V> Map<K, V> castMap(Map<?, ?> map, Class<K> keyClass, Class<V> valueClass) {
+        if (map == null) {
+            return null;
+        }
+
+        Map<K, V> result = new HashMap<K, V>();
+        for (Map.Entry<?, ?> entry : map.entrySet()) {
+            result.put(keyClass.cast(entry.getKey()), valueClass.cast(entry.getValue()));
+        }
+
+        return result;
+    }
+
+    public static <E> List<E> castList(List<?> list, Class<E> clazz) {
+        if (list == null) {
+            return null;
+        }
+
+        List<E> result = new ArrayList<E>();
+        for (Object item : list) {
+            result.add(clazz.cast(item));
+        }
+
+        return result;
+    }
+
 }
diff --git a/src/org/antlr/works/utils/awtree/AWTreeGraphView.java b/src/org/antlr/works/utils/awtree/AWTreeGraphView.java
index 987b64ab..a66f750b 100644
--- a/src/org/antlr/works/utils/awtree/AWTreeGraphView.java
+++ b/src/org/antlr/works/utils/awtree/AWTreeGraphView.java
@@ -434,7 +434,7 @@ public double getLastChildRightSpan() {
                 return 0;
 
             for (int i = elements.size()-1; i >= 0; i--) {
-                GElement element = (GElement) elements.get(i);
+                GElement element = elements.get(i);
                 if(element instanceof GElementNode) {
                     GElementNode n = (GElementNode)element;
                     return n.getRightSpan();
diff --git a/src/org/antlr/works/visualization/VisualDrawing.java b/src/org/antlr/works/visualization/VisualDrawing.java
index 797f0852..202cbe05 100644
--- a/src/org/antlr/works/visualization/VisualDrawing.java
+++ b/src/org/antlr/works/visualization/VisualDrawing.java
@@ -38,6 +38,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import org.antlr.works.utils.Console;
 import org.antlr.works.utils.ErrorListener;
 import org.antlr.works.visualization.graphics.GFactory;
+import org.antlr.works.visualization.graphics.graph.GGraphAbstract;
 
 import javax.swing.*;
 import java.util.HashMap;
@@ -57,7 +58,7 @@ public class VisualDrawing extends ATEThread {
     protected ElementRule threadRule;
     protected ElementRule threadLastProcessedRule;
 
-    protected Map<ElementRule,List> cacheGraphs = new HashMap<ElementRule, List>();
+    protected Map<ElementRule, List<? extends GGraphAbstract>> cacheGraphs = new HashMap<ElementRule, List<? extends GGraphAbstract>>();
 
     public VisualDrawing(SyntaxDiagramTab syntaxDiagramTab) {
         this.syntaxDiagramTab = syntaxDiagramTab;
@@ -93,7 +94,7 @@ public synchronized void clearCacheGraphs() {
      * Tries to refresh the current graph in cache. If the graphs are not in cache, return false.
      */
     public synchronized boolean refresh() {
-        final List graphs = cacheGraphs.get(threadLastProcessedRule);
+        final List<? extends GGraphAbstract> graphs = cacheGraphs.get(threadLastProcessedRule);
         if(graphs == null || graphs.isEmpty()) {
             return false;
         } else {
@@ -111,7 +112,7 @@ public void run() {
         }
     }
 
-    private void refreshVisualPanel(List graphs) {
+    private void refreshVisualPanel(List<? extends GGraphAbstract> graphs) {
         syntaxDiagramTab.panel.setRule(threadLastProcessedRule);
         syntaxDiagramTab.panel.setGraphs(graphs);
         syntaxDiagramTab.panel.update();
@@ -183,7 +184,7 @@ private void threadProcessRule() throws Exception {
     }
 
     protected synchronized void createGraphsForRule(ElementRule rule) throws Exception {
-        List graphs = cacheGraphs.get(rule);
+        List<? extends GGraphAbstract> graphs = cacheGraphs.get(rule);
         if(graphs == null) {
             factory.setOptimize(!AWPrefs.getDebugDontOptimizeNFA());
             factory.setConsole(syntaxDiagramTab.getConsole());
diff --git a/src/org/antlr/works/visualization/fa/FAAnalysis.java b/src/org/antlr/works/visualization/fa/FAAnalysis.java
index 8da5d4d3..da644cd4 100644
--- a/src/org/antlr/works/visualization/fa/FAAnalysis.java
+++ b/src/org/antlr/works/visualization/fa/FAAnalysis.java
@@ -43,8 +43,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public class FAAnalysis {
 
-    private Set processedStates = new HashSet();
-    private Map stateIncomingTransitionCount = new HashMap();
+    private Set<Object> processedStates = new HashSet<Object>();
+    private Map<Object, Integer> stateIncomingTransitionCount = new HashMap<Object, Integer>();
 
     public FAAnalysis() {
     }
@@ -97,7 +97,7 @@ public void recursiveAnalysis(FAState state) {
     }
 
     public void addIncomingTransitionToState(Object state) {
-        Integer i = (Integer)stateIncomingTransitionCount.get(state);
+        Integer i = stateIncomingTransitionCount.get(state);
         int count = 0;
         if(i != null)
             count = i.intValue();
@@ -105,7 +105,7 @@ public void addIncomingTransitionToState(Object state) {
     }
 
     public int numberOfIncomingTransition(Object state) {
-        Integer i = (Integer)stateIncomingTransitionCount.get(state);
+        Integer i = stateIncomingTransitionCount.get(state);
         if(i == null)
             return 0;
         else
@@ -114,10 +114,10 @@ public int numberOfIncomingTransition(Object state) {
     
     public String toString() {
         StringBuilder s = new StringBuilder();
-        Iterator iterator = stateIncomingTransitionCount.keySet().iterator();
+        Iterator<Object> iterator = stateIncomingTransitionCount.keySet().iterator();
         while(iterator.hasNext()) {
             NFAState key = (NFAState)iterator.next();
-            Integer count = (Integer)stateIncomingTransitionCount.get(key);
+            Integer count = stateIncomingTransitionCount.get(key);
             s.append(key.stateNumber+" = "+count.intValue()+"\n");
         }
         return s.toString();
diff --git a/src/org/antlr/works/visualization/graphics/GContext.java b/src/org/antlr/works/visualization/graphics/GContext.java
index def1c325..d89f3049 100644
--- a/src/org/antlr/works/visualization/graphics/GContext.java
+++ b/src/org/antlr/works/visualization/graphics/GContext.java
@@ -37,7 +37,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import org.antlr.works.visualization.skin.Skin;
 
 import java.awt.*;
-import java.util.Stack;
+import java.util.ArrayList;
+import java.util.List;
 
 public class GContext {
 
@@ -76,7 +77,7 @@ public class GContext {
 
     private boolean showRuleName = true;
 
-    public final Stack<Color> colorStack = new Stack<Color>();
+    public final List<Color> colorStack = new ArrayList<Color>();
 
     public Color nodeColor = Color.black;
     public Color linkColor = Color.black;
@@ -225,12 +226,12 @@ public void setColor(Color color) {
     }
 
     public void pushColor(Color color) {
-        colorStack.push(engine.getColor());
+        colorStack.add(engine.getColor());
         setColor(color);
     }
 
     public void popColor() {
-        setColor(colorStack.pop());
+        setColor(colorStack.remove(colorStack.size() - 1));
     }
 
     public Color getColorForLabel(String label) {
diff --git a/src/org/antlr/works/visualization/graphics/GFactory.java b/src/org/antlr/works/visualization/graphics/GFactory.java
index 65ac5ab6..dfd493eb 100644
--- a/src/org/antlr/works/visualization/graphics/GFactory.java
+++ b/src/org/antlr/works/visualization/graphics/GFactory.java
@@ -39,6 +39,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import org.antlr.works.visualization.fa.FAFactory;
 import org.antlr.works.visualization.fa.FAState;
 import org.antlr.works.visualization.graphics.graph.GGraph;
+import org.antlr.works.visualization.graphics.graph.GGraphAbstract;
 import org.antlr.works.visualization.graphics.graph.GGraphGroup;
 
 import java.util.ArrayList;
@@ -66,7 +67,7 @@ public void setConsole(Console console) {
         this.console = console;
     }
 
-    public List buildGraphsForRule(ANTLRGrammarEngine antlrEngineGrammar, String rule, List<GrammarError> errors) throws Exception {
+    public List<? extends GGraphAbstract> buildGraphsForRule(ANTLRGrammarEngine antlrEngineGrammar, String rule, List<GrammarError> errors) throws Exception {
         if(antlrEngineGrammar == null)
             return null;
         
@@ -123,7 +124,7 @@ private GGraphGroup buildGraphGroup(Grammar grammar, GrammarError error) {
 
         // Attach all error paths to the GGraphGroup
         for(int i=0; i<error.paths.size(); i++) {
-            List states = error.paths.get(i);
+            List<? extends NFAState> states = error.paths.get(i);
             Boolean disabled = error.pathsDisabled.get(i);
             try {
                 gg.addPath(states, disabled, factory.getSkippedStatesMap());
diff --git a/src/org/antlr/works/visualization/graphics/graph/GGraph.java b/src/org/antlr/works/visualization/graphics/graph/GGraph.java
index 73fac098..1b6e6940 100644
--- a/src/org/antlr/works/visualization/graphics/graph/GGraph.java
+++ b/src/org/antlr/works/visualization/graphics/graph/GGraph.java
@@ -159,10 +159,9 @@ public GNode findNodeForStateNumber(int stateNumber) {
         return null;
     }
 
-    public boolean containsAtLeastOneState(List states) {
+    public boolean containsAtLeastOneState(List<NFAState> states) {
         for (GNode node : nodes) {
-            for (Object state1 : states) {
-                NFAState state = (NFAState) state1;
+            for (NFAState state : states) {
                 if (node.containsStateNumber(state.stateNumber))
                     return true;
             }
diff --git a/src/org/antlr/works/visualization/graphics/graph/GGraphGroup.java b/src/org/antlr/works/visualization/graphics/graph/GGraphGroup.java
index c4405c14..b713a87a 100644
--- a/src/org/antlr/works/visualization/graphics/graph/GGraphGroup.java
+++ b/src/org/antlr/works/visualization/graphics/graph/GGraphGroup.java
@@ -102,13 +102,13 @@ public float getWidth() {
         return getDimension().getPixelWidth(context);
     }
 
-    public List<FATransition> getTransitionsMatchingSkippedStates(List<FATransition> candidates, List states) {
+    public List<FATransition> getTransitionsMatchingSkippedStates(List<FATransition> candidates, List<? extends NFAState> states) {
         /** First convert the list of NFAStates to a list of Integer containing
          * the state number
          */
         List<Integer> statesNumbers = new ArrayList<Integer>();
-        for (Object state : states) {
-            statesNumbers.add((((NFAState) state).stateNumber));
+        for (NFAState state : states) {
+            statesNumbers.add(state.stateNumber);
         }
 
         /** Select only the transitions that containing all the state numbers */
@@ -122,7 +122,7 @@ public List<FATransition> getTransitionsMatchingSkippedStates(List<FATransition>
         return newCandidates;
     }
 
-    public FATransition getNodeTransitionToNextNonSkippedState(GNode node, List path) {
+    public FATransition getNodeTransitionToNextNonSkippedState(GNode node, List<? extends NFAState> path) {
         if(node == null)
             return null;
 
@@ -149,7 +149,7 @@ public FATransition getNodeTransitionToNextNonSkippedState(GNode node, List path
                     // missing a transition: this can happen if a transition is a subset of
                     // the others (the next state of the path can return no transition at all)
                     if(getPathIndex() +1 < path.size()) {
-                        NFAState nextPathState = (NFAState) path.get(getPathIndex() +1);
+                        NFAState nextPathState = path.get(getPathIndex() +1);
                         for (FATransition t : candidateTransitions) {
                             if (t.target.stateNumber == nextPathState.stateNumber) {
                                 pathIndex = getPathIndex() + 1;    // always points to the next element after the transition
@@ -220,7 +220,7 @@ public void addNextElementInOtherRule(List<GPathElement> elements, GNode node, G
         }
     }
 
-    public void addPath(List path, boolean disabled, Map<Integer,FAState> skippedStates) {
+    public void addPath(List<? extends NFAState> path, boolean disabled, Map<Integer,FAState> skippedStates) {
         List<GPathElement> elements = new ArrayList<GPathElement>();
 
         /** path contains a list of NFAState states (from ANTLR): they represent
@@ -238,7 +238,7 @@ public void addPath(List path, boolean disabled, Map<Integer,FAState> skippedSta
         GNode nextNode = null;
         for(pathIndex = 0; getPathIndex() < path.size(); pathIndex = getPathIndex() + 1) {
             if(getPathIndex() == 0) {
-                nextState = (NFAState)path.get(getPathIndex());
+                nextState = path.get(getPathIndex());
                 nextNode = findNodeForStateNumber(nextState.stateNumber);
                 if(nextNode == null) {
                     // A path can start from anywhere in the graph. It might happen
@@ -259,7 +259,7 @@ public void addPath(List path, boolean disabled, Map<Integer,FAState> skippedSta
                 node = nextNode;
             }
 
-            nextState = (NFAState)path.get(getPathIndex());
+            nextState = path.get(getPathIndex());
             nextNode = findNodeForStateNumber(nextState.stateNumber);
 
             GNode externalNode = null;
@@ -287,7 +287,7 @@ public void addPath(List path, boolean disabled, Map<Integer,FAState> skippedSta
                     if(getPathIndex() >= path.size()) {
                         nextNode = findNodeForStateNumber(t.target.stateNumber);
                     } else {
-                        nextState = (NFAState)path.get(getPathIndex());
+                        nextState = path.get(getPathIndex());
 
                         if(t.target.stateNumber == nextState.stateNumber) {
                             nextNode = findNodeForStateNumber(t.target.stateNumber);
diff --git a/src/org/antlr/works/visualization/graphics/panel/GPanel.java b/src/org/antlr/works/visualization/graphics/panel/GPanel.java
index 200b9667..c4b58a14 100644
--- a/src/org/antlr/works/visualization/graphics/panel/GPanel.java
+++ b/src/org/antlr/works/visualization/graphics/panel/GPanel.java
@@ -88,7 +88,7 @@ public void close() {
         XJNotificationCenter.defaultCenter().removeObserver(this);
     }
 
-    public void setGraphs(List graphs) {
+    public void setGraphs(List<? extends GGraphAbstract> graphs) {
         view.setGraphs(graphs);
         view.refresh();
         updateCurrentAlternative();
diff --git a/src/org/antlr/works/visualization/graphics/panel/GView.java b/src/org/antlr/works/visualization/graphics/panel/GView.java
index 0f68111a..e360a410 100644
--- a/src/org/antlr/works/visualization/graphics/panel/GView.java
+++ b/src/org/antlr/works/visualization/graphics/panel/GView.java
@@ -58,7 +58,7 @@ public class GView extends JPanel implements XJMenuItemDelegate {
     protected String placeholder;
     protected BufferedImage cachedImage = null;
 
-    protected List graphs = new ArrayList();
+    protected List<GGraphAbstract> graphs = new ArrayList<GGraphAbstract>();
     protected int currentGraphIndex = 0;
     protected GPanel panel;
     protected GContext context;
@@ -103,7 +103,7 @@ public void setPlaceholder(String placeholder) {
     }
 
     @SuppressWarnings("unchecked")
-    public void setGraphs(List graphs) {
+    public void setGraphs(List<? extends GGraphAbstract> graphs) {
         this.graphs.clear();
 
         if(graphs == null)
@@ -117,7 +117,7 @@ public void setGraphs(List graphs) {
         applyContext();
     }
 
-    public List getGraphs() {
+    public List<? extends GGraphAbstract> getGraphs() {
         return graphs;
     }
 
@@ -187,7 +187,7 @@ public int getCurrentGraphIndex() {
 
     public GGraphAbstract getCurrentGraph() {
         if(graphs.size()>0)
-            return (GGraphAbstract)graphs.get(currentGraphIndex);
+            return graphs.get(currentGraphIndex);
         else
             return null;
     }
diff --git a/src/org/antlr/works/visualization/graphics/path/GPath.java b/src/org/antlr/works/visualization/graphics/path/GPath.java
index e3c54de7..82355457 100644
--- a/src/org/antlr/works/visualization/graphics/path/GPath.java
+++ b/src/org/antlr/works/visualization/graphics/path/GPath.java
@@ -113,13 +113,13 @@ public int getNumberOfVisibleElements() {
         return count;
     }
 
-    public void draw(float width, List ignoreElements) {
+    public void draw(float width, List<? super GPathElement> ignoreElements) {
         if(showRuleLinks)
             drawElements(width, ignoreElements, true);
         drawElements(width, ignoreElements, false);
     }
 
-    public void drawElements(float width, List ignoreElements, boolean ruleLink) {
+    public void drawElements(float width, List<? super GPathElement> ignoreElements, boolean ruleLink) {
         context.nodeColor = disabled?Color.red:Color.green.darker();
         context.linkColor = context.nodeColor;
         context.setLineWidth(width);
diff --git a/src/org/antlr/works/visualization/serializable/SXMLEncoder.java b/src/org/antlr/works/visualization/serializable/SXMLEncoder.java
index 8fcc515f..c9c1f924 100644
--- a/src/org/antlr/works/visualization/serializable/SXMLEncoder.java
+++ b/src/org/antlr/works/visualization/serializable/SXMLEncoder.java
@@ -34,7 +34,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class SXMLEncoder implements SEncoder {
 
     private final Map<SSerializable, Entry> cache = new HashMap<SSerializable, Entry>();
-    private final Stack<Entry> stack = new Stack<Entry>();
+    private final List<Entry> stack = new ArrayList<Entry>();
     private long uid;
     private Entry root;
 
@@ -55,31 +55,31 @@ public void write(SSerializable object) {
 
             if(root == null) {
                 root = entry;
-                stack.push(root);
+                stack.add(root);
             } else {
-                stack.peek().write(entry);                
+                stack.get(stack.size() - 1).write(entry);
             }
 
             // serialize this object
-            stack.push(entry);
+            stack.add(entry);
             object.encode(this);
-            stack.pop();
+            stack.remove(stack.size() - 1);
         } else {
             // already being serialized
-            stack.peek().write(entry.getUID());
+            stack.get(stack.size() - 1).write(entry.getUID());
         }
     }
 
     public void write(String value) {
-        stack.peek().write(value);
+        stack.get(stack.size() - 1).write(value);
     }
 
     public void write(int value) {
-        stack.peek().write(value);
+        stack.get(stack.size() - 1).write(value);
     }
 
     public void write(boolean value) {
-        stack.peek().write(value);
+        stack.get(stack.size() - 1).write(value);
     }
 
     public static class Entry {
@@ -149,17 +149,17 @@ public long getUID() {
     public static class XMLWriter {
 
         StringBuilder sb = new StringBuilder();
-        Stack<String> elements = new Stack<String>();
+        List<String> elements = new ArrayList<String>();
 
         public void open(String name) {
-            elements.push(name);
+            elements.add(name);
             sb.append("<");
             sb.append(name);
             sb.append(">");
         }
 
         public void close() {
-            String name = elements.pop();
+            String name = elements.remove(elements.size() - 1);
             sb.append("</");
             sb.append(name);
             sb.append(">");
diff --git a/src/org/antlr/xjlib/appkit/app/MacOS/XJApplicationMacOS.java b/src/org/antlr/xjlib/appkit/app/MacOS/XJApplicationMacOS.java
index 7e16c269..7f3ae621 100755
--- a/src/org/antlr/xjlib/appkit/app/MacOS/XJApplicationMacOS.java
+++ b/src/org/antlr/xjlib/appkit/app/MacOS/XJApplicationMacOS.java
@@ -116,6 +116,8 @@ public void menuItemState(XJMenuItem item) {
         switch(tag) {
             case XJMainMenuBar.MI_NEW:
                 item.setTitle(XJLocalizable.getXJString("New")+((XJApplication.shared().getDocumentExtensions().size()>1)?"...":""));
+                item.setEnabled(true);
+                break;
 
             case XJMainMenuBar.MI_OPEN:
             case XJMainMenuBar.MI_RECENT_FILES:
diff --git a/src/org/antlr/xjlib/appkit/app/XJApplication.java b/src/org/antlr/xjlib/appkit/app/XJApplication.java
index fccdec85..ff04b185 100755
--- a/src/org/antlr/xjlib/appkit/app/XJApplication.java
+++ b/src/org/antlr/xjlib/appkit/app/XJApplication.java
@@ -31,6 +31,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.xjlib.appkit.app;
 
+import org.antlr.xjlib.appkit.app.MacOS.XJApplicationMacOS;
+import org.antlr.xjlib.appkit.document.XJData;
 import org.antlr.xjlib.appkit.document.XJDocument;
 import org.antlr.xjlib.appkit.document.XJDocumentFactory;
 import org.antlr.xjlib.appkit.frame.XJFrame;
@@ -101,7 +103,7 @@ public static synchronized XJApplicationInterface shared() {
         if(shared == null) {
             if(XJSystem.isMacOS()) {
                 try {
-                    shared = (XJApplication)Class.forName("org.antlr.xjlib.appkit.app.MacOS.XJApplicationMacOS").newInstance();
+                    shared = new XJApplicationMacOS();
                 } catch (Exception e) {
                     e.printStackTrace();
                     System.err.println("XJApplication: cannot instanciate the MacOS application ("+e+")");
@@ -258,7 +260,7 @@ public void displayAbout() {
     public void displayPrefs() {
         if(prefs == null) {
             try {
-                prefs = (XJPanel)delegate.appPreferencesPanelClass().newInstance();
+                prefs = delegate.appPreferencesPanelClass().newInstance();
                 prefs.setDelegate(this);
                 prefs.awake();
             } catch (Exception e) {
@@ -309,7 +311,7 @@ public void clearRecentFiles() {
         XJMainMenuBar.refreshAllRecentFilesMenu();
     }
 
-    public List recentFiles() {
+    public List<String> recentFiles() {
         return recentFiles;
     }
 
@@ -323,7 +325,7 @@ protected void removePreferencesMenuItem() {
 
     // *** XJDocument
 
-    public static void addDocumentFactory(Class documentClass, Class windowClass, Class dataClass, String ext, String description) {
+    public static void addDocumentFactory(Class<? extends XJDocument> documentClass, Class<? extends XJWindow> windowClass, Class<? extends XJData> dataClass, String ext, String description) {
         addDocumentFactory(new XJDocumentFactory(documentClass, windowClass, dataClass, ext, description));
     }
 
@@ -349,8 +351,8 @@ public XJDocumentFactory getDocumentTypeForPath(String path) {
         return null;
     }
 
-    public List getDocumentExtensions() {
-        List<List> ext = new ArrayList<List>();
+    public List<List<String>> getDocumentExtensions() {
+        List<List<String>> ext = new ArrayList<List<String>>();
         for (XJDocumentFactory factory : documentFactories) {
             ext.add(factory.getExtensions());
         }
@@ -650,7 +652,7 @@ public boolean useDesktopMode() {
         return useDesktopMode;
     }
 
-    public Class getPreferencesClass() {
+    public Class<?> getPreferencesClass() {
         if(delegate == null)
             return XJApplication.class;
         else
diff --git a/src/org/antlr/xjlib/appkit/app/XJApplicationDelegate.java b/src/org/antlr/xjlib/appkit/app/XJApplicationDelegate.java
index e095bdc5..fe6d1695 100755
--- a/src/org/antlr/xjlib/appkit/app/XJApplicationDelegate.java
+++ b/src/org/antlr/xjlib/appkit/app/XJApplicationDelegate.java
@@ -32,7 +32,6 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 package org.antlr.xjlib.appkit.app;
 
 import org.antlr.xjlib.appkit.frame.XJPanel;
-import org.antlr.xjlib.appkit.frame.XJDialog;
 import org.antlr.xjlib.appkit.menu.XJMenu;
 import org.antlr.xjlib.appkit.document.XJDocument;
 
@@ -44,12 +43,12 @@ public abstract class XJApplicationDelegate {
     public String appVersionLong() { return null; }
     public void appDidLaunch(String[] args, List<String> documentsToOpenAtStartup) {}
     public void appWillTerminate() {}
-    public Class appPreferencesPanelClass() { return null; }
+    public Class<? extends XJPanel> appPreferencesPanelClass() { return null; }
     public XJPanel appInstanciateAboutPanel() { return null; }
     public void appShowHelp() {}
     public boolean appHasPreferencesMenuItem() { return false; }
     public boolean appShouldQuitAfterLastWindowClosed() { return false; }
-    public Class appPreferencesClass() { return null; }
+    public Class<?> appPreferencesClass() { return null; }
     public boolean supportsPersistence() { return true; }
     public boolean useDesktopMode() { return false; }
     public boolean displayNewDocumentWizard(XJDocument document) { return false; }
diff --git a/src/org/antlr/xjlib/appkit/app/XJApplicationInterface.java b/src/org/antlr/xjlib/appkit/app/XJApplicationInterface.java
index 2e53aca1..13944185 100755
--- a/src/org/antlr/xjlib/appkit/app/XJApplicationInterface.java
+++ b/src/org/antlr/xjlib/appkit/app/XJApplicationInterface.java
@@ -49,7 +49,7 @@ public interface XJApplicationInterface {
 
     XJDocument newDocument();
     XJWindow getWindowContainingDocumentForPath(String path);
-    List getDocumentExtensions();
+    List<List<String>> getDocumentExtensions();
 
     void addWindow(XJWindow window);
     void removeWindow(XJWindow window);
@@ -66,7 +66,7 @@ public interface XJApplicationInterface {
     void addRecentFile(String path);
     void removeRecentFile(String file);
     void clearRecentFiles();
-    List recentFiles();
+    List<String> recentFiles();
 
     void performQuit();
 
diff --git a/src/org/antlr/xjlib/appkit/app/XJPreferences.java b/src/org/antlr/xjlib/appkit/app/XJPreferences.java
index 40ab6f27..e455c476 100755
--- a/src/org/antlr/xjlib/appkit/app/XJPreferences.java
+++ b/src/org/antlr/xjlib/appkit/app/XJPreferences.java
@@ -31,6 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.xjlib.appkit.app;
 
+import org.antlr.works.utils.Utils;
 import org.antlr.xjlib.appkit.frame.XJDialog;
 import org.antlr.xjlib.appkit.swing.XJColorChooser;
 
@@ -50,7 +51,7 @@ public class XJPreferences {
     protected Preferences prefs = null;
     protected Map<String,EventListener> bindings = new HashMap<String, EventListener>();
 
-    public XJPreferences(Class c) {
+    public XJPreferences(Class<?> c) {
         this.prefs = Preferences.userNodeForPackage(c);
     }
 
@@ -103,7 +104,7 @@ public void setList(String key, List<String> array) {
     }
 
     public List<String> getList(String key) {
-        return (List<String>)getObject(key, null);
+        return Utils.castList((List<?>)getObject(key, null), String.class);
     }
 
     public void setObject(String key, Object obj) {
diff --git a/src/org/antlr/xjlib/appkit/document/XJData.java b/src/org/antlr/xjlib/appkit/document/XJData.java
index d194a3d2..e043984e 100755
--- a/src/org/antlr/xjlib/appkit/document/XJData.java
+++ b/src/org/antlr/xjlib/appkit/document/XJData.java
@@ -31,6 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.xjlib.appkit.document;
 
+import org.antlr.works.utils.Utils;
 import org.antlr.xjlib.foundation.XJObject;
 
 import java.io.*;
@@ -102,7 +103,7 @@ public void writeData(OutputStream os) throws IOException {
 
     public void readData(ObjectInputStream ois) throws IOException, ClassNotFoundException {
         ois.readInt();
-        dictionary = (HashMap<String,Object>)ois.readObject();
+        dictionary = Utils.castMap((Map<?, ?>)ois.readObject(), String.class, Object.class);
         dataChanged();
     }
 
diff --git a/src/org/antlr/xjlib/appkit/document/XJDocument.java b/src/org/antlr/xjlib/appkit/document/XJDocument.java
index 884be44a..1b6b4349 100755
--- a/src/org/antlr/xjlib/appkit/document/XJDocument.java
+++ b/src/org/antlr/xjlib/appkit/document/XJDocument.java
@@ -54,7 +54,7 @@ public class XJDocument extends XJObject {
     protected String documentTitle = XJLocalizable.getXJString("DocUntitled");
     protected String documentPath;
 
-    protected List documentFileExts;
+    protected List<String> documentFileExts;
     protected String documentFileExtDescription;
 
     protected boolean dirty = false;
@@ -179,7 +179,7 @@ public String getDocumentNameWithoutExtension() {
         return XJUtils.getPathByDeletingPathExtension(getDocumentName());
     }
 
-    public void setDocumentFileType(List ext, String description) {
+    public void setDocumentFileType(List<String> ext, String description) {
         documentFileExts = ext;
         documentFileExtDescription = description;
     }
diff --git a/src/org/antlr/xjlib/appkit/document/XJDocumentFactory.java b/src/org/antlr/xjlib/appkit/document/XJDocumentFactory.java
index ccb46bac..c70da8a5 100755
--- a/src/org/antlr/xjlib/appkit/document/XJDocumentFactory.java
+++ b/src/org/antlr/xjlib/appkit/document/XJDocumentFactory.java
@@ -38,13 +38,13 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public class XJDocumentFactory {
 
-    private Class documentClass;
-    private Class windowClass;
-    private Class dataClass;
+    private Class<? extends XJDocument> documentClass;
+    private Class<? extends XJWindow> windowClass;
+    private Class<? extends XJData> dataClass;
     private String ext;
     private String description;
 
-    public XJDocumentFactory(Class documentClass, Class windowClass, Class dataClass, String ext, String description) {
+    public XJDocumentFactory(Class<? extends XJDocument> documentClass, Class<? extends XJWindow> windowClass, Class<? extends XJData> dataClass, String ext, String description) {
         this.documentClass = documentClass;
         this.windowClass = windowClass;
         this.dataClass = dataClass;
@@ -65,11 +65,11 @@ public String getDescriptionString() {
     }
 
     public XJDocument createDocument() throws IllegalAccessException, InstantiationException {
-        XJDocument document = (XJDocument)documentClass.newInstance();
-        document.setDocumentData((XJData)dataClass.newInstance());
+        XJDocument document = documentClass.newInstance();
+        document.setDocumentData(dataClass.newInstance());
         document.setDocumentFileType(getExtensions(), getDescriptionString());
 
-        XJWindow window = (XJWindow)windowClass.newInstance();
+        XJWindow window = windowClass.newInstance();
         window.addDocument(document);
         document.setWindow(window);
 
diff --git a/src/org/antlr/xjlib/appkit/frame/XJInternalFrameHandling.java b/src/org/antlr/xjlib/appkit/frame/XJInternalFrameHandling.java
index ac1c0a36..4552be12 100644
--- a/src/org/antlr/xjlib/appkit/frame/XJInternalFrameHandling.java
+++ b/src/org/antlr/xjlib/appkit/frame/XJInternalFrameHandling.java
@@ -24,6 +24,8 @@ public void menuItemState(XJMenuItem item) {
         switch(tag) {
             case XJMainMenuBar.MI_NEW:
                 item.setTitle(XJLocalizable.getXJString("New")+((XJApplication.shared().getDocumentExtensions().size()>1)?"...":""));
+                item.setEnabled(true);
+                break;
 
             case XJMainMenuBar.MI_OPEN:
             case XJMainMenuBar.MI_RECENT_FILES:
diff --git a/src/org/antlr/xjlib/appkit/gview/event/GEventManager.java b/src/org/antlr/xjlib/appkit/gview/event/GEventManager.java
index 038b9411..5e766cc3 100755
--- a/src/org/antlr/xjlib/appkit/gview/event/GEventManager.java
+++ b/src/org/antlr/xjlib/appkit/gview/event/GEventManager.java
@@ -41,7 +41,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 public class GEventManager {
 
     private List<GAbstractEvent> eventObjects = new ArrayList<GAbstractEvent>();
-    private Set exclusiveValueSet = new HashSet();
+    private Set<Object> exclusiveValueSet = new HashSet<Object>();
     private GEventDelegate eventDelegate = null;
 
     public static final int EVENT_DRAW = 1;
diff --git a/src/org/antlr/xjlib/appkit/menu/XJMainMenuBar.java b/src/org/antlr/xjlib/appkit/menu/XJMainMenuBar.java
index ce85770d..bdddcd95 100755
--- a/src/org/antlr/xjlib/appkit/menu/XJMainMenuBar.java
+++ b/src/org/antlr/xjlib/appkit/menu/XJMainMenuBar.java
@@ -386,10 +386,10 @@ private XJMenu buildEditMenu() {
     }
 
     private void buildWindowMenu_() {
-        Iterator iterator = XJApplication.shared().getWindows().iterator();
+        Iterator<XJWindow> iterator = XJApplication.shared().getWindows().iterator();
         int count = 0;
         while(iterator.hasNext()) {
-            XJWindow window = (XJWindow)iterator.next();
+            XJWindow window = iterator.next();
             if(window.shouldAppearsInWindowMenu()) {
                 XJMenuItemCheck item = buildMenuItemCheck(window.getTitle(), count<10?KeyEvent.VK_0+count:-1, MI_WINDOW+count);
                 item.setSelected(window.isActive());
diff --git a/src/org/antlr/xjlib/appkit/swing/XJGraphics2DPS.java b/src/org/antlr/xjlib/appkit/swing/XJGraphics2DPS.java
index 1a9a1a76..d1a8cc7f 100644
--- a/src/org/antlr/xjlib/appkit/swing/XJGraphics2DPS.java
+++ b/src/org/antlr/xjlib/appkit/swing/XJGraphics2DPS.java
@@ -655,10 +655,10 @@ public Object getRenderingHint(RenderingHints.Key hintKey) {
         return null;
     }
 
-    public void setRenderingHints(Map hints) {
+    public void setRenderingHints(Map<?, ?> hints) {
     }
 
-    public void addRenderingHints(Map hints) {
+    public void addRenderingHints(Map<?, ?> hints) {
     }
 
     public RenderingHints getRenderingHints() {
diff --git a/src/org/antlr/xjlib/appkit/undo/XJUndo.java b/src/org/antlr/xjlib/appkit/undo/XJUndo.java
index 50ff330b..8565d2c4 100644
--- a/src/org/antlr/xjlib/appkit/undo/XJUndo.java
+++ b/src/org/antlr/xjlib/appkit/undo/XJUndo.java
@@ -37,7 +37,8 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 import javax.swing.undo.CompoundEdit;
 import javax.swing.undo.UndoManager;
 import javax.swing.undo.UndoableEdit;
-import java.util.Stack;
+import java.util.ArrayList;
+import java.util.List;
 
 public class XJUndo {
 
@@ -48,7 +49,7 @@ public class XJUndo {
     protected XJUndoAction undoAction;
     protected XJRedoAction redoAction;
 
-    protected Stack<CustomCompoundEdit> groupEditEvent = new Stack<CustomCompoundEdit>();
+    protected List<CustomCompoundEdit> groupEditEvent = new ArrayList<CustomCompoundEdit>();
 
     protected int enable = 0;
 
@@ -99,11 +100,11 @@ public void performRedo() {
     }
 
     public void beginUndoGroup(String name) {
-        groupEditEvent.push(new CustomCompoundEdit(name));
+        groupEditEvent.add(new CustomCompoundEdit(name));
     }
 
     public void endUndoGroup() {
-        CustomCompoundEdit edit = groupEditEvent.pop();
+        CustomCompoundEdit edit = groupEditEvent.remove(groupEditEvent.size() - 1);
         edit.end();
         addEditEvent(edit);
     }
@@ -112,7 +113,7 @@ public CompoundEdit getUndoGroup() {
         if(groupEditEvent.isEmpty())
             return null;
         else
-            return (CompoundEdit)groupEditEvent.peek();
+            return groupEditEvent.get(groupEditEvent.size() - 1);
     }
 
     public void enableUndo() {
diff --git a/src/org/antlr/xjlib/appkit/update/XJUpdateManager.java b/src/org/antlr/xjlib/appkit/update/XJUpdateManager.java
index 32f37778..7f93ce1e 100644
--- a/src/org/antlr/xjlib/appkit/update/XJUpdateManager.java
+++ b/src/org/antlr/xjlib/appkit/update/XJUpdateManager.java
@@ -31,6 +31,7 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 package org.antlr.xjlib.appkit.update;
 
+import org.antlr.works.utils.Utils;
 import org.antlr.xjlib.appkit.app.XJApplication;
 import org.antlr.xjlib.appkit.frame.XJDialog;
 import org.antlr.xjlib.appkit.utils.XJAlert;
@@ -58,7 +59,7 @@ public class XJUpdateManager {
 
     protected Container parent;
     protected XJUpdateManagerDelegate delegate;
-    protected Map updateInfoMap;
+    protected Map<String, Object> updateInfoMap;
 
     protected boolean cancelDownload = false;
 
@@ -199,7 +200,7 @@ public void fetchRemoteUpdateInformation(String urlString, boolean silent) {
 
         XMLDecoder decoder = new XMLDecoder(new BufferedInputStream(is));
         try {
-            updateInfoMap = (Map)decoder.readObject();
+            updateInfoMap = Utils.castMap((Map<?, ?>)decoder.readObject(), String.class, Object.class);
         } catch(Exception e) {
             XJAlert.display(getParentContainer(), "Update Manager", "Cannot check the update because:\n"+e);
             return;            
diff --git a/src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java b/src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java
index 1d26ca39..0b5221ea 100755
--- a/src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java
+++ b/src/org/antlr/xjlib/appkit/utils/BrowserLauncher.java
@@ -71,10 +71,10 @@ public class BrowserLauncher {
 	private static boolean loadedWithoutErrors;
 
 	/** The com.apple.mrj.MRJFileUtils class */
-	private static Class mrjFileUtilsClass;
+	private static Class<?> mrjFileUtilsClass;
 
 	/** The com.apple.mrj.MRJOSType class */
-	private static Class mrjOSTypeClass;
+	private static Class<?> mrjOSTypeClass;
 
 	/** The com.apple.MacOS.AEDesc class */
 	private static Class<?> aeDescClass;
@@ -259,18 +259,18 @@ private static boolean loadClasses() {
 			case MRJ_2_0:
 				try {
 					Class<?> aeTargetClass = Class.forName("com.apple.MacOS.AETarget");
-					Class osUtilsClass = Class.forName("com.apple.MacOS.OSUtils");
+					Class<?> osUtilsClass = Class.forName("com.apple.MacOS.OSUtils");
 					Class<?> appleEventClass = Class.forName("com.apple.MacOS.AppleEvent");
-					Class aeClass = Class.forName("com.apple.MacOS.ae");
+					Class<?> aeClass = Class.forName("com.apple.MacOS.ae");
 					aeDescClass = Class.forName("com.apple.MacOS.AEDesc");
 
-					aeTargetConstructor = aeTargetClass.getDeclaredConstructor(new Class [] { int.class });
-					appleEventConstructor = appleEventClass.getDeclaredConstructor(new Class[] { int.class, int.class, aeTargetClass, int.class, int.class });
-					aeDescConstructor = aeDescClass.getDeclaredConstructor(new Class[] { String.class });
+					aeTargetConstructor = aeTargetClass.getDeclaredConstructor(int.class);
+					appleEventConstructor = appleEventClass.getDeclaredConstructor(int.class, int.class, aeTargetClass, int.class, int.class);
+					aeDescConstructor = aeDescClass.getDeclaredConstructor(String.class);
 
-					makeOSType = osUtilsClass.getDeclaredMethod("makeOSType", new Class [] { String.class });
-					putParameter = appleEventClass.getDeclaredMethod("putParameter", new Class[] { int.class, aeDescClass });
-					sendNoReply = appleEventClass.getDeclaredMethod("sendNoReply", new Class[] { });
+					makeOSType = osUtilsClass.getDeclaredMethod("makeOSType", String.class);
+					putParameter = appleEventClass.getDeclaredMethod("putParameter", int.class, aeDescClass);
+					sendNoReply = appleEventClass.getDeclaredMethod("sendNoReply");
 
 					Field keyDirectObjectField = aeClass.getDeclaredField("keyDirectObject");
 					keyDirectObject = (Integer) keyDirectObjectField.get(null);
@@ -298,9 +298,9 @@ private static boolean loadClasses() {
 					mrjOSTypeClass = Class.forName("com.apple.mrj.MRJOSType");
 					Field systemFolderField = mrjFileUtilsClass.getDeclaredField("kSystemFolderType");
 					kSystemFolderType = systemFolderField.get(null);
-					findFolder = mrjFileUtilsClass.getDeclaredMethod("findFolder", new Class[] { mrjOSTypeClass });
-					getFileCreator = mrjFileUtilsClass.getDeclaredMethod("getFileCreator", new Class[] { File.class });
-					getFileType = mrjFileUtilsClass.getDeclaredMethod("getFileType", new Class[] { File.class });
+					findFolder = mrjFileUtilsClass.getDeclaredMethod("findFolder", mrjOSTypeClass);
+					getFileCreator = mrjFileUtilsClass.getDeclaredMethod("getFileCreator", File.class);
+					getFileType = mrjFileUtilsClass.getDeclaredMethod("getFileType", File.class);
 				} catch (ClassNotFoundException cnfe) {
 					errorMessage = cnfe.getMessage();
 					return false;
@@ -321,8 +321,8 @@ private static boolean loadClasses() {
 			case MRJ_3_0:
 			    try {
 					Class<?> linker = Class.forName("com.apple.mrj.jdirect.Linker");
-					Constructor<?> constructor = linker.getConstructor(new Class[]{ Class.class });
-					linkage = constructor.newInstance(new Object[] { BrowserLauncher.class });
+					Constructor<?> constructor = linker.getConstructor(Class.class);
+					linkage = constructor.newInstance(BrowserLauncher.class);
 				} catch (ClassNotFoundException cnfe) {
 					errorMessage = cnfe.getMessage();
 					return false;
@@ -343,7 +343,7 @@ private static boolean loadClasses() {
 			case MRJ_3_1:
 				try {
 					mrjFileUtilsClass = Class.forName("com.apple.mrj.MRJFileUtils");
-					openURL = mrjFileUtilsClass.getDeclaredMethod("openURL", new Class[] { String.class });
+					openURL = mrjFileUtilsClass.getDeclaredMethod("openURL", String.class);
 				} catch (ClassNotFoundException cnfe) {
 					errorMessage = cnfe.getMessage();
 					return false;
@@ -374,10 +374,10 @@ private static Object locateBrowser() {
 		switch (jvm) {
 			case MRJ_2_0:
 				try {
-					Integer finderCreatorCode = (Integer) makeOSType.invoke(null, new Object[] { FINDER_CREATOR });
-					Object aeTarget = aeTargetConstructor.newInstance(new Object[] { finderCreatorCode });
-					Integer gurlType = (Integer) makeOSType.invoke(null, new Object[] { GURL_EVENT });
-					Object appleEvent = appleEventConstructor.newInstance(new Object[] { gurlType, gurlType, aeTarget, kAutoGenerateReturnID, kAnyTransactionID });
+					Integer finderCreatorCode = (Integer) makeOSType.invoke(null, FINDER_CREATOR);
+					Object aeTarget = aeTargetConstructor.newInstance(finderCreatorCode);
+					Integer gurlType = (Integer) makeOSType.invoke(null, GURL_EVENT);
+					Object appleEvent = appleEventConstructor.newInstance(gurlType, gurlType, aeTarget, kAutoGenerateReturnID, kAnyTransactionID);
 					// Don't set browser = appleEvent because then the next time we call
 					// locateBrowser(), we'll get the same AppleEvent, to which we'll already have
 					// added the relevant parameter. Instead, regenerate the AppleEvent every time.
@@ -400,7 +400,7 @@ private static Object locateBrowser() {
 			case MRJ_2_1:
 				File systemFolder;
 				try {
-					systemFolder = (File) findFolder.invoke(null, new Object[] { kSystemFolderType });
+					systemFolder = (File) findFolder.invoke(null, kSystemFolderType);
 				} catch (IllegalArgumentException iare) {
 					browser = null;
 					errorMessage = iare.getMessage();
@@ -427,9 +427,9 @@ private static Object locateBrowser() {
 						// applications being picked up on certain Mac OS 9 systems,
 						// especially German ones, and sending a GURL event to those
 						// applications results in a logout under Multiple Users.
-						Object fileType = getFileType.invoke(null, new Object[] { file });
+						Object fileType = getFileType.invoke(null, file);
 						if (FINDER_TYPE.equals(fileType.toString())) {
-							Object fileCreator = getFileCreator.invoke(null, new Object[] { file });
+							Object fileCreator = getFileCreator.invoke(null, file);
 							if (FINDER_CREATOR.equals(fileCreator.toString())) {
 								browser = file.toString();	// Actually the Finder, but that's OK
 								return browser;
@@ -488,9 +488,9 @@ public static void openURL(String url) throws IOException {
 			case MRJ_2_0:
 				Object aeDesc;
 				try {
-					aeDesc = aeDescConstructor.newInstance(new Object[] { url });
-					putParameter.invoke(browser, new Object[] { keyDirectObject, aeDesc });
-					sendNoReply.invoke(browser, new Object[] { });
+					aeDesc = aeDescConstructor.newInstance(url);
+					putParameter.invoke(browser, keyDirectObject, aeDesc);
+					sendNoReply.invoke(browser);
 				} catch (InvocationTargetException ite) {
 					throw new IOException("InvocationTargetException while creating AEDesc: " + ite.getMessage());
 				} catch (IllegalAccessException iae) {
@@ -528,7 +528,7 @@ public static void openURL(String url) throws IOException {
 				break;
 			case MRJ_3_1:
 				try {
-					openURL.invoke(null, new Object[] { url });
+					openURL.invoke(null, url);
 				} catch (InvocationTargetException ite) {
 					throw new IOException("InvocationTargetException while calling openURL: " + ite.getMessage());
 				} catch (IllegalAccessException iae) {
@@ -574,7 +574,7 @@ private static boolean openUnixBrowser(String browser, String url) {
         Process process;
         try {
             // First, attempt to open the URL in a currently running session of Netscape
-            process = Runtime.getRuntime().exec(new String[] { (String) browser,
+            process = Runtime.getRuntime().exec(new String[] { browser,
                                                                NETSCAPE_REMOTE_PARAMETER,
                                                                NETSCAPE_OPEN_PARAMETER_START +
                     url +
@@ -582,7 +582,7 @@ private static boolean openUnixBrowser(String browser, String url) {
             try {
                 int exitCode = process.waitFor();
                 if (exitCode != 0) {	// if Netscape was not open
-                    Runtime.getRuntime().exec(new String[] { (String) browser, url });
+                    Runtime.getRuntime().exec(new String[] { browser, url });
                     exitCode = 0;
                 }
                 success = (exitCode == 0);
diff --git a/src/org/antlr/xjlib/appkit/utils/XJFileChooser.java b/src/org/antlr/xjlib/appkit/utils/XJFileChooser.java
index b422eaca..d7228b24 100755
--- a/src/org/antlr/xjlib/appkit/utils/XJFileChooser.java
+++ b/src/org/antlr/xjlib/appkit/utils/XJFileChooser.java
@@ -69,14 +69,14 @@ public boolean displayOpenDialog(Component parent, boolean multiple) {
     }
 
     public boolean displayOpenDialog(Component parent, String extension, String description, boolean multiple) {
-        return displayOpenDialog(parent, Collections.singletonList(extension), Collections.singletonList(description), multiple);
+        return displayOpenDialog(parent, Collections.singletonList(extension), description, multiple);
     }
 
-    public boolean displayOpenDialog(Component parent, List extensions, String description, boolean multiple) {
+    public boolean displayOpenDialog(Component parent, List<String> extensions, String description, boolean multiple) {
         return displayOpenDialog(parent, Collections.singletonList(extensions), Collections.singletonList(description), multiple);
     }
 
-    public boolean displayOpenDialog(Component parent, List extensions, List<String> descriptions, boolean multiple) {
+    public boolean displayOpenDialog(Component parent, List<List<String>> extensions, List<String> descriptions, boolean multiple) {
         if(parent != null)
             parent = XJDialog.resolveOwner(parent.getParent());
 
@@ -144,15 +144,15 @@ private List<String> filesToList(File[] files) {
 
     public boolean displaySaveDialog(Component parent, String extension, String extensionDescription, boolean acceptAll) {
         return displaySaveDialog(parent, Collections.singletonList(extension),
-                Collections.singletonList(extensionDescription), acceptAll);
+                extensionDescription, acceptAll);
     }
 
-    public boolean displaySaveDialog(Component parent, List extensions, String extensionDescription, boolean acceptAll) {
+    public boolean displaySaveDialog(Component parent, List<String> extensions, String extensionDescription, boolean acceptAll) {
         return displaySaveDialog(parent, Collections.singletonList(extensions),
                 Collections.singletonList(extensionDescription), acceptAll);
     }
 
-    public boolean displaySaveDialog(Component parent, List extensions, List<String> descriptions, boolean acceptAll) {
+    public boolean displaySaveDialog(Component parent, List<List<String>> extensions, List<String> descriptions, boolean acceptAll) {
         if(parent != null)
             parent = XJDialog.resolveOwner(parent.getParent());
 
@@ -189,7 +189,7 @@ public boolean displayChooseDirectory(Component parent) {
         return displayChooseDirectory(parent, null, null, true);
     }
 
-    public boolean displayChooseDirectory(Component parent, List extensions, List<String> descriptions, boolean acceptAll) {
+    public boolean displayChooseDirectory(Component parent, List<List<String>> extensions, List<String> descriptions, boolean acceptAll) {
         if(parent != null)
             parent = XJDialog.resolveOwner(parent.getParent());
 
@@ -233,7 +233,7 @@ public boolean displayChooseDirectory(Component parent, List extensions, List<St
         return result;
     }
 
-    private String getExtension(List extensions, JFileChooser chooser) {
+    private String getExtension(List<List<String>> extensions, JFileChooser chooser) {
         if(extensions != null && extensions.size() >= 0) {
             FileFilter ff = chooser.getFileFilter();
             if(ff instanceof XJFileFilter) {
@@ -245,7 +245,7 @@ private String getExtension(List extensions, JFileChooser chooser) {
         return XJUtils.getPathExtension(selectedFilePath);
     }
 
-    private void applyExtensions(List extensions, JFileChooser chooser, boolean acceptAll, List<String> descriptions) {
+    private void applyExtensions(List<List<String>> extensions, JFileChooser chooser, boolean acceptAll, List<String> descriptions) {
         if(extensions == null || extensions.size() == 0)
             chooser.setAcceptAllFileFilterUsed(acceptAll);
         else {
diff --git a/src/org/antlr/xjlib/appkit/utils/XJFileFilter.java b/src/org/antlr/xjlib/appkit/utils/XJFileFilter.java
index cb2e4021..eb9e0566 100755
--- a/src/org/antlr/xjlib/appkit/utils/XJFileFilter.java
+++ b/src/org/antlr/xjlib/appkit/utils/XJFileFilter.java
@@ -38,16 +38,16 @@ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 
 public class XJFileFilter extends FileFilter {
 
-    private List exts = null;
+    private List<String> exts = null;
     private String description = null;
 
-    public static XJFileFilter createFileFilter(Object ext, String description) {
+    public static XJFileFilter createFileFilter(String ext, String description) {
+        return createFileFilter(Collections.singletonList(ext), description);
+    }
+
+    public static XJFileFilter createFileFilter(List<String> ext, String description) {
         XJFileFilter ff = new XJFileFilter();
-        if(ext instanceof String) {
-            ff.exts = Collections.singletonList(ext);
-        } else {
-            ff.exts = (List)ext;
-        }
+        ff.exts = ext;
         ff.description = description;
         return ff;
     }
@@ -57,8 +57,7 @@ public boolean accept(File f) {
     }
 
     public boolean accept(String path) {
-        for (Object ext : exts) {
-            String e = (String) ext;
+        for (String e : exts) {
             if (path.endsWith("."+e)) {
                 return true;
             }
@@ -67,7 +66,7 @@ public boolean accept(String path) {
     }
 
     public String getDefaultExtension() {
-        return (String) exts.get(0);
+        return exts.get(0);
     }
 
     public String getDescription() {
diff --git a/src/org/antlr/xjlib/foundation/XJObject.java b/src/org/antlr/xjlib/foundation/XJObject.java
index 878e4682..fc363651 100755
--- a/src/org/antlr/xjlib/foundation/XJObject.java
+++ b/src/org/antlr/xjlib/foundation/XJObject.java
@@ -64,7 +64,7 @@ public void addObserverForKey(Object o, String key) {
     }
 
     public void removeObserverForKey(Object o, String key) {
-        List list = keyObservers.get(key);
+        List<Object> list = keyObservers.get(key);
         if(list == null)
             return;
 
@@ -81,7 +81,7 @@ public void keyValueChanged(Object sender, String key, Object value) {
         keyValueChangedToObservers(keyObservers.get(key), sender, key, value);
     }
 
-    private void keyValueChangedToObservers(List observers, Object sender, String key, Object value) {
+    private void keyValueChangedToObservers(List<Object> observers, Object sender, String key, Object value) {
         if(observers == null)
             return;
 
diff --git a/src/org/antlr/xjlib/foundation/XJUtils.java b/src/org/antlr/xjlib/foundation/XJUtils.java
index 4c6105fc..4990ef58 100755
--- a/src/org/antlr/xjlib/foundation/XJUtils.java
+++ b/src/org/antlr/xjlib/foundation/XJUtils.java
@@ -106,7 +106,7 @@ public static String getPathByDeletingLastComponent(String path) {
         return getPathByDeletingLastComponent(path, File.separator);
     }
 
-    public static List sortedFilesInPath(String path) {
+    public static List<File> sortedFilesInPath(String path) {
         File[] files = new File(path).listFiles();
         List<File> sortedFiles = Arrays.asList(files);
         Collections.sort(sortedFiles);