From 9f23ca4a3f95422dbdc01fc1c4eb2ca21fc19cc2 Mon Sep 17 00:00:00 2001
From: zpc <zpc@finereport.com>
Date: Mon, 8 Aug 2016 13:57:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8bug,=20=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=82=A3=E8=BE=B9=E9=80=89=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=BD=A2=E6=80=81,=20=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=85=AC=E5=BC=8F,=20=E6=97=A5=E6=9C=9F=E7=AD=89?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原先保存的时候入参根本没赋值(字符串的时候赋值了)，其他情况传入的是null，保存后xml也没有内容。
---
 .../fr/design/condition/PresentHighlightPane.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java
index d00515501..3e154320a 100644
--- a/designer/src/com/fr/design/condition/PresentHighlightPane.java
+++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java
@@ -98,20 +98,22 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
 
     public  void populate(HighlightAction ha) {
         present = ((PresentHighlightAction)ha).getPresent();
-        if (!(present instanceof NormalPresent)) {
+        Object obj = ((PresentHighlightAction)ha).getValue();
+        if (!(present instanceof NormalPresent) && null == obj) {
             presentComboBox.setSelectedIndex(1);
         } else {
             presentComboBox.setSelectedIndex(0);
-            valueEditor.populate(((NormalPresent)present).getNormalPresent());
+            this.valueEditor.populate(obj);
         }
     }
 
     public HighlightAction update() {
-        if (presentComboBox.getSelectedIndex() == 0) {
-            if (this.valueEditor.update() instanceof String) {
+        Object value = this.valueEditor.update();
+        if (presentComboBox.getSelectedIndex() == 1) {
+            if (value instanceof String) {
                 present = new NormalPresent(this.valueEditor.update());
             }
         }
-        return new PresentHighlightAction(present);
+        return new PresentHighlightAction(this.valueEditor.update());
     }
 }
\ No newline at end of file

From 419bb2347b66158cd8b99fccd9d553c47e56a09c Mon Sep 17 00:00:00 2001
From: zpc <zpc@finereport.com>
Date: Mon, 8 Aug 2016 16:21:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8bug,=20=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=B1=9E=E6=80=A7=E9=82=A3=E8=BE=B9=E9=80=89=E6=99=AE?=
 =?UTF-8?q?=E9=80=9A=E5=BD=A2=E6=80=81,=20=E6=97=A0=E6=B3=95=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=85=AC=E5=BC=8F,=20=E6=97=A5=E6=9C=9F=E7=AD=89?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

代码规范
---
 .../fr/design/condition/PresentHighlightPane.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java
index 3e154320a..15a8b5e08 100644
--- a/designer/src/com/fr/design/condition/PresentHighlightPane.java
+++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java
@@ -97,14 +97,16 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
     }
 
     public  void populate(HighlightAction ha) {
-        present = ((PresentHighlightAction)ha).getPresent();
-        Object obj = ((PresentHighlightAction)ha).getValue();
-        if (!(present instanceof NormalPresent) && null == obj) {
+        int valueIndex = ((PresentHighlightAction)ha).getValueIndex();
+        if(0 == valueIndex)
+        {
             presentComboBox.setSelectedIndex(1);
-        } else {
+        }
+        else {
             presentComboBox.setSelectedIndex(0);
-            this.valueEditor.populate(obj);
+            this.valueEditor.populate(((PresentHighlightAction)ha).getValue());
         }
+
     }
 
     public HighlightAction update() {

From baa85099e643daaff8695c1fa058f208887fff6c Mon Sep 17 00:00:00 2001
From: zpc <zpc@finereport.com>
Date: Mon, 8 Aug 2016 16:48:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

代码质量
---
 .../fr/design/condition/PresentHighlightPane.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/designer/src/com/fr/design/condition/PresentHighlightPane.java b/designer/src/com/fr/design/condition/PresentHighlightPane.java
index 15a8b5e08..f306ec0f7 100644
--- a/designer/src/com/fr/design/condition/PresentHighlightPane.java
+++ b/designer/src/com/fr/design/condition/PresentHighlightPane.java
@@ -98,15 +98,11 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
 
     public  void populate(HighlightAction ha) {
         int valueIndex = ((PresentHighlightAction)ha).getValueIndex();
-        if(0 == valueIndex)
-        {
-            presentComboBox.setSelectedIndex(1);
+        Object obj = ((PresentHighlightAction)ha).getValue();
+        presentComboBox.setSelectedIndex(valueIndex);
+        if(null != obj) {
+            this.valueEditor.populate(obj);
         }
-        else {
-            presentComboBox.setSelectedIndex(0);
-            this.valueEditor.populate(((PresentHighlightAction)ha).getValue());
-        }
-
     }
 
     public HighlightAction update() {