This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 756a45d NETBEANS-998: update display name when DelayedNode resolves
it (#636)
756a45d is described below
commit 756a45d902d3a5a58ee1a213b5139c3a0ed3cdc9
Author: Svatopluk Dedic <svatopluk.de...@oracle.com>
AuthorDate: Thu Jul 19 21:09:57 2018 +0200
NETBEANS-998: update display name when DelayedNode resolves it (#636)
---
openide.loaders/src/org/openide/loaders/TemplateWizard1.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
b/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
index 255f594..f0a1bd4 100644
--- a/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
+++ b/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
@@ -195,7 +195,7 @@ final class TemplateWizard1 extends javax.swing.JPanel
implements DataFilter,
@Override
protected Node[] createNodes(Node key) {
Node n = key;
- String nodeName = n.getDisplayName();
+ String nodeName = null;
DataObject obj = null;
DataShadow shadow = n.getCookie(DataShadow.class);
@@ -239,7 +239,7 @@ final class TemplateWizard1 extends javax.swing.JPanel
implements DataFilter,
}
public String getDisplayName() {
- return name;
+ return name != null ? name : super.getDisplayName();
}
// issue 29867, rename should be prohibited
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
