Merge pull request #82 from shyim/plugin-command

Fix plugin command, fixes #50
Haehnchen · Nov 22, 2018 · f67f16c · f67f16c
2 parents 4421c91 + 8c2a9fb
commit f67f16c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/de/espend/idea/shopware/action/generator/ui/PluginGeneratorDialog.java b/src/main/java/de/espend/idea/shopware/action/generator/ui/PluginGeneratorDialog.java
@@ -61,8 +61,13 @@ public void windowClosing(WindowEvent e) {
         this.namespaceComboBox.addItem("Frontend");
         this.namespaceComboBox.addItem("Core");
         this.namespaceComboBox.addItem("Backend");
+        this.namespaceComboBox.setEnabled(false);
 
         this.namespaceComboBox.setSelectedIndex(0);
+
+        this.addLegacyCheckBox.addActionListener(e -> {
+            this.namespaceComboBox.setEnabled(((JCheckBox) e.getSource()).isSelected());
+        });
     }
 
     private void onOK() {

diff --git a/src/main/java/de/espend/idea/shopware/action/generator/utils/PluginGeneratorUtil.java b/src/main/java/de/espend/idea/shopware/action/generator/utils/PluginGeneratorUtil.java
@@ -146,8 +146,6 @@ private static List<String> generateCommand(@NotNull PluginGeneratorSettings set
         commands.add("sw-cli-tools.phar");
         commands.add("plugin:create");
 
-        commands.add("--namespace=" + settings.getNamespace());
-
         if (settings.getAddDummyFilter()) {
             commands.add("--haveFilter");
         }
@@ -178,6 +176,7 @@ private static List<String> generateCommand(@NotNull PluginGeneratorSettings set
 
         if (settings.isLegacyStructure()) {
             commands.add("--legacy");
+            commands.add("--namespace=" + settings.getNamespace());
         }
 
         commands.add(settings.getPluginName());