fix eclipse warning - mostly generics cosmetics

close resources in tests
junit4 conversions
convert spreadsheet based formular test to junit parameterized tests

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1702659 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 24 insertions, 26 deletions

diff --git a/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java b/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java
index 170dacb697..5868a175df 100644
--- a/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java
+++ b/src/examples/src/org/apache/poi/hssf/view/SVTableModel.java
@@ -25,6 +25,7 @@ import javax.swing.table.*;
 
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 
 /**
@@ -43,7 +44,7 @@ public class SVTableModel extends AbstractTableModel {
 
   public SVTableModel(HSSFSheet st) {
     this.st = st;
-    Iterator i = st.rowIterator();
+    Iterator<Row> i = st.rowIterator();
 
     while (i.hasNext()) {
       HSSFRow row = (HSSFRow)i.next();
@@ -69,7 +70,7 @@ public class SVTableModel extends AbstractTableModel {
     return st.getLastRowNum() + 1;
   }
 
-  public Class getColumnClass(int c) {
+  public Class<?> getColumnClass(int c) {
 	return HSSFCell.class;
   }
 
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
index 7f73ebce46..ee58728640 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
@@ -43,18 +43,18 @@ public class ExtendableTreeCellRenderer implements TreeCellRenderer
     /**
      * <p>Maps classes to renderers.</p>
      */
-    protected Map renderers;
+    protected Map<Class<?>,TreeCellRenderer> renderers;
 
 
 
     public ExtendableTreeCellRenderer()
     {
-        renderers = new HashMap();
+        renderers = new HashMap<Class<?>,TreeCellRenderer>();
         register(Object.class, new DefaultTreeCellRenderer()
             {
                 public Component getTreeCellRendererComponent
-                    (JTree tree, Object value, boolean selected,
-                     boolean expanded, boolean leaf, int row, boolean hasFocus)
+                    (JTree tree, Object value, boolean selectedCell,
+                     boolean expanded, boolean leaf, int row, boolean hasCellFocus)
                 {
                     final String s = value.toString();
                     final JLabel l = new JLabel(s + "  ");
@@ -73,7 +73,7 @@ public class ExtendableTreeCellRenderer implements TreeCellRenderer
     /**
      * <p>Registers a renderer for a class.</p>
      **/
-    public void register(final Class c, final TreeCellRenderer renderer)
+    public void register(final Class<?> c, final TreeCellRenderer renderer)
     {
         renderers.put(c, renderer);
     }
@@ -84,7 +84,7 @@ public class ExtendableTreeCellRenderer implements TreeCellRenderer
      * <p>Unregisters a renderer for a class. The renderer for the
      * {@link Object} class cannot be unregistered.</p>
      */
-    public void unregister(final Class c)
+    public void unregister(final Class<?> c)
     {
         if (c == Object.class)
             throw new IllegalArgumentException
@@ -127,15 +127,15 @@ public class ExtendableTreeCellRenderer implements TreeCellRenderer
     /**
      * <p>Find the renderer for the specified class.</p>
      */
-    protected TreeCellRenderer findRenderer(final Class c)
+    protected TreeCellRenderer findRenderer(final Class<?> c)
     {
-        final TreeCellRenderer r = (TreeCellRenderer) renderers.get(c);
+        final TreeCellRenderer r = renderers.get(c);
         if (r != null)
             /* The class has a renderer. */
             return r;
 
         /* The class has no renderer, try the superclass, if any. */
-        final Class superclass = c.getSuperclass();
+        final Class<?> superclass = c.getSuperclass();
         if (superclass != null) {
             return findRenderer(superclass);
         }
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java b/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
index 7624ed2125..a57c48d678 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
@@ -89,19 +89,16 @@ public class POIBrowser extends JFrame
         for (int i = 0; i < args.length; i++)
         {
             final String filename = args[i];
-            try
-            {
+            try {
+                FileInputStream fis = new FileInputStream(filename);
                 POIFSReader r = new POIFSReader();
                 r.registerListener(new TreeReaderListener(filename, rootNode));
-                r.read(new FileInputStream(filename));
+                r.read(fis);
+                fis.close();
                 displayedFiles++;
-            }
-            catch (IOException ex)
-            {
+            } catch (IOException ex) {
                 System.err.println(filename + ": " + ex);
-            }
-            catch (Exception t)
-            {
+            } catch (Exception t) {
                 System.err.println("Unexpected exception while reading \"" +
                                    filename + "\":");
                 t.printStackTrace(System.err);
diff --git a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
index 75277d2f34..297fa908c9 100644
--- a/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
+++ b/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
@@ -45,11 +45,11 @@ public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
 
     public Component getTreeCellRendererComponent(final JTree tree,
                                                   final Object value,
-                                                  final boolean selected,
+                                                  final boolean selectedCell,
                                                   final boolean expanded,
                                                   final boolean leaf,
                                                   final int row,
-                                                  final boolean hasFocus)
+                                                  final boolean hasCellFocus)
     {
         final PropertySetDescriptor d = (PropertySetDescriptor)
             ((DefaultMutableTreeNode) value).getUserObject();
@@ -96,7 +96,7 @@ public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
             text.append("\nSecurity:            " + si.getSecurity());
         }
 
-        if (selected)
+        if (selectedCell)
             Util.invert(text);
         return p;
     }
@@ -107,13 +107,13 @@ public class PropertySetDescriptorRenderer extends DocumentDescriptorRenderer
      * <p>Returns a string representation of a list of {@link
      * Section}s.</p>
      */
-    protected String sectionsToString(final List sections)
+    protected String sectionsToString(final List<Section> sections)
     {
         final StringBuffer b = new StringBuffer();
         int count = 1;
-        for (Iterator i = sections.iterator(); i.hasNext();)
+        for (Iterator<Section>  i = sections.iterator(); i.hasNext();)
         {
-            Section s = (Section) i.next();
+            Section s = i.next();
             String d = toString(s, "Section " + count++);
             b.append(d);
         }