From 17d98288c59c7f9a372d8d7038c2889ec11b0fc5 Mon Sep 17 00:00:00 2001 From: "Link.Zhao" Date: Mon, 19 Sep 2022 14:55:24 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-79093=20=E8=BF=90=E8=90=A5=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=8C=96=E4=BA=8C=E6=9C=9F=EF=BC=88=E9=81=97=E7=95=99?= =?UTF-8?q?=EF=BC=89=201=E3=80=81=E4=BF=AE=E6=94=B9pr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/component/CustomSortPane.java | 6 +++--- .../help/alphafine/component/MenuLabel.java | 18 +++++++++--------- .../alphafine/component/MenuLabelPane.java | 6 +++--- .../component/RecommendSearchLabel.java | 3 +++ .../alphafine/component/SearchHintPane.java | 4 ++-- .../alphafine/preview/DefaultContentPane.java | 6 +++--- .../alphafine/search/SearchManager.java | 3 +++ .../search/manager/impl/FileSearchManager.java | 4 ++-- .../manager/impl/PluginSearchManager.java | 10 +++++----- 9 files changed, 33 insertions(+), 27 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java index e483482ed..e080b3e7c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java @@ -24,10 +24,10 @@ import java.util.Map; import java.util.function.Function; /** + * @author Link * @version 11.0 - * @author: Link - * @date: 2022/9/9 - * @Description: alphafine设置 - 搜索范围 - 自定义排序 - 弹出面板 + * Created by Link on 2022/9/18 + * alphafine设置 - 搜索范围 - 自定义排序 - 弹出面板 */ public class CustomSortPane extends JPanel { diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java index 2342f6da7..dfe83b708 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabel.java @@ -13,10 +13,10 @@ import java.awt.event.MouseListener; import java.util.function.Function; /** + * @author Link * @version 11.0 - * @author: Link - * @date: 2022/9/12 - * @Description: 菜单label + * Created by Link on 2022/9/18 + * 菜单选项label */ public class MenuLabel extends UILabel { @@ -28,7 +28,7 @@ public class MenuLabel extends UILabel { private MenuLabelPane parentMenu; private Function function; - private boolean isSelected; + private boolean selected; public MenuLabel(String text, Function function) { super(text); @@ -56,15 +56,15 @@ public class MenuLabel extends UILabel { parentMenu.setNoneSelected(); setBackground(SELECTED_COLOR); function.apply(this); - isSelected = true; + selected = true; } else { setBackground(BACKGROUND_COLOR); - isSelected = false; + selected = false; } } public boolean isSelected() { - return isSelected; + return selected; } MouseListener createMouseListener() { @@ -78,7 +78,7 @@ public class MenuLabel extends UILabel { @Override public void mouseEntered(MouseEvent e) { super.mouseEntered(e); - if (!isSelected) { + if (!selected) { setBackground(HOVERED_COLOR); } } @@ -86,7 +86,7 @@ public class MenuLabel extends UILabel { @Override public void mouseExited(MouseEvent e) { super.mouseExited(e); - if (!isSelected) { + if (!selected) { setBackground(BACKGROUND_COLOR); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabelPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabelPane.java index 74877f9bb..83a15ff5d 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabelPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/MenuLabelPane.java @@ -5,10 +5,10 @@ import java.awt.FlowLayout; import java.util.List; /** + * @author Link * @version 11.0 - * @author: Link - * @date: 2022/9/12 - * @Description: 简单菜单面板 + * Created by Link on 2022/9/18 + * 简单菜单面板 */ public class MenuLabelPane extends JPanel { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchLabel.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchLabel.java index 3830b6db0..acf3e1f3a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchLabel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchLabel.java @@ -34,6 +34,9 @@ public class RecommendSearchLabel extends JPanel { } + /** + * 推荐搜索词，绑定alphaFine搜索事件 + * */ public class SearchKeyLabel extends JLabel { String searchKey; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchHintPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchHintPane.java index 6207be842..43394e0a7 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchHintPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/SearchHintPane.java @@ -29,7 +29,7 @@ public class SearchHintPane extends JPanel { private static final String TITLE = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Search_Title"); private static final String RECOMMEND = Toolkit.i18nText("Fine-Design_Report_AlphaFine_Recommend_Search"); - private static final Icon icon = IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/search_hint.svg"); + private static final Icon ICON = IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/search_hint.svg"); private static final int HEIGHT = 305; private static final int WIDTH = 300; private static final int TITLE_FONT_SIZE = 14; @@ -39,7 +39,7 @@ public class SearchHintPane extends JPanel { } public SearchHintPane(List hints) { - this(hints, icon, TITLE); + this(hints, ICON, TITLE); } public SearchHintPane(List hints, Icon icon, String title) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/DefaultContentPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/DefaultContentPane.java index 91a79f66c..ef4487f7e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/DefaultContentPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/DefaultContentPane.java @@ -11,10 +11,10 @@ import javax.swing.JPanel; import java.awt.BorderLayout; /** + * @author Link * @version 11.0 - * @author: Link - * @date: 2022/9/16 - * @Description: alphaFine - 默认展示页面 + * Created by Link on 2022/9/18 + * alphaFine - 默认展示页面 */ public class DefaultContentPane extends JPanel { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/SearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/SearchManager.java index 079f1b710..027dc1577 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/SearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/SearchManager.java @@ -9,6 +9,9 @@ import com.fr.design.mainframe.alphafine.preview.DefaultContentPane; */ public interface SearchManager { + /** + * 搜索 + * */ void doSearch(SearchTextBean searchTextBean); /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java index 7508f3a6c..5f358bbb5 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java @@ -39,7 +39,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { private SearchResult moreModelList; private String searchText; private FileNode[] fileNodes = null; - private static final int defaultListSize = 10; + private static final int DEFAULT_LIST_SIZE = 10; //停止搜索 //隐藏的搜索功能，可根据特殊的字符标记判断搜索分类 @@ -145,7 +145,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { public SearchResult getDefaultResult() { List list = DesignerEnvManager.getEnvManager().getRecentOpenedFilePathList(); defaultModelList = new SearchResult(); - for (int i = 0; i < Math.min(defaultListSize, list.size()); i++) { + for (int i = 0; i < Math.min(DEFAULT_LIST_SIZE, list.size()); i++) { String name = list.get(i).toLowerCase(); name = name.replaceAll(StringUtils.BLANK, StringUtils.EMPTY); FileModel model = new FileModel(name, name); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java index 5627f8995..8fa28040d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java @@ -39,8 +39,8 @@ public class PluginSearchManager implements AlphaFineSearchProvider { private SearchResult searchResult; private SearchResult defaultModelList; - private static final int defaultListSize = 10; - private static final String timeFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; + private static final int DEFAULT_LIST_SIZE = 10; + private static final String TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; private static final String UPLOAD_TIME = "uploadTime"; @@ -200,12 +200,12 @@ public class PluginSearchManager implements AlphaFineSearchProvider { List parseDefaultPluginModel(List jsonObjects) { List pluginModels = new ArrayList<>(); if (!Collections.isEmpty(jsonObjects)) { - SimpleDateFormat format = new SimpleDateFormat(timeFormat); + SimpleDateFormat format = new SimpleDateFormat(TIME_FORMAT); try { jsonObjects.sort(Comparator.comparingLong(new ToLongFunction() { @Override public long applyAsLong(Map value) { - Long time = 0l; + long time = 0L; try { time = format.parse((String) value.get(UPLOAD_TIME)).getTime(); } catch (ParseException e) { @@ -217,7 +217,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider { } catch (Exception e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); } - for (int i = 0; i < defaultListSize; i++) { + for (int i = 0; i < DEFAULT_LIST_SIZE; i++) { pluginModels.add(getPluginModel(new JSONObject(jsonObjects.get(i)), false)); } }