You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2019/02/05 21:15:54 UTC
svn commit: r1853038 - in
/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools:
docanalyzer/AnnotationViewerDialog.java jcasgen/Jg.java
pear/merger/PMUimaAgent.java util/htmlview/AnnotationViewGenerator.java
Author: schor
Date: Tue Feb 5 21:15:54 2019
New Revision: 1853038
URL: http://svn.apache.org/viewvc?rev=1853038&view=rev
Log:
[UIMA-5931] try-with-resources
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java
uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java?rev=1853038&r1=1853037&r2=1853038&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/docanalyzer/AnnotationViewerDialog.java Tue Feb 5 21:15:54 2019
@@ -36,6 +36,7 @@ import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.FilenameFilter;
import java.io.IOException;
+import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
@@ -499,13 +500,8 @@ public class AnnotationViewerDialog exte
CAS cas = CasCreationUtils.createCas(Collections.EMPTY_LIST, typeSystem, UIMAFramework
.getDefaultPerformanceTuningProperties());
// deserialize XCAS into CAS
- FileInputStream xcasInStream = null;
- try {
- xcasInStream = new FileInputStream(xcasFile);
+ try (InputStream xcasInStream = new FileInputStream(xcasFile)) {
XmlCasDeserializer.deserialize(xcasInStream, cas, true);
- } finally {
- if (xcasInStream != null)
- xcasInStream.close();
}
//get the specified view
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java?rev=1853038&r1=1853037&r2=1853038&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java Tue Feb 5 21:15:54 2019
@@ -28,6 +28,7 @@ import java.awt.event.WindowEvent;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -1037,12 +1038,9 @@ public class Jg {
} else
progressMonitorGenerateClass.subTask(getString("creatingTarget",
new Object[] { qualifiedClassName }));
- (new File(targetContainer)).mkdirs();
- FileWriter fw = new FileWriter(targetPath);
- try {
+ new File(targetContainer).mkdirs();
+ try (Writer fw = new FileWriter(targetPath)) {
fw.write(sourceContents);
- } finally {
- fw.close();
}
}
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java?rev=1853038&r1=1853037&r2=1853038&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java Tue Feb 5 21:15:54 2019
@@ -24,6 +24,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -334,19 +335,10 @@ public class PMUimaAgent {
*/
static void saveAggregateDescription(AnalysisEngineDescription aggDescription, File aggDescFile)
throws IOException {
- FileWriter fWriter = null;
- try {
- fWriter = new FileWriter(aggDescFile);
+ try (Writer fWriter = new FileWriter(aggDescFile)) {
aggDescription.toXML(fWriter);
} catch (SAXException exc) {
throw new IOException(exc.toString());
- } finally {
- if (fWriter != null) {
- try {
- fWriter.close();
- } catch (Exception e) {
- }
- }
}
}
@@ -360,19 +352,10 @@ public class PMUimaAgent {
*/
static String toXmlString(XMLizable content) {
StringWriter sWriter = new StringWriter();
- PrintWriter oWriter = null;
- try {
- oWriter = new PrintWriter(sWriter);
+ try (PrintWriter oWriter = new PrintWriter(sWriter)) {
content.toXML(oWriter);
oWriter.flush();
} catch (Exception exc) {
- } finally {
- if (oWriter != null) {
- try {
- oWriter.close();
- } catch (Exception e) {
- }
- }
}
return sWriter.toString();
}
Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java?rev=1853038&r1=1853037&r2=1853038&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/util/htmlview/AnnotationViewGenerator.java Tue Feb 5 21:15:54 2019
@@ -26,10 +26,10 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Iterator;
-import javax.xml.XMLConstants;
import javax.xml.transform.Templates;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -369,13 +369,8 @@ public class AnnotationViewGenerator {
public void autoGenerateStyleMapFile(AnalysisEngineMetaData aMetaData, File aStyleMapFile)
throws IOException {
String xmlStr = autoGenerateStyleMap(aMetaData);
- FileWriter out = null;
- try {
- out = new FileWriter(aStyleMapFile);
+ try (Writer out = new FileWriter(aStyleMapFile)) {
out.write(xmlStr);
- } finally {
- if (out != null)
- out.close();
}
}
@@ -390,13 +385,8 @@ public class AnnotationViewGenerator {
public void autoGenerateStyleMapFile(TypeSystemDescription aTypeSystem, File aStyleMapFile)
throws IOException {
String xmlStr = autoGenerateStyleMap(aTypeSystem);
- FileWriter out = null;
- try {
- out = new FileWriter(aStyleMapFile);
+ try (Writer out = new FileWriter(aStyleMapFile)) {
out.write(xmlStr);
- } finally {
- if (out != null)
- out.close();
}
}
}