From f0b782d7555204e17b98bdd49eebe343522c41a4 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Fri, 9 Jun 2017 21:19:25 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/search/manager/PluginSearchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index 53fc0bb17..a24368ba6 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -105,7 +105,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { int pluginId = object.optInt("id"); String imageUrl = null; try { - imageUrl = AlphaFineConstants.PLUGIN_IMAGE_URL + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineConstants.PLUGIN_IMAGE_URL.length()), "utf8"); + imageUrl = isFromCloud? AlphaFineConstants.PLUGIN_IMAGE_URL + URLEncoder.encode(object.optString("pic").toString().substring(AlphaFineConstants.PLUGIN_IMAGE_URL.length()), "utf8") : object.optString("pic"); } catch (UnsupportedEncodingException e) { FRLogger.getLogger().error(e.getMessage()); } From eb5a7a7cb3a6b2e1a77ff455a6da3c8ec9150e95 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 10 Jun 2017 11:20:50 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9A=84=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 35 ++++++++++++--- .../search/manager/FileSearchManager.java | 44 +++++++++++++++++-- 2 files changed, 69 insertions(+), 10 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 1b975f948..b1a3c1858 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -246,7 +246,7 @@ public class AlphaFineDialog extends UIDialog { this.searchWorker = new SwingWorker() { @Override protected Object doInBackground() throws Exception { - rebuildList(searchTextField.getText()); + rebuildList(searchTextField.getText().toLowerCase()); return null; } @@ -262,10 +262,38 @@ public class AlphaFineDialog extends UIDialog { /** * 重新构建搜索结果列表 + * 先根据输入判断是不是隐藏的搜索功能 * @param searchText */ private void rebuildList(String searchText) { searchListModel.removeAllElements(); + if (searchText.startsWith("k:1 ") || searchText.startsWith("k:setting ")) { + getActionList(searchText.substring(4, searchText.length())); + return; + } else if (searchText.startsWith("k:2 ") || searchText.startsWith("k:help ")) { + getDocumentList(searchText.substring(4, searchText.length())); + return; + + } else if (searchText.startsWith("k:3 ") || searchText.startsWith("k:reportlets ")) { + getFileList(searchText.substring(4, searchText.length())); + return; + + } else if (searchText.startsWith("k:cpt ") || searchText.startsWith("k:frm ")) { + getFileList(searchText); + return; + } else if (searchText.startsWith("k:4 ") || searchText.startsWith("k:shop ")) { + getPluginList(searchText.substring(4, searchText.length())); + return; + + } + doNormalSearch(searchText.trim()); + } + + /** + * 普通搜索 + * @param searchText + */ + private void doNormalSearch(String searchText) { getRecentList(searchText); getRecommendList(searchText); getActionList(searchText); @@ -275,18 +303,13 @@ public class AlphaFineDialog extends UIDialog { } - private synchronized void getDocumentList(final String searchText) { - SearchResult documentModelList = DocumentSearchManager.getDocumentSearchManager().getLessSearchResult(searchText); for (Object object : documentModelList) { AlphaFineHelper.checkCancel(); searchListModel.addElement(object); } - - - } private synchronized void getFileList(final String searchText) { diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 6fe9f5d23..68adf0c44 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -27,7 +27,11 @@ public class FileSearchManager implements AlphaFineSearchProcessor { private SearchResult lessModelList; private SearchResult moreModelList; private List fileNodes = null; + //隐藏的搜索功能，可根据特殊的字符标记判断搜索分类 + private boolean isContainCpt = true; + private boolean isContainFrm = true; private static FileSearchManager fileSearchManager = null; + private static final int MARK_LENGTH = 6; private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE); private static final MoreModel MORE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.FILE); @@ -47,6 +51,13 @@ public class FileSearchManager implements AlphaFineSearchProcessor { this.filterModelList = new SearchResult(); this.lessModelList = new SearchResult(); this.moreModelList = new SearchResult(); + if (searchText.startsWith("k:frm ")) { + isContainCpt = false; + searchText = searchText.substring(MARK_LENGTH, searchText.length()); + } else if (searchText.startsWith("k:cpt ")) { + isContainFrm = false; + searchText = searchText.substring(MARK_LENGTH, searchText.length()); + } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainTemplate()) { Env env = FRContext.getCurrentEnv(); fileNodes = new ArrayList<>(); @@ -151,7 +162,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { try { listAll(env, rootFilePath, fileNodeList, recurse); } catch (Exception e) { - FRContext.getLogger().error(e.getMessage(), e); + FRContext.getLogger().error("file search error: " + e.getMessage(), e); } return fileNodeList; } @@ -168,14 +179,16 @@ public class FileSearchManager implements AlphaFineSearchProcessor { FileNode[] fns = env.listFile(rootFilePath); for (int i = 0; i < fns.length; i++) { FileNode fileNode = fns[i]; - if (fileNode.isDirectory()) { + if (isContainCpt && fileNode.isFileType("cpt")) { + nodeList.add(fileNode); + } else if (isContainFrm && fileNode.isFileType("frm")) { + nodeList.add(fileNode); + } else if (fileNode.isDirectory()) { if (recurse) { listAll(env, rootFilePath + File.separator + fns[i].getName(), nodeList, true); } else { nodeList.add(fns[i]); } - } else if (fileNode.isFileType("cpt") || fileNode.isFileType("frm")) { - nodeList.add(fileNode); } } } @@ -190,4 +203,27 @@ public class FileSearchManager implements AlphaFineSearchProcessor { return new FileModel(name, filePath); } + /** + * 是否包含cpt + * @return + */ + public boolean isContainCpt() { + return isContainCpt; + } + + public void setContainCpt(boolean containCpt) { + isContainCpt = containCpt; + } + + /** + * 是否包含frm + * @return + */ + public boolean isContainFrm() { + return isContainFrm; + } + + public void setContainFrm(boolean containFrm) { + isContainFrm = containFrm; + } } From 230832651de10ee641e0de2859e41bc7ea0b519d Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 10 Jun 2017 11:58:43 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 12 ++++++++---- .../search/manager/ActionSearchManager.java | 5 +++++ .../search/manager/DocumentSearchManager.java | 8 ++++++++ .../alphafine/search/manager/FileSearchManager.java | 8 ++++++++ .../search/manager/PluginSearchManager.java | 6 ++++++ 5 files changed, 35 insertions(+), 4 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 b1a3c1858..324f0c75c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -268,21 +268,25 @@ public class AlphaFineDialog extends UIDialog { private void rebuildList(String searchText) { searchListModel.removeAllElements(); if (searchText.startsWith("k:1 ") || searchText.startsWith("k:setting ")) { - getActionList(searchText.substring(4, searchText.length())); + int index = searchText.indexOf(" "); + getActionList(searchText.substring(index + 1, searchText.length())); return; } else if (searchText.startsWith("k:2 ") || searchText.startsWith("k:help ")) { - getDocumentList(searchText.substring(4, searchText.length())); + int index = searchText.indexOf(" "); + getDocumentList(searchText.substring(index + 1, searchText.length())); return; } else if (searchText.startsWith("k:3 ") || searchText.startsWith("k:reportlets ")) { - getFileList(searchText.substring(4, searchText.length())); + int index = searchText.indexOf(" "); + getFileList(searchText.substring(index + 1, searchText.length())); return; } else if (searchText.startsWith("k:cpt ") || searchText.startsWith("k:frm ")) { getFileList(searchText); return; } else if (searchText.startsWith("k:4 ") || searchText.startsWith("k:shop ")) { - getPluginList(searchText.substring(4, searchText.length())); + int index = searchText.indexOf(" "); + getPluginList(searchText.substring(index + 1, searchText.length())); return; } 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 85c43b794..a8f9434de 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 @@ -39,6 +39,11 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { filterModelList = new SearchResult(); lessModelList = new SearchResult(); moreModelList = new SearchResult(); + if (StringUtils.isBlank(searchText)) { + lessModelList.add(TITLE_MODEL); + lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); + return lessModelList; + } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainAction()) { List updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); for (UpdateActionModel updateActionModel : updateActions) { diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index 4fb8a060d..466ff8a06 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -6,6 +6,7 @@ import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.CellType; import com.fr.design.mainframe.alphafine.cell.model.DocumentModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.NoResultModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.FRLogger; import com.fr.general.Inter; @@ -13,6 +14,7 @@ import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; +import com.fr.stable.StringUtils; /** * Created by XiaXiang on 2017/3/27. @@ -36,6 +38,11 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { public synchronized SearchResult getLessSearchResult(String searchText) { lessModelList = new SearchResult(); moreModelList = new SearchResult(); + if (StringUtils.isBlank(searchText)) { + lessModelList.add(TITLE_MODEL); + lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); + return lessModelList; + } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainDocument()) { String result; String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText + "-1"; @@ -75,6 +82,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { } catch (JSONException e) { FRLogger.getLogger().error("document search error: " + e.getMessage()); + return lessModelList; } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 68adf0c44..c27e180df 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -13,6 +13,7 @@ import com.fr.file.filetree.FileNode; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.stable.StableUtils; +import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; import java.io.*; @@ -58,10 +59,17 @@ public class FileSearchManager implements AlphaFineSearchProcessor { isContainFrm = false; searchText = searchText.substring(MARK_LENGTH, searchText.length()); } + if (StringUtils.isBlank(searchText)) { + lessModelList.add(TITLE_MODEL); + lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); + return lessModelList; + } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainTemplate()) { Env env = FRContext.getCurrentEnv(); fileNodes = new ArrayList<>(); fileNodes = listTpl(env, ProjectConstants.REPORTLETS_NAME, true); + isContainCpt = true; + isContainFrm = true; for (FileNode node : fileNodes) { boolean isAlreadyContain = false; String fileEnvPath = node.getEnvPath(); diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index a24368ba6..f3f8d0b20 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -14,6 +14,7 @@ import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; +import com.fr.stable.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -43,6 +44,11 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { public synchronized SearchResult getLessSearchResult(String searchText) { this.lessModelList = new SearchResult(); this.moreModelList = new SearchResult(); + if (StringUtils.isBlank(searchText)) { + lessModelList.add(TITLE_MODEL); + lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); + return lessModelList; + } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainPlugin()) { String result; try { From eb0e66a99a61398c0af70442754d107166f429eb Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 10 Jun 2017 12:00:28 +0800 Subject: [PATCH 04/17] bug fix --- .../alphafine/search/manager/DocumentSearchManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index 466ff8a06..e6f8df0fa 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -6,7 +6,6 @@ import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.CellType; import com.fr.design.mainframe.alphafine.cell.model.DocumentModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; -import com.fr.design.mainframe.alphafine.cell.model.NoResultModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.FRLogger; import com.fr.general.Inter; From 46232eb4e1110a11f46e3dcd0079d6fb1accc4aa Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 10 Jun 2017 12:06:42 +0800 Subject: [PATCH 05/17] bug fix --- .../mainframe/alphafine/search/manager/ActionSearchManager.java | 2 +- .../src/com/fr/design/mainframe/toolbar/UpdateActionModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a8f9434de..6b208c490 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 @@ -48,7 +48,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { List updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); for (UpdateActionModel updateActionModel : updateActions) { if (StringUtils.isNotBlank(updateActionModel.getSearchKey())) { - if (updateActionModel.getSearchKey().toLowerCase().contains(searchText.toLowerCase()) && updateActionModel.getAction().isEnabled()) { + if (updateActionModel.getSearchKey().contains(searchText) && updateActionModel.getAction().isEnabled()) { filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction())); } } diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java b/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java index 4ded05f71..cb16c62ee 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java @@ -40,7 +40,7 @@ public class UpdateActionModel { .append(SEPARATOR).append(PinyinHelper.getShortPinyin(parentName)).append(SEPARATOR) .append(actionName).append(SEPARATOR).append(PinyinHelper.convertToPinyinString(actionName, "", PinyinFormat.WITHOUT_TONE)) .append(SEPARATOR).append(PinyinHelper.getShortPinyin(actionName)).append(action.getSearchText()); - this.searchKey = buffer.toString(); + this.searchKey = buffer.toString().toLowerCase(); } /** From e0b6a138afa0e384efe2daa44f02bac7ac381f38 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sat, 10 Jun 2017 12:13:16 +0800 Subject: [PATCH 06/17] fix --- .../alphafine/component/AlphaFineDialog.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 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 324f0c75c..a2f3c9cc6 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -268,25 +268,21 @@ public class AlphaFineDialog extends UIDialog { private void rebuildList(String searchText) { searchListModel.removeAllElements(); if (searchText.startsWith("k:1 ") || searchText.startsWith("k:setting ")) { - int index = searchText.indexOf(" "); - getActionList(searchText.substring(index + 1, searchText.length())); + getActionList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; } else if (searchText.startsWith("k:2 ") || searchText.startsWith("k:help ")) { - int index = searchText.indexOf(" "); - getDocumentList(searchText.substring(index + 1, searchText.length())); + getDocumentList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; } else if (searchText.startsWith("k:3 ") || searchText.startsWith("k:reportlets ")) { - int index = searchText.indexOf(" "); - getFileList(searchText.substring(index + 1, searchText.length())); + getFileList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; } else if (searchText.startsWith("k:cpt ") || searchText.startsWith("k:frm ")) { getFileList(searchText); return; } else if (searchText.startsWith("k:4 ") || searchText.startsWith("k:shop ")) { - int index = searchText.indexOf(" "); - getPluginList(searchText.substring(index + 1, searchText.length())); + getPluginList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; } From af957ba00cd91956098a23ab4183fb7e4e09da2c Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sun, 11 Jun 2017 13:29:22 +0800 Subject: [PATCH 07/17] bug fix --- .../search/manager/ActionSearchManager.java | 7 +- .../search/manager/DocumentSearchManager.java | 4 +- .../search/manager/FileSearchManager.java | 104 +++++++++--------- .../search/manager/PluginSearchManager.java | 6 +- .../manager/RecommendSearchManager.java | 4 +- 5 files changed, 61 insertions(+), 64 deletions(-) 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 6b208c490..928f68a3d 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 @@ -23,9 +23,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { private SearchResult filterModelList; private SearchResult lessModelList; private SearchResult moreModelList; - private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Set"), CellType.ACTION); - private static final MoreModel MORE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Set"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.ACTION); public synchronized static ActionSearchManager getActionSearchManager() { if (actionSearchManager == null) { @@ -41,7 +39,6 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { moreModelList = new SearchResult(); if (StringUtils.isBlank(searchText)) { lessModelList.add(TITLE_MODEL); - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); return lessModelList; } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainAction()) { @@ -68,7 +65,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { lessModelList.addAll(result); } } else { - lessModelList.add(0, MORE_MODEL); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.ACTION)); lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size())); } @@ -90,7 +87,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())) { + if (ComparatorUtils.equals(actionName, updateActionModel.getClassName()) && updateActionModel.getAction().isEnabled()) { return new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index e6f8df0fa..695101986 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -23,7 +23,6 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { private SearchResult lessModelList; private SearchResult moreModelList; private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), CellType.DOCUMENT); - private static final MoreModel MORE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.DOCUMENT); public synchronized static DocumentSearchManager getDocumentSearchManager() { if (documentSearchManager == null) { @@ -39,7 +38,6 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { moreModelList = new SearchResult(); if (StringUtils.isBlank(searchText)) { lessModelList.add(TITLE_MODEL); - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); return lessModelList; } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainDocument()) { @@ -73,7 +71,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { lessModelList.addAll(searchResult); } } else { - lessModelList.add(0, MORE_MODEL); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.DOCUMENT)); lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size())); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index c27e180df..80c9d4b64 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -24,6 +24,9 @@ import java.util.List; * Created by XiaXiang on 2017/3/27. */ public class FileSearchManager implements AlphaFineSearchProcessor { + private static final int MARK_LENGTH = 6; + private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE); + private static FileSearchManager fileSearchManager = null; private SearchResult filterModelList; private SearchResult lessModelList; private SearchResult moreModelList; @@ -31,11 +34,6 @@ public class FileSearchManager implements AlphaFineSearchProcessor { //隐藏的搜索功能，可根据特殊的字符标记判断搜索分类 private boolean isContainCpt = true; private boolean isContainFrm = true; - private static FileSearchManager fileSearchManager = null; - private static final int MARK_LENGTH = 6; - - private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE); - private static final MoreModel MORE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.FILE); public synchronized static FileSearchManager getFileSearchManager() { init(); @@ -48,6 +46,17 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } } + /** + * 根据文件路径获取文件模型 + * + * @param filePath + * @return + */ + public static FileModel getModelFromCloud(String filePath) { + String name = AlphaFineHelper.findFileName(filePath); + return new FileModel(name, filePath); + } + public synchronized SearchResult getLessSearchResult(String searchText) { this.filterModelList = new SearchResult(); this.lessModelList = new SearchResult(); @@ -61,48 +70,48 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } if (StringUtils.isBlank(searchText)) { lessModelList.add(TITLE_MODEL); - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); return lessModelList; } - if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainTemplate()) { - Env env = FRContext.getCurrentEnv(); - fileNodes = new ArrayList<>(); - fileNodes = listTpl(env, ProjectConstants.REPORTLETS_NAME, true); - isContainCpt = true; - isContainFrm = true; - for (FileNode node : fileNodes) { - boolean isAlreadyContain = false; - String fileEnvPath = node.getEnvPath(); - String filePath = StableUtils.pathJoin(env.getPath(), fileEnvPath); - isAlreadyContain = searchFile(searchText, node, isAlreadyContain); - searchFileContent(searchText, node, isAlreadyContain, filePath); - } - SearchResult result = new SearchResult(); - for (Object object : filterModelList) { - if (!AlphaFineHelper.getFilterResult().contains(object)) { - result.add(object); - } + Env env = FRContext.getCurrentEnv(); + fileNodes = new ArrayList<>(); + fileNodes = listTpl(env, ProjectConstants.REPORTLETS_NAME, true); + isContainCpt = true; + isContainFrm = true; + for (FileNode node : fileNodes) { + boolean isAlreadyContain = false; + String fileEnvPath = node.getEnvPath(); + String filePath = StableUtils.pathJoin(env.getPath(), fileEnvPath); + isAlreadyContain = searchFile(searchText, node, isAlreadyContain); + searchFileContent(searchText, node, isAlreadyContain, filePath); + } + SearchResult result = new SearchResult(); + for (Object object : filterModelList) { + if (!AlphaFineHelper.getFilterResult().contains(object)) { + result.add(object); } - if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { - lessModelList.add(0, TITLE_MODEL); - if (result.size() == 0) { - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); - } else { - lessModelList.addAll(result); - } + + } + if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { + lessModelList.add(0, TITLE_MODEL); + if (result.size() == 0) { + lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); } else { - lessModelList.add(0, MORE_MODEL); - lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); - moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size())); + lessModelList.addAll(result); } + } else { + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.FILE)); + lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE)); + moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size())); } + return this.lessModelList; } /** * 搜索文件内容 + * * @param searchText * @param node * @param isAlreadyContain @@ -137,6 +146,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { /** * 搜索模板 + * * @param searchText * @param node * @param isAlreadyContain @@ -144,7 +154,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { */ private boolean searchFile(String searchText, FileNode node, boolean isAlreadyContain) { if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainTemplate()) { - if (node.getName().toLowerCase().contains(searchText.toLowerCase())) { + if (node.getName().toLowerCase().contains(searchText)) { FileModel model = new FileModel(node.getName(), node.getEnvPath()); this.filterModelList.add(model); isAlreadyContain = true; @@ -160,6 +170,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { /** * 获取工作目录下所有符合要求的模板 + * * @param env * @param rootFilePath * @param recurse @@ -177,6 +188,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { /** * 获取当前工作目录下所有模板 + * * @param env * @param rootFilePath * @param nodeList @@ -187,32 +199,23 @@ public class FileSearchManager implements AlphaFineSearchProcessor { FileNode[] fns = env.listFile(rootFilePath); for (int i = 0; i < fns.length; i++) { FileNode fileNode = fns[i]; - if (isContainCpt && fileNode.isFileType("cpt")) { - nodeList.add(fileNode); - } else if (isContainFrm && fileNode.isFileType("frm")) { - nodeList.add(fileNode); - } else if (fileNode.isDirectory()) { + if (fileNode.isDirectory()) { if (recurse) { listAll(env, rootFilePath + File.separator + fns[i].getName(), nodeList, true); } else { nodeList.add(fns[i]); } + } else if (isContainCpt && fileNode.isFileType("cpt")) { + nodeList.add(fileNode); + } else if (isContainFrm && fileNode.isFileType("frm")) { + nodeList.add(fileNode); } } } - /** - * 根据文件路径获取文件模型 - * @param filePath - * @return - */ - public static FileModel getModelFromCloud(String filePath) { - String name = AlphaFineHelper.findFileName(filePath); - return new FileModel(name, filePath); - } - /** * 是否包含cpt + * * @return */ public boolean isContainCpt() { @@ -225,6 +228,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { /** * 是否包含frm + * * @return */ public boolean isContainFrm() { diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index f3f8d0b20..dcdda514e 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -24,10 +24,7 @@ import java.net.URLEncoder; */ public class PluginSearchManager implements AlphaFineSearchProcessor { private static PluginSearchManager pluginSearchManager = null; - private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), CellType.PLUGIN); - private static final MoreModel MORE_MODEL = new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.PLUGIN); - private SearchResult lessModelList; private SearchResult moreModelList; @@ -46,7 +43,6 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { this.moreModelList = new SearchResult(); if (StringUtils.isBlank(searchText)) { lessModelList.add(TITLE_MODEL); - lessModelList.add(AlphaFineHelper.NO_RESULT_MODEL); return lessModelList; } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainPlugin()) { @@ -80,7 +76,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { lessModelList.addAll(searchResult); } } else { - lessModelList.add(0, MORE_MODEL); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"),true, CellType.PLUGIN)); lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.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 051c8e66e..9b38f7144 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 @@ -13,6 +13,7 @@ import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; import com.fr.stable.CodeUtils; +import com.fr.stable.StringUtils; import java.util.ArrayList; import java.util.List; @@ -36,6 +37,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { @Override public synchronized SearchResult getLessSearchResult(String searchText) { this.modelList = new SearchResult(); + this.recommendModelList = new ArrayList<>(); if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainRecommend()) { String result; HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText)); @@ -64,7 +66,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } catch (JSONException e) { FRLogger.getLogger().error("recommend search error! :" + e.getMessage()); } - if (modelList.size() > 0) { + if (recommendModelList.size() > 0) { modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Recommend"), false)); modelList.addAll(recommendModelList); } From aa2f1279688fdf34d033b177bfbfe091b7a69c74 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sun, 11 Jun 2017 22:11:22 +0800 Subject: [PATCH 08/17] bug fix --- .../actions/server/ConnectionListAction.java | 11 ++++++++++- .../data/datapane/connect/JDBCDefPane.java | 16 +++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java index a91ab6af1..b8c42c978 100644 --- a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -9,6 +9,7 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.data.datapane.connect.ConnectionManagerPane; import com.fr.design.data.datapane.connect.ConnectionShowPane; import com.fr.design.data.datapane.connect.DatabaseConnectionPane; +import com.fr.design.data.datapane.connect.JDBCDefPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; @@ -33,7 +34,15 @@ public class ConnectionListAction extends UpdateAction { this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/connection.png")); - this.setSearchText(new DatabaseConnectionPane.JDBC()); + this.setSearchText(getContainer()); + } + + private JPanel getContainer() { + JPanel panel = new JPanel(); + panel.add(new DatabaseConnectionPane.JDBC()); + panel.add(new DatabaseConnectionPane.JNDI()); + panel.add(new JDBCDefPane().getAllComponents()); + return panel; } public static final MenuKeySet DEFINE_DATA_CONNECTION = new MenuKeySet() { diff --git a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java index 07c5b9100..d836f849a 100644 --- a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -1,21 +1,21 @@ package com.fr.design.data.datapane.connect; -import com.fr.design.constants.UIConstants; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.pool.DBCPConnectionPoolAttr; import com.fr.design.border.UITitledBorder; +import com.fr.design.constants.UIConstants; +import com.fr.design.dialog.BasicPane; +import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.itextfield.UITextField; -import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.dialog.BasicPane; -import com.fr.design.editor.editor.IntegerEditor; import com.fr.file.filter.ChooseFileFilter; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; @@ -158,6 +158,11 @@ public class JDBCDefPane extends JPanel { }); } + public JPanel getAllComponents() { + this.add(new DBCPAttrPane()); + return this; + } + public void populate(JDBCDatabaseConnection jdbcDatabase) { if (jdbcDatabase == null) { jdbcDatabase = new JDBCDatabaseConnection(); @@ -315,7 +320,7 @@ public class JDBCDefPane extends JPanel { return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this)); } - class DBCPAttrPane extends BasicPane { + public class DBCPAttrPane extends BasicPane { public DBCPAttrPane() { JPanel defaultPane = this; @@ -374,4 +379,5 @@ public class JDBCDefPane extends JPanel { private String driver; private String url; } + } \ No newline at end of file From 3a4766d654283c66268538f507b42aab2af4a461 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Sun, 11 Jun 2017 22:14:19 +0800 Subject: [PATCH 09/17] bug fix --- .../src/com/fr/design/data/datapane/connect/JDBCDefPane.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java index d836f849a..f9edfbe6e 100644 --- a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -158,6 +158,10 @@ public class JDBCDefPane extends JPanel { }); } + /** + * 获取全部组件 + * @return + */ public JPanel getAllComponents() { this.add(new DBCPAttrPane()); return this; From 7c9fd9b5a4cb54949993773c086b9795c3a650a9 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 00:16:45 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 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 a2f3c9cc6..1ddf7958a 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -70,6 +70,19 @@ public class AlphaFineDialog extends UIDialog { //是否强制打开，因为面板是否关闭绑定了全局鼠标事件，这里需要处理一下 private boolean forceOpen; + private static final String ACTION_MARK_SHORT = "k:1 "; + private static final String ACTION_MARK = "k:setting "; + private static final String DOCUMENT_MARK_SHORT = "k:2 "; + private static final String DOCUMENT_MARK = "k:help "; + private static final String FILE_MARK_SHORT = "k:3 "; + private static final String FILE_MARK = "k:reportlets "; + private static final String CPT_MARK = "k:cpt "; + private static final String FRM_MARK = "k:frm "; + private static final String DS_MARK = "k:ds "; + private static final String PLUGIN_MARK_SHORT = "k:4 "; + private static final String PLUGIN_MARK = "k:shop "; + + public AlphaFineDialog(Frame parent, boolean forceOpen) { super(parent); this.forceOpen = forceOpen; @@ -254,6 +267,7 @@ public class AlphaFineDialog extends UIDialog { protected void done() { if (!isCancelled()) { searchResultList.setSelectedIndex(1); + showResult(searchResultList.getSelectedIndex(), searchResultList.getSelectedValue()); } } }; @@ -267,21 +281,21 @@ public class AlphaFineDialog extends UIDialog { */ private void rebuildList(String searchText) { searchListModel.removeAllElements(); - if (searchText.startsWith("k:1 ") || searchText.startsWith("k:setting ")) { + if (searchText.startsWith(ACTION_MARK_SHORT) || searchText.startsWith(ACTION_MARK)) { getActionList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; - } else if (searchText.startsWith("k:2 ") || searchText.startsWith("k:help ")) { + } else if (searchText.startsWith(DOCUMENT_MARK_SHORT) || searchText.startsWith(DOCUMENT_MARK)) { getDocumentList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; - } else if (searchText.startsWith("k:3 ") || searchText.startsWith("k:reportlets ")) { + } else if (searchText.startsWith(FILE_MARK_SHORT) || searchText.startsWith(FILE_MARK)) { getFileList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; - } else if (searchText.startsWith("k:cpt ") || searchText.startsWith("k:frm ")) { + } else if (searchText.startsWith(CPT_MARK) || searchText.startsWith(FRM_MARK)) { getFileList(searchText); return; - } else if (searchText.startsWith("k:4 ") || searchText.startsWith("k:shop ")) { + } else if (searchText.startsWith(PLUGIN_MARK_SHORT) || searchText.startsWith(PLUGIN_MARK)) { getPluginList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; From 4535d0cea2ee4e9e7e0e18d6b46653280aae3359 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 08:20:44 +0800 Subject: [PATCH 11/17] bug fix --- .../design/mainframe/alphafine/component/AlphaFineDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1ddf7958a..eac17200a 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -265,7 +265,7 @@ public class AlphaFineDialog extends UIDialog { @Override protected void done() { - if (!isCancelled()) { + if (!isCancelled() && searchListModel.getSize() > 0) { searchResultList.setSelectedIndex(1); showResult(searchResultList.getSelectedIndex(), searchResultList.getSelectedValue()); } From a876212e28bcf7e5dd317fa22e2edba1d2578e3c Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 08:29:35 +0800 Subject: [PATCH 12/17] bug fix --- .../actions/server/ConnectionListAction.java | 11 +-------- .../data/datapane/connect/JDBCDefPane.java | 24 ++++++------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java index b8c42c978..a91ab6af1 100644 --- a/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer_base/src/com/fr/design/actions/server/ConnectionListAction.java @@ -9,7 +9,6 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.data.datapane.connect.ConnectionManagerPane; import com.fr.design.data.datapane.connect.ConnectionShowPane; import com.fr.design.data.datapane.connect.DatabaseConnectionPane; -import com.fr.design.data.datapane.connect.JDBCDefPane; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; @@ -34,15 +33,7 @@ public class ConnectionListAction extends UpdateAction { this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/connection.png")); - this.setSearchText(getContainer()); - } - - private JPanel getContainer() { - JPanel panel = new JPanel(); - panel.add(new DatabaseConnectionPane.JDBC()); - panel.add(new DatabaseConnectionPane.JNDI()); - panel.add(new JDBCDefPane().getAllComponents()); - return panel; + this.setSearchText(new DatabaseConnectionPane.JDBC()); } public static final MenuKeySet DEFINE_DATA_CONNECTION = new MenuKeySet() { diff --git a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java index f9edfbe6e..d2804f9c4 100644 --- a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -1,21 +1,21 @@ package com.fr.design.data.datapane.connect; +import com.fr.design.constants.UIConstants; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.pool.DBCPConnectionPoolAttr; import com.fr.design.border.UITitledBorder; -import com.fr.design.constants.UIConstants; -import com.fr.design.dialog.BasicPane; -import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; +import com.fr.design.dialog.BasicPane; +import com.fr.design.editor.editor.IntegerEditor; import com.fr.file.filter.ChooseFileFilter; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; @@ -34,7 +34,7 @@ import java.util.Map.Entry; public class JDBCDefPane extends JPanel { public static final String DRIVER_TYPE = "driver_type"; public static final String USER_NAME = "user_name"; - public static final int TIME_MULTIPLE = 1000; + public static final int TIME_MULTIPLE = 1000; private static Map jdbcMap = new HashMap(); @@ -43,7 +43,7 @@ public class JDBCDefPane extends JPanel { new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"), new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"), new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/")}); - jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"), + jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"), new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver","jdbc:inceptor://localhost:10000/default")}); jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")}); jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:50000/")}); @@ -158,15 +158,6 @@ public class JDBCDefPane extends JPanel { }); } - /** - * 获取全部组件 - * @return - */ - public JPanel getAllComponents() { - this.add(new DBCPAttrPane()); - return this; - } - public void populate(JDBCDatabaseConnection jdbcDatabase) { if (jdbcDatabase == null) { jdbcDatabase = new JDBCDatabaseConnection(); @@ -324,7 +315,7 @@ public class JDBCDefPane extends JPanel { return new DBCPAttrPane().showWindow(SwingUtilities.getWindowAncestor(JDBCDefPane.this)); } - public class DBCPAttrPane extends BasicPane { + class DBCPAttrPane extends BasicPane { public DBCPAttrPane() { JPanel defaultPane = this; @@ -383,5 +374,4 @@ public class JDBCDefPane extends JPanel { private String driver; private String url; } - } \ No newline at end of file From 4a509632fad965d4385eada5ed55a5af563a341b Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 10:00:06 +0800 Subject: [PATCH 13/17] bug fix --- .../src/com/fr/design/data/datapane/connect/JDBCDefPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java index d2804f9c4..07c5b9100 100644 --- a/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer_base/src/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -34,7 +34,7 @@ import java.util.Map.Entry; public class JDBCDefPane extends JPanel { public static final String DRIVER_TYPE = "driver_type"; public static final String USER_NAME = "user_name"; - public static final int TIME_MULTIPLE = 1000; + public static final int TIME_MULTIPLE = 1000; private static Map jdbcMap = new HashMap(); @@ -43,7 +43,7 @@ public class JDBCDefPane extends JPanel { new DriverURLName("org.hsqldb.jdbcDriver", "jdbc:hsqldb:file:[PATH_TO_DB_FILES]"), new DriverURLName("com.inet.tds.TdsDriver", "jdbc:inetdae7:localhost:1433/"), new DriverURLName("COM.cloudscape.JDBCDriver", "jdbc:cloudscape:/cloudscape/"), new DriverURLName("com.internetcds.jdbc.tds.Driver", "jdbc:freetds:sqlserver://localhost/")}); - jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"), + jdbcMap.put("Inceptor",new DriverURLName[]{new DriverURLName("org.apache.hive.jdbc.HiveDriver","jdbc:inceptor2://localhost:10000/default"), new DriverURLName("org.apache.hadoop.hive.jdbc.HiveDriver","jdbc:inceptor://localhost:10000/default")}); jdbcMap.put("Oracle", new DriverURLName[]{new DriverURLName("oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@localhost:1521:databaseName")}); jdbcMap.put("DB2", new DriverURLName[]{new DriverURLName("com.ibm.db2.jcc.DB2Driver", "jdbc:db2://localhost:50000/")}); From 7a642fc6410b4c490118d19eaf35e02983182ed2 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 16:57:42 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF=20al?= =?UTF-8?q?phafine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/AlphaFineDialog.java | 6 +++- .../mainframe/alphafine/images/noresult.png | Bin 0 -> 6691 bytes .../alphafine/preview/ActionPreviewPane.java | 32 ++++++++++++++++-- .../com/fr/design/locale/designer.properties | 3 +- .../design/locale/designer_en_US.properties | 1 + .../design/locale/designer_zh_CN.properties | 1 + .../design/locale/designer_zh_TW.properties | 1 + 7 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 designer/src/com/fr/design/mainframe/alphafine/images/noresult.png 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 eac17200a..d8293f772 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -16,6 +16,7 @@ import com.fr.design.mainframe.alphafine.listener.ComponentHandler; import com.fr.design.mainframe.alphafine.listener.DocumentAdapter; import com.fr.design.mainframe.alphafine.model.SearchListModel; import com.fr.design.mainframe.alphafine.model.SearchResult; +import com.fr.design.mainframe.alphafine.preview.ActionPreviewPane; import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane; import com.fr.design.mainframe.alphafine.preview.FilePreviewPane; import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane; @@ -539,7 +540,10 @@ public class AlphaFineDialog extends UIDialog { this.searchWorker.execute(); } else if (selectedValue instanceof ActionModel) { - showDefaultPreviewPane(); + rightSearchResultPane.removeAll(); + rightSearchResultPane.add(new ActionPreviewPane()); + validate(); + repaint(); } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/images/noresult.png b/designer/src/com/fr/design/mainframe/alphafine/images/noresult.png new file mode 100644 index 0000000000000000000000000000000000000000..388bb84ffa88282e41b0f5c692f1c4a279ca7eb6 GIT binary patch literal 6691 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 P>VpP@YATk?TZa7)#)JsY literal 0 HcmV?d00001 diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java index ec2d6ca38..f0f209901 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java @@ -1,8 +1,36 @@ package com.fr.design.mainframe.alphafine.preview; + +import com.fr.design.gui.ilable.UILabel; +import com.fr.design.mainframe.alphafine.AlphaFineConstants; +import com.fr.design.mainframe.alphafine.AlphaFineHelper; +import com.fr.general.IOUtils; + +import javax.swing.*; +import java.awt.*; + + /** * Created by XiaXiang on 2017/5/5. */ -public class ActionPreviewPane { - //todo:还没确定要不要使用面板截图 +public class ActionPreviewPane extends JPanel { + private static final Font NAME = new Font("Song_TypeFace",0,14); + public ActionPreviewPane() { + setLayout(new BorderLayout()); + setBackground(null); + setBorder(BorderFactory.createEmptyBorder(120,0,0,0)); + UILabel image = new UILabel(); + image.setPreferredSize(new Dimension(150,111)); + image.setHorizontalAlignment(SwingConstants.CENTER); + image.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); + image.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png")); + UILabel name = new UILabel("暂不支持显示"); + name.setForeground(AlphaFineConstants.MEDIUM_GRAY); + name.setFont(NAME); + name.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); + name.setHorizontalAlignment(SwingConstants.CENTER); + this.add(image, BorderLayout.CENTER); + this.add(name, BorderLayout.SOUTH); + } + } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 1453ff2df..96aaff01c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2008,4 +2008,5 @@ FR-Designer_AlphaFine_ShowLess=show less FR-Designer_Alphafine=AlphaFine FR-Designer-Alphafine_No_Remind= FR-Designer_AlphaFine_NoResult=no results -FR-Designer_ConnectionFailed=connection failed \ No newline at end of file +FR-Designer_ConnectionFailed=connection failed +FR-Designer_NoResult=No results \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 96d737429..8c8e4046a 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -2009,3 +2009,4 @@ FR-Designer_AlphaFine_NoResult=No results FR-Designer_ConnectionFailed=Connection failed FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine FR-Designer_AlphaFine_EnableInternet=Internet +FR-Designer_NoResult=No results diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index d63b22e16..f37ed736f 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -2005,3 +2005,4 @@ FR-Designer_Alphafine=AlphaFine\u667A\u80FD\u641C\u7D22 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25 +FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 9e59a18a0..01fb047ff 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -2003,3 +2003,4 @@ FR-Designer_AlphaFine_ShowAll=\u986F\u793A\u5168\u90E8 FR-Designer-Alphafine_No_Remind=\u4E0D\u518D\u63D0\u793A FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9 FR-Designer_ConnectionFailed=\u93C8\u63A5\u5931\u6557 +FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A From bfdf0e71e59a827bd58587e041d0c1c02e2062b2 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 17:10:40 +0800 Subject: [PATCH 15/17] bug fix --- .../alphafine/preview/ActionPreviewPane.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java index f0f209901..416c9512b 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java @@ -3,8 +3,8 @@ package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.general.IOUtils; +import com.fr.general.Inter; import javax.swing.*; import java.awt.*; @@ -18,19 +18,19 @@ public class ActionPreviewPane extends JPanel { public ActionPreviewPane() { setLayout(new BorderLayout()); setBackground(null); - setBorder(BorderFactory.createEmptyBorder(120,0,0,0)); + setBorder(BorderFactory.createEmptyBorder(135,0,0,0)); UILabel image = new UILabel(); image.setPreferredSize(new Dimension(150,111)); image.setHorizontalAlignment(SwingConstants.CENTER); image.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); image.setIcon(IOUtils.readIcon("/com/fr/design/mainframe/alphafine/images/noresult.png")); - UILabel name = new UILabel("暂不支持显示"); - name.setForeground(AlphaFineConstants.MEDIUM_GRAY); - name.setFont(NAME); - name.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); - name.setHorizontalAlignment(SwingConstants.CENTER); + UILabel description = new UILabel(Inter.getLocText("FR-Designer_NoResult")); + description.setForeground(AlphaFineConstants.MEDIUM_GRAY); + description.setFont(NAME); + description.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); + description.setHorizontalAlignment(SwingConstants.CENTER); this.add(image, BorderLayout.CENTER); - this.add(name, BorderLayout.SOUTH); + this.add(description, BorderLayout.SOUTH); } } From 9b2405bf34f46d4280f9e72f956c5cde46e62016 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 19:30:56 +0800 Subject: [PATCH 16/17] =?UTF-8?q?bug=20fix=20ds=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/component/AlphaFineDialog.java | 5 +++++ .../alphafine/search/manager/FileSearchManager.java | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 d8293f772..eb986cb13 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -80,6 +80,7 @@ public class AlphaFineDialog extends UIDialog { private static final String CPT_MARK = "k:cpt "; private static final String FRM_MARK = "k:frm "; private static final String DS_MARK = "k:ds "; + private static final String DS_NAME = "dsname=\""; private static final String PLUGIN_MARK_SHORT = "k:4 "; private static final String PLUGIN_MARK = "k:shop "; @@ -296,6 +297,10 @@ public class AlphaFineDialog extends UIDialog { } else if (searchText.startsWith(CPT_MARK) || searchText.startsWith(FRM_MARK)) { getFileList(searchText); return; + } else if (searchText.startsWith(DS_MARK)) { + getFileList(DS_NAME + searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); + return; + } else if (searchText.startsWith(PLUGIN_MARK_SHORT) || searchText.startsWith(PLUGIN_MARK)) { getPluginList(searchText.substring(searchText.indexOf(" ") + 1, searchText.length())); return; diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 80c9d4b64..a7d9fbe65 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -10,6 +10,7 @@ import com.fr.design.mainframe.alphafine.cell.model.FileModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.file.filetree.FileNode; +import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.stable.StableUtils; @@ -25,6 +26,7 @@ import java.util.List; */ public class FileSearchManager implements AlphaFineSearchProcessor { private static final int MARK_LENGTH = 6; + private static final String DS_NAME = "dsname=\""; private static final MoreModel TITLE_MODEL = new MoreModel(Inter.getLocText("FR-Designer_Templates"), CellType.FILE); private static FileSearchManager fileSearchManager = null; private SearchResult filterModelList; @@ -68,7 +70,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { isContainFrm = false; searchText = searchText.substring(MARK_LENGTH, searchText.length()); } - if (StringUtils.isBlank(searchText)) { + if (StringUtils.isBlank(searchText) || ComparatorUtils.equals(searchText, DS_NAME)) { lessModelList.add(TITLE_MODEL); return lessModelList; } From 96c8994c49c7bed5dda399363c25b861b601712f Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 12 Jun 2017 19:35:11 +0800 Subject: [PATCH 17/17] bug fix --- .../alphafine/search/manager/DocumentSearchManager.java | 2 -- .../alphafine/search/manager/PluginSearchManager.java | 4 ---- 2 files changed, 6 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index 695101986..fc10e8f9c 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -76,12 +76,10 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size())); } } - } catch (JSONException e) { FRLogger.getLogger().error("document search error: " + e.getMessage()); return lessModelList; } - } return lessModelList; } diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index dcdda514e..cadbbe119 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -80,9 +80,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size())); } - } - } catch (JSONException e) { FRLogger.getLogger().error("plugin search json error :" + e.getMessage()); } catch (UnsupportedEncodingException e) { @@ -90,8 +88,6 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { } } return this.lessModelList; - - } private SearchResult getNoConnectList() {