Update re ObservableMap API

Author: safris

binding/src/main/java/org/jsonx/IdToElement.java

@@ -46,11 +46,11 @@ void setMaxIterate(final int maxIterate) {
   }
 
   @Override
-  protected boolean beforePut(final Integer key, final Annotation oldValue, final Annotation newValue) {
+  protected Object beforePut(final Integer key, final Annotation oldValue, final Annotation newValue, final Object preventDefault) {
     if (oldValue != null)
       throw new ValidationException("Duplicate id=" + key + " found in {" + oldValue + ", " + newValue + "}");
 
-    return true;
+    return newValue;
   }
 
   Annotation[] get(final int[] ids) {

generator/src/main/java/org/jsonx/AttributeMap.java

@@ -54,12 +54,12 @@ protected boolean beforeRemove(final Object key, final Object value) {
   }
 
   @Override
-  protected boolean beforePut(final String key, final Object oldValue, final Object newValue) {
+  protected Object beforePut(final String key, final Object oldValue, final Object newValue, final Object preventDefault) {
     // Commented out, because <binding field="..."> may end up being overwritten for non-root-based reference/model pairs
     // if (oldValue != null && !oldValue.equals(newValue) && !"xsi:schemaLocation".equals(key))
     //   throw new IllegalArgumentException("Attribute overwrite: [" + key + "] from [" + oldValue + "] to [" + newValue + "]");
 
     target.put(prefix != null ? prefix + key : key, newValue);
-    return false;
+    return preventDefault;
   }
 }