Merge pull request #19 from XieEDeHeiShou/master

master

Author: githubwing

.idea/workspace.xml

@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-171.4073.35" jdkType="IDEA JDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

MVPHelper.iml

@@ -19,6 +19,10 @@
 
 ![suffix_support](img/suffix_support.gif)
 
+日志输出(气球偶尔会闪现一下,可以在Event Log里关闭):
+
+![log](img/log.gif)
+
 错误提示:
 
 ![error_package](img/error_package.gif)
@@ -49,8 +53,8 @@
 
 ### 或者
 #### 第一步
-下载[MvpHelper_v2_1_release.jar](MVPHelper_v2_1_release.jar)
-或者前往 [releases](https://github.com/XieEDeHeiShou/MVPHelper/releases/tag/2.1)
+下载[MvpHelper_v2_2_release.jar](MVPHelper_v2_2_release.jar)
+或者前往 [releases](https://github.com/XieEDeHeiShou/MVPHelper/releases/tag/2.2)
 
 #### 第二步
 安装插件
@@ -101,7 +105,11 @@
 + [AndroidStudio/IDEA插件开发学习](http://www.jianshu.com/p/0117d4b1eb00) (中文博客)
 
 ## 更新日志
-### v2.0版 -基于Intellij Open Api 实现 by [XieEDeHeiShou](https://github.com/XieEDeHeiShou)
+### v2.x版 -基于Intellij Open Api 实现 by [XieEDeHeiShou](https://github.com/XieEDeHeiShou)
++ 2017-04-27
+  + 修复实现类修饰符异常 package-private -> public
+  + 新增日志类EventLogger
+  + MvpHelper_v2_2_release.jar
 + 2017-04-25
   + 实现配置信息的存取
   + 实现运行时加载配置信息
@@ -132,7 +140,7 @@
   + Java源文件的文件名是否以 ```Presenter``` 结尾, 并处于 ```presenter``` 包下
 
 
-### v1.1版 -基于Java IO Api 实现 by [githubwing](https://github.com/githubwing)
+### v1.x版 -基于Java IO Api 实现 by [githubwing](https://github.com/githubwing)
 + 2017-04-10 将源文件分包并尝试重构
 + 2017-04-09 移除源文件中的 ```C``` 语言异味
 + 2017-04-06 分支自[原仓库](https://github.com/githubwing/MVPHelper), 并向源文件中追加注释, 以便阅读

MVPHelper_v2_1_release.jar renamed to MVPHelper_v2_2_release.jar

@@ -19,6 +19,9 @@ Suffix support:
 
 ![suffix_support](img/suffix_support.gif)
 
+Log (unexpected balloon may appear, just disable it in the Event Log):
+![log](img/log.gif)
+
 Error dialog:
 
 ![error_package](img/error_package.gif)
@@ -49,8 +52,8 @@ will greatly reduce the number of source files:
 
 ### Or install plugin.jar
 #### step1
-Download [MvpHelper_v2_1_release.jar](MVPHelper_v2_1_release.jar)
-or redirect to [releases](https://github.com/XieEDeHeiShou/MVPHelper/releases/tag/2.1)
+Download [MvpHelper_v2_2_release.jar](MVPHelper_v2_2_release.jar)
+or redirect to [releases](https://github.com/XieEDeHeiShou/MVPHelper/releases/tag/2.2)
 
 #### step2
 Install it.
@@ -61,7 +64,7 @@ Install it.
 In ```Contract``` or ```Presenter``` ，click ```Generate``` menu or try hot-key ```Alt + Insert```, 
 select ```Mvp Helper``` .
 
-## Features
+## Feature
 + Remove hot-key ```Meta + 1```
 + MvpHelper menu will not appear in un-java files when use hot key ```Alt + Insert```
 + No more root package limit (v1.0 only support com,org,me...)
@@ -100,7 +103,11 @@ select ```Mvp Helper``` .
 + [AndroidStudio/IDEA插件开发学习](http://www.jianshu.com/p/0117d4b1eb00) (Chinese blog)
 
 ## Change log
-### v2.0 -Based on Intellij Open Api, by [XieEDeHeiShou](https://github.com/XieEDeHeiShou)
+### v2.x -Based on Intellij Open Api, by [XieEDeHeiShou](https://github.com/XieEDeHeiShou)
++ 2017-04-27
+  + Fix generated class modifier bug:package-private -> public
+  + Add EventLogger
+  + MvpHelper_v2_2_release.jar
 + 2017-04-25
   + Save and load configurations.
   + Load config while running.
@@ -130,7 +137,7 @@ select ```Mvp Helper``` .
   + Is the document END WITH ```Contract``` and UNDER a ```contract``` package
   + Is the document END WITH ```Presneter``` and UNDER a ```presenter``` package
 
-### v1.1 -Based on Java IO Api, by [githubwing](https://github.com/githubwing)
+### v1.x -Based on Java IO Api, by [githubwing](https://github.com/githubwing)
 + 2017-04-10 Try to rebuild the project with Intellij Open Api.
 + 2017-04-09 Remove ```C``` smell form original source code.
 + 2017-04-06 Fork form [original repe](https://github.com/githubwing/MVPHelper), add comment lines for reading.

README.md

@@ -4,16 +4,17 @@
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
     <idea-version since-build="141.0"/>
     <name>MVPHelper</name>
-    <version>2.1</version>
+    <version>2.2</version>
     <vendor email="[email protected]" url="https://github.com/githubwing/MVPHelper"/>
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
     <!-- uncomment to enable plugin in all products
     <depends>com.intellij.modules.lang</depends>
     -->
     <description>
-        A plugin that helps you to create classes and interfaces for MVP. Click Generate --> MVPHelper in Contract or
-        Presenter class. see the https://github.com/githubwing/MVPHelper
+        A plugin that helps you to create classes and interfaces for MVP.
+        Click 'Generate' --> 'Mvp Helper' in Contract or Presenter class.
+        For more detail see the link below.
     </description>
 
     <extensions defaultExtensionNs="com.intellij">

README_EN.md

@@ -0,0 +1,24 @@
+package com.wingsofts.mvphelper.biz;
+
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationType;
+import com.intellij.notification.Notifications;
+
+/**
+ * @author Administrator
+ * @since 2017/4/27
+ */
+public class EventLogger {
+    private static final String GROUP_ID = "Mvp Helper";//The unique group id where "Event Log" could use to group your messages together.
+    private static final String TITLE = "Mvp Helper Event Log";//The title on Balloon
+
+    /**
+     * Print log to "Event Log"
+     */
+    public static void log(String msg) {
+        Notification notification = new Notification(GROUP_ID, TITLE, msg, NotificationType.INFORMATION);//build a notification
+        Notifications.Bus.notify(notification);//use the default bus to notify (application level)
+        //noinspection ConstantConditions: since the notification has been notified, the balloon won't be null.
+        notification.getBalloon().hide(true);//try to hide the balloon immediately.
+    }
+}

img/log.gif

@@ -13,6 +13,8 @@
 
 import java.util.ResourceBundle;
 
+import static com.wingsofts.mvphelper.biz.EventLogger.log;
+
 /**
  * @author DengChao
  * @see #moveDirPointer(PsiDirectory, String)
@@ -110,6 +112,7 @@ protected PsiDirectory moveDirPointer(@NotNull final PsiDirectory currentDir, @N
         if (subDirectory[0] == null) {
             WriteCommandAction.runWriteCommandAction(currentDir.getProject(), () -> {
                 subDirectory[0] = currentDir.createSubdirectory(subPackage);
+                log("BaseDirGenerator: " + currentDir.getVirtualFile().getPath() + "/" + subPackage + " generated");
             });
         }
         return subDirectory[0];

resources/META-INF/plugin.xml

@@ -10,6 +10,8 @@
 import com.wingsofts.mvphelper.biz.config.impl.MvpConfig;
 import com.wingsofts.mvphelper.biz.file.generator.FileGenerator;
 
+import static com.wingsofts.mvphelper.biz.EventLogger.log;
+
 /**
  * The base file generator, provide basic functions for child-class.
  *
@@ -18,6 +20,7 @@
  */
 @SuppressWarnings({"ConstantConditions", "WeakerAccess"})
 abstract class BaseFileGenerator implements FileGenerator {
+    //    private final org.apache.log4j.Logger logger;
     protected Project myProject;//current java project
     protected PsiDirectory myContractDir;//the contract package dir
     protected PsiDirectory myModelDir;//the model package dir
@@ -66,17 +69,18 @@ protected void generateFile(final PsiDirectory directory, final String fileName,
                 psiClass = psiClasses[0];
                 javaFile = (PsiJavaFile) psiClass.getContainingFile();
                 javaFile.delete();//then delete the old one
-                System.out.println("JavaModeFileGenerator.generateFile: " + fixedFileName + " old file deleted");
+                log("BaseFileGenerator: " + fixedFileName + " old file deleted");
             }//and re-generate one
             psiClass = myDirectoryService.createClass(directory, fixedFileName, type);
             javaFile = (PsiJavaFile) psiClass.getContainingFile();
             PsiPackage psiPackage = myDirectoryService.getPackage(directory);
             javaFile.setPackageName(psiPackage.getQualifiedName());
-            System.out.println("JavaModeFileGenerator.generateFile: " + fixedFileName + " generated");
+            log("BaseFileGenerator: " + fixedFileName + " generated");
             listener.onJavaFileGenerated(javaFile, psiClass);
         });
     }
 
+
     @FunctionalInterface
     protected interface onFileGeneratedListener {
         /**