extract DMR utils

rareddy · Aug 7, 2012 · 0c91b11 · 0c91b11
1 parent f8da5c7
commit 0c91b11
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 26 deletions.
diff --git a/gui/src/main/java/org/jboss/as/console/client/tools/DMR.java b/gui/src/main/java/org/jboss/as/console/client/tools/DMR.java
@@ -0,0 +1,40 @@
+package org.jboss.as.console.client.tools;
+
+import org.jboss.dmr.client.ModelNode;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author Heiko Braun
+ * @date 7/24/12
+ */
+public class DMR {
+
+    public static void mergeChanges(ModelNode target, Map<String,Object> changeset)
+    {
+        final Set<String> changesetKeys = changeset.keySet();
+        final Set<String> attributeNames = target.keys();
+
+        for(String key : changesetKeys)
+        {
+            boolean matched = false;
+            for(String attribute : attributeNames)
+            {
+                if(key.equals(attribute))
+                {
+                    final Object o = changeset.get(key);
+                    final ModelNode node = Types.toDMR(o);
+                    target.get(attribute).set(node);
+                    matched = true;
+                    break;
+                }
+            }
+
+            if(!matched)
+                throw new RuntimeException("Unmatched attribute name in changeset: "+key);
+        }
+
+    }
+
+}
diff --git a/gui/src/main/java/org/jboss/as/console/client/tools/FXModelsView.java b/gui/src/main/java/org/jboss/as/console/client/tools/FXModelsView.java
@@ -145,19 +145,7 @@ public void onSave(Map<String, Object> changeset) {
 
                 final FXModel modelStep = selectionModel.getSelectedObject();
                 final ModelNode modelNode = modelStep.asModelNode();
-                for(String key : changeset.keySet())
-                {
-                    for(String attribute : modelNode.keys())
-                    {
-                        if(key.equals(attribute))
-                        {
-                            final Object o = changeset.get(key);
-                            final ModelNode node = Types.toDMR(o);
-                            modelNode.get(attribute).set(node);
-                            break;
-                        }
-                    }
-                }
+                DMR.mergeChanges(modelNode, changeset);
 
                 getCurrentTemplate().removeModel(modelStep.getId());
                 getCurrentTemplate().getModels().add(FXModel.fromModelNode(modelNode));

diff --git a/gui/src/main/java/org/jboss/as/console/client/tools/FXTemplatesView.java b/gui/src/main/java/org/jboss/as/console/client/tools/FXTemplatesView.java
@@ -142,19 +142,7 @@ public void onSave(Map<String, Object> changeset) {
 
                 final FXTemplate template = selectionModel.getSelectedObject();
                 final ModelNode modelNode = template.asModelNode();
-                for(String key : changeset.keySet())
-                {
-                    for(String attribute : modelNode.keys())
-                    {
-                        if(key.equals(attribute))
-                        {
-                            final Object o = changeset.get(key);
-                            final ModelNode node = Types.toDMR(o);
-                            modelNode.get(attribute).set(node);
-                            break;
-                        }
-                    }
-                }
+                DMR.mergeChanges(modelNode, changeset);
 
                 presenter.onUpdateTemplate(FXTemplate.fromModelNode(modelNode));
             }