From 630a2e0038dc6ebb14da4346ac6f6c604d368628 Mon Sep 17 00:00:00 2001 From: hans <837713748@qq.com> Date: Sun, 19 Nov 2023 20:39:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4name=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++ gradle.properties | 2 +- .../metadata/SolonCreationMetadata.java | 14 ++-- .../initializr/step/ProjectDetails.form | 64 +++++++------------ .../initializr/step/ProjectDetails.java | 32 ++++------ .../initializr/step/ProjectDetailsStep.java | 4 +- 6 files changed, 52 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d467643..11f31de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Solon Changelog +## [0.0.6] +### Added +- Code prompt garbled +- Fix configuration issues under native project +- Fix the issue of occasionally not displaying configuration prompts + ## [0.0.6-M4] ### Added diff --git a/gradle.properties b/gradle.properties index b0960d0..471079d 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.6-M4 +pluginVersion = 0.0.6 # 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/metadata/SolonCreationMetadata.java b/src/main/java/org/noear/solon/idea/plugin/initializr/metadata/SolonCreationMetadata.java index b94ebd4..6bbfb98 100644 --- a/src/main/java/org/noear/solon/idea/plugin/initializr/metadata/SolonCreationMetadata.java +++ b/src/main/java/org/noear/solon/idea/plugin/initializr/metadata/SolonCreationMetadata.java @@ -102,13 +102,13 @@ public class SolonCreationMetadata { return true; } - public String getName() { - return name; - } +// public String getName() { +// return name; +// } - public void setName(String name) { - this.name = name; - } +// public void setName(String name) { +// this.name = name; +// } public String getLocation() { return location; @@ -259,7 +259,7 @@ public class SolonCreationMetadata { SolonMetadata solonMetadata = JSON.parseObject(responseText, SolonMetadata.class); setInitMetadata(solonMetadata); setServer(solonMetadata.getServer()); - setName(solonMetadata.getArtifact().getDefaultValue()); +// setName(solonMetadata.getArtifact().getDefaultValue()); setGroupId(solonMetadata.getGroup().getDefaultValue()); setArtifactId(solonMetadata.getArtifact().getDefaultValue()); setPackageName(solonMetadata.getPackageName().getDefaultValue()); 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 5d7a8db..426f300 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 @@ -1,34 +1,16 @@
- + - + - - - - - - - - - - - - - - - - - - - + @@ -36,13 +18,13 @@ - + - + @@ -50,7 +32,7 @@ - + @@ -60,7 +42,7 @@ - + @@ -68,7 +50,7 @@ - + @@ -78,7 +60,7 @@ - + @@ -86,7 +68,7 @@ - + @@ -96,7 +78,7 @@ - + @@ -104,7 +86,7 @@ - + @@ -112,7 +94,7 @@ - + @@ -122,7 +104,7 @@ - + @@ -130,7 +112,7 @@ - + @@ -138,7 +120,7 @@ - + @@ -146,7 +128,7 @@ - + @@ -154,7 +136,7 @@ - + @@ -200,13 +182,13 @@ - + - + @@ -215,7 +197,7 @@ - + @@ -240,7 +222,7 @@ - + @@ -248,7 +230,7 @@ - + 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 6cae702..75a3b02 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 @@ -50,7 +50,6 @@ public class ProjectDetails { private final SolonInitializrBuilder moduleBuilder; private final SolonCreationMetadata metadata; private JPanel Panel_Root; - private JBTextField TextField_Name; private TextFieldWithBrowseButton TextField_Location; private JBTextField TextField_Group; private JBTextField TextField_Artifact; @@ -66,6 +65,7 @@ public class ProjectDetails { private JComboBox ComboBox_Packaging; private JPanel ServerUrl_Panel; private JBLabel ServerUrl_JBLabel; + public ProjectDetails(SolonInitializrBuilder moduleBuilder, WizardContext context) { this.moduleBuilder = moduleBuilder; @@ -86,9 +86,10 @@ public class ProjectDetails { ex.printStackTrace(); } } + @Override public void mouseEntered(MouseEvent e) { - ServerUrl_JBLabel.setText(MessageFormat.format("{1}",server.getUrl(),server.getTitle())); + ServerUrl_JBLabel.setText(MessageFormat.format("{1}", server.getUrl(), server.getTitle())); } @Override @@ -97,7 +98,7 @@ public class ProjectDetails { } }); ServerUrl_Panel.setLayout(new BorderLayout()); - ServerUrl_Panel.add(ServerUrl_JBLabel,BorderLayout.CENTER); + ServerUrl_Panel.add(ServerUrl_JBLabel, BorderLayout.CENTER); // Init and select default jdk if (ComboBox_JDK != null && ComboBox_JDK.getItemCount() > 0 && !ComboBox_JDK.isProjectJdkSelected()) { ComboBox_JDK.setSelectedIndex(0); @@ -108,16 +109,6 @@ public class ProjectDetails { }); } - TextField_Name.setText(this.metadata.getName()); - TextField_Name.addCaretListener(e -> { - this.metadata.setName(TextField_Name.getText()); - LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Name.getText())); - TextField_Artifact.setText(TextField_Name.getText()); - }); - - - LocationTips.setText(StringUtils.PathStrAssemble(this.metadata.getLocation(),TextField_Name.getText())); - TextField_Group.setText(this.metadata.getGroupId()); TextField_Group.addCaretListener(e -> { this.metadata.setGroupId(TextField_Group.getText()); @@ -129,11 +120,14 @@ public class ProjectDetails { this.metadata.setArtifactId(TextField_Artifact.getText()); String artifact = TextField_Artifact.getText(); if (artifact.contains("-")) { - artifact=artifact.replace("-","_"); + artifact = artifact.replace("-", "_"); } TextField_PackageName.setText(TextField_Group.getText() + "." + artifact); + LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Artifact.getText())); }); + LocationTips.setText(StringUtils.PathStrAssemble(this.metadata.getLocation(), TextField_Artifact.getText())); + TextField_PackageName.setText(this.metadata.getPackageName()); TextField_PackageName.addCaretListener(e -> { this.metadata.setPackageName(TextField_PackageName.getText()); @@ -176,14 +170,16 @@ public class ProjectDetails { }); TextField_Location.setText(this.metadata.getLocation()); + // 选择文件路径后的监听 TextField_Location.addActionListener(e -> { this.metadata.setLocation(TextField_Location.getText()); - LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Name.getText())); + LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Artifact.getText())); }); + // 直接修改框内值的监听 TextField_Location.getTextField().addCaretListener(e -> { this.metadata.setLocation(TextField_Location.getText()); - LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Name.getText())); + LocationTips.setText(StringUtils.PathStrAssemble(TextField_Location.getText(), TextField_Artifact.getText())); }); if (metadata.getInitMetadata() != null) { @@ -246,9 +242,7 @@ public class ProjectDetails { public boolean validate(ModuleBuilder moduleBuilder, WizardContext wizardContext) throws ConfigurationException { - if (!this.metadata.hasValidName()) { - throw new ConfigurationException("Invalid name", "Invalid Data"); - } else if (!this.metadata.hasValidLocation()) { + if (!this.metadata.hasValidLocation()) { throw new ConfigurationException("Invalid location", "Invalid Data"); } else if (!this.metadata.hasValidGroupId()) { throw new ConfigurationException("Invalid group id", "Invalid Data"); diff --git a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetailsStep.java b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetailsStep.java index 98e9bc5..abc3ac5 100644 --- a/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetailsStep.java +++ b/src/main/java/org/noear/solon/idea/plugin/initializr/step/ProjectDetailsStep.java @@ -43,8 +43,8 @@ public class ProjectDetailsStep extends ModuleWizardStep implements Disposable { @Override public void updateDataModel() { this.wizardContext.setProjectJdk(this.metadata.getSdk()); - this.wizardContext.setProjectName(this.metadata.getName()); - this.wizardContext.setProjectFileDirectory(this.metadata.getLocation() + File.separator + this.metadata.getName()); + this.wizardContext.setProjectName(this.metadata.getArtifactId()); + this.wizardContext.setProjectFileDirectory(this.metadata.getLocation() + File.separator + this.metadata.getArtifactId()); } @Override -- Gitee From b517c2e6fa1a4cc26f89d820cd5de0a0155b083a Mon Sep 17 00:00:00 2001 From: hans <837713748@qq.com> Date: Sun, 19 Nov 2023 21:10:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ gradle.properties | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11f31de..b6ec2fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Solon Changelog +## [0.0.7-M1] +### Updated +- Modify the initializer interface + ## [0.0.6] ### Added - Code prompt garbled diff --git a/gradle.properties b/gradle.properties index 471079d..3f9563e 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.6 +pluginVersion = 0.0.7-M1 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 213 -- Gitee