Moved object conversion to one place (removed code redundancy)

Alexander Lippling · Alexander Lippling · commit fbc4635a3e1f · 2012-05-31T16:33:00.000+02:00
Change-Id: Ib73efcb15552aa4d42a57aeda2d4411df5a9415a
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBArrayAdapter.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBArrayAdapter.java
@@ -22,7 +22,6 @@
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
 import com.sap.prd.mobile.ios.mios.xcodeprojreader.Array;
-import com.sap.prd.mobile.ios.mios.xcodeprojreader.Dict;
 
 public class JAXBArrayAdapter extends XmlAdapter<JAXBArray, Array>
 {
@@ -31,20 +30,10 @@ public JAXBArray marshal(Array array) throws Exception
   {
     JAXBArray jaxbArray = new JAXBArray();
     Array elements = new JAXBPlist().createArray();
+    JAXBPlistElementConverter converter = new JAXBPlistElementConverter(new JAXBDictAdapter(), this);
     for (Object value : array)
     {
-      if (value instanceof Dict)
-      {
-        value = new JAXBDictAdapter().marshal((Dict) value);
-      }
-      else if (value instanceof Array)
-      {
-        value = marshal((Array) value);
-      }
-      else if (value instanceof Boolean)
-      {
-        value = ((Boolean)value) ? new JAXBTrue() : new JAXBFalse();
-      }
+      value = converter.convertToJAXB(value);
       elements.add(value);
     }
     jaxbArray.setElements(elements);
@@ -55,24 +44,10 @@ else if (value instanceof Boolean)
   public Array unmarshal(JAXBArray jaxbArray) throws Exception
   {
     Array array = new JAXBPlist().createArray();
+    JAXBPlistElementConverter converter = new JAXBPlistElementConverter(new JAXBDictAdapter(), this);
     for (Object value : jaxbArray.getElements())
     {
-      if (value instanceof JAXBDict)
-      {
-        value = new JAXBDictAdapter().unmarshal((JAXBDict) value);
-      }
-      else if (value instanceof JAXBArray)
-      {
-        value = unmarshal((JAXBArray) value);
-      }
-      else if (value instanceof JAXBTrue)
-      {
-        value = Boolean.TRUE;
-      }
-      else if (value instanceof JAXBFalse)
-      {
-        value = Boolean.FALSE;
-      }
+      value = converter.convertFromJAXB(value);
       array.add(value);
     }
     return array;
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBDictAdapter.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBDictAdapter.java
@@ -33,25 +33,16 @@ public JAXBDict marshal(Dict dict) throws Exception
   {
     JAXBDict jaxbDict = new JAXBDict();
     Array elements = new JAXBPlist().createArray();
+    JAXBPlistElementConverter converter = new JAXBPlistElementConverter(this, new JAXBArrayAdapter());
     for (Map.Entry<String, Object> entry : dict.entrySet())
     {
       JAXBKey key = new JAXBKey();
       key.setValue(entry.getKey());
       elements.add(key);
 
       Object value = entry.getValue();
-      if (value instanceof Dict)
-      {
-        value = marshal((Dict) value);
-      }
-      else if (value instanceof Array)
-      {
-        value = new JAXBArrayAdapter().marshal((Array) value);
-      }
-      else if (value instanceof Boolean)
-      {
-        value = ((Boolean)value) ? new JAXBTrue() : new JAXBFalse();
-      }
+      value = converter.convertToJAXB(value);
+
       elements.add(value);
     }
     jaxbDict.setElements(elements);
@@ -62,6 +53,7 @@ else if (value instanceof Boolean)
   public Dict unmarshal(JAXBDict jaxbDict) throws Exception
   {
     Dict dict = new LinkedHashMapDict();
+    JAXBPlistElementConverter converter = new JAXBPlistElementConverter(this, new JAXBArrayAdapter());
     for (int i = 0; i < jaxbDict.getElements().size(); i += 2)
     {
       Object key = jaxbDict.getElements().get(i);
@@ -71,22 +63,8 @@ public Dict unmarshal(JAXBDict jaxbDict) throws Exception
       }
 
       Object value = jaxbDict.getElements().get(i + 1);
-      if (value instanceof JAXBDict)
-      {
-        value = unmarshal((JAXBDict) value);
-      }
-      else if (value instanceof JAXBArray)
-      {
-        value = new JAXBArrayAdapter().unmarshal((JAXBArray) value);
-      }
-      else if (value instanceof JAXBTrue)
-      {
-        value = Boolean.TRUE;
-      }
-      else if (value instanceof JAXBFalse)
-      {
-        value = Boolean.FALSE;
-      }
+      value = converter.convertFromJAXB(value);
+
       dict.put((String) key, value);
     }
     return dict;
diff --git a/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistElementConverter.java b/src/main/java/com/sap/prd/mobile/ios/mios/xcodeprojreader/jaxb/JAXBPlistElementConverter.java
@@ -0,0 +1,54 @@
+package com.sap.prd.mobile.ios.mios.xcodeprojreader.jaxb;
+
+import com.sap.prd.mobile.ios.mios.xcodeprojreader.Array;
+import com.sap.prd.mobile.ios.mios.xcodeprojreader.Dict;
+
+public class JAXBPlistElementConverter
+{
+  private final JAXBDictAdapter dictAdapter;
+  private final JAXBArrayAdapter arrayAdapter;
+
+  public JAXBPlistElementConverter(JAXBDictAdapter dictAdapter, JAXBArrayAdapter arrayAdapter)
+  {
+    this.dictAdapter = dictAdapter;
+    this.arrayAdapter = arrayAdapter;
+  }
+
+  public Object convertFromJAXB(Object value) throws Exception
+  {
+    if (value instanceof JAXBDict)
+    {
+      value = dictAdapter.unmarshal((JAXBDict) value);
+    }
+    else if (value instanceof JAXBArray)
+    {
+      value = arrayAdapter.unmarshal((JAXBArray) value);
+    }
+    else if (value instanceof JAXBTrue)
+    {
+      value = Boolean.TRUE;
+    }
+    else if (value instanceof JAXBFalse)
+    {
+      value = Boolean.FALSE;
+    }
+    return value;
+  }
+
+  public Object convertToJAXB(Object value) throws Exception
+  {
+    if (value instanceof Dict)
+    {
+      value = dictAdapter.marshal((Dict) value);
+    }
+    else if (value instanceof Array)
+    {
+      value = arrayAdapter.marshal((Array) value);
+    }
+    else if (value instanceof Boolean)
+    {
+      value = ((Boolean) value) ? new JAXBTrue() : new JAXBFalse();
+    }
+    return value;
+  }
+}
