From 7f7a97bd3e48a03c70f6239e78bba88bc26afe34 Mon Sep 17 00:00:00 2001
From: hans <837713748@qq.com>
Date: Wed, 13 Sep 2023 20:36:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=9D=E5=A7=8B=E5=8C=96=E5=99=A8ux?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=202.=E5=8E=BB=E9=99=A4pull?=
 =?UTF-8?q?ing=20metadata=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                       |  4 ++++
 gradle.properties                                  |  2 +-
 .../plugin/initializr/SolonInitializrBuilder.java  | 14 ++++++++++++--
 .../plugin/initializr/step/ProjectDetails.form     |  2 +-
 .../plugin/initializr/step/ProjectDetails.java     | 11 +++++++----
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd4139..c4db0d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
 
 # Solon Changelog
+## [0.0.1-M7]
+### Added
+- Initializer ux logic optimization
+- Removing Pulling Metadata Popup
 
 ## [0.0.1-M6]
 ### Added
diff --git a/gradle.properties b/gradle.properties
index e5ce368..eaa3511 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ pluginName = Solon
 pluginRepositoryUrl = https://gitee.com/noear/solon-idea-plugin
 # SemVer format -> https://semver.org
 
-pluginVersion = 0.0.1-M6
+pluginVersion = 0.0.1-M7
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 213
diff --git a/src/main/java/org/noear/solon/idea/plugin/initializr/SolonInitializrBuilder.java b/src/main/java/org/noear/solon/idea/plugin/initializr/SolonInitializrBuilder.java
index a9c6420..3b00531 100644
--- a/src/main/java/org/noear/solon/idea/plugin/initializr/SolonInitializrBuilder.java
+++ b/src/main/java/org/noear/solon/idea/plugin/initializr/SolonInitializrBuilder.java
@@ -89,7 +89,7 @@ public class SolonInitializrBuilder extends ModuleBuilder {
     // first wizard page
     @Override
     public @Nullable ModuleWizardStep getCustomOptionsStep(WizardContext wizardContext, Disposable parentDisposable) {
-        ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
+        ProgressManager.getInstance().executeNonCancelableSection(() -> {
             try {
                 this.getMetadata().refreshMetadataOptions(ProgressManager.getInstance().getProgressIndicator());
             } catch (IOException e) {
@@ -97,7 +97,17 @@ public class SolonInitializrBuilder extends ModuleBuilder {
                         () -> Messages.showErrorDialog("Error: " + e.getMessage(), "Pull metadata Failed")
                 );
             }
-        }, "Pulling metadata...", true, null);
+        });
+        //暂时保留防止executeNonCancelableSection方法不正确用于参考
+//        ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
+//            try {
+//                this.getMetadata().refreshMetadataOptions(ProgressManager.getInstance().getProgressIndicator());
+//            } catch (IOException e) {
+//                ApplicationManager.getApplication().invokeLater(
+//                        () -> Messages.showErrorDialog("Error: " + e.getMessage(), "Pull metadata Failed")
+//                );
+//            }
+//        }, "Pulling metadata...", true, null);
         return new ProjectDetailsStep(this, wizardContext);
     }
 
diff --git a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.form b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.form
index 6e455d3..c45017d 100644
--- a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.form
+++ b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="Panel_Root" layout-manager="GridLayoutManager" row-count="16" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="20" vgap="15">
     <margin top="20" left="20" bottom="20" right="20"/>
     <constraints>
-      <xy x="20" y="20" width="540" height="743"/>
+      <xy x="20" y="20" width="536" height="753"/>
     </constraints>
     <properties/>
     <border type="none"/>
diff --git a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.java b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.java
index 9a60d74..bc888e7 100644
--- a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.java
+++ b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetails.java
@@ -76,6 +76,7 @@ public class ProjectDetails {
             this.isNameChanged = true;
             this.metadata.setName(TextField_Name.getText());
             LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Name.getText()));
+            TextField_Artifact.setText(TextField_Name.getText());
         });
 
         LocationTips.setText(this.metadata.getLocation() + "\\" + TextField_Name.getText());
@@ -85,16 +86,17 @@ public class ProjectDetails {
             this.isGroupChanged = true;
             this.metadata.setGroupId(TextField_Group.getText());
             TextField_PackageName.setText(TextField_Group.getText() + "." + TextField_Artifact.getText());
-            this.metadata.setPackageName(TextField_PackageName.getText());
         });
 
         TextField_Artifact.setText(this.metadata.getArtifactId());
         TextField_Artifact.addCaretListener(e -> {
             this.isArtifactChanged = true;
             this.metadata.setArtifactId(TextField_Artifact.getText());
-            TextField_PackageName.setText(TextField_Group.getText() + "." + TextField_Artifact.getText());
-            this.metadata.setPackageName(TextField_PackageName.getText());
-
+            String artifact = TextField_Artifact.getText();
+            if (artifact.contains("-")) {
+                artifact=artifact.replace("-","_");
+            }
+            TextField_PackageName.setText(TextField_Group.getText() + "." + artifact);
         });
 
         TextField_PackageName.setText(this.metadata.getPackageName());
@@ -233,4 +235,5 @@ public class ProjectDetails {
         }
         return true;
     }
+
 }
-- 
Gitee