Merge pull request #4 from DanielCoutoVale/remove-warnings

Remove warnings (unclosed readers/writers and unsafe varargs)

src/opennlp/ccg/grammar/RuleGroup.java

@@ -337,6 +337,7 @@ public void loadSupercatRuleCombos(URL url) throws IOException {
     			supercatRuleCombos.add(new SupercatRuleCombo(tokens[0], tokens[1], tokens[2]));
     		}
     	}
+    	in.close();
     }
 
 

src/opennlp/ccg/ngrams/SRILM_FactoredScorerMaker.java

@@ -75,6 +75,7 @@ protected void writeFoldSpecFile(File tmpDir, int foldNum) throws IOException {
             }
         }
         out.close();
+        br.close();
     }
 
     /**

src/opennlp/ccg/parse/Chart.java

@@ -668,8 +668,10 @@ public void loadChartEntries(File file) throws IOException {
 			_size = _table.length;
 			_numUnpackingEdges = 0;
 		} catch (ClassNotFoundException e) {
+			in.close();
             throw (RuntimeException) new RuntimeException().initCause(e);
 		}
+		in.close();
 	}
 
 

src/opennlp/ccg/parse/postagger/ml/POSPriorModel.java

@@ -112,6 +112,7 @@ public POSPriorModel(String flmFile, String vocabFile) throws IOException {
         for (String posTag : allSupertags) {
             posVocab[cnt++] = posTag.intern();
         }
+        br.close();
     }
 
     /** Get the prior probability of this POS/word combo. */

src/opennlp/ccg/parse/supertagger/ml/STPriorModel.java

@@ -125,6 +125,7 @@ public STPriorModel(String flmFile, String vocabFile, STTaggerPOSDictionary posD
                 st = st.trim().split("-")[1];
             }
         }
+        br.close();
 
         // initialize the arrays to this size.
         stagVocab = new String[cnt];

src/opennlp/ccg/util/CompositeFilter.java

@@ -45,6 +45,7 @@ public CompositeFilter() {
 	 * Creates a new composite filter made up of the specified filters.
 	 * @see #CompositeFilter(Collection)
 	 */
+	@SafeVarargs
 	public CompositeFilter(Filter<? super E>... edgeFilters) {
 		this(Arrays.asList(edgeFilters));
 	}

src/opennlp/ccgbank/convert/ApposTally.java

@@ -70,6 +70,7 @@ public void openCueFile(String fileName) throws IOException {
 				cueList.add(line);
 			//System.out.println(line);
 		}
+		br.close();
 	}
 
 	//Proc which traps, stores id of each sentence in a global var 

src/opennlp/ccgbank/convert/InfoHelper.java

@@ -88,6 +88,7 @@ public static void readBBNAuxfiles(String sect){
 					bbnSpans.put(sentId,spanList);
 
 				}
+				inp.close();
 			}
 		}
 		catch(IOException e){
@@ -120,7 +121,7 @@ public static void readQuoteAuxfiles(String sect){
 					quotedText=quotedText.trim();
 					quoteInfo.put(key,quotedText);
 				}
-
+				inp.close();
 			}
 		}
 		catch(IOException e){
@@ -164,6 +165,7 @@ else if(label.equals("TPC")){
 						}
 					}
 				}
+				inp.close();
 			}
 		}
 		catch(IOException e){
@@ -191,7 +193,7 @@ public static void readTreeAuxfiles(String sect){
 					String catId=treeParts[2];
 					treeInfo.put(key,catId);
 				}
-
+				inp.close();
 			}
 
 		}
@@ -602,7 +604,7 @@ public void printBBNClasses(){
 					print_writer.print("\"/>");
 				print_writer.flush();
 			}
-
+			print_writer.close();
 		}
 		catch (Exception e){
 			System.err.println ("Error writing info to file");

src/opennlp/ccgbank/convert/MorphLookup.java

@@ -49,6 +49,8 @@ public static void init(File wordsFile, File stemsFile) throws IOException {
 			stemMap.put(key, stem);
 			stemMap.put(key2, stem);
 		}
+		wordsReader.close();
+		stemsReader.close();
 	}
 
 	/** Returns the stem for the given word and pos, or the empty string if none. */

src/opennlp/ccgbank/extract/DebugHelper.java

@@ -68,7 +68,7 @@ public void readInfo() {
 			//System.out.println(tagInfo);
 			//System.out.println(tagInfo.size());
 			init = false;
-
+			inp.close();
 		}
 
 		catch (IOException e) {

src/opennlp/ccgbank/extract/RulesTally.java

@@ -191,6 +191,7 @@ public static void printTally(File directory) throws FileNotFoundException{
 		output.println("</body>");
 		output.println("</html>");
 		output.flush();
+		output.close();
 	}