diff --git a/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj b/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj index 032cd2342..d0f310829 100644 --- a/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj +++ b/designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj @@ -35,7 +35,7 @@ public aspect TemplateProcessTracker { // String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 before(ActionEvent e) : onActionPerformed(e) { @@ -47,7 +47,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 @@ -56,7 +56,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 @@ -66,7 +66,7 @@ public aspect TemplateProcessTracker { // String v = "test"; //String log = String.format("%s:\n%s\nset value: %s at %s\n\n", new Date(), sl, v, g.getEditingCellElement()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } 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 b2707e502..d1213822b 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 @@ -30,9 +30,9 @@ public class RecommendSearchManager implements AlphaFineSearchProcessor { } @Override public synchronized SearchResult getLessSearchResult(String searchText) { + this.modelList = new SearchResult(); if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainRecommend()) { String result; - this.modelList = new SearchResult(); HttpClient httpClient = new HttpClient(SEARCHAPI + CodeUtils.cjkEncode(searchText)); httpClient.asGet(); httpClient.setTimeout(5000); diff --git a/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj b/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj new file mode 100644 index 000000000..ba1422f9e --- /dev/null +++ b/designer_base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj @@ -0,0 +1,23 @@ +package com.fr.aspectj.designerbase; + +import java.awt.event.ActionEvent; + +/** + * Created by XiaXiang on 2017/5/25. + */ +public aspect AlphaFineReminder { + pointcut onActionPerformed(ActionEvent e) : + execution(* actionPerformed(ActionEvent)) && args(e); + + before(ActionEvent e) : onActionPerformed(e) { + String point = thisJoinPoint.toString(); + if (e != null && e.getSource().toString().contains("javax.swing.Timer")) { + return; + } + if (e != null && e.getSource().getClass().getName().equals("com.fr.design.gui.imenu.UIMenuItem") && point.contains("com.fr.design.actions")) { + //System.out.print(thisJoinPoint + "\n"); + } + + + } +} diff --git a/designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj b/designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj index 61a0be500..bc8b58615 100644 --- a/designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj +++ b/designer_base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj @@ -32,7 +32,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 before(ActionEvent e) : onActionPerformed(e) { @@ -44,7 +44,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 @@ -53,7 +53,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c); String log = ""; - TemplateInfoCollector.appendProcess(log); + // TemplateInfoCollector.appendProcess(log); } diff --git a/designer_base/src/com/fr/design/extra/LoginWebBridge.java b/designer_base/src/com/fr/design/extra/LoginWebBridge.java index 6592e1601..7db9fc5ac 100644 --- a/designer_base/src/com/fr/design/extra/LoginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/LoginWebBridge.java @@ -146,7 +146,7 @@ public class LoginWebBridge { if (res.equals(FAILED_MESSAGE_STATUS)) { } else { JSONObject jo = new JSONObject(res); - if (jo.getString("status").equals(SUCCESS_MESSAGE_STATUS)) { + if (jo.optString("status").equals(SUCCESS_MESSAGE_STATUS)) { setMessageCount(Integer.parseInt(jo.getString("message"))); } } diff --git a/designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj b/designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj index 51e86fd15..60038d4a3 100644 --- a/designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj +++ b/designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj @@ -32,7 +32,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 before(ActionEvent e) : onActionPerformed(e) { @@ -44,7 +44,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 @@ -52,7 +52,7 @@ public aspect TemplateProcessTracker { SourceLocation sl = thisJoinPoint.getSourceLocation(); //String log = String.format("%s:\n%s\n插入新图表:%s\n\n", new Date(), sl, c.getChartName()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } diff --git a/designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj b/designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj index 0aabeb362..187079371 100644 --- a/designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj +++ b/designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj @@ -30,7 +30,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 before(ActionEvent e) : onActionPerformed(e) { @@ -42,7 +42,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource()); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); } //同上 @@ -51,7 +51,7 @@ public aspect TemplateProcessTracker { //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c); String log = ""; - TemplateInfoCollector.appendProcess(log); + //TemplateInfoCollector.appendProcess(log); }