From e702ac89d5b8c88b9f094f28f1124c7346490d16 Mon Sep 17 00:00:00 2001
From: senn <bart.senn@gmail.com>
Date: Thu, 28 Oct 2021 14:36:56 +0200
Subject: [PATCH] a tough nut to crack but persistence of settings works!

---
 .idea/codeStyles/codeStyleConfig.xml          |   5 +
 .idea/workspace.xml                           | 142 ++++++++++++++++--
 resources/META-INF/plugin.xml                 |  18 ++-
 .../compgen/{ui => }/IJSessionConstants.java  |   4 +-
 .../intellij/compgen/PersistentSettings.java  | 111 ++++++++++++++
 .../intellij/compgen/PluginConstants.java     |  16 ++
 .../compgen/actions/OnClickCreateAction.java  |  17 ++-
 .../compgen/ui/ComponentOptionsDialog.form    |  16 +-
 .../compgen/ui/ComponentOptionsDialog.java    |   5 +
 9 files changed, 310 insertions(+), 24 deletions(-)
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 rename src/com/senn/aem/plugin/intellij/compgen/{ui => }/IJSessionConstants.java (89%)
 create mode 100644 src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java

diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8f49b19..d48ef37 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="c4d16df7-eacd-49f2-9bcf-b370bfbd6c4d" name="Changes" comment="">
+    <list default="true" id="c4d16df7-eacd-49f2-9bcf-b370bfbd6c4d" name="Changes" comment="removed System.out.println statements">
+      <change afterPath="$PROJECT_DIR$/.idea/ant.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/resources/META-INF/plugin.xml" beforeDir="false" afterPath="$PROJECT_DIR$/resources/META-INF/plugin.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/create/ComponentFilesCreatorFactory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/create/ComponentFilesCreatorFactory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/create/impl/FileWritingComponentFilesCreator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/create/impl/FileWritingComponentFilesCreator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/utils/ComponentConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ComponentConfig.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/ui/IJSessionConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/IJSessionConstants.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -138,6 +144,10 @@
       <workItem from="1634825539573" duration="24931000" />
       <workItem from="1635150992361" duration="74000" />
       <workItem from="1635151215421" duration="6927000" />
+      <workItem from="1635248319722" duration="344000" />
+      <workItem from="1635340257967" duration="2280000" />
+      <workItem from="1635343963592" duration="8788000" />
+      <workItem from="1635407182752" duration="16618000" />
     </task>
     <task id="LOCAL-00001" summary="work in progress 1">
       <created>1634231384327</created>
@@ -272,7 +282,98 @@
       <option name="project" value="LOCAL" />
       <updated>1635159318707</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="moved ComponentConfig.java to main package (didn't belong in utils)">
+      <created>1635166317398</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1635166317398</updated>
+    </task>
+    <task id="LOCAL-00021" summary="added readme">
+      <created>1635167104912</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1635167104912</updated>
+    </task>
+    <task id="LOCAL-00022" summary="added some extra readme info">
+      <created>1635167201318</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1635167201318</updated>
+    </task>
+    <task id="LOCAL-00023" summary="added some extra readme info - usage">
+      <created>1635168018814</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1635168018814</updated>
+    </task>
+    <task id="LOCAL-00024" summary="removed System.out.println statements">
+      <created>1635236413378</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1635236413378</updated>
+    </task>
+    <task id="LOCAL-00025" summary="removed System.out.println statements">
+      <created>1635236469879</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1635236469879</updated>
+    </task>
+    <task id="LOCAL-00026" summary="updated README.md">
+      <created>1635342043246</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1635342043246</updated>
+    </task>
+    <task id="LOCAL-00027" summary="added important remark in README.md">
+      <created>1635342358547</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1635342358547</updated>
+    </task>
+    <task id="LOCAL-00028" summary="sling model package fix">
+      <created>1635347690165</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1635347690165</updated>
+    </task>
+    <task id="LOCAL-00029" summary="added handling of /apps folder showing up in clientlib category">
+      <created>1635349343160</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1635349343160</updated>
+    </task>
+    <task id="LOCAL-00030" summary="critical bug fixed: no component subpackage in imports and htl-use">
+      <created>1635403418442</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1635403418442</updated>
+    </task>
+    <task id="LOCAL-00031" summary="some major UI improvements like project view expansion to files">
+      <created>1635410642171</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1635410642171</updated>
+    </task>
+    <task id="LOCAL-00032" summary="plugin constants">
+      <created>1635421577254</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1635421577254</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -281,12 +382,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="work in progress 1" />
-    <MESSAGE value="renamed action label" />
-    <MESSAGE value="updated workspace.xml" />
-    <MESSAGE value="refactored and changed a whole lot (session constants, more config options, ...)" />
-    <MESSAGE value="working file creation and notifications" />
-    <MESSAGE value="some logging added" />
     <MESSAGE value="success notification when finished" />
     <MESSAGE value="working HTML files creation + some other improvements and refactored stuff" />
     <MESSAGE value="forgot to set UI_APPS_JCR_ROOT session constant" />
@@ -300,6 +395,29 @@
     <MESSAGE value="added some comment to dialogconfig.content.xml" />
     <MESSAGE value="removed unused variable" />
     <MESSAGE value="working sling model" />
-    <option name="LAST_COMMIT_MESSAGE" value="working sling model" />
+    <MESSAGE value="moved ComponentConfig.java to main package (didn't belong in utils)" />
+    <MESSAGE value="added readme" />
+    <MESSAGE value="added some extra readme info" />
+    <MESSAGE value="added some extra readme info - usage" />
+    <MESSAGE value="removed System.out.println statements" />
+    <MESSAGE value="updated README.md" />
+    <MESSAGE value="added important remark in README.md" />
+    <MESSAGE value="sling model package fix" />
+    <MESSAGE value="added handling of /apps folder showing up in clientlib category" />
+    <MESSAGE value="critical bug fixed: no component subpackage in imports and htl-use" />
+    <MESSAGE value="some major UI improvements like project view expansion to files" />
+    <MESSAGE value="plugin constants" />
+    <option name="LAST_COMMIT_MESSAGE" value="plugin constants" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java</url>
+          <line>17</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index f25f12c..0844662 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,21 +1,23 @@
 <idea-plugin>
   <id>com.senn.aem.plugin.intellij.compgen</id>
   <name>AEM Component Generator</name>
-  <version>0.1.2</version>
+  <version>0.1.3</version>
   <vendor email="bart.senn@gmail.com" url="https://github.com/senn">senn</vendor>
 
   <description><![CDATA[
-      Plugin that can easily create AEM component files (
+      Plugin that can easily create AEM component files
     ]]></description>
 
   <change-notes><![CDATA[
-      Initial plugin
-        + removed some println statements
+      v0.1.2
+        + bugfixes and improvements
+        + UI improvements (project view can navigate to new files)
+        + persistence of selected values in workspace xml
     ]]>
   </change-notes>
 
   <!-- please see https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html for description -->
-  <idea-version since-build="173.0"/>
+  <idea-version since-build="193.0"/>
 
   <!-- please see https://plugins.jetbrains.com/docs/intellij/plugin-compatibility.html
        on how to target different products -->
@@ -23,8 +25,14 @@
 
   <extensions defaultExtensionNs="com.intellij">
     <notificationGroup id="Senn.AEM" displayType="BALLOON" key="com.senn.aem"/>
+    <postStartupActivity id="initPlugin" implementation="com.senn.aem.plugin.intellij.compgen.PersistentSettings" />
   </extensions>
 
+  <projectListeners>
+    <listener class="com.senn.aem.plugin.intellij.compgen.PersistentSettings"
+              topic="com.intellij.openapi.project.ProjectManagerListener"/>
+  </projectListeners>
+
   <actions>
     <action
             id="Senn.AEM.CompGen.Create"
diff --git a/src/com/senn/aem/plugin/intellij/compgen/ui/IJSessionConstants.java b/src/com/senn/aem/plugin/intellij/compgen/IJSessionConstants.java
similarity index 89%
rename from src/com/senn/aem/plugin/intellij/compgen/ui/IJSessionConstants.java
rename to src/com/senn/aem/plugin/intellij/compgen/IJSessionConstants.java
index eb7126c..e950727 100644
--- a/src/com/senn/aem/plugin/intellij/compgen/ui/IJSessionConstants.java
+++ b/src/com/senn/aem/plugin/intellij/compgen/IJSessionConstants.java
@@ -1,4 +1,4 @@
-package com.senn.aem.plugin.intellij.compgen.ui;
+package com.senn.aem.plugin.intellij.compgen;
 
 /**
  * Some fields that should be kept in memory during the IntelliJ session.
@@ -22,4 +22,6 @@ public class IJSessionConstants {
 
     //booleans what to do
     public static boolean OPEN_AFTER_CREATION = true;
+    public static boolean PERSIST_SETTINGS = true;
+
 }
diff --git a/src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java b/src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java
new file mode 100644
index 0000000..22c66f8
--- /dev/null
+++ b/src/com/senn/aem/plugin/intellij/compgen/PersistentSettings.java
@@ -0,0 +1,111 @@
+package com.senn.aem.plugin.intellij.compgen;
+
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.application.ApplicationListener;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManagerListener;
+import com.intellij.openapi.startup.StartupActivity;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PersistentSettings implements StartupActivity, ProjectManagerListener {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PersistentSettings.class);
+
+    @Override
+    public void runActivity(@NotNull Project project) {
+        //loadSettings(project);
+    }
+
+    @Override
+    public void projectOpened(@NotNull Project project) {
+        loadSettings(project);
+    }
+
+    @Override
+    public boolean canCloseProject(@NotNull Project project) {
+        persistSettings(project);
+        return ProjectManagerListener.super.canCloseProject(project);
+    }
+
+    @Override
+    public void projectClosing(@NotNull Project project) {
+        persistSettings(project);
+    }
+
+    public static void persistSettings(@NotNull Project project) {
+        LOGGER.info("Persisting settings to workspace file...");
+        final PropertiesComponent props = PropertiesComponent.getInstance(project);
+        props.setValue(PluginConstants.KEY_JAVA_ROOT, IJSessionConstants.JAVA_ROOT);
+        props.setValue(PluginConstants.KEY_COMPONENT_GROUP, IJSessionConstants.COMPONENT_GROUP);
+        props.setValue(PluginConstants.KEY_UI_APPS_ROOT, IJSessionConstants.UI_APPS_ROOT);
+        props.setValue(PluginConstants.KEY_PACKAGE, IJSessionConstants.PACKAGE);
+        //for booleans nothing is persisted if the value is the same as the default value for some reason
+        //see PropertiesComponentImpl.setValue(String, boolean, boolean)
+        //so we explicitly provide a default that is the negation of our value
+        props.setValue(PluginConstants.KEY_SELECT_HTML, IJSessionConstants.SELECT_HTML, !IJSessionConstants.SELECT_HTML);
+        props.setValue(PluginConstants.KEY_SELECT_DIALOG_XML, IJSessionConstants.SELECT_DIALOG_XML, !IJSessionConstants.SELECT_DIALOG_XML);
+        props.setValue(PluginConstants.KEY_SELECT_EDIT_CONFIG_XML, IJSessionConstants.SELECT_EDIT_CONFIG_XML, !IJSessionConstants.SELECT_EDIT_CONFIG_XML);
+        props.setValue(PluginConstants.KEY_SELECT_JS, IJSessionConstants.SELECT_JS, !IJSessionConstants.SELECT_JS);
+        props.setValue(PluginConstants.KEY_SELECT_CSS, IJSessionConstants.SELECT_CSS, !IJSessionConstants.SELECT_CSS);
+        props.setValue(PluginConstants.KEY_SELECT_SLING_MODEL, IJSessionConstants.SELECT_SLING_MODEL, !IJSessionConstants.SELECT_SLING_MODEL);
+        props.setValue(PluginConstants.KEY_SELECT_OPEN_AFTER_CREATION, IJSessionConstants.OPEN_AFTER_CREATION, !IJSessionConstants.OPEN_AFTER_CREATION);
+        LOGGER.info("Settings successfully persisted!");
+    }
+
+    public static void loadSettings(@NotNull Project project) {
+        LOGGER.info("Loading persistent settings from workspace file...");
+        final PropertiesComponent props = PropertiesComponent.getInstance(project);
+        int loaded = 0;
+        if(props.isValueSet(PluginConstants.KEY_JAVA_ROOT)) {
+            IJSessionConstants.JAVA_ROOT = props.getValue(PluginConstants.KEY_JAVA_ROOT);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_COMPONENT_GROUP)) {
+            IJSessionConstants.COMPONENT_GROUP = props.getValue(PluginConstants.KEY_COMPONENT_GROUP);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_UI_APPS_ROOT)) {
+            IJSessionConstants.UI_APPS_ROOT = props.getValue(PluginConstants.KEY_UI_APPS_ROOT);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_PACKAGE)) {
+            IJSessionConstants.PACKAGE = props.getValue(PluginConstants.KEY_PACKAGE);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_HTML)) {
+            IJSessionConstants.SELECT_HTML = props.getBoolean(PluginConstants.KEY_SELECT_HTML);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_DIALOG_XML)) {
+            IJSessionConstants.SELECT_DIALOG_XML = props.getBoolean(PluginConstants.KEY_SELECT_DIALOG_XML);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_EDIT_CONFIG_XML)) {
+            IJSessionConstants.SELECT_EDIT_CONFIG_XML = props.getBoolean(PluginConstants.KEY_SELECT_EDIT_CONFIG_XML);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_JS)) {
+            IJSessionConstants.SELECT_JS = props.getBoolean(PluginConstants.KEY_SELECT_JS);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_CSS)) {
+            IJSessionConstants.SELECT_CSS = props.getBoolean(PluginConstants.KEY_SELECT_CSS);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_SLING_MODEL)) {
+            IJSessionConstants.SELECT_SLING_MODEL = props.getBoolean(PluginConstants.KEY_SELECT_SLING_MODEL);
+            loaded++;
+        }
+        if(props.isValueSet(PluginConstants.KEY_SELECT_OPEN_AFTER_CREATION)) {
+            IJSessionConstants.OPEN_AFTER_CREATION = props.getBoolean(PluginConstants.KEY_SELECT_OPEN_AFTER_CREATION);
+            loaded++;
+        }
+        if(loaded > 0) {
+            LOGGER.info("Settings successfully loaded!");
+        } else {
+            LOGGER.info("No settings found!");
+        }
+    }
+}
diff --git a/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java b/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java
index fe53675..4938f97 100644
--- a/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java
+++ b/src/com/senn/aem/plugin/intellij/compgen/PluginConstants.java
@@ -8,4 +8,20 @@ public interface PluginConstants {
 
     String PLUGIN_ID = "com.senn.aem.plugin.intellij.compgen";
 
+    //persistent keys
+    String KEY_JAVA_ROOT = buildKey("javaRoot");
+    String KEY_UI_APPS_ROOT = buildKey("uiAppsRoot");
+    String KEY_PACKAGE = buildKey("package");
+    String KEY_COMPONENT_GROUP = buildKey("componentGroup");
+    String KEY_SELECT_HTML = buildKey("selectHtml");
+    String KEY_SELECT_DIALOG_XML = buildKey("selectDialogXml");
+    String KEY_SELECT_EDIT_CONFIG_XML = buildKey("selectEditConfigXml");
+    String KEY_SELECT_JS = buildKey("selectJS");
+    String KEY_SELECT_CSS = buildKey("selectCSS");
+    String KEY_SELECT_SLING_MODEL = buildKey("selectSlingModel");
+    String KEY_SELECT_OPEN_AFTER_CREATION = buildKey("selectOpenAfterCreation");
+
+    private static String buildKey(final String setting) {
+        return PLUGIN_ID + "." + setting;
+    }
 }
diff --git a/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java b/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java
index 0c8501e..9ed01f4 100644
--- a/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java
+++ b/src/com/senn/aem/plugin/intellij/compgen/actions/OnClickCreateAction.java
@@ -6,10 +6,11 @@
 import com.intellij.openapi.project.Project;
 import com.senn.aem.plugin.intellij.compgen.ComponentConfig;
 import com.senn.aem.plugin.intellij.compgen.ComponentCreationException;
+import com.senn.aem.plugin.intellij.compgen.PersistentSettings;
 import com.senn.aem.plugin.intellij.compgen.create.ComponentFilesCreator;
 import com.senn.aem.plugin.intellij.compgen.create.ComponentFilesCreatorFactory;
 import com.senn.aem.plugin.intellij.compgen.ui.ComponentOptionsDialog;
-import com.senn.aem.plugin.intellij.compgen.ui.IJSessionConstants;
+import com.senn.aem.plugin.intellij.compgen.IJSessionConstants;
 import com.senn.aem.plugin.intellij.compgen.ui.UIUtils;
 import com.senn.aem.plugin.intellij.compgen.utils.FocusPriorityFile;
 import java.io.File;
@@ -52,7 +53,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {
                     dialog.makeHtml()
             );
 
-            updateSessionConstants(dialog);
+            updateSessionConstants(dialog, project);
 
             try {
                 long startTime = System.currentTimeMillis();
@@ -85,9 +86,10 @@ public void actionPerformed(@NotNull AnActionEvent event) {
         }
     }
 
-    private void updateSessionConstants(final ComponentOptionsDialog dialog) {
+    private void updateSessionConstants(final ComponentOptionsDialog dialog, final Project project) {
         IJSessionConstants.SELECT_HTML = dialog.makeHtml();
         IJSessionConstants.JAVA_ROOT = dialog.getJavaRoot();
+        IJSessionConstants.COMPONENT_GROUP = dialog.getComponentGroup();
         IJSessionConstants.PACKAGE = dialog.getPackageName();
         IJSessionConstants.SELECT_HTML = dialog.makeHtml();
         IJSessionConstants.SELECT_DIALOG_XML = dialog.makeDialogXml();
@@ -97,7 +99,14 @@ private void updateSessionConstants(final ComponentOptionsDialog dialog) {
         IJSessionConstants.SELECT_SLING_MODEL = dialog.makeSlingModelCode();
         IJSessionConstants.UI_APPS_ROOT = dialog.getUiAppsRoot();
         IJSessionConstants.OPEN_AFTER_CREATION = dialog.openAfterCreation();
-        LOGGER.info("Setting session constants to selected values");
+        IJSessionConstants.PERSIST_SETTINGS = dialog.persistSettings();
+        LOGGER.info("Set session constants to selected values");
+
+        if(dialog.persistSettings()) {
+            PersistentSettings.persistSettings(project);
+            LOGGER.info("Also persisted session constants to selected values");
+        }
+
     }
 
     private List<File> createComponentFiles(final ComponentConfig config, final Project project) throws ComponentCreationException {
diff --git a/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form b/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form
index 5d40d6e..40491aa 100644
--- a/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form
+++ b/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.senn.aem.plugin.intellij.compgen.ui.ComponentOptionsDialog">
-  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="12" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="13" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="891" height="356"/>
+      <xy x="20" y="20" width="891" height="382"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -167,6 +167,18 @@
           <text value="                                                                                                                                      Open files after creation?"/>
         </properties>
       </component>
+      <component id="e1386" class="javax.swing.JCheckBox" binding="chkPersistSettings">
+        <constraints>
+          <grid row="12" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <font style="2"/>
+          <horizontalAlignment value="4"/>
+          <horizontalTextPosition value="2"/>
+          <selected value="true"/>
+          <text value="                                                                                                                                        Save settings in project?"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java b/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java
index d648ab4..9c621df 100644
--- a/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java
+++ b/src/com/senn/aem/plugin/intellij/compgen/ui/ComponentOptionsDialog.java
@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.senn.aem.plugin.intellij.compgen.IJSessionConstants;
 import java.awt.*;
 import javax.swing.*;
 import org.apache.commons.lang.StringUtils;
@@ -21,6 +22,7 @@ public class ComponentOptionsDialog extends DialogWrapper {
     private JTextField txtUiAppsRoot;
     private JTextField txtComponentGroup;
     private JCheckBox chkOpenFiles;
+    private JCheckBox chkPersistSettings;
 
     public ComponentOptionsDialog(@Nullable Project project) {
         super(project, true);
@@ -48,6 +50,7 @@ protected void init() {
         chkCSS.setSelected(IJSessionConstants.SELECT_CSS);
         chkCode.setSelected(IJSessionConstants.SELECT_SLING_MODEL);
         chkOpenFiles.setSelected(IJSessionConstants.OPEN_AFTER_CREATION);
+        chkPersistSettings.setSelected(IJSessionConstants.PERSIST_SETTINGS);
 
         txtUiAppsRoot.setInputVerifier(new NotEmptyVerifier());
         txtCodeJavaRoot.setInputVerifier(new NotEmptyVerifier());
@@ -105,6 +108,8 @@ public boolean makeHtml()  {
 
     public boolean openAfterCreation() { return chkOpenFiles.isSelected(); }
 
+    public boolean persistSettings() { return chkPersistSettings.isSelected(); }
+
     private static class NotEmptyVerifier extends InputVerifier {
         @Override
         public boolean verify(JComponent jComponent) {