bug fix

designer/src/com/fr/aspectj/designer/TemplateProcessTracker.aj

@@ -41,7 +41,7 @@ public aspect TemplateProcessTracker {
     before(ActionEvent e) : onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 

designer_chart/src/com/fr/aspectj/designerchart/TemplateProcessTracker.aj

@@ -38,7 +38,7 @@ public aspect TemplateProcessTracker {
     before(ActionEvent e) : onActionPerformed(e) {
         SourceLocation sl = thisJoinPoint.getSourceLocation();
         // !within(LogHandlerBar) 没用, 手动过滤
-        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
             return;
         }
 

designer_form/src/com/fr/aspectj/designerform/TemplateProcessTracker.aj

@@ -1,59 +1,59 @@
-//package com.fr.aspectj.designerform;
+package com.fr.aspectj.designerform;
-//
+
-///**
+/**
-// * Created by plough on 2017/3/3.
+ * Created by plough on 2017/3/3.
-// */
+ */
-//import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
+import com.fr.design.mainframe.templateinfo.TemplateInfoCollector;
-//import org.aspectj.lang.reflect.SourceLocation;
+import org.aspectj.lang.reflect.SourceLocation;
-//
+
-//import java.awt.event.ActionEvent;
+import java.awt.event.ActionEvent;
-//import java.awt.event.MouseEvent;
+import java.awt.event.MouseEvent;
-//import java.util.Date;
+import java.util.Date;
-//
+
-//public aspect TemplateProcessTracker {
+public aspect TemplateProcessTracker {
-//    //声明一个pointcut，匹配你需要的方法
+    //声明一个pointcut，匹配你需要的方法
-//    pointcut onMouseClicked(MouseEvent e) :
+    pointcut onMouseClicked(MouseEvent e) :
-//            execution(* mouseClicked(MouseEvent)) && args(e);
+            execution(* mouseClicked(MouseEvent)) && args(e);
-//    pointcut onMousePressed(MouseEvent e) :
+    pointcut onMousePressed(MouseEvent e) :
-//            execution(* mousePressed(MouseEvent)) && args(e);
+            execution(* mousePressed(MouseEvent)) && args(e);
-//    pointcut onMouseReleased(MouseEvent e) :
+    pointcut onMouseReleased(MouseEvent e) :
-//            execution(* mouseReleased(MouseEvent)) && args(e);
+            execution(* mouseReleased(MouseEvent)) && args(e);
-//    pointcut onActionPerformed(ActionEvent e) :
+    pointcut onActionPerformed(ActionEvent e) :
-//            execution(* actionPerformed(ActionEvent)) && args(e);
+            execution(* actionPerformed(ActionEvent)) && args(e);
-//    pointcut onSetValueAt(Object v, int r, int c) :
+    pointcut onSetValueAt(Object v, int r, int c) :
-//            execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
+            execution(* setValueAt(java.lang.Object, int, int)) && args(v, r, c);
-//
+
-//    //before表示之前的意思
+    //before表示之前的意思
-//    //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
+    //这整个表示在MouseAdapter的public void mouseXXX(MouseEvent)方法调用之前，你想要执行的代码
-//    before(MouseEvent e) : onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
+    before(MouseEvent e) : onMouseClicked(e) || onMousePressed(e) || onMouseReleased(e) {
-//        SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
+        SourceLocation sl = thisJoinPoint.getSourceLocation();//切面对应的代码位置
-//
+
-//        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
-//        String log = "";
+        String log = "";
-//        //TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
-//    }
+    }
-//    //同上
+    //同上
-//    before(ActionEvent e) : onActionPerformed(e) {
+    before(ActionEvent e) : onActionPerformed(e) {
-//        SourceLocation sl = thisJoinPoint.getSourceLocation();
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
-//        // !within(LogHandlerBar) 没用, 手动过滤
+        // !within(LogHandlerBar) 没用, 手动过滤
-//        if (e.getSource().toString().contains("javax.swing.Timer")) {
+        if (e != null && e.getSource().toString().contains("javax.swing.Timer")) {
-//            return;
+            return;
-//        }
+        }
-//
+
-//        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
+        //String log = String.format("%s:\n%s\n%s\n%s\n\n", new Date(), sl, e, e.getSource());
-//        String log = "";
+        String log = "";
-//        //TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
-//
+
-//    }
+    }
-//    //同上
+    //同上
-//    before(Object v, int r, int c) : onSetValueAt(v, r, c) {
+    before(Object v, int r, int c) : onSetValueAt(v, r, c) {
-//        SourceLocation sl = thisJoinPoint.getSourceLocation();
+        SourceLocation sl = thisJoinPoint.getSourceLocation();
-//
+
-//        //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
+        //String log = String.format("%s:\n%s\nset value: %s at (%d, %d)\n\n", new Date(), sl, v, r, c);
-//        String log = "";
+        String log = "";
-//        //TemplateInfoCollector.appendProcess(log);
+        //TemplateInfoCollector.appendProcess(log);
-//
+
-//    }
+    }
-//
+
-//
+
-//}
+}