This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release120
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/release120 by this push:
new 143ef55 [NETBEANS-4438] Fix new action wizard
143ef55 is described below
commit 143ef555d993c12983e1a09aacdf3513d8680f13
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Mon Jun 15 13:24:10 2020 -0700
[NETBEANS-4438] Fix new action wizard
---
apisupport/apisupport.wizards/manifest.mf | 2 +-
.../modules/apisupport/project/ui/wizard/action/DataModel.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apisupport/apisupport.wizards/manifest.mf
b/apisupport/apisupport.wizards/manifest.mf
index 94563f2..87b2102 100644
--- a/apisupport/apisupport.wizards/manifest.mf
+++ b/apisupport/apisupport.wizards/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.apisupport.wizards
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
OpenIDE-Module-Layer:
org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.28.1
diff --git
a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
index 43e2a69..1489fae 100644
---
a/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
+++
b/apisupport/apisupport.wizards/src/org/netbeans/modules/apisupport/project/ui/wizard/action/DataModel.java
@@ -621,7 +621,7 @@ final class DataModel extends
BasicWizardIterator.BasicDataModel {
this.edContextSeparatorBefore = separator;
}
- static class ActionReferenceModel implements Serializable {
+ public static class ActionReferenceModel implements Serializable {
String parentPath;
String name;
int beforeSep;
@@ -630,7 +630,7 @@ final class DataModel extends
BasicWizardIterator.BasicDataModel {
public ActionReferenceModel(String parentPath, String name, int
beforeSep, int afterSep, int position) {
this.parentPath = parentPath;
- this.name = name;
+ this.name = name != null ? name : "";
this.beforeSep = beforeSep;
this.afterSep = afterSep;
this.position = position;
@@ -645,7 +645,7 @@ final class DataModel extends
BasicWizardIterator.BasicDataModel {
}
public String name() {
- return name == null ? "" : name;
+ return name;
}
public int separatorBefore() {
@@ -658,7 +658,7 @@ final class DataModel extends
BasicWizardIterator.BasicDataModel {
@Override
public String toString() {
- return "ActionReferenceModel{" + "parentPath=" + parentPath + ",
name=" + name + ", beforeSep=" + beforeSep + ", afterSep=" + afterSep + ",
position=" + position + '}';
+ return "ActionReferenceModel{" + "path=" + parentPath + ", name="
+ name + ", beforeSep=" + beforeSep + ", afterSep=" + afterSep + ", position="
+ position + '}';
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
