From 213acb8172c37c88dc358b67b49fc7bba6ae7e3a Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 23 May 2017 13:13:45 +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

---
 .../alphafine/component/AlphaFineDialog.java      | 15 ++-------------
 .../searchManager/RecentSearchManager.java        | 14 +++++++++-----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
index e17156260..ba86aa027 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
@@ -595,7 +595,7 @@ public class AlphaFineDialog extends UIDialog {
         httpClient.setTimeout(5000);
         httpClient.asGet();
         if (!httpClient.isServerAlive()) {
-            FRLogger.getLogger().error("404");
+            FRLogger.getLogger().error("Failed to sent data to server!");
         }
 
     }
@@ -626,10 +626,6 @@ public class AlphaFineDialog extends UIDialog {
         repaint();
     }
 
-    private void updatePopup() {
-
-    }
-
     private SearchResult getMoreResult(MoreModel selectedValue) {
         SearchResult moreResult;
         switch (selectedValue.getType()) {
@@ -655,14 +651,6 @@ public class AlphaFineDialog extends UIDialog {
         return (SearchListModel) searchResultList.getModel();
     }
 
-//    //测试
-//    public static void main(String[] args) {
-//        AlphaFineDialog alphaFineDialog = new AlphaFineDialog(DesignerContext.getDesignerFrame());
-//        alphaFineDialog.setSize(new Dimension(680,55));
-//        alphaFineDialog.setVisible(true);
-//    }
-
-
     public SearchListModel setListModel(SearchListModel jListModel) {
         this.searchListModel = jListModel;
         return this.searchListModel;
@@ -676,4 +664,5 @@ public class AlphaFineDialog extends UIDialog {
         this.searchWorker = searchWorker;
     }
 
+
 }
\ No newline at end of file
diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java
index 8afe87441..6f87232ab 100644
--- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java
+++ b/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java
@@ -89,15 +89,19 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear
             String nodeName = reader.getTagName();
             if (nodeName.equals("model")) {
                 String name = reader.getAttrAsString("cellModel", StringUtils.EMPTY);
-                try {
-                    list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
-                } catch (JSONException e) {
-                    FRLogger.getLogger().error(e.getMessage());
-                }
+                addModelToList(list, name);
             }
         }
     }
 
+    private void addModelToList(List<AlphaCellModel> list, String name) {
+        try {
+            list.add(CellModelHelper.getModelFromJson(new JSONObject(name)));
+        } catch (JSONException e) {
+            FRLogger.getLogger().error(e.getMessage());
+        }
+    }
+
     @Override
     public void writeXML(XMLPrintWriter writer) {
         writer.startTAG(XML_TAG);