tmf: Switch tmf.ui to Java 7 + fix warnings

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui / src / org / eclipse / linuxtools / internal / tmf / ui / parsers / custom / CustomTxtTraceDefinition.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java
index 1216812fae6aaf44b4bc6ee95e37ffab2474980f..7decee4ecbd730457ea7d1a1582ca17b83e7e468 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomTxtTraceDefinition.java
@@ -191,7 +191,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
          */
         public void addChild(InputLine input) {
             if (childrenInputs == null) {
-                childrenInputs = new ArrayList<InputLine>(1);
+                childrenInputs = new ArrayList<>(1);
             } else if (childrenInputs.size() > 0) {
                 InputLine last = childrenInputs.get(childrenInputs.size() - 1);
                 last.nextInput = input;
@@ -255,7 +255,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
          */
         public void addColumn(InputData column) {
             if (columns == null) {
-                columns = new ArrayList<InputData>(1);
+                columns = new ArrayList<>(1);
             }
             columns.add(column);
         }
@@ -268,7 +268,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
          * @return The next list of lines.
          */
         public List<InputLine> getNextInputs(Map<InputLine, Integer> countMap) {
-            List<InputLine> nextInputs = new ArrayList<InputLine>();
+            List<InputLine> nextInputs = new ArrayList<>();
             InputLine next = nextInput;
             while (next != null) {
                 nextInputs.add(next);
@@ -515,9 +515,9 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
             transformer.transform(source, result);
             String xmlString = result.getWriter().toString();
 
-            FileWriter writer = new FileWriter(file);
-            writer.write(xmlString);
-            writer.close();
+            try (FileWriter writer = new FileWriter(file);) {
+                writer.write(xmlString);
+            }
         } catch (ParserConfigurationException e) {
             Activator.getDefault().logError("Error saving CustomTxtTraceDefinition: path=" + path, e); //$NON-NLS-1$
         } catch (TransformerConfigurationException e) {
@@ -623,7 +623,7 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
                 return new CustomTxtTraceDefinition[0];
             }
 
-            ArrayList<CustomTxtTraceDefinition> defList = new ArrayList<CustomTxtTraceDefinition>();
+            ArrayList<CustomTxtTraceDefinition> defList = new ArrayList<>();
             NodeList nodeList = root.getChildNodes();
             for (int i = 0; i < nodeList.getLength(); i++) {
                 Node node = nodeList.item(i);
@@ -845,9 +845,9 @@ public class CustomTxtTraceDefinition extends CustomTraceDefinition {
             transformer.transform(source, result);
             String xmlString = result.getWriter().toString();
 
-            FileWriter writer = new FileWriter(file);
-            writer.write(xmlString);
-            writer.close();
+            try (FileWriter writer = new FileWriter(file);) {
+                writer.write(xmlString);
+            }
         } catch (ParserConfigurationException e) {
             Activator.getDefault().logError("Error deleting CustomTxtTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$
         } catch (SAXException e) {