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 / CustomXmlTraceDefinition.java

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java
index b8b440e99a82686f75e3e7fa37667b53744f4050..4d73eaf54b9d98501fbc16710c3cb9838d1dd4cf 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/parsers/custom/CustomXmlTraceDefinition.java
@@ -175,7 +175,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition {
          */
         public void addAttribute(InputAttribute attribute) {
             if (attributes == null) {
-                attributes = new ArrayList<InputAttribute>(1);
+                attributes = new ArrayList<>(1);
             }
             attributes.add(attribute);
         }
@@ -188,7 +188,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition {
          */
         public void addChild(InputElement input) {
             if (childElements == null) {
-                childElements = new ArrayList<InputElement>(1);
+                childElements = new ArrayList<>(1);
             } else if (childElements.size() > 0) {
                 InputElement last = childElements.get(childElements.size() - 1);
                 last.nextElement = input;
@@ -376,9 +376,9 @@ public class CustomXmlTraceDefinition 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 CustomXmlTraceDefinition: path=" + path, e); //$NON-NLS-1$
         } catch (TransformerConfigurationException e) {
@@ -493,7 +493,7 @@ public class CustomXmlTraceDefinition extends CustomTraceDefinition {
                 return new CustomXmlTraceDefinition[0];
             }
 
-            ArrayList<CustomXmlTraceDefinition> defList = new ArrayList<CustomXmlTraceDefinition>();
+            ArrayList<CustomXmlTraceDefinition> defList = new ArrayList<>();
             NodeList nodeList = root.getChildNodes();
             for (int i = 0; i < nodeList.getLength(); i++) {
                 Node node = nodeList.item(i);
@@ -723,9 +723,9 @@ public class CustomXmlTraceDefinition 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 deleteing CustomXmlTraceDefinition: definitionName=" + definitionName, e); //$NON-NLS-1$
         } catch (SAXException e) {