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] =?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 15a8b5e08d..f306ec0f7c 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() {