From 0eaddb26ef44ddda1bd6b15ae833eee1400a6707 Mon Sep 17 00:00:00 2001
From: Fabian Becker <fabian.becker@uni-tuebingen.de>
Date: Tue, 21 Oct 2014 18:50:11 +0200
Subject: [PATCH] Update copyright

---
 src/eva2/EvAInfo.java                        | 2 +-
 src/eva2/gui/editor/GenericObjectEditor.java | 9 +++------
 src/eva2/tools/Serializer.java               | 6 ++++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/eva2/EvAInfo.java b/src/eva2/EvAInfo.java
index 270a8654..e84f8382 100644
--- a/src/eva2/EvAInfo.java
+++ b/src/eva2/EvAInfo.java
@@ -43,7 +43,7 @@ public class EvAInfo {
     public static final String splashLocation = "images/EvASplashScreen.png";
 
     public static final String infoTitle = productName + " Information";
-    public static final String copyrightYear = "2010-2012";
+    public static final String copyrightYear = "2010-2014";
 
     ////////////// Property handling...
 
diff --git a/src/eva2/gui/editor/GenericObjectEditor.java b/src/eva2/gui/editor/GenericObjectEditor.java
index f8f50399..ed54c5ce 100644
--- a/src/eva2/gui/editor/GenericObjectEditor.java
+++ b/src/eva2/gui/editor/GenericObjectEditor.java
@@ -89,9 +89,7 @@ public class GenericObjectEditor implements PropertyEditor {
                      * not have this field.
                      */
                     LOGGER.log(Level.FINER, String.format("%1$s does not have a hideFromGOE field", clazz.toString()), e);
-                } catch (IllegalArgumentException e) {
-                    LOGGER.log(Level.FINER, e.getMessage(), e);
-                } catch (IllegalAccessException e) {
+                } catch (IllegalArgumentException | IllegalAccessException e) {
                     LOGGER.log(Level.FINER, e.getMessage(), e);
                 }
 
@@ -122,7 +120,7 @@ public class GenericObjectEditor implements PropertyEditor {
      *
      * @param cls      class the property belongs to
      * @param property string name of the property
-     * @param hide     desired value to set, true for hidden, false for visible
+     * @param expertValue desired value to set, true for hidden, false for visible
      * @return false, if an error occurs, else true
      */
     public static boolean setExpertProperty(Class<?> cls, String property, boolean expertValue) {
@@ -393,8 +391,7 @@ public class GenericObjectEditor implements PropertyEditor {
             if (getNameMethod >= 0) {
                 try {
                     rep = (String) methods[getNameMethod].getMethod().invoke(object, (Object[]) null);
-                } catch (java.lang.IllegalAccessException e1) {
-                } catch (java.lang.reflect.InvocationTargetException e2) {
+                } catch (IllegalAccessException | java.lang.reflect.InvocationTargetException ignored) {
                 }
             }
             if (rep.length() <= 0) {
diff --git a/src/eva2/tools/Serializer.java b/src/eva2/tools/Serializer.java
index f483a3f6..9f81ea7c 100644
--- a/src/eva2/tools/Serializer.java
+++ b/src/eva2/tools/Serializer.java
@@ -1,5 +1,7 @@
 package eva2.tools;
 
+import com.google.gson.Gson;
+
 import java.io.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -46,6 +48,10 @@ public class Serializer {
             objectStream.writeObject(objToStore);
             objectStream.flush();
             objectStream.close();
+            String output;
+            Gson gson = new Gson();
+            output = gson.toJson(objToStore);
+            System.out.println(output);
         } catch (java.io.NotSerializableException ex) {
             LOGGER.log(Level.SEVERE, "Object is not serializable!", ex);
         }