BZ-996942 & BZ-996932: Fixing audit log for GDT widget.

apache · Dec 13, 2013 · 7c62843 · 7c62843
1 parent ef88f7e
commit 7c62843
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/...org/drools/workbench/models/guided/dtable/shared/model/ActionInsertFactFieldsPattern.java b/...org/drools/workbench/models/guided/dtable/shared/model/ActionInsertFactFieldsPattern.java
@@ -54,4 +54,16 @@ public void setInsertedLogically( boolean isInsertedLogically ) {
         this.isInsertedLogically = isInsertedLogically;
     }
 
+    @Override
+    public ActionInsertFactFieldsPattern clonePattern() {
+        ActionInsertFactFieldsPattern cloned = (ActionInsertFactFieldsPattern) super.clonePattern();
+        cloned.setInsertedLogically(isInsertedLogically);
+        return cloned;
+    }
+
+    @Override
+    public void update(Pattern52 other) {
+        super.update(other);
+        setInsertedLogically(((ActionInsertFactFieldsPattern)other).isInsertedLogically);
+    }
 }
diff --git a/...rc/main/java/org/drools/workbench/models/guided/dtable/shared/model/DTColumnConfig52.java b/...rc/main/java/org/drools/workbench/models/guided/dtable/shared/model/DTColumnConfig52.java
@@ -85,8 +85,10 @@ public List<BaseColumnFieldDiff> diff(BaseColumn otherColumn) {
         }
 
         // Field: default value.
-        if ( !isEqualOrNull( this.getDefaultValue(),
-                other.getDefaultValue() ) ) {
+        // NOTE: Compare using getDefaultValueAsString because then if data types differs it will appear as changed field.
+        // And data type can be changed due to legacy implementations (see ConditionPopup#makeDefaultValueWidget)
+        if ( !isEqualOrNull( this.getDefaultValueAsString(),
+                other.getDefaultValueAsString() ) ) {
             result.add(new BaseColumnFieldDiffImpl(FIELD_DEFAULT_VALUE, this.getDefaultValueAsString(), other.getDefaultValueAsString()));
         }
 

diff --git a/...table/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/Pattern52.java b/...table/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/Pattern52.java
@@ -106,6 +106,36 @@ public List<BaseColumnFieldDiff> diff(BaseColumn otherColumn) {
         return result;
     }
 
+    /**
+     * Clones this pattern instance.
+     *
+     * @return The cloned instance.
+     */
+    public Pattern52 clonePattern() {
+        Pattern52 cloned = new Pattern52();
+        cloned.setBoundName(getBoundName());
+        cloned.setChildColumns(new ArrayList<ConditionCol52>(getChildColumns()));
+        cloned.setEntryPointName(getEntryPointName());
+        cloned.setFactType(getFactType());
+        cloned.setNegated(isNegated());
+        cloned.setWindow(getWindow());
+        return cloned;
+    }
+
+    /**
+     * Update this pattern instance properties with the given ones from other pattern instance.
+     *
+     * @param other The pattern to obtain the properties to set.
+     */
+    public void update(Pattern52 other) {
+        setBoundName(other.getBoundName());
+        setChildColumns(other.getChildColumns());
+        setEntryPointName(other.getEntryPointName());
+        setFactType(other.getFactType());
+        setNegated(other.isNegated());
+        setWindow(other.getWindow());
+    }
+
     public String getFactType() {
         return factType;
     }