Revision: 8475
http://languagetool.svn.sourceforge.net/languagetool/?rev=8475&view=rev
Author: dnaber
Date: 2012-12-01 21:38:47 +0000 (Sat, 01 Dec 2012)
Log Message:
-----------
properly close FileInputStream; tiny code cleanup
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
Modified: trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-12-01 20:15:20 UTC (rev 8474)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
2012-12-01 21:38:47 UTC (rev 8475)
@@ -37,10 +37,7 @@
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.event.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.Reader;
+import java.io.*;
import java.net.URL;
import java.util.*;
import java.util.List;
@@ -216,9 +213,13 @@
return;
}
try {
- final String fileContents = StringTools.readFile(new FileInputStream(file
- .getAbsolutePath()));
- textArea.setText(fileContents);
+ final FileInputStream inputStream = new FileInputStream(file);
+ try {
+ final String fileContents = StringTools.readFile(inputStream);
+ textArea.setText(fileContents);
+ } finally {
+ inputStream.close();
+ }
checkTextAndDisplayResults();
} catch (IOException e) {
Tools.showError(e);
@@ -228,8 +229,8 @@
void hideToTray() {
if (!isInTray) {
final SystemTray tray = SystemTray.getSystemTray();
- final Image img = Toolkit.getDefaultToolkit().getImage(
-
JLanguageTool.getDataBroker().getFromResourceDirAsUrl((tray.getTrayIconSize().height
> 16 ) ? SYSTEM_TRAY_ICON_NAME : SYSTEM_TRAY_SMALL_ICON_NAME));
+ final String iconPath = tray.getTrayIconSize().height > 16 ?
SYSTEM_TRAY_ICON_NAME : SYSTEM_TRAY_SMALL_ICON_NAME;
+ final Image img =
Toolkit.getDefaultToolkit().getImage(JLanguageTool.getDataBroker().getFromResourceDirAsUrl(iconPath));
final PopupMenu popup = makePopupMenu();
try {
final TrayIcon trayIcon = new TrayIcon(img, SYSTEM_TRAY_TOOLTIP,
popup);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
INSIGHTS What's next for parallel hardware, programming and related areas?
Interviews and blogs by thought leaders keep you ahead of the curve.
http://goparallel.sourceforge.net
_______________________________________________
Languagetool-commits mailing list
Languagetool-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
