From b8e46e07b2b1a97d3e9404c7fc24b304d30dc7ec Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 23 Aug 2017 16:38:34 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=94=99?= =?UTF-8?q?=E4=BA=86?= 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 04c5074ef..70f745d29 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 @@ -113,7 +113,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { return this.lessModelList; } if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { - lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); + lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"))); lessModelList.addAll(searchResult); } else { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"), Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), true, CellType.PLUGIN)); From f748fc547e0fb76778625b0eb2a5c449c21a4dec Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 23 Aug 2017 18:46:17 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=94=99?= =?UTF-8?q?=E4=BA=86=20=E6=94=B9=E4=B8=8B=E4=BB=A3=E7=A0=81=E8=B4=A8?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alphafine/search/manager/ActionSearchManager.java | 5 ++--- .../alphafine/search/manager/AlphaFineSearchProcessor.java | 2 +- .../alphafine/search/manager/DocumentSearchManager.java | 5 ++--- .../alphafine/search/manager/FileSearchManager.java | 7 +++---- .../alphafine/search/manager/PluginSearchManager.java | 7 +++---- .../alphafine/search/manager/RecentSearchManager.java | 2 +- .../alphafine/search/manager/RecommendSearchManager.java | 2 +- 7 files changed, 13 insertions(+), 17 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 14135a2b2..6acca5c8e 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 @@ -77,8 +77,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { } if (result.size() == 0) { return lessModelList; - } - if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { + } else if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"))); lessModelList.addAll(result); } else { @@ -92,7 +91,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return moreModelList; } } \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java index df5b36c09..301ea4bca 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java @@ -19,5 +19,5 @@ public interface AlphaFineSearchProcessor { * * @return */ - SearchResult getMoreSearchResult(); + SearchResult getMoreSearchResult(String searchText); } 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 7067dd17c..0efef5ef3 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 @@ -78,8 +78,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { } if (searchResult.size() == 0) { return lessModelList; - } - if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { + } else if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"))); lessModelList.addAll(searchResult); } else { @@ -109,7 +108,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return moreModelList; } 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 d67d434bd..515739100 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 @@ -100,10 +100,9 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } } - if (result.size() == 0) { + if (result.isEmpty()) { return lessModelList; - } - if (result.size() > 0 && result.size() < AlphaFineConstants.SHOW_SIZE + 1) { + } else if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Templates"))); lessModelList.addAll(result); } else { @@ -173,7 +172,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return moreModelList; } 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 70f745d29..a8367d367 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 @@ -109,10 +109,9 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } - if (searchResult.size() == 0) { + if (searchResult.isEmpty()) { return this.lessModelList; - } - if (searchResult.size() > 0 && searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { + } else if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer-Plugin_Addon"))); lessModelList.addAll(searchResult); } else { @@ -138,7 +137,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return this.moreModelList; } } \ No newline at end of file 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 69959830c..55fe6ecad 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 @@ -283,7 +283,7 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return new SearchResult(); } 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 176a24b24..322ffe586 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 @@ -99,7 +99,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult() { + public SearchResult getMoreSearchResult(String searchText) { return new SearchResult(); } From 40ed094eb3354819ffe02a65a64ee5e17f7f979b Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Wed, 23 Aug 2017 18:50:47 +0800 Subject: [PATCH 03/33] rt --- .../mainframe/alphafine/search/manager/ActionSearchManager.java | 2 +- .../alphafine/search/manager/AlphaFineSearchProcessor.java | 2 +- .../alphafine/search/manager/DocumentSearchManager.java | 2 +- .../mainframe/alphafine/search/manager/FileSearchManager.java | 2 +- .../mainframe/alphafine/search/manager/PluginSearchManager.java | 2 +- .../mainframe/alphafine/search/manager/RecentSearchManager.java | 2 +- .../alphafine/search/manager/RecommendSearchManager.java | 2 +- 7 files changed, 7 insertions(+), 7 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 6acca5c8e..070f1597b 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 @@ -91,7 +91,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return moreModelList; } } \ No newline at end of file diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java index 301ea4bca..df5b36c09 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java @@ -19,5 +19,5 @@ public interface AlphaFineSearchProcessor { * * @return */ - SearchResult getMoreSearchResult(String searchText); + SearchResult getMoreSearchResult(); } 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 0efef5ef3..950d8f591 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 @@ -108,7 +108,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return moreModelList; } 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 515739100..0c1a3b61b 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 @@ -172,7 +172,7 @@ public class FileSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return moreModelList; } 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 a8367d367..3a799331e 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 @@ -137,7 +137,7 @@ public class PluginSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return this.moreModelList; } } \ No newline at end of file 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 55fe6ecad..69959830c 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 @@ -283,7 +283,7 @@ public class RecentSearchManager extends XMLFileManager implements AlphaFineSear } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return new SearchResult(); } 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 322ffe586..176a24b24 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 @@ -99,7 +99,7 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } @Override - public SearchResult getMoreSearchResult(String searchText) { + public SearchResult getMoreSearchResult() { return new SearchResult(); } From 14927cba8d100a8182d7133d2c9e0c990adff63a Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 24 Aug 2017 00:50:25 +0800 Subject: [PATCH 04/33] bug fix --- .../alphafine/component/AlphaFineDialog.java | 13 +++++-------- 1 file changed, 5 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 ae811dbda..408baf23d 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -325,8 +325,6 @@ public class AlphaFineDialog extends UIDialog { this.searchWorker = new SwingWorker() { @Override protected Object doInBackground() throws Exception { - resumeLeftPane(); - splitLabel.setIcon(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigloading.gif"))); rebuildList(searchTextField.getText().toLowerCase()); return null; } @@ -347,11 +345,9 @@ public class AlphaFineDialog extends UIDialog { */ private void resumeLeftPane() { if (searchResultPane != null && defaultPane != null) { - rightSearchResultPane.removeAll(); searchResultPane.remove(defaultPane); defaultPane = null; searchResultPane.add(leftSearchResultPane, BorderLayout.WEST); - refreshContainer(); } } @@ -425,9 +421,11 @@ public class AlphaFineDialog extends UIDialog { * 重置面板 */ private void resetContainer() { + rightSearchResultPane.removeAll(); + splitLabel.setIcon(new ImageIcon(getClass().getResource("/com/fr/design/mainframe/alphafine/images/bigloading.gif"))); + resumeLeftPane(); searchListModel.removeAllElements(); searchListModel.resetSelectedState(); - rightSearchResultPane.removeAll(); refreshContainer(); } @@ -639,11 +637,10 @@ public class AlphaFineDialog extends UIDialog { } } - private void HandleMoreOrLessResult(int index, MoreModel selectedValue) { + private void dealWithMoreOrLessResult(int index, MoreModel selectedValue) { if (selectedValue.getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowAll"))) { selectedValue.setContent(Inter.getLocText("FR-Designer_AlphaFine_ShowLess")); rebuildShowMoreList(index, selectedValue); - } else { selectedValue.setContent(Inter.getLocText("FR-Designer_AlphaFine_ShowAll")); rebuildShowMoreList(index, selectedValue); @@ -935,7 +932,7 @@ public class AlphaFineDialog extends UIDialog { saveHistory(selectedValue); } else if (e.getClickCount() == 1) { if (selectedValue instanceof MoreModel && ((MoreModel) selectedValue).isNeedMore()) { - HandleMoreOrLessResult(selectedIndex, (MoreModel) selectedValue); + dealWithMoreOrLessResult(selectedIndex, (MoreModel) selectedValue); } } } From d6290d0861360b53eb7ccd80b41f86bc58384712 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 24 Aug 2017 00:56:08 +0800 Subject: [PATCH 05/33] pmd --- .../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 408baf23d..6dd9d21b4 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -638,7 +638,7 @@ public class AlphaFineDialog extends UIDialog { } private void dealWithMoreOrLessResult(int index, MoreModel selectedValue) { - if (selectedValue.getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowAll"))) { + if (ComparatorUtils.equals(Inter.getLocText("FR-Designer_AlphaFine_ShowAll"), selectedValue.getContent())) { selectedValue.setContent(Inter.getLocText("FR-Designer_AlphaFine_ShowLess")); rebuildShowMoreList(index, selectedValue); } else { From 64b68c66b8b85ab602065ad7ee1e9e95548ed046 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Thu, 24 Aug 2017 08:12:09 +0800 Subject: [PATCH 06/33] pmd --- .../design/mainframe/alphafine/component/AlphaFineDialog.java | 2 +- .../mainframe/alphafine/search/manager/ActionSearchManager.java | 2 +- .../alphafine/search/manager/DocumentSearchManager.java | 2 +- 3 files changed, 3 insertions(+), 3 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 6dd9d21b4..f638ede17 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -723,7 +723,7 @@ public class AlphaFineDialog extends UIDialog { @Override public void checkValid() throws Exception { - + //不处理 } private void doNavigate() { 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 070f1597b..185938ab8 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 @@ -75,7 +75,7 @@ public class ActionSearchManager implements AlphaFineSearchProcessor { result.add(object); } } - if (result.size() == 0) { + if (result.isEmpty()) { return lessModelList; } else if (result.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_Set"))); 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 950d8f591..34130cdd8 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,7 +76,7 @@ public class DocumentSearchManager implements AlphaFineSearchProcessor { searchResult.add(cellModel); } } - if (searchResult.size() == 0) { + if (searchResult.isEmpty()) { return lessModelList; } else if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { lessModelList.add(0, new MoreModel(Inter.getLocText("FR-Designer_COMMUNITY_HELP"))); From ed97de27e7da963e77e14b70e5ddbcb8043baa71 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Mon, 28 Aug 2017 14:50:39 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6=20?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/alphafine/preview/PluginPreviewPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java index fed36e99f..fe69403a8 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java @@ -52,7 +52,7 @@ public class PluginPreviewPane extends JPanel { String price0 = price == 0 ? Inter.getLocText("FR-Designer-Collect_Information_free") : String.valueOf(price); UILabel priceLabel = new UILabel(price0); priceLabel.setForeground(AlphaFineConstants.RED); - priceLabel.setFont(AlphaFineConstants.SMALL_FONT); + priceLabel.setFont(AlphaFineConstants.MEDIUM_FONT); bottomPane.add(priceLabel, BorderLayout.WEST); panel.add(nameLabel, BorderLayout.NORTH); panel.add(line, BorderLayout.SOUTH); From 3ad6fae1a27914c759b88a6915059fcbf4a8a942 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 29 Aug 2017 14:18:54 +0800 Subject: [PATCH 08/33] rt --- .../design/mainframe/alphafine/preview/PluginPreviewPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java index fe69403a8..d6cffc885 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java @@ -49,7 +49,7 @@ public class PluginPreviewPane extends JPanel { nameLabel.setBackground(AlphaFineConstants.BLUE); nameLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 10, 20)); line.setBorder(BorderFactory.createEmptyBorder(20, 0, 10, 0)); - String price0 = price == 0 ? Inter.getLocText("FR-Designer-Collect_Information_free") : String.valueOf(price); + String price0 = price == 0 ? Inter.getLocText("FR-Designer-Collect_Information_free") : "￥" + String.valueOf(price); UILabel priceLabel = new UILabel(price0); priceLabel.setForeground(AlphaFineConstants.RED); priceLabel.setFont(AlphaFineConstants.MEDIUM_FONT); From 2b1d0bb9f60ab4e367d4539e8af06f72efb46c90 Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 5 Sep 2017 14:18:38 +0800 Subject: [PATCH 09/33] =?UTF-8?q?REPORT-3958=20&&=20REPORT-4374=20[9.0?= =?UTF-8?q?=E4=B8=80=E8=BD=AE=E5=9B=9E=E5=BD=92]=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=97=A0=E6=95=88=20=E6=8E=A7=E4=BB=B6=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=A0=87=E7=AD=BE=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=8E=A7=E4=BB=B6=E8=83=BD=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E4=B8=8D=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/CellWidgetPropertyPane.java | 10 +++- .../src/com/fr/design/widget/WidgetPane.java | 4 ++ .../fr/design/widget/ui/ButtonDefinePane.java | 4 ++ .../widget/ui/btn/ButtonSytleDefinedPane.java | 60 +++++++++---------- .../widget/ui/btn/FreeButtonDetailPane.java | 18 ++---- .../ui/designer/CheckBoxDefinePane.java | 2 + .../ui/designer/DateEditorDefinePane.java | 3 - 7 files changed, 51 insertions(+), 50 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java index e0a2cf441..39b3e3d93 100644 --- a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java +++ b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java @@ -75,8 +75,8 @@ public class CellWidgetPropertyPane extends BasicPane { FRContext.getLogger().error(e.getMessage(), e); } } - cellEditorDefPane.populate(cellWidget); + cellEditorDefPane.populate(cellWidget); } @@ -122,10 +122,16 @@ public class CellWidgetPropertyPane extends BasicPane { } } }); - DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); + if(DesignerContext.getDesignerFrame().getSelectedJTemplate() != null){ + DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); + } } + public void reInitAllListener(){ + cellEditorDefPane.registerListener(); + } + private Widget upDateWidgetAuthority(TemplateCellElement cellElement, Widget newWidget) { try { Widget oldWidget = (Widget) cellElement.getWidget().clone(); diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 593bf2197..61e79acb8 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -163,6 +163,10 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener } + public void registerListener(){ + initAllListeners(); + } + private static class EditorTypeComboBox extends UIComboBox { private Item item = new Item(Inter.getLocText("Widget-User_Defined"), diff --git a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java index 3d2a703dd..59a5b62bb 100644 --- a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java @@ -1,10 +1,12 @@ package com.fr.design.widget.ui; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.CellWidgetPropertyPane; import com.fr.design.widget.ui.btn.ButtonDetailPaneFactory; import com.fr.form.ui.Button; import com.fr.form.ui.FreeButton; import com.fr.design.widget.btn.ButtonDetailPane; + import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; @@ -38,6 +40,8 @@ public class ButtonDefinePane extends AbstractDataModify