# HG changeset patch
# User dirk
# Date 1316338075 -7200
# Node ID d7f357434800ce586c7a7d41b689fd53fc1288c6
# Parent  ca9c62a68e878ac2b5f5e6aab8ff0d3cbb8dfb1a
the current conflict is an ObjectNode now so there's less need for casts

diff -r ca9c62a68e87 -r d7f357434800 conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorController.java
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorController.java	Sun Sep 18 11:00:16 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorController.java	Sun Sep 18 11:27:55 2011 +0200
@@ -20,7 +20,7 @@
 public class ConflictEditorController extends Object
 {
     private CouchDb _database;
-    private JsonNode _currentConflict;
+    private ObjectNode _currentConflict;
     private Difference _currentDifference;
 
     public JsonNode findConflicts(String dbUrl) throws IOException
@@ -60,14 +60,14 @@
 
     public void useCurrentValue()
     {
-        JsonNode currentValue = (JsonNode)_currentDifference.currentValue;
-        ((ObjectNode)_currentConflict).put(_currentDifference.key, currentValue);
+        JsonNode value = (JsonNode)_currentDifference.currentValue;
+        _currentConflict.put(_currentDifference.key, value);
     }
 
     public void useConflictValue()
     {
         JsonNode value = (JsonNode)_currentDifference.otherValue;
-        ((ObjectNode)_currentConflict).put(_currentDifference.key, value);
+        _currentConflict.put(_currentDifference.key, value);
     }
 
     public JsonNode getCurrentConflict()