From b50ce9f52b7996a2cf7abc9794f26082044c540f Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 15:59:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?alphafine=20=E7=8C=9C=E6=82=A8=E5=96=9C?= =?UTF-8?q?=E6=AC=A2=E5=92=8C=E6=9C=AC=E5=9C=B0=E5=B8=B8=E7=94=A8=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/search/manager/RecentSearchManager.java | 7 +++++++ .../alphafine/search/manager/RecommendSearchManager.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index 7e97c6ecd..ef9a8bcd9 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -4,7 +4,9 @@ import com.fr.base.FRContext; import com.fr.base.Utils; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.AlphaFineHelper; +import com.fr.design.mainframe.alphafine.CellType; import com.fr.design.mainframe.alphafine.cell.CellModelHelper; +import com.fr.design.mainframe.alphafine.cell.model.ActionModel; import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; @@ -224,6 +226,11 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear if (ComparatorUtils.equals(key, searchText)) { recentModelList = recentKVModelMap.get(searchText); int size = recentModelList.size(); + for (AlphaCellModel model : recentModelList) { + if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) { + recentModelList.remove(model); + } + } if (size > MAX_SIZE) { return recentModelList.subList(size - MAX_SIZE, size); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java index 053eac54e..17287b59b 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java @@ -2,7 +2,9 @@ package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.alphafine.AlphaFineHelper; +import com.fr.design.mainframe.alphafine.CellType; import com.fr.design.mainframe.alphafine.cell.CellModelHelper; +import com.fr.design.mainframe.alphafine.cell.model.ActionModel; import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; @@ -66,6 +68,11 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } catch (JSONException e) { FRLogger.getLogger().error("recommend search error! :" + e.getMessage()); } + for (AlphaCellModel model : recommendModelList) { + if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) { + recommendModelList.remove(model); + } + } if (recommendModelList.size() > 0) { modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Recommend"), false)); modelList.addAll(recommendModelList); From ddbc91055df42ebe61b4138c186ce71bf7b73794 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 16:25:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?bug=20fix=20=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/search/manager/RecentSearchManager.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index ef9a8bcd9..40502274c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -225,16 +225,17 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear AlphaFineHelper.checkCancel(); if (ComparatorUtils.equals(key, searchText)) { recentModelList = recentKVModelMap.get(searchText); - int size = recentModelList.size(); - for (AlphaCellModel model : recentModelList) { + List resultModelList = new ArrayList<>(recentModelList); + int size = resultModelList.size(); + for (AlphaCellModel model : resultModelList) { if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) { - recentModelList.remove(model); + resultModelList.remove(model); } } if (size > MAX_SIZE) { - return recentModelList.subList(size - MAX_SIZE, size); + return resultModelList.subList(size - MAX_SIZE, size); } - return recentModelList; + return resultModelList; } } return recentModelList; From 89da3df2641d4ff526306062fa6300463e0381c7 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 16:28:47 +0800 Subject: [PATCH 3/6] reformat --- .../mainframe/alphafine/search/manager/RecentSearchManager.java | 2 +- .../alphafine/search/manager/RecommendSearchManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index 40502274c..7716de32e 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -228,7 +228,7 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear List resultModelList = new ArrayList<>(recentModelList); int size = resultModelList.size(); for (AlphaCellModel model : resultModelList) { - if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) { + if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { resultModelList.remove(model); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java index 17287b59b..c3030ede5 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java @@ -69,7 +69,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { FRLogger.getLogger().error("recommend search error! :" + e.getMessage()); } for (AlphaCellModel model : recommendModelList) { - if (model.getType() == CellType.ACTION && !((ActionModel)model).getAction().isEnabled()) { + if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { recommendModelList.remove(model); } } From 9c6f0e254b339143cb937d8cc57b3a968075b3f7 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 16:55:25 +0800 Subject: [PATCH 4/6] bug fix --- .../search/manager/RecentSearchManager.java | 12 ++++++------ .../search/manager/RecommendSearchManager.java | 6 +++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index 7716de32e..cc5ef1f48 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -27,10 +27,7 @@ import com.fr.stable.xml.XMLTools; import com.fr.stable.xml.XMLableReader; import java.io.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by XiaXiang on 2017/5/15. @@ -226,12 +223,15 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear if (ComparatorUtils.equals(key, searchText)) { recentModelList = recentKVModelMap.get(searchText); List resultModelList = new ArrayList<>(recentModelList); - int size = resultModelList.size(); - for (AlphaCellModel model : resultModelList) { + Iterator modelIterator = resultModelList.iterator(); + while (modelIterator.hasNext()) { + AlphaCellModel model = modelIterator.next(); if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { resultModelList.remove(model); } + } + int size = resultModelList.size(); if (size > MAX_SIZE) { return resultModelList.subList(size - MAX_SIZE, size); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java index c3030ede5..e1f4fee71 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java @@ -17,6 +17,7 @@ import com.fr.json.JSONObject; import com.fr.stable.CodeUtils; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; /** @@ -68,10 +69,13 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } catch (JSONException e) { FRLogger.getLogger().error("recommend search error! :" + e.getMessage()); } - for (AlphaCellModel model : recommendModelList) { + Iterator modelIterator = recommendModelList.iterator(); + while (modelIterator.hasNext()) { + AlphaCellModel model = modelIterator.next(); if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { recommendModelList.remove(model); } + } if (recommendModelList.size() > 0) { modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Recommend"), false)); From 08fbc8ec6773e2d5f194ba92e3b068203b5b727e Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 17:00:04 +0800 Subject: [PATCH 5/6] bug fix --- .../mainframe/alphafine/search/manager/ActionSearchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java index c52c8b938..03a63e063 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java @@ -41,7 +41,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { public static ActionModel getModelFromCloud(String actionName) { List updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); for (UpdateActionModel updateActionModel : updateActions) { - if (ComparatorUtils.equals(actionName, updateActionModel.getClassName()) && updateActionModel.getAction().isEnabled()) { + if (ComparatorUtils.equals(actionName, updateActionModel.getClassName())) { return new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()); } } From 842f691442c61e472ad7e5327ab35031a8e3cd39 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 13 Jun 2017 17:27:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=20fix=E9=81=8D=E5=8E=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/search/manager/RecentSearchManager.java | 2 +- .../alphafine/search/manager/RecommendSearchManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index cc5ef1f48..6dcebbf63 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -227,7 +227,7 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear while (modelIterator.hasNext()) { AlphaCellModel model = modelIterator.next(); if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { - resultModelList.remove(model); + modelIterator.remove(); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java index e1f4fee71..217eccb83 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java @@ -73,7 +73,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { while (modelIterator.hasNext()) { AlphaCellModel model = modelIterator.next(); if (model.getType() == CellType.ACTION && !((ActionModel) model).getAction().isEnabled()) { - recommendModelList.remove(model); + modelIterator.remove(); } }