Merge pull request #13 from SchibstedSpain/issue-8-corrected-generati…

…on-path

[Issue 8] Corrected generation of files with the correct active project path (PART2)

CHANGELOG.md

@@ -1,3 +1 @@
-Now shows the modules from the current project active
-When using a kotlin reserved name on a model it changes its name to "Model"+"class name"
-"Body" parameter now use the correct class reference
+Corrected generation of files with the correct active project path

src/main/java/protein/common/StorageUtils.java

@@ -44,14 +44,14 @@ public static ListModel getFoldersList() {
     }
 
     public static void generateFiles(@Nullable String moduleName, @Nullable String packageName, @NotNull com.squareup.kotlinpoet.TypeSpec classTypeSpec) {
-        FileSpec kotlinFile = FileSpec.builder(packageName, classTypeSpec.getName()).addType(classTypeSpec).build();
-
         try {
+            FileSpec kotlinFile = FileSpec.builder(packageName, classTypeSpec.getName()).addType(classTypeSpec).build();
+            Project currentProject = (Project)DataManager.getInstance().getDataContext().getData(DataConstants.PROJECT);
             String projectPath;
             if (moduleName != null && !"".equals(moduleName)) {
-                projectPath = FileEditorManager.getInstance(ProjectManager.getInstance().getOpenProjects()[0]).getProject().getBasePath() + "/" + moduleName + "/src/main/java/";
+                projectPath = FileEditorManager.getInstance(currentProject).getProject().getBasePath() + "/" + moduleName + "/src/main/java/";
             } else {
-                projectPath = FileEditorManager.getInstance(ProjectManager.getInstance().getOpenProjects()[0]).getProject().getBasePath() + "/src/main/java/";
+                projectPath = FileEditorManager.getInstance(currentProject).getProject().getBasePath() + "/src/main/java/";
             }
             Path path = FileSystems.getDefault().getPath(projectPath);
             if (!Files.exists(path)) {

src/main/kotlin/protein/ide/component/ProteinUpdateComponent.kt

@@ -31,8 +31,8 @@ class ProteinUpdateComponent(project: Project) : AbstractProjectComponent(projec
     If you find my plugin helpful,
     <b><a href="https://plugins.jetbrains.com/plugin/10206-protein--kotlin-code-generator-for-retrofit2-and-rxjava2-based-on-swagger">
     Please give me a star on JetBrains Plugin Store</a></b><br/>
-    If you find any issue, <b><a href="https://github.com/SchibstedSpain">Feel free to raise a issue</a></b><br/>
-    See <b><a href="https://plugins.jetbrains.com/plugin/10206-protein--kotlin-code-generator-for-retrofit2-and-rxjava2-based-on-swagger">Changelog</a></b>
+    If you find any issue, <b><a href="https://github.com/SchibstedSpain/Protein/issues/new/choose">Feel free to raise a issue</a></b><br/>
+    See <b><a href="https://github.com/SchibstedSpain/Protein/blob/master/CHANGELOG.md">Changelog</a></b>
     for more details.
     """
 

src/main/resources/META-INF/plugin.xml

@@ -42,9 +42,7 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      Now shows the modules from the current project active
-      When using a kotlin reserved name on a model it changes its name to "Model"+"class name"
-      "Body" parameter now use the correct class reference
+      Corrected generation of files with the correct active project path
     ]]>
   </change-notes>
 

version.properties

@@ -1,3 +1,3 @@
 MAJOR=1
 MINOR=0
-PATCH=1
+PATCH=2