Minor cleanup of org.eclipse.compare.examples
Removes unless see comments and uses try with resources
Change-Id: I30d26d8eeaaa3c4c51f7e1cf43c5b2d45ee3f4ca
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
index 2f6a260..40bd7c0 100644
--- a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
+++ b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/KeyValuePairStructureCreator.java
@@ -49,9 +49,6 @@
return fValue;
}
- /*
- * @see ITypedElement#getName
- */
@Override
public String getName() {
return this.getId();
@@ -66,9 +63,6 @@
return "kvtxt"; //$NON-NLS-1$
}
- /*
- * @see ITypedElement#getImage
- */
@Override
public Image getImage() {
return CompareUI.getImage(getType());
diff --git a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
index 6347dbe..3b262d5 100644
--- a/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
+++ b/examples/org.eclipse.compare.examples/src/org/eclipse/compare/examples/structurecreator/Util.java
@@ -42,12 +42,11 @@
private static String readString(InputStream is, String encoding) {
if (is == null)
return null;
- BufferedReader reader= null;
- try {
+ try (BufferedReader reader=new BufferedReader(new InputStreamReader(is, encoding)))
+ {
StringBuilder buffer= new StringBuilder();
char[] part= new char[2048];
int read= 0;
- reader= new BufferedReader(new InputStreamReader(is, encoding));
while ((read= reader.read(part)) != -1)
buffer.append(part, 0, read);
@@ -56,15 +55,7 @@
} catch (IOException ex) {
// silently ignored
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException ex) {
- // we don't log IOException when closing a file
- }
- }
- }
+ }
return null;
}
