[netbeans] branch master updated (2cea3bf -> a9f38e8)

2021-05-22 Thread jtulach
This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 2cea3bf  Various small UI improvements to the database module's "New 
Connection" wizard.
 new 3cd275a  Issue #270552: AbstractProjectClassPathImpl subtypes 
generally need to process Artifact.file to handle timestamped snapshots 
properly.
 new f00ab3e  Merge branch 'master' into 
AbstractProjectClassPathImpl-Artifact.file-270552
 new 8289ca0  Was not correctly handling timestamed snapshots of nonprimary 
artifacts, such as something-1.0-20180102.123456-1-tests.jar.
 new 45e238b  Merge branch 'master' of https://github.com/apache/netbeans 
into AbstractProjectClassPathImpl-Artifact.file-270552
 new 6659a7e  More accurate log message
 new 55d9512  Added `AbstractProjectClassPathImplTest`
 new a9f38e8  Merge pull request #502 from 
jglick/AbstractProjectClassPathImpl-Artifact.file-270552

The 5466 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../classpath/AbstractProjectClassPathImpl.java| 39 
 .../maven/classpath/CompileClassPathImpl.java  |  8 ++-
 .../maven/classpath/RuntimeClassPathImpl.java  |  6 +-
 .../maven/classpath/TestCompileClassPathImpl.java  |  8 ++-
 .../maven/classpath/TestRuntimeClassPathImpl.java  |  6 +-
 .../modules/maven/nodes/DependencyNode.java|  1 +
 .../maven/queries/RepositoryMavenCPProvider.java   |  2 +-
 .../AbstractProjectClassPathImplTest.java  | 71 ++
 8 files changed, 130 insertions(+), 11 deletions(-)
 create mode 100644 
java/maven/test/unit/src/org/netbeans/modules/maven/classpath/AbstractProjectClassPathImplTest.java

-
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



[jira] [Resolved] (NETBEANS-5658) Add remaining SVG icons in editor toolbar

2021-05-22 Thread Eirik Bakke (Jira)


 [ 
https://issues.apache.org/jira/browse/NETBEANS-5658?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eirik Bakke resolved NETBEANS-5658.
---
Fix Version/s: Next
   Resolution: Fixed

PR was merged; marking fixed.

> Add remaining SVG icons in editor toolbar
> -
>
> Key: NETBEANS-5658
> URL: https://issues.apache.org/jira/browse/NETBEANS-5658
> Project: NetBeans
>  Issue Type: Improvement
>  Components: editor - Other
>Affects Versions: 12.2
>Reporter: Eirik Bakke
>Priority: Major
>  Labels: HiDPI, pull-request-available
> Fix For: Next
>
> Attachments: MoreEditorToolbarIconsEirik.ai
>
>  Time Spent: 40m
>  Remaining Estimate: 0h
>
> See the associated Pull Request, which adds 14 more SVG icons, adjusts two 
> existing ones, and reuses some existing ones for newly identified duplicates. 
> See NETBEANS-2617 for a more detailed description of this effort.
> The Adobe Illustrator file that was used to produce the latest icons is 
> attached here. I haven't cleaned up the Illustrator file, so it may contain 
> some duplicates from previous Illustrator file in NETBEANS-2617.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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



[netbeans-html4j] branch master updated: One configuration of the Maven plugin shall be enough

2021-05-22 Thread jtulach
This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git


The following commit(s) were added to refs/heads/master by this push:
 new a5c9df2  One configuration of the Maven plugin shall be enough
a5c9df2 is described below

commit a5c9df20e73f29117716ba378ff91939f1b403af
Author: Jaroslav Tulach 
AuthorDate: Sat May 22 16:26:52 2021 +0200

One configuration of the Maven plugin shall be enough
---
 pom.xml | 9 -
 1 file changed, 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34f6af9..337c2f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -299,15 +299,6 @@ 
org.netbeans.html.boot.impl:org.netbeans.html.boot.fx:org.netbeans.html.context.
 
   
   
-org.apache.maven.plugins
-maven-javadoc-plugin
-2.9
-
-${publicPackages}
-false
-
-  
-
 org.apache.felix
 maven-bundle-plugin
 2.4.0

-
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



[netbeans] 02/02: Various small UI improvements to the database module's "New Connection" wizard.

2021-05-22 Thread ebakke
This is an automated email from the ASF dual-hosted git repository.

ebakke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 2cea3bfd02d64ee4817dd9cf15e2a110fe58ce03
Author: Eirik Bakke 
AuthorDate: Tue Feb 4 00:46:55 2020 -0500

Various small UI improvements to the database module's "New Connection" 
wizard.

Details:
* Improve two error messages in "New Connection" wizard.
* Avoid a spurious 'Specified class is not a driver' warning in certain 
situations.
* When detecting the Microsoft SQL Server JDBC driver, avoid showing an 
ancient version number.
* Add a default port number for Microsoft SQL Server.
* Decrease the timeout of the connection validation step.
---
 .../org/netbeans/modules/db/explorer/Bundle.properties  |  4 +++-
 .../modules/db/explorer/dlg/AddDriverDialog.java| 12 
 .../modules/db/explorer/dlg/ConnectionPanel.java|  2 +-
 .../modules/db/explorer/dlg/NewConnectionPanel.java |  8 +++-
 .../src/org/netbeans/modules/db/util/Bundle.properties  |  2 +-
 .../org/netbeans/modules/db/util/DriverListUtil.java|  5 -
 ide/db/src/org/netbeans/modules/db/util/JdbcUrl.java| 17 +
 .../netbeans/modules/db/util/DriverListUtilTest.java|  7 +++
 8 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/ide/db/src/org/netbeans/modules/db/explorer/Bundle.properties 
b/ide/db/src/org/netbeans/modules/db/explorer/Bundle.properties
index b984e90..3cf2553 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/Bundle.properties
+++ b/ide/db/src/org/netbeans/modules/db/explorer/Bundle.properties
@@ -21,7 +21,9 @@ SchemaIsNotSet=Default schema
 
 EXC_InsufficientConnInfo=insufficient information to create a connection
 # {0} is database URL, {1} is the database driver name, {2} is additional info 
-EXC_CannotEstablishConnection=Cannot establish a connection to {0} using {1} 
({2})
+# The "New Connection Wizard" only has space for the first part of the 
message, so put the message
+# from the driver (parameter {2}), which usually explains the error, first.
+EXC_CannotEstablishConnection=Connection failed: {2} ({0} using {1})
 
 # {0} is a user provided value
 EXC_CannotOperateWith=Cannot operate with {0}
diff --git 
a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java 
b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java
index 6f7f644..dfd8d32 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddDriverDialog.java
@@ -160,6 +160,7 @@ public final class AddDriverDialog extends 
javax.swing.JPanel {
 String fileName = null;
 dlm.clear();
 drvs.clear();
+jarClassLoader = null;
 URL[] urls = drv == null ? new URL[0] : drv.getURLs();
 for (int i = 0; i < urls.length; i++) {
 URL url = urls[i];
@@ -379,6 +380,7 @@ public final class AddDriverDialog extends 
javax.swing.JPanel {
 if (lsm.isSelectedIndex(i)) {
 dlm.remove(i);
 drvs.remove(i);
+jarClassLoader = null;
 count--;
 continue;
 }
@@ -431,6 +433,7 @@ public final class AddDriverDialog extends 
javax.swing.JPanel {
 dlm.addElement(file.toString());
 try {
 drvs.add(file.toURI().toURL());
+jarClassLoader = null;
 } catch (MalformedURLException exc) {
 LOGGER.log(Level.WARNING,
 "Unable to add driver jar file " +
@@ -603,10 +606,11 @@ public final class AddDriverDialog extends 
javax.swing.JPanel {
 }
 
 private URLClassLoader getJarClassLoader() {
-// This classloader is used to load classes
-// from the jar files for the driver.  We can then use
-// introspection to see if a class in one of these jar files
-// implements java.sql.Driver
+/* This classloader is used to load classes from the jar files for the 
driver.  We can then
+introspection to see if a class in one of these jar files implements 
java.sql.Driver. (We
+clear the jarClassLoader whenever drvs is modified, to avoid the 
AddDriverNotJavaSqlDriver
+message popping up if a different driver is picked from the dropdown 
after an unrelated JAR
+file is added.) */
 jarClassLoader =
 new URLClassLoader(drvs.toArray(new URL[drvs.size()]),
 this.getClass().getClassLoader());
diff --git 
a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionPanel.java 
b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionPanel.java
index 020141d..0710e07 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionPanel.java
+++ 

[netbeans] 01/02: In the Database module, refactor the 'Add Connection' wizard to avoid depending on hardcoded wizard panel indexes.

2021-05-22 Thread ebakke
This is an automated email from the ASF dual-hosted git repository.

ebakke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 5a34cc3b6c84411258263e532a7b516548834e6c
Author: Eirik Bakke 
AuthorDate: Mon Feb 3 13:57:51 2020 -0500

In the Database module, refactor the 'Add Connection' wizard to avoid 
depending on hardcoded wizard panel indexes.
---
 .../db/explorer/dlg/AddConnectionWizard.java   | 51 --
 .../explorer/dlg/ChoosingConnectionNamePanel.java  |  7 ++-
 .../db/explorer/dlg/ChoosingDriverPanel.java   |  6 ++-
 .../db/explorer/dlg/ChoosingSchemaPanel.java   |  9 +++-
 .../modules/db/explorer/dlg/ConnectionPanel.java   |  9 ++--
 5 files changed, 52 insertions(+), 30 deletions(-)

diff --git 
a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddConnectionWizard.java 
b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddConnectionWizard.java
index b71769c..e6c4f0d 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddConnectionWizard.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/AddConnectionWizard.java
@@ -21,6 +21,8 @@ package org.netbeans.modules.db.explorer.dlg;
 import java.awt.Dialog;
 import java.net.URL;
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -60,12 +62,11 @@ public class AddConnectionWizard extends 
ConnectionDialogMediator implements Wiz
 private final String pwd;
 private final String databaseUrl;
 private final String user;
+private final WizardDescriptor wd;
 private DatabaseConnection connection;
 private List schemas = null;
 private String currentSchema;
 private JDBCDriver jdbcDriver;
-private boolean increase = false;
-private WizardDescriptor wd;
 
 private AddConnectionWizard(JDBCDriver driver, String databaseUrl, String 
user, String password) {
 this.databaseUrl = databaseUrl;
@@ -123,30 +124,41 @@ public class AddConnectionWizard extends 
ConnectionDialogMediator implements Wiz
  */
 private WizardDescriptor.Panel[] getPanels() {
 if (panels == null) {
+boolean skipDriverSelection = false;
 if (jdbcDriver != null) {
 URL[] jars = jdbcDriver.getURLs();
 if (jars != null && jars.length > 0) {
 FileObject jarFO = URLMapper.findFileObject(jars[0]);
 if (jarFO != null && jarFO.isValid()) {
 
this.allPrivilegedFileNames.add(jarFO.getNameExt());
-this.increase = true;
+skipDriverSelection = true;
 }
 }
 }
-driverPanel = new ChoosingDriverPanel(jdbcDriver);
-panels = new Panel[] {
-driverPanel,
-new ConnectionPanel(),
-new ChoosingSchemaPanel(),
-new ChoosingConnectionNamePanel()
-};
-steps = new String[panels.length];
-steps = new String[] {
-NbBundle.getMessage(AddConnectionWizard.class, 
"ChoosingDriverUI.Name"), // NOI18N
-NbBundle.getMessage(AddConnectionWizard.class, 
"ConnectionPanel.Name"), // NOI18N
-NbBundle.getMessage(AddConnectionWizard.class, 
"ChoosingSchemaPanel.Name"), // NOI18N
-NbBundle.getMessage(AddConnectionWizard.class, 
"ChooseConnectionNamePanel.Name"), // NOI18N
-};
+List toPanels = new ArrayList<>();
+List toSteps = new ArrayList<>();
+int stepIndex = 0;
+
+if (!skipDriverSelection) {
+toPanels.add(new ChoosingDriverPanel(jdbcDriver, stepIndex));
+toSteps.add(NbBundle.getMessage(AddConnectionWizard.class, 
"ChoosingDriverUI.Name")); // NOI18N
+stepIndex++;
+}
+
+toPanels.add(new ConnectionPanel(stepIndex));
+toSteps.add(NbBundle.getMessage(AddConnectionWizard.class, 
"ConnectionPanel.Name")); // NOI18N
+stepIndex++;
+
+toPanels.add(new ChoosingSchemaPanel(stepIndex));
+toSteps.add(NbBundle.getMessage(AddConnectionWizard.class, 
"ChoosingSchemaPanel.Name")); // NOI18N
+stepIndex++;
+
+toPanels.add(new ChoosingConnectionNamePanel(stepIndex));
+toSteps.add(NbBundle.getMessage(AddConnectionWizard.class, 
"ChooseConnectionNamePanel.Name")); // NOI18N
+stepIndex++;
+
+panels = toPanels.toArray(new Panel[stepIndex]);
+steps = toSteps.toArray(new String[stepIndex]);
 }
 return panels;
 }
@@ -155,11 +167,6 @@ public class AddConnectionWizard extends 
ConnectionDialogMediator implements Wiz
 public WizardDescriptor.Panel current() {
 // init panels first

[netbeans] branch master updated (4e6ce19 -> 2cea3bf)

2021-05-22 Thread ebakke
This is an automated email from the ASF dual-hosted git repository.

ebakke pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 4e6ce19  [NETBEANS-5693] Assure that debugger session finishes when 
native image application exits.
 new 5a34cc3  In the Database module, refactor the 'Add Connection' wizard 
to avoid depending on hardcoded wizard panel indexes.
 new 2cea3bf  Various small UI improvements to the database module's "New 
Connection" wizard.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../netbeans/modules/db/explorer/Bundle.properties |  4 +-
 .../db/explorer/dlg/AddConnectionWizard.java   | 51 --
 .../modules/db/explorer/dlg/AddDriverDialog.java   | 12 +++--
 .../explorer/dlg/ChoosingConnectionNamePanel.java  |  7 ++-
 .../db/explorer/dlg/ChoosingDriverPanel.java   |  6 ++-
 .../db/explorer/dlg/ChoosingSchemaPanel.java   |  9 +++-
 .../modules/db/explorer/dlg/ConnectionPanel.java   | 11 +++--
 .../db/explorer/dlg/NewConnectionPanel.java|  8 +++-
 .../org/netbeans/modules/db/util/Bundle.properties |  2 +-
 .../netbeans/modules/db/util/DriverListUtil.java   |  5 ++-
 .../src/org/netbeans/modules/db/util/JdbcUrl.java  | 17 ++--
 .../modules/db/util/DriverListUtilTest.java|  7 ++-
 12 files changed, 92 insertions(+), 47 deletions(-)

-
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



[jira] [Resolved] (NETBEANS-5693) Native image debugging does not finish when the application exits.

2021-05-22 Thread Martin Entlicher (Jira)


 [ 
https://issues.apache.org/jira/browse/NETBEANS-5693?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Martin Entlicher resolved NETBEANS-5693.

Resolution: Fixed

> Native image debugging does not finish when the application exits.
> --
>
> Key: NETBEANS-5693
> URL: https://issues.apache.org/jira/browse/NETBEANS-5693
> Project: NetBeans
>  Issue Type: Bug
>  Components: vscode
>Affects Versions: 12.4
>Reporter: Martin Entlicher
>Assignee: Martin Entlicher
>Priority: Major
>  Labels: Usability, pull-request-available
> Fix For: 12.5
>
>  Time Spent: 1.5h
>  Remaining Estimate: 0h
>
> When native image application exits, the VSCode's debugger session does not 
> finish. It needs to be closed manually.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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



[netbeans] 01/02: Assure that debug process exits when debugging finishes.

2021-05-22 Thread entl
This is an automated email from the ASF dual-hosted git repository.

entl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit fd6921c496c53e51f8c451dee46887545c9d0ca7
Author: Martin Entlicher 
AuthorDate: Fri May 21 10:58:13 2021 +0200

Assure that debug process exits when debugging finishes.
---
 .../modules/cpplite/debugger/CPPLiteDebugger.java  | 72 ++--
 .../cpplite/debugger/AbstractDebugTest.java| 14 +++-
 .../modules/cpplite/debugger/BreakpointsTest.java  |  1 +
 .../debugger/{StepTest.java => ExitTest.java}  | 76 ++
 .../modules/cpplite/debugger/StepTest.java |  3 +-
 5 files changed, 103 insertions(+), 63 deletions(-)

diff --git 
a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java
 
b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java
index 8545d3f..0c41c83 100644
--- 
a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java
+++ 
b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java
@@ -36,6 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -93,6 +94,7 @@ public final class CPPLiteDebugger {
 private final ThreadsCollector  threadsCollector = new 
ThreadsCollector(this);
 private volatile CPPThread  currentThread;
 private volatile CPPFrame   currentFrame;
+private AtomicInteger   exitCode = new AtomicInteger();
 
 public CPPLiteDebugger(ContextProvider contextProvider) {
 this.contextProvider = contextProvider;
@@ -359,6 +361,13 @@ public final class CPPLiteDebugger {
 }
 
 void finish (boolean sendExit) {
+finish(sendExit, 0);
+}
+
+private void finish (boolean sendExit, int exitCode) {
+if (exitCode != 0) {
+this.exitCode.set(exitCode);
+}
 LOGGER.fine("CPPLiteDebugger.finish()");
 if (finished) {
 LOGGER.fine("finish(): already finished.");
@@ -462,29 +471,43 @@ public final class CPPLiteDebugger {
 }
 CPPThread thread = threadsCollector.get(threadId);
 String reason = results.getConstValue("reason", "");
-switch (reason) {
-case "exited-normally":
-if ('*' == record.type()) {
-finish(false);
+if (reason.startsWith("exited")) {
+if ('*' == record.type()) {
+int exitCode;
+if ("exited-normally".equals(reason)) {
+exitCode = 0;
 } else {
-threadsCollector.remove(threadId);
-}
-break;
-default:
-MITList topFrameList = (MITList) 
results.valueOf("frame");
-CPPFrame frame = topFrameList != null ? 
CPPFrame.create(thread, topFrameList) : null;
-thread.setTopFrame(frame);
-setSuspended(true, thread, frame);
-if (frame != null) {
-Line currentLine = frame.location();
-if (currentLine != null) {
-Annotatable[] lines = new 
Annotatable[] {currentLine};
-CPPLiteDebugger.this.currentLine = 
lines;
-Utils.markCurrent(lines);
-Utils.showLine(lines);
+String exitCodeStr = 
results.getConstValue("exit-code", null);
+if (exitCodeStr != null) {
+if (exitCodeStr.startsWith("0x")) {
+exitCode = 
Integer.parseInt(exitCodeStr, 16);
+} else if 
(exitCodeStr.startsWith("0")) {
+exitCode = 
Integer.parseInt(exitCodeStr, 8);
+} else {
+exitCode = 
Integer.parseInt(exitCodeStr);
+}
+} else {
+exitCode = 0;
 }
 

[netbeans] 02/02: [NETBEANS-5693] Assure that debugger session finishes when native image application exits.

2021-05-22 Thread entl
This is an automated email from the ASF dual-hosted git repository.

entl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit 4e6ce195c7ac9df98b0a066192acae492d72c2cc
Author: Martin Entlicher 
AuthorDate: Wed May 19 15:27:13 2021 +0200

[NETBEANS-5693] Assure that debugger session finishes when native image 
application exits.
---
 .../server/debugging/launch/NbLaunchDelegate.java  | 62 --
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
index 54aab5e..c255f20 100644
--- 
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
+++ 
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchDelegate.java
@@ -40,6 +40,7 @@ import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
 
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.api.annotations.common.NonNull;
+import org.netbeans.api.annotations.common.NullAllowed;
 import org.netbeans.api.debugger.DebuggerManager;
 import org.netbeans.api.debugger.DebuggerManagerAdapter;
 import org.netbeans.api.debugger.Session;
@@ -221,16 +222,26 @@ public abstract class NbLaunchDelegate {
 Lookup.getDefault()
 );
 List args = argsToStringList(launchArguments.get("args"));
+// Add session's lookup, it may override dialog displayer, etc.
+Lookup execLookup = new ProxyLookup(launchCtx, 
context.getLspSession().getLookup());
 if (debug) {
 requestProcessor.post(() -> {
-Lookups.executeWith(launchCtx, () -> {
+ActionProgress debugProgress = 
ActionProgress.start(launchCtx);
+ExecutionDescriptor ed = 
executionDescriptor.postExecution((@NullAllowed Integer exitCode) -> {
+debugProgress.finished(exitCode != null && exitCode == 
0);
+});
+Lookups.executeWith(execLookup, () -> {
 String miDebugger = (String) 
launchArguments.get("miDebugger");
-startNativeDebug(nativeImageFile, args, miDebugger, 
context, executionDescriptor, launchFuture);
+startNativeDebug(nativeImageFile, args, miDebugger, 
context, ed, launchFuture, debugProgress);
 });
 });
 } else {
-Lookups.executeWith(launchCtx, () -> {
-execNative(nativeImageFile, args, context, 
executionDescriptor, launchFuture);//, success);
+ExecutionDescriptor ed = 
executionDescriptor.postExecution((@NullAllowed Integer exitCode) -> {
+ioContext.stop();
+notifyFinished(context, exitCode != null && exitCode == 0);
+});
+Lookups.executeWith(execLookup, () -> {
+execNative(nativeImageFile, args, context, ed, 
launchFuture);
 });
 }
 }
@@ -259,30 +270,27 @@ public abstract class NbLaunchDelegate {
 return joined;
 }
 
-private static void startNativeDebug(File nativeImageFile, List 
args, String miDebugger, DebugAdapterContext context, ExecutionDescriptor 
executionDescriptor, CompletableFuture launchFuture) {
+private static void startNativeDebug(File nativeImageFile, List 
args, String miDebugger, DebugAdapterContext context, ExecutionDescriptor 
executionDescriptor, CompletableFuture launchFuture, ActionProgress 
debugProgress) {
 AtomicReference debugSessionRef = new 
AtomicReference<>();
-Runnable start = () -> {
-NIDebugger niDebugger;
-try {
-niDebugger = NIDebugRunner.start(nativeImageFile, args, 
miDebugger, null, null, executionDescriptor, engine -> {
-Session session = engine.lookupFirst(null, Session.class);
-NbDebugSession debugSession = new NbDebugSession(session);
-debugSessionRef.set(debugSession);
-context.setDebugSession(debugSession);
-launchFuture.complete(null);
-
context.getConfigurationSemaphore().waitForConfigurationDone();
-});
-} catch (IllegalStateException ex) {
-ErrorUtilities.completeExceptionally(launchFuture,
-"Failed to launch debuggee native image. " + 
ex.getLocalizedMessage(),
-ResponseErrorCode.serverErrorStart);
-return ;
-}
-NbDebugSession debugSession = debugSessionRef.get();
-debugSession.setNIDebugger(niDebugger);
-};
-// Start debugger in 

[netbeans] branch master updated (7cfbb58 -> 4e6ce19)

2021-05-22 Thread entl
This is an automated email from the ASF dual-hosted git repository.

entl pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.


from 7cfbb58  [NETBEANS-5658] Add remaining icons in editor toolbar, and a 
few other icons. Copy the icons to all locations which used the same PNG file 
as well.
 new fd6921c  Assure that debug process exits when debugging finishes.
 new 4e6ce19  [NETBEANS-5693] Assure that debugger session finishes when 
native image application exits.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../modules/cpplite/debugger/CPPLiteDebugger.java  | 72 ++--
 .../cpplite/debugger/AbstractDebugTest.java| 14 +++-
 .../modules/cpplite/debugger/BreakpointsTest.java  |  1 +
 .../debugger/{StepTest.java => ExitTest.java}  | 76 ++
 .../modules/cpplite/debugger/StepTest.java |  3 +-
 .../server/debugging/launch/NbLaunchDelegate.java  | 62 ++
 6 files changed, 138 insertions(+), 90 deletions(-)
 copy 
cpplite/cpplite.debugger/test/unit/src/org/netbeans/modules/cpplite/debugger/{StepTest.java
 => ExitTest.java} (54%)

-
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



[jira] [Comment Edited] (NETBEANS-2523) Netbeans 64-bit creates invalid nomodify value in windows registry for years

2021-05-22 Thread Lars Bruun-Hansen (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-2523?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17349634#comment-17349634
 ] 

Lars Bruun-Hansen edited comment on NETBEANS-2523 at 5/22/21, 8:07 AM:
---

The bug still exists in the [Release Candidate for NetBeans IDE 12.4 Installer 
for 
Windows|https://dist.apache.org/repos/dist/dev/netbeans/netbeans/12.4-installers/windows/Apache-NetBeans-12.4-bin-windows-x64.exe].

 

For reference here's the Quick-and-Dirty method for how to "release" the fix:
 # Build new binary for Windows from the jnilib project (repo path: 
{{nbi/engine/native/jnilib}})
 # Based on the [current binary package 
used|https://netbeans.osuosl.org/binaries/2B892D9E648A792EDB0F705378E06F84C322E208-nbi.engine-external-binaries-11.zip]
 you would create a new zip package which includes the updated binary (meaning 
newly build version of (ZIP path) {{native/jnilib/dist/windows*.dll}} from step 
1).
 # Name the new zip package something like 
{{nbi.engine-external-binaries-12.zip}} (i.e. bump its version) and upload it 
to OSUOSL.
 # The binary is used in project (repo path) {{harness/libs.nbi.engine}} which 
would need to have its pointers to the binary on OSUOSL changed so that the new 
ZIP package is used.

 
 The reason why the method is called "quick-and-dirty" is that the audit trail 
is lost. By using such method we cannot be sure from which git ref the binaries 
at OSUOSL are build. In fact, we cannot even guarantee that what is at OSUOSL 
is based on on source code committed and pushed to the Netbeans Git repo. Lot's 
of discussions on this on the NetBeans dev mailing list.

As a parallel example, the build process for native binaries for Profiler Lib 
project has been streamlined in 
[PR2853|https://github.com/apache/netbeans/pull/2853]. Those binaries are now 
build on a CI pipeline whenever the source code changes and a ZIP package with 
git ref pointers is build as a result (which can then subsequently be put into 
OSUOSL). Ideally something similar would need to be done for jnilib project. Or 
use the quick-and-dirty method if in a hurry ... however such method is 
unsustainable for the community in the long run.

 

 


was (Author: lbruun):
The bug still exists in the [Release Candidate for NetBeans IDE 12.4 Installer 
for 
Windows|https://dist.apache.org/repos/dist/dev/netbeans/netbeans/12.4-installers/windows/Apache-NetBeans-12.4-bin-windows-x64.exe].

 

For reference here's the Quick-and-Dirty method for how to "release" the fix:
 # Build new binary for Windows from the jnilib project (repo path: 
{{nbi/engine/native/jnilib}})
 # Based on the [current binary package 
used|https://netbeans.osuosl.org/binaries/2B892D9E648A792EDB0F705378E06F84C322E208-nbi.engine-external-binaries-11.zip]
 you would create a new zip package which includes the updated binary (meaning 
newly build version of (ZIP path) {{native/jnilib/dist/windows*.dll}} from step 
1).
 # Name the new zip package something like 
{{nbi.engine-external-binaries-12.zip}} (i.e. bump its version) and upload it 
to OSUOSL.
 # The binary is used in project (repo path) {{harness/libs.nbi.engine}} which 
would need to have its pointers to the binary on OSUOSL changed.

 
 The reason why the method is called "quick-and-dirty" is that the audit trail 
is lost. By using such method we cannot be sure from which git ref the binaries 
at OSUOSL are build. In fact, we cannot even guarantee that what is at OSUOSL 
is based on on source code committed and pushed to the Netbeans Git repo. Lot's 
of discussions on this on the NetBeans dev mailing list.

As a parallel example, the build process for native binaries for Profiler Lib 
project has been streamlined in 
[PR2853|https://github.com/apache/netbeans/pull/2853]. Those binaries are now 
build on a CI pipeline whenever the source code changes and a ZIP package with 
git ref pointers is build as a result (which can then subsequently be put into 
OSUOSL). Ideally something similar would need to be done for jnilib project. Or 
use the quick-and-dirty method if in a hurry ... however such method is 
unsustainable for the community in the long run.

 

 

> Netbeans 64-bit creates invalid nomodify value in windows registry for years
> 
>
> Key: NETBEANS-2523
> URL: https://issues.apache.org/jira/browse/NETBEANS-2523
> Project: NetBeans
>  Issue Type: Bug
>Reporter: Joseph Szabo
>Assignee: Lars Bruun-Hansen
>Priority: Major
>  Labels: pull-request-available
> Attachments: 2020-01-04 22_13_24-Registry Editor.png, 2021-01-03 
> 08_22_56-Registry Editor.png
>
>  Time Spent: 1h 40m
>  Remaining Estimate: 0h
>
> See [https://netbeans.org/bugzilla/show_bug.cgi?id=251538]
> Netbeans 64 bit installer 

[jira] [Commented] (NETBEANS-2523) Netbeans 64-bit creates invalid nomodify value in windows registry for years

2021-05-22 Thread Lars Bruun-Hansen (Jira)


[ 
https://issues.apache.org/jira/browse/NETBEANS-2523?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17349634#comment-17349634
 ] 

Lars Bruun-Hansen commented on NETBEANS-2523:
-

The bug still exists in the [Release Candidate for NetBeans IDE 12.4 Installer 
for 
Windows|https://dist.apache.org/repos/dist/dev/netbeans/netbeans/12.4-installers/windows/Apache-NetBeans-12.4-bin-windows-x64.exe].

 

For reference here's the Quick-and-Dirty method for how to "release" the fix:
 # Build new binary for Windows from the jnilib project (repo path: 
{{nbi/engine/native/jnilib}})
 # Based on the [current binary package 
used|https://netbeans.osuosl.org/binaries/2B892D9E648A792EDB0F705378E06F84C322E208-nbi.engine-external-binaries-11.zip]
 you would create a new zip package which includes the updated binary (meaning 
newly build version of (ZIP path) {{native/jnilib/dist/windows*.dll}} from step 
1).
 # Name the new zip package something like 
{{nbi.engine-external-binaries-12.zip}} (i.e. bump its version) and upload it 
to OSUOSL.
 # The binary is used in project (repo path) {{harness/libs.nbi.engine}} which 
would need to have its pointers to the binary on OSUOSL changed.

 
 The reason why the method is called "quick-and-dirty" is that the audit trail 
is lost. By using such method we cannot be sure from which git ref the binaries 
at OSUOSL are build. In fact, we cannot even guarantee that what is at OSUOSL 
is based on on source code committed and pushed to the Netbeans Git repo. Lot's 
of discussions on this on the NetBeans dev mailing list.

As a parallel example, the build process for native binaries for Profiler Lib 
project has been streamlined in 
[PR2853|https://github.com/apache/netbeans/pull/2853]. Those binaries are now 
build on a CI pipeline whenever the source code changes and a ZIP package with 
git ref pointers is build as a result (which can then subsequently be put into 
OSUOSL). Ideally something similar would need to be done for jnilib project. Or 
use the quick-and-dirty method if in a hurry ... however such method is 
unsustainable for the community in the long run.

 

 

> Netbeans 64-bit creates invalid nomodify value in windows registry for years
> 
>
> Key: NETBEANS-2523
> URL: https://issues.apache.org/jira/browse/NETBEANS-2523
> Project: NetBeans
>  Issue Type: Bug
>Reporter: Joseph Szabo
>Assignee: Lars Bruun-Hansen
>Priority: Major
>  Labels: pull-request-available
> Attachments: 2020-01-04 22_13_24-Registry Editor.png, 2021-01-03 
> 08_22_56-Registry Editor.png
>
>  Time Spent: 1h 40m
>  Remaining Estimate: 0h
>
> See [https://netbeans.org/bugzilla/show_bug.cgi?id=251538]
> Netbeans 64 bit installer creates a 64 bit integer in what is supposed to be 
> a 32 bit dword in the registry, which becomes an invalid value.
>  
> Windows Registry Editor Version 5.00
> [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\nbi-nb-base-8.2.0.0.201609300101]
>  "NoModify"=hex(4):01,00,00,00,00,00,00,00
>  
> Netbeans prevents powershell from listing registry uninstall keys in windows:
> {noformat}
> get-itemproperty hklm:\software\microsoft\windows\currentversion\uninstall*
> ...
> get-itemproperty : Specified cast is not valid.
>  At line:1 char:1
>  + get-itemproperty hklm:\software\microsoft\windows\currentversion\unin ...
>  + ~
>  + CategoryInfo : NotSpecified: ( [Get-ItemProperty], InvalidCastException
>  + FullyQualifiedErrorId : 
> System.InvalidCastException,Microsoft.PowerShell.Commands.GetItemPropertyCommand
> {noformat}
>  



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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



[jira] [Closed] (NETBEANS-142) Freeze on search and replace

2021-05-22 Thread Lars Bruun-Hansen (Jira)


 [ 
https://issues.apache.org/jira/browse/NETBEANS-142?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Lars Bruun-Hansen closed NETBEANS-142.
--
Resolution: Cannot Reproduce

I'm closing this myself since I haven't been able to reproduce for a long time,

> Freeze on search and replace
> 
>
> Key: NETBEANS-142
> URL: https://issues.apache.org/jira/browse/NETBEANS-142
> Project: NetBeans
>  Issue Type: Bug
>  Components: editor - Search
>Affects Versions: 8.2, 9.0
>Reporter: Lars Bruun-Hansen
>Priority: Major
> Attachments: 2017-11-14 17_15_04-D__freeze-dump.txt - Notepad++.png, 
> 2017-11-14 17_16_07-D__freeze-dump.txt - Notepad++2.png, freeze-dump.txt
>
>
> While doing a search and replace operation, NetBeans IDE froze on me.
> The search-and-replace operation found 298 occurrences in multiple files, 
> however all within same project.
> I've attached a thread dump.
> I see the AWT event thread being blocked:
> !2017-11-14 17_15_04-D__freeze-dump.txt - Notepad++.png!
> and the culprit is here:
> !2017-11-14 17_16_07-D__freeze-dump.txt - Notepad++2.png!
> That is how far I got in the analysis of the bug.



--
This message was sent by Atlassian Jira
(v8.3.4#803005)

-
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