[ jEdit-commits ] SF.net SVN: jedit:[16793] plugins/CtagsInterface/trunk/src/ctagsinterface

[<sh...@us...>]

Revision: 16793
          http://jedit.svn.sourceforge.net/jedit/?rev=16793&view=rev
Author:   shlomy
Date:     2009-12-30 20:43:08 +0000 (Wed, 30 Dec 2009)

Log Message:
-----------
Fixed some minor issues detected by FindBugs.

Modified Paths:
--------------
    plugins/CtagsInterface/trunk/src/ctagsinterface/db/TagDB.java
    plugins/CtagsInterface/trunk/src/ctagsinterface/main/QuickSearchTagDialog.java
    plugins/CtagsInterface/trunk/src/ctagsinterface/main/Runner.java
    plugins/CtagsInterface/trunk/src/ctagsinterface/options/ActionsOptionPane.java

Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/db/TagDB.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/db/TagDB.java	2009-12-30 20:17:21 UTC (rev 16792)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/db/TagDB.java	2009-12-30 20:43:08 UTC (rev 16793)
@@ -15,9 +15,11 @@
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.Vector;
+import java.util.Map.Entry;
 
 import org.gjt.sp.jedit.jEdit;
 
@@ -105,8 +107,11 @@
 		if (mapFile == null || mapFile.length() == 0)
 			return;
 		Properties props = new Properties();
+		FileInputStream fis = null;
 		try {
-			props.load(new FileInputStream(mapFile));
+			fis = new FileInputStream(mapFile);
+			props.load(fis);
+			fis.close();
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 			return;
@@ -275,9 +280,10 @@
 		HashMap<String, Vector<String>> origins) 
 	{
 		StringBuffer sb = new StringBuffer();
-		Set<String> types = origins.keySet();
-		for (String type: types) {
-			Vector<String> names = origins.get(type);
+		for (Map.Entry<String, Vector<String>> origin: origins.entrySet())
+		{
+			String type = origin.getKey();
+			Vector<String> names = origin.getValue();
 			if (names == null || names.size() == 0)
 				continue;
 			if (sb.length() > 0)

Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/main/QuickSearchTagDialog.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/main/QuickSearchTagDialog.java	2009-12-30 20:17:21 UTC (rev 16792)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/main/QuickSearchTagDialog.java	2009-12-30 20:43:08 UTC (rev 16793)
@@ -274,7 +274,7 @@
 		}
 	}
 
-	public class TagListCellRenderer extends DefaultListCellRenderer {
+	static public class TagListCellRenderer extends DefaultListCellRenderer {
 
 		@Override
 		public Component getListCellRendererComponent(JList list, Object value,

Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/main/Runner.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/main/Runner.java	2009-12-30 20:17:21 UTC (rev 16792)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/main/Runner.java	2009-12-30 20:43:08 UTC (rev 16793)
@@ -22,7 +22,7 @@
 	private static final String SPACES = "\\s+";
 	private static Set<String> tempFiles;
 	
-	{
+	static {
 		tempFiles = new HashSet<String>();
 	}
 	

Modified: plugins/CtagsInterface/trunk/src/ctagsinterface/options/ActionsOptionPane.java
===================================================================
--- plugins/CtagsInterface/trunk/src/ctagsinterface/options/ActionsOptionPane.java	2009-12-30 20:17:21 UTC (rev 16792)
+++ plugins/CtagsInterface/trunk/src/ctagsinterface/options/ActionsOptionPane.java	2009-12-30 20:43:08 UTC (rev 16793)
@@ -100,7 +100,7 @@
 		CtagsInterfacePlugin.updateActions();
 	}
 
-	public class ActionEditor extends JDialog {
+	static public class ActionEditor extends JDialog {
 		
 		QueryAction action;
 		JTextField query;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.