[incubator-netbeans] branch master updated: NETBEANS-951: terminate application in headless mode (#586)
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 fd2a2de NETBEANS-951: terminate application in headless mode (#586)
fd2a2de is described below
commit fd2a2de2141b66fc47c1f1d888b7bbc3bc81d4e4
Author: Svatopluk Dedic
AuthorDate: Tue Jun 12 10:01:33 2018 +0200
NETBEANS-951: terminate application in headless mode (#586)
---
o.n.core/src/org/netbeans/core/GuiRunLevel.java | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/o.n.core/src/org/netbeans/core/GuiRunLevel.java
b/o.n.core/src/org/netbeans/core/GuiRunLevel.java
index f46f028..c072a90 100644
--- a/o.n.core/src/org/netbeans/core/GuiRunLevel.java
+++ b/o.n.core/src/org/netbeans/core/GuiRunLevel.java
@@ -36,6 +36,7 @@ import org.openide.awt.StatusDisplayer;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
import org.openide.util.lookup.ServiceProvider;
import org.openide.windows.WindowManager;
@@ -67,12 +68,19 @@ public class GuiRunLevel implements RunLevel {
Splash.getInstance().increment(10);
if (CLIOptions.isGui()) {
-
//-
-// initialize main window AFTER the setup wizard is finished
-
-initializeMainWindow ();
-StartLog.logProgress ("Main window initialized"); // NOI18N
-Splash.getInstance().increment(1);
+
//-
+// initialize main window AFTER the setup wizard is finished
+
+initializeMainWindow ();
+StartLog.logProgress ("Main window initialized"); // NOI18N
+Splash.getInstance().increment(1);
+} else {
+RequestProcessor.getDefault().post(new Runnable() {
+@Override
+public void run() {
+maybeDie(null);
+}
+});
}
//
-
--
To stop receiving notification emails like this one, please contact
sde...@apache.org.
-
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
[incubator-netbeans] branch master updated: [NetBeans-778] Formatting issue with var declaration statement (#568)
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 9cac272 [NetBeans-778] Formatting issue with var declaration
statement (#568)
9cac272 is described below
commit 9cac2724c8610d556d8c01681543201f76df7103
Author: Vikas Prabhakar
AuthorDate: Thu Jun 14 14:44:14 2018 +0530
[NetBeans-778] Formatting issue with var declaration statement (#568)
[NetBeans-778] Formatting issue with var declaration statement
---
.../modules/java/source/save/Reformatter.java | 10 +++-
.../modules/java/source/save/FormatingTest.java| 58 ++
2 files changed, 66 insertions(+), 2 deletions(-)
diff --git
a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
b/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
index 20af393..5b359c5 100644
---
a/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
+++
b/java.source.base/src/org/netbeans/modules/java/source/save/Reformatter.java
@@ -1196,9 +1196,15 @@ public class Reformatter implements ReformatTask {
} else {
if (!insideForTryOrCatch)
continuationIndent = true;
-if (node.getType() == null || scan(node.getType(), p)) {
-if (node.getType() != null) {
+if (node.getType() == null || tokens.token().id() ==
JavaTokenId.VAR || scan(node.getType(), p)) {
+if (node.getType() != null && tokens.token().id() !=
JavaTokenId.VAR) {
spaces(1, fieldGroup);
+} else {
+if (tokens.token().id() == JavaTokenId.VAR) {
+//Add space after 'var' token
+addDiff(new Diff(tokens.offset() + 3,
tokens.offset() + 3, " "));
+tokens.moveNext();
+}
}
if (!ERROR.contentEquals(node.getName()))
accept(IDENTIFIER, UNDERSCORE);
diff --git
a/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
b/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
index 59e8969..cda1c9f 100644
---
a/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
+++
b/java.source.base/test/unit/src/org/netbeans/modules/java/source/save/FormatingTest.java
@@ -4457,6 +4457,64 @@ public class FormatingTest extends NbTestCase {
reformat(doc, content, golden);
}
+public void testForVar1() throws Exception {
+testFile = new File(getWorkDir(), "Test.java");
+TestUtilities.copyStringToFile(testFile, "");
+FileObject testSourceFO = FileUtil.toFileObject(testFile);
+DataObject testSourceDO = DataObject.find(testSourceFO);
+EditorCookie ec = (EditorCookie)
testSourceDO.getCookie(EditorCookie.class);
+String oldLevel = JavaSourceTest.SourceLevelQueryImpl.sourceLevel;
+JavaSourceTest.SourceLevelQueryImpl.sourceLevel = "1.10";
+final Document doc = ec.openDocument();
+doc.putProperty(Language.class, JavaTokenId.language());
+String content
+= "package hierbas.del.litoral;\n\n"
++ "public class Test {\n\n"
++ "public static void main(String[] args) {\n"
++ "varv= 10; \n"
++ "}\n"
++ "}\n";
+
+String golden
+= "package hierbas.del.litoral;\n\n"
++ "public class Test {\n\n"
++ "public static void main(String[] args) {\n"
++ "var v = 10;\n"
++ "}\n"
++ "}\n";
+reformat(doc, content, golden);
+JavaSourceTest.SourceLevelQueryImpl.sourceLevel = oldLevel;
+}
+
+public void testForVar2() throws Exception {
+testFile = new File(getWorkDir(), "Test.java");
+TestUtilities.copyStringToFile(testFile, "");
+FileObject testSourceFO = FileUtil.toFileObject(testFile);
+DataObject testSourceDO = DataObject.find(testSourceFO);
+EditorCookie ec = (EditorCookie)
testSourceDO.getCookie(EditorCookie.class);
+String oldLevel = JavaSourceTest.SourceLevelQueryImpl.sourceLevel;
+JavaSourceTest.SourceLevelQueryImpl.sourceLevel = "1.10";
+final Document doc = ec.openDocument();
+doc.putProperty(Lan
[incubator-netbeans] branch master updated: [NETBEANS-975] Wizard properly reports items created on configuration FS (#597)
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 8db91d3 [NETBEANS-975] Wizard properly reports items created on
configuration FS (#597)
8db91d3 is described below
commit 8db91d34cdf1d629ec59492147f96701fff4ca63
Author: Svatopluk Dedic
AuthorDate: Sat Jun 23 11:28:33 2018 +0200
[NETBEANS-975] Wizard properly reports items created on configuration FS
(#597)
---
.../src/org/openide/loaders/TemplateWizard2.java | 41 +++-
.../org/openide/loaders/TemplateWizardTest.java| 54 +-
2 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
b/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
index 1c000e7..ec0b172 100644
--- a/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
+++ b/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
@@ -26,6 +26,7 @@ import java.beans.PropertyDescriptor;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.nio.file.Path;
import javax.swing.*;
import javax.swing.event.*;
import org.openide.WizardDescriptor;
@@ -44,6 +45,7 @@ final class TemplateWizard2 extends javax.swing.JPanel
implements DocumentListen
private static final String PROP_LOCATION_FOLDER = "locationFolder"; //
NOI18N
private File locationFolder;
+private DataFolder locationDataFolder;
private DefaultPropertyModel locationFolderModel;
/** File extension of the template and of the created file -
@@ -392,7 +394,39 @@ final class TemplateWizard2 extends javax.swing.JPanel
implements DocumentListen
private javax.swing.JTextField newObjectName;
// End of variables declaration//GEN-END:variables
+private DataFolder findRelativeFolder(File fd) {
+if (locationDataFolder == null) {
+return null;
+}
+File f = FileUtil.toFile(locationDataFolder.getPrimaryFile());
+if (f == null) {
+return null;
+} else if (f.equals(fd)) {
+return locationDataFolder;
+}
+// attempt to locate neighbouring file on the DF's filesystem
+FileObject folderFO = locationDataFolder.getPrimaryFile();
+File lf = FileUtil.toFile(folderFO);
+if (lf != null) {
+try {
+Path p = lf.toPath().relativize(fd.toPath());
+FileObject newDF = folderFO.getFileObject(p.toString());
+if (newDF != null) {
+return DataFolder.findFolder(newDF);
+}
+} catch (IllegalArgumentException ex) {
+// cannot relativize
+}
+}
+return null;
+}
+
public void setLocationFolder(File fd) {
+locationDataFolder = findRelativeFolder(fd);
+setLocationFolder0(fd);
+}
+
+private void setLocationFolder0(File fd) {
if (locationFolder == fd)
return ;
if (locationFolder != null && locationFolder.equals (fd))
@@ -405,14 +439,19 @@ final class TemplateWizard2 extends javax.swing.JPanel
implements DocumentListen
firePropertyChange (PROP_LOCATION_FOLDER, oldLocation, locationFolder);
fireStateChanged ();
}
+
private void setLocationDataFolder(DataFolder fd) {
-setLocationFolder(fd != null ? FileUtil.toFile(fd.getPrimaryFile()) :
null);
+locationDataFolder = fd;
+setLocationFolder0(fd != null ? FileUtil.toFile(fd.getPrimaryFile()) :
null);
}
public File getLocationFolder() {
return locationFolder;
}
private DataFolder getLocationDataFolder() {
+if (locationDataFolder != null) {
+return locationDataFolder;
+}
if (locationFolder != null) {
FileObject f =
FileUtil.toFileObject(FileUtil.normalizeFile(locationFolder));
if (f != null && f.isFolder()) {
diff --git
a/openide.loaders/test/unit/src/org/openide/loaders/TemplateWizardTest.java
b/openide.loaders/test/unit/src/org/openide/loaders/TemplateWizardTest.java
index d270501..739ff48 100644
--- a/openide.loaders/test/unit/src/org/openide/loaders/TemplateWizardTest.java
+++ b/openide.loaders/test/unit/src/org/openide/loaders/TemplateWizardTest.java
@@ -22,6 +22,7 @@ package org.openide.loaders;
import java.awt.Component;
import java.awt.Dialog;
import java.awt.EventQueue;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,6 +30,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
import javax.swing.event.ChangeListener;
import org.n
[incubator-netbeans] 01/01: Merge pull request #371 from dtrebbien/add-2018-to-list-of-valid-apichanges-years
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 commit fd7670643adea43c2f33d81ce80e4fe99267be18 Merge: be4cced d2d2213 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Mon Jan 15 19:12:08 2018 +0100 Merge pull request #371 from dtrebbien/add-2018-to-list-of-valid-apichanges-years Add 2018 to the list of valid apichanges years nbbuild/javadoctools/apichanges.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact "commits@netbeans.apache.org" <commits@netbeans.apache.org>. - 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
[incubator-netbeans] branch master updated (be4cced -> fd76706)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from be4cced Merge pull request #362 from JaroslavTulach/AntUpdate add d2d2213 Add 2018 to the list of valid apichanges years new fd76706 Merge pull request #371 from dtrebbien/add-2018-to-list-of-valid-apichanges-years The 1 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: nbbuild/javadoctools/apichanges.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact ['"commits@netbeans.apache.org" <commits@netbeans.apache.org>']. - 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
[incubator-netbeans] 01/01: Merge pull request #378 from sdedic/sdedic/jshell_mac_launch
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 commit 349ac7ea39255824a6935f0bd4c35978b7587ff7 Merge: 67c4882 9a91501 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Wed Jan 24 21:46:53 2018 +0100 Merge pull request #378 from sdedic/sdedic/jshell_mac_launch NETBEANS-133: Use explicit loopback address instead of autoselect jshell.support/src/org/netbeans/lib/nbjshell/LaunchJDIAgent.java| 6 +++--- .../src/org/netbeans/modules/jshell/tool/JShellLauncher.java| 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact sde...@apache.org. - 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
[incubator-netbeans] branch master updated (2be199e -> 67c4882)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from 2be199e [NETBEANS-313] Remove bootstrap.css from css.model (#384) add 901915d [NETBEANS-251] WidthEstimator is doing estimates based on Symbols, but that's no desirable, as all trees are printed as they are by VeryPretty. new 67c4882 Merge pull request #368 from jlahoda/NETBEANS-251 The 1 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/java/source/pretty/VeryPretty.java | 22 .../modules/java/source/pretty/WidthEstimator.java | 60 +++--- .../netbeans/api/java/source/gen/Method1Test.java | 58 + 3 files changed, 66 insertions(+), 74 deletions(-) -- To stop receiving notification emails like this one, please contact sde...@apache.org. - 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
[incubator-netbeans] 01/01: Merge pull request #368 from jlahoda/NETBEANS-251
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 commit 67c4882192cc5233081e279dfa48a70d90fcb38a Merge: 2be199e 901915d Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Wed Jan 24 21:44:17 2018 +0100 Merge pull request #368 from jlahoda/NETBEANS-251 [NETBEANS-251] WidthEstimator is doing estimates based on Symbols, but that's no desirable, as all trees are printed as they are by VeryPretty. .../modules/java/source/pretty/VeryPretty.java | 22 .../modules/java/source/pretty/WidthEstimator.java | 60 +++--- .../netbeans/api/java/source/gen/Method1Test.java | 58 + 3 files changed, 66 insertions(+), 74 deletions(-) -- To stop receiving notification emails like this one, please contact sde...@apache.org. - 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
[incubator-netbeans] 01/01: Merge pull request #362 from JaroslavTulach/AntUpdate
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 commit be4cced4f46189e550f43a7d5f6dfbea89b2ea95 Merge: d23e386 a44fa7c Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Mon Jan 15 09:05:35 2018 +0100 Merge pull request #362 from JaroslavTulach/AntUpdate ant update was broken nbbuild/build.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact "commits@netbeans.apache.org" <commits@netbeans.apache.org>. - 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
[incubator-netbeans] branch master updated (d23e386 -> be4cced)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from d23e386 [NETBEANS-281] Add ASF license template (#367) add a44fa7c ant update task is still calling finish-build. Returning it back and making it delegate to platform or nb one. new be4cced Merge pull request #362 from JaroslavTulach/AntUpdate The 1 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: nbbuild/build.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact ['"commits@netbeans.apache.org" <commits@netbeans.apache.org>']. - 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
[incubator-netbeans] 01/01: Merge pull request #390 from sdedic/sdedic/maven_graph_edt
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 commit 346c2aba470f38fc1edeef8c86dd18020ef26481 Merge: 775de6e 36b87e7 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Thu Jan 25 22:26:31 2018 +0100 Merge pull request #390 from sdedic/sdedic/maven_graph_edt NETBEANS-324: Maven graph widgets created in EDT .../maven/graph/DependencyGraphTopComponent.java | 15 +++ .../modules/maven/graph/GraphConstructor.java | 52 +++--- 2 files changed, 33 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact sde...@apache.org. - 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
[incubator-netbeans] branch master updated: Left/Right arrow are too generic to be used for switching tabs in the Tools/Option dialog. Prefer Ctrl-(Shift)-Tab. (#660)
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 d9b5883 Left/Right arrow are too generic to be used for switching
tabs in the Tools/Option dialog. Prefer Ctrl-(Shift)-Tab. (#660)
d9b5883 is described below
commit d9b588328ebb22b14d849ebf5d849c26f577134a
Author: Jaroslav Tulach
AuthorDate: Wed Aug 15 08:17:30 2018 +0200
Left/Right arrow are too generic to be used for switching tabs in the
Tools/Option dialog. Prefer Ctrl-(Shift)-Tab. (#660)
---
options.api/src/org/netbeans/modules/options/OptionsPanel.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/options.api/src/org/netbeans/modules/options/OptionsPanel.java
b/options.api/src/org/netbeans/modules/options/OptionsPanel.java
index d058192..5baa3c4 100644
--- a/options.api/src/org/netbeans/modules/options/OptionsPanel.java
+++ b/options.api/src/org/netbeans/modules/options/OptionsPanel.java
@@ -848,10 +848,10 @@ public class OptionsPanel extends JPanel {
if (getActionMap ().get("PREVIOUS") == null) {//NOI18N
InputMap inputMap = getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-inputMap.put (KeyStroke.getKeyStroke (KeyEvent.VK_LEFT, 0),
"PREVIOUS");//NOI18N
+inputMap.put (KeyStroke.getKeyStroke (KeyEvent.VK_TAB,
KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK), "PREVIOUS");//NOI18N
getActionMap ().put ("PREVIOUS", new PreviousAction ());//NOI18N
-inputMap.put (KeyStroke.getKeyStroke (KeyEvent.VK_RIGHT,
0),"NEXT");//NOI18N
+inputMap.put (KeyStroke.getKeyStroke (KeyEvent.VK_TAB,
KeyEvent.CTRL_DOWN_MASK),"NEXT");//NOI18N
getActionMap ().put ("NEXT", new NextAction ());//NOI18N
}
}
-
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
[incubator-netbeans] branch master updated: Fixed enable evaluation for cloned PropertyMonitors. Defined default behaviour for collections and numbers (#701)
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 f875db2 Fixed enable evaluation for cloned PropertyMonitors. Defined
default behaviour for collections and numbers (#701)
f875db2 is described below
commit f875db2fa731fac09d516f68f4ecf5e818d48125
Author: Svatopluk Dedic
AuthorDate: Fri Aug 17 11:31:55 2018 +0200
Fixed enable evaluation for cloned PropertyMonitors. Defined default
behaviour for collections and numbers (#701)
---
openide.awt/src/org/openide/awt/ActionState.java | 3 ++
.../src/org/openide/awt/PropertyMonitor.java | 10 ++
.../openide/awt/StatefulActionProcessorTest.java | 42 ++
3 files changed, 55 insertions(+)
diff --git a/openide.awt/src/org/openide/awt/ActionState.java
b/openide.awt/src/org/openide/awt/ActionState.java
index fda05ba..814ebf0 100644
--- a/openide.awt/src/org/openide/awt/ActionState.java
+++ b/openide.awt/src/org/openide/awt/ActionState.java
@@ -59,6 +59,9 @@ import org.openide.util.actions.Presenter;
* if {@link #checkValue} is {@link #NON_NULL_VALUE}, the action is
checked if and only if
* the value is not {@code null}.
* if the value type is an enum, its {@link Enum#name} is compared to
{@link #checkValue}
+ * if the value is a {@link Collection} or {@link Map}, state evaluates to
the {@link Collection#isEmpty} or
+ * {@link Map#isEmpty}, respectively.
+ * if the value is a {@link Number}, state will be true if value evaluates
to a positive integer.
* the state will be {@code false} (unchecked) otherwise.
*
* If {@link #type} is set to {@link Action}.class, the annotated element
must
diff --git a/openide.awt/src/org/openide/awt/PropertyMonitor.java
b/openide.awt/src/org/openide/awt/PropertyMonitor.java
index 7b36d4d..9ed2cae 100644
--- a/openide.awt/src/org/openide/awt/PropertyMonitor.java
+++ b/openide.awt/src/org/openide/awt/PropertyMonitor.java
@@ -26,6 +26,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.EventListener;
import java.util.List;
@@ -520,6 +521,14 @@ class PropertyMonitor implements
ContextAction.StatefulMonitor, PropertyCh
}
}
if (checkedValue == null) {
+// v is not null;
+if (v instanceof Collection) {
+return !((Collection) v).isEmpty();
+} else if (v instanceof Map) {
+return !((Map) v).isEmpty();
+} else if (Number.class.isInstance(v)) {
+return ((Number)v).intValue() > 0;
+}
return false;
}
if (checkedValue == ActionState.NON_NULL_VALUE) {
@@ -551,6 +560,7 @@ class PropertyMonitor implements
ContextAction.StatefulMonitor, PropertyCh
this.listenerType = other.listenerType;
this.refGetter = other.refGetter;
this.valueFactory = other.valueFactory;
+this.valType = other.valType;
this.refAddListener = other.refAddListener;
this.refRemoveListener = other.refRemoveListener;
this.listenerInterface = other.listenerInterface;
diff --git
a/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/StatefulActionProcessorTest.java
b/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/StatefulActionProcessorTest.java
index 2c59454..5de7162 100644
---
a/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/StatefulActionProcessorTest.java
+++
b/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/StatefulActionProcessorTest.java
@@ -31,6 +31,8 @@ import java.util.Collection;
import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
+import javax.swing.DefaultListModel;
+import javax.swing.DefaultListSelectionModel;
import javax.swing.ListSelectionModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -1377,4 +1379,44 @@ public class StatefulActionProcessorTest extends
NbTestCase implements ContextGl
received = e;
}
}
+
+public void testCustomContextAwareInstance() {
+Action a = Actions.forID("Foo", "test.ListAction");
+DefaultListSelectionModel model = new DefaultListSelectionModel();
+
+InstanceContent localContent1 = new InstanceContent();
+AbstractLookup localLookup1 = new AbstractLookup(localContent1);
+
+Action la =
((ContextAwareAction)a).createContextAwareInstance(localLookup1);
+
+assertFalse(a.isEnabled());
+assertFalse(la.isEnabled());
+
+localContent1.add(model);
+
+assertFalse(a.isEnabled());
+
[incubator-netbeans] branch netbeans-1074-2nd-review-javascript2-nodejs deleted (was 53f7d2c)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch netbeans-1074-2nd-review-javascript2-nodejs in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. was 53f7d2c [NETBEANS-1074] Review Module javascript2.nodejs This change permanently discards the following revisions: discard 53f7d2c [NETBEANS-1074] Review Module javascript2.nodejs - 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
[incubator-netbeans] branch master updated: [NETBEANS-1074] Review Module javascript2.nodejs
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 afe53fc [NETBEANS-1074] Review Module javascript2.nodejs afe53fc is described below commit afe53fc5dc60c0241a4329ec17717fe1dadf08c5 Author: Svata Dedic AuthorDate: Mon Aug 20 20:48:42 2018 +0200 [NETBEANS-1074] Review Module javascript2.nodejs --- javascript2.nodejs/external/binaries-list | 16 .../qa-functional/data/SimpleNode/src/cc/cc1.js| 21 + .../qa-functional/data/SimpleNode/src/cc/cc2.js| 21 + .../qa-functional/data/SimpleNode/src/cc/cc4.js| 21 + .../qa-functional/data/SimpleNode/src/cc/foo.js| 19 +++ .../data/SimpleNode/src/core/mymod.js | 21 + .../data/SimpleNode/src/folder/arr.js | 21 + .../data/SimpleNode/src/folder/arrRef.js | 21 + .../data/SimpleNode/src/folder/newjavascript.js| 21 + .../data/TestNavigation/public_html/index.html | 22 +++--- .../js/issue247565/folder/literalRef247565.js | 21 + .../public_html/js/issue250329/s1.js | 21 + .../public_html/js/issue250329/s2.js | 21 + .../public_html/js/issue250329/s3.js | 21 + .../nodejs/editor/NodeJsDeclarationFinderTest.java | 14 +++--- 15 files changed, 248 insertions(+), 54 deletions(-) diff --git a/javascript2.nodejs/external/binaries-list b/javascript2.nodejs/external/binaries-list index 9490f90..f3e4210 100644 --- a/javascript2.nodejs/external/binaries-list +++ b/javascript2.nodejs/external/binaries-list @@ -1 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. 39405F982F7D0E5D0932219BE1D91358D316D0AE javascript2.nodejs-nodejs-resources.zip diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js index d908bd6..5533024 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc1.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. */ diff --git a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js index 98715a5..eed99e7 100644 --- a/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js +++ b/javascript2.nodejs/test/qa-functional/data/SimpleNode/src/cc/cc2.js @@ -1,7 +1,20 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional infor
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review javascript2.model (#730)
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 7fd26e5 [NETBEANS-1074] Module Review javascript2.model (#730)
7fd26e5 is described below
commit 7fd26e5d80ea6f7b26544ac4fad612a66455c0fb
Author: Svatopluk Dedic
AuthorDate: Tue Aug 21 09:11:47 2018 +0200
[NETBEANS-1074] Module Review javascript2.model (#730)
[NETBEANS-1074] Review Module javascript2.model. Fixed unit test broken by
relicensing
---
.../javascript2/model/JsWithObjectImpl.java| 61 +++---
.../testfiles/model/anonymousFunction.js.model | 2 +-
2 files changed, 20 insertions(+), 43 deletions(-)
diff --git
a/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
b/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
index d689160..3a5be31 100644
---
a/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
+++
b/javascript2.model/src/org/netbeans/modules/javascript2/model/JsWithObjectImpl.java
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.netbeans.modules.javascript2.model;
import org.netbeans.modules.javascript2.model.api.ModelUtils;
@@ -16,48 +35,6 @@ import org.netbeans.modules.javascript2.model.api.JsObject;
import org.netbeans.modules.javascript2.model.api.JsWith;
import org.netbeans.modules.javascript2.model.api.Occurrence;
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2013 Sun Microsystems, Inc.
- */
-
/**
*
* @author Petr Pisl
diff --git
a/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
b/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
index 78facd3..2052f65 100644
---
a/javascript2.model/test/unit/data/testfiles/model/anonymousFunction.js.model
+++
b/javascript2.model/test/unit/data/testfiles/model/anonymo
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review javascript2.requirejs (#735)
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 efea113 [NETBEANS-1074] Module Review javascript2.requirejs (#735)
efea113 is described below
commit efea11366860f74fe7c630e41b85c13d2f777106
Author: Svatopluk Dedic
AuthorDate: Wed Aug 22 15:24:52 2018 +0200
[NETBEANS-1074] Module Review javascript2.requirejs (#735)
[NETBEANS-1074] Review Module javascript2.requirejs
---
javascript2.requirejs/.gitignore | 2 +
javascript2.requirejs/build.xml| 10 ++-
javascript2.requirejs/external/binaries-list | 19 -
.../javascript2.requirejs-requirejs-license.txt| 89 --
.../external/requirejs-2.1.8-license.txt | 30
.../{build.xml => licenseinfo.xml} | 16 ++--
.../javascript2/requirejs/ui/Bundle.properties | 56 --
.../editor/RequireJSCodeCompletionTest.java| 2 +
.../editor/RequireJsDeclarationFinderCodeTest.java | 63 +--
9 files changed, 102 insertions(+), 185 deletions(-)
diff --git a/javascript2.requirejs/.gitignore b/javascript2.requirejs/.gitignore
new file mode 100644
index 000..9169293
--- /dev/null
+++ b/javascript2.requirejs/.gitignore
@@ -0,0 +1,2 @@
+test/unit/data/TestProject2/public_html/js/lib/require.js/require.js
+
diff --git a/javascript2.requirejs/build.xml b/javascript2.requirejs/build.xml
index 464411a..b5e365d 100644
--- a/javascript2.requirejs/build.xml
+++ b/javascript2.requirejs/build.xml
@@ -23,8 +23,14 @@
Builds, tests, and runs the project
org.netbeans.modules.javascript2.requirejs
-
-
+
+
+
+
+
+
+
+
diff --git a/javascript2.requirejs/external/binaries-list
b/javascript2.requirejs/external/binaries-list
index bfe7a2f..1ea41fe 100644
--- a/javascript2.requirejs/external/binaries-list
+++ b/javascript2.requirejs/external/binaries-list
@@ -1 +1,18 @@
-CBD2C9E078492B00E2402E9282AC8686351D9D56
javascript2.requirejs-requirejs-resources.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+531D2F915DE16E2A47FD89D61A2B1FED7316BEBC org.webjars:requirejs:2.1.8
+
diff --git
a/javascript2.requirejs/external/javascript2.requirejs-requirejs-license.txt
b/javascript2.requirejs/external/javascript2.requirejs-requirejs-license.txt
deleted file mode 100644
index b2411f5..000
--- a/javascript2.requirejs/external/javascript2.requirejs-requirejs-license.txt
+++ /dev/null
@@ -1,89 +0,0 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/requirejs/requirejs
-
-The following license applies to all parts of this software except as
-documented below:
-
-
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-Copyright and related rights for sample code are waived via
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review javascript2.nodejs - followup (#760)
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 5ee0d11 [NETBEANS-1074] Module Review javascript2.nodejs - followup
(#760)
5ee0d11 is described below
commit 5ee0d1162fbde7497c13193e3bfe85cfe510590b
Author: Svatopluk Dedic
AuthorDate: Thu Aug 23 08:27:25 2018 +0200
[NETBEANS-1074] Module Review javascript2.nodejs - followup (#760)
[NETBEANS-1074] Module Review javascript2.nodejs - followup
---
javascript2.nodejs/.gitignore| 2 ++
javascript2.nodejs/build.xml | 2 +-
javascript2.nodejs/external/binaries-list| 2 +-
.../{nodejs-license.txt => nodejs-resources-8.4.0-license.txt} | 9 +
.../external/nodejs-license.txt => nbbuild/licenses/MIT-nodejs | 0
5 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/javascript2.nodejs/.gitignore b/javascript2.nodejs/.gitignore
new file mode 100644
index 000..6f0da0e
--- /dev/null
+++ b/javascript2.nodejs/.gitignore
@@ -0,0 +1,2 @@
+test/unit/data/NodeJsRuntime/*
+
diff --git a/javascript2.nodejs/build.xml b/javascript2.nodejs/build.xml
index ee301ba..de7913e 100644
--- a/javascript2.nodejs/build.xml
+++ b/javascript2.nodejs/build.xml
@@ -24,6 +24,6 @@
-
+
diff --git a/javascript2.nodejs/external/binaries-list
b/javascript2.nodejs/external/binaries-list
index f3e4210..1e4970f 100644
--- a/javascript2.nodejs/external/binaries-list
+++ b/javascript2.nodejs/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-39405F982F7D0E5D0932219BE1D91358D316D0AE
javascript2.nodejs-nodejs-resources.zip
+39405F982F7D0E5D0932219BE1D91358D316D0AE nodejs-resources-8.4.0.zip
diff --git a/javascript2.nodejs/external/nodejs-license.txt
b/javascript2.nodejs/external/nodejs-resources-8.4.0-license.txt
similarity index 99%
copy from javascript2.nodejs/external/nodejs-license.txt
copy to javascript2.nodejs/external/nodejs-resources-8.4.0-license.txt
index c5aee58..0fbcb1a 100644
--- a/javascript2.nodejs/external/nodejs-license.txt
+++ b/javascript2.nodejs/external/nodejs-resources-8.4.0-license.txt
@@ -1,3 +1,12 @@
+Name: Nodejs
+Version: 8.4.0
+License: MIT-nodejs
+Origin: https://nodejs.org/en/
+Source: https://github.com/nodejs/node/archive/v8.4.0.zip
+Description: Nodejs
+Type: compile-time
+Comment: Nodejs files are used for testing only, they are not distributed in
the convenience binary.
+
Copyright Node.js contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/javascript2.nodejs/external/nodejs-license.txt
b/nbbuild/licenses/MIT-nodejs
similarity index 100%
rename from javascript2.nodejs/external/nodejs-license.txt
rename to nbbuild/licenses/MIT-nodejs
-
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
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review libs.nashorn (#738)
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 84b1d33 [NETBEANS-1074] Module Review libs.nashorn (#738) 84b1d33 is described below commit 84b1d33a08c0147444c5a0c4178bca2abe10f02e Author: Svatopluk Dedic AuthorDate: Thu Aug 23 08:27:51 2018 +0200 [NETBEANS-1074] Module Review libs.nashorn (#738) [NETBEANS-1074] Module Review libs.nashorn --- libs.nashorn/external/binaries-list| 18 +- ...t => com.oracle.js.parser-ba7a8bc42268-license.txt} | 14 -- libs.nashorn/nbproject/project.properties | 3 ++- libs.nashorn/nbproject/project.xml | 5 - 4 files changed, 31 insertions(+), 9 deletions(-) diff --git a/libs.nashorn/external/binaries-list b/libs.nashorn/external/binaries-list index 529bd58..b9b7a8f 100644 --- a/libs.nashorn/external/binaries-list +++ b/libs.nashorn/external/binaries-list @@ -1 +1,17 @@ -7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser.jar +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +7CA13589F586F659BB0E1561719A91CA47BF1897 com.oracle.js.parser-ba7a8bc42268.jar diff --git a/libs.nashorn/external/com.oracle.js.parser-license.txt b/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt similarity index 97% rename from libs.nashorn/external/com.oracle.js.parser-license.txt rename to libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt index 8e008a3..740763e 100644 --- a/libs.nashorn/external/com.oracle.js.parser-license.txt +++ b/libs.nashorn/external/com.oracle.js.parser-ba7a8bc42268-license.txt @@ -2,12 +2,14 @@ Name: com.oracle.js.parser.jar Version: ba7a8bc42268 Description: An ECMAScript 6 (ECMAScript 2015) compliant parser for JavaScript source code. Based on the parser of Project Nashorn in OpenJDK (http://openjdk.java.net/projects/nashorn/). License: GPL-2-CP -Source: http://hg.openjdk.java.net/graal/graal-js-parser +Origin: http://hg.openjdk.java.net/graal/graal-js-parser +Type: compile-time +Comment: NetBeans JS support will be broken unless Nashorn is compatible-licensed, or a download is provided similar to nb-javac. See NETBEANS-1159, NETBEANS-1160. The GNU General Public License (GPL) Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. + Copyright 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not @@ -405,16 +407,16 @@ Public License instead of this License. Certain source files distributed by Sun Microsystems, Inc. are subject to the following clarification and special -exception to the GPL Version 2, but only where Sun has expressly +exception to the GPL, but only where Sun has expressly included in the particular source file's header the words "Sun designates this particular file as subject to the -"Classpath" exception as provided by Sun in the License file +"Classpath" exception as provided by Sun in the LICENSE file that accompanied this code." Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of the GNU General Public -License Version 2 cover the whole combination. +License cover the whole combination. As a special exception, the copyright holders of this library give you permission to link this library with @@ -428,4 +430,4 @@ not derived from or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from -your version. \ No newline at end of file +your version. diff --git a/libs.nashorn/nbproject/project.properties b/libs.nashorn/nbproject/project.properties index b6f4b38..6aa6895 100644 --- a/libs.nashorn/nbproject/project.properties +++ b/lib
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module review javascript2.jade (#728)
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 74bd902 [NETBEANS-1074] Module review javascript2.jade (#728)
74bd902 is described below
commit 74bd90269ae9ef06c917dadee8a798e15a2b1e80
Author: Svatopluk Dedic
AuthorDate: Wed Aug 22 20:31:32 2018 +0200
[NETBEANS-1074] Module review javascript2.jade (#728)
---
javascript2.jade/build.xml | 5 +-
javascript2.jade/external/binaries-list| 17 ++
javascript2.jade/external/jflex-1.4.3-license.txt | 308 +
javascript2.jade/licenseinfo.xml | 28 ++
.../jade/editor/JadeCssEmbeddingProvider.java | 61 ++--
.../jade/editor/JadeJsEmbeddingProvider.java | 51 +---
.../javascript2/jade/resources/jadeTemplate.jade | 20 ++
javascript2.jade/tools/lexer-jade.patch| 17 ++
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +
9 files changed, 427 insertions(+), 83 deletions(-)
diff --git a/javascript2.jade/build.xml b/javascript2.jade/build.xml
index d1c6a23..ef391a5 100644
--- a/javascript2.jade/build.xml
+++ b/javascript2.jade/build.xml
@@ -25,12 +25,9 @@
-
-http://repo1.maven.org/maven2/de/jflex/jflex/1.4.3/jflex-1.4.3.jar;
- dest="${build.dir}/tools/jflex.jar" verbose="true"/>
+ classpath="${basedir}/external/jflex-1.4.3.jar"
onerror="fail"/>
diff --git a/javascript2.jade/external/binaries-list
b/javascript2.jade/external/binaries-list
new file mode 100644
index 000..d7b5729
--- /dev/null
+++ b/javascript2.jade/external/binaries-list
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+88516325EF6816C047027DD87D00493CF6C31E7E de.jflex:jflex:1.4.3
diff --git a/javascript2.jade/external/jflex-1.4.3-license.txt
b/javascript2.jade/external/jflex-1.4.3-license.txt
new file mode 100644
index 000..19e7cb2
--- /dev/null
+++ b/javascript2.jade/external/jflex-1.4.3-license.txt
@@ -0,0 +1,308 @@
+Name: JFlex
+Version: 1.4.3
+Description: The Fast Scanner Generator
+License: jflex
+Origin: http://jflex.de/
+Type: compile-time
+
+JFlex - Copying, Warranty & License
+
+
+
+JFlex is free software, published under the terms of the GNU General Public
License.
+
+There is absolutely NO WARRANTY for JFlex, its code and its documentation.
+
+The code generated by JFlex inherits the copyright of the specification it
+was produced from. If it was your specification, you may use the generated
+code without restriction.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+
+
+0.
+ This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+
+
+1.
+ You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License a
[incubator-netbeans] branch master updated: NETBEANS-1049: prevent NPE on unpersistable components (#638)
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 c43c903 NETBEANS-1049: prevent NPE on unpersistable components (#638)
c43c903 is described below
commit c43c9033f11952f73971ae4b1534b94883edef00
Author: Svatopluk Dedic
AuthorDate: Thu Jul 19 21:09:06 2018 +0200
NETBEANS-1049: prevent NPE on unpersistable components (#638)
---
.../src/org/netbeans/core/windows/documentgroup/GroupsManager.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/core.windows/src/org/netbeans/core/windows/documentgroup/GroupsManager.java
b/core.windows/src/org/netbeans/core/windows/documentgroup/GroupsManager.java
index 2e026c8..180db3c 100644
---
a/core.windows/src/org/netbeans/core/windows/documentgroup/GroupsManager.java
+++
b/core.windows/src/org/netbeans/core/windows/documentgroup/GroupsManager.java
@@ -348,7 +348,13 @@ public class GroupsManager {
String id = wmi.findTopComponentID(tc);
if( tc.equals(welcomeTc) && !welcomeWasOpened )
continue;
+if (tc.getPersistenceType() == TopComponent.PERSISTENCE_NEVER) {
+continue;
+}
FileObject tcFO = FileUtil.toFileObject(new File(componentRoot, id
+ "." + SETTINGS)); //NOI18N //NOI18N
+if (tcFO == null) {
+continue;
+}
try {
tcFO.copy(groupFO, id, SETTINGS);
} catch( IOException ex ) {
-
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
[incubator-netbeans] branch master updated: NETBEANS-998: update display name when DelayedNode resolves it (#636)
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
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
[incubator-netbeans] branch master updated: NETBEANS-1048: display start of product info in about box (#637)
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 660477b NETBEANS-1048: display start of product info in about box (#637) 660477b is described below commit 660477b1733f66951cdb24283f85cd7cfa2f44d3 Author: Svatopluk Dedic AuthorDate: Thu Jul 19 21:09:37 2018 +0200 NETBEANS-1048: display start of product info in about box (#637) --- o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java b/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java index b300dda..ea4fa22 100644 --- a/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java +++ b/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java @@ -110,6 +110,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener description.setText(LBL_description(getProductVersionValue(), getJavaValue(), getVMValue(), getOperatingSystemValue(), getEncodingValue(), getSystemLocaleValue(), getUserDirValue(), Places.getCacheDirectory().getAbsolutePath(), updates, FONT_SIZE, getJavaRuntime())); description.setCursor(null); description.revalidate(); +description.setCaretPosition(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
[incubator-netbeans] branch master updated: Added license names for licenses added during webcommon cluster review (#855)
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 522e5a7 Added license names for licenses added during webcommon cluster review (#855) 522e5a7 is described below commit 522e5a730a123dc3ca25ce56daa1e2ec52286064 Author: Svatopluk Dedic AuthorDate: Tue Sep 11 09:37:28 2018 +0200 Added license names for licenses added during webcommon cluster review (#855) --- nbbuild/licenses/names.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties index 9e87cc4..73a49b7 100644 --- a/nbbuild/licenses/names.properties +++ b/nbbuild/licenses/names.properties @@ -51,6 +51,8 @@ MIT-dd-plist=MIT license dd-plist variant MIT-html5-parser=MIT license html5 parser variant MIT-icu4j=MIT license icu4j variant MIT-isorelax=MIT license isorelax variant +MIT-jquery=MIT license JQuery variant +MIT-nodejs=MIT license NodeJS variant plus node external libraries licenses MIT-validator=MIT license validator variant MPL-1.0=MPL 1.0 license CDDL-SPL=CDDL 1.0 + SPL 1.0 @@ -60,3 +62,4 @@ Maven-EPL-v10=EPL 1.0 as used in Apache Maven Maven-jsoup=jsoup license as used in Apache Maven Maven-MIT=MIT license as used in Apache Maven Maven-PD=Public Domain from Apache Maven distribution +jflex=JFlex GNU GPL license with exception for generated code - 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
[incubator-netbeans] branch master updated: Allow to postprocess downloaded binaries (#491)
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 acefa19 Allow to postprocess downloaded binaries (#491) acefa19 is described below commit acefa191423bf4ac9522371a07f9de071037ab80 Author: Svatopluk Dedic <svatopluk.de...@oracle.com> AuthorDate: Wed Apr 11 10:54:23 2018 +0200 Allow to postprocess downloaded binaries (#491) Overridable process.release.files with dependencies. Adapted lib.profiler and o.apache.xml.resolver to the new overridable task. --- lib.profiler/build.xml| 9 + nbbuild/templates/projectized.xml | 13 + o.apache.xml.resolver/build.xml | 4 +++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib.profiler/build.xml b/lib.profiler/build.xml index 1089296..e6c6d8b 100644 --- a/lib.profiler/build.xml +++ b/lib.profiler/build.xml @@ -24,15 +24,8 @@ - - - - - - + - - diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml index a993f77..b112e65 100644 --- a/nbbuild/templates/projectized.xml +++ b/nbbuild/templates/projectized.xml @@ -230,14 +230,19 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= - - - + + + + + + + + @@ -811,5 +816,5 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds= - + diff --git a/o.apache.xml.resolver/build.xml b/o.apache.xml.resolver/build.xml index 6fb51e4..977594f 100644 --- a/o.apache.xml.resolver/build.xml +++ b/o.apache.xml.resolver/build.xml @@ -58,5 +58,7 @@ - + + + -- To stop receiving notification emails like this one, please contact sde...@apache.org. - 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
[incubator-netbeans] branch master updated: Using Plugin Portal for NetBeans 10.0 in master.
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 d6a13cf Using Plugin Portal for NetBeans 10.0 in master.
d6a13cf is described below
commit d6a13cfea1bfbec1a47d3a542957e51173a7
Author: Jan Lahoda
AuthorDate: Thu Nov 1 08:35:44 2018 +0100
Using Plugin Portal for NetBeans 10.0 in master.
---
.../src/org/netbeans/modules/updatecenters/resources/Bundle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
index c3e26b6..7393d1b 100644
---
a/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
+++
b/nb/updatecenters/src/org/netbeans/modules/updatecenters/resources/Bundle.properties
@@ -32,6 +32,6 @@
URL_LatestBuild=http://bits.netbeans.org/dev/nbms-and-javadoc/lastSuccessfulBuil
#NOI18N
URL_Default_N=http://updates.netbeans.org/netbeans/updates/dev/uc/final/main/catalog.xml.gz?{$netbeans.hash.code}
#NOI18N
-URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/9.0/catalog.xml.gz
+URL_PluginPortal=http://plugins.netbeans.org/nbpluginportal/updates/10.0/catalog.xml.gz
#NOI18N
URL_82PluginPortal=http://updates.netbeans.org/netbeans/updates/8.2/uc/final/distribution/catalog.xml.gz
-
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
[incubator-netbeans] branch master updated: GraalJS parser JAR removed from distribution. Created convenience module to produce distribution NBM for non-Apache distributors. Compile-time jsparser incl
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 3357fa5 GraalJS parser JAR removed from distribution. Created
convenience module to produce distribution NBM for non-Apache distributors.
Compile-time jsparser included into ergonomics testsuite
3357fa5 is described below
commit 3357fa5b18590908ac9de4ad7e55ab1fdf88cd50
Author: Svata Dedic
AuthorDate: Fri Oct 19 15:44:54 2018 +0200
GraalJS parser JAR removed from distribution. Created convenience module to
produce distribution NBM for non-Apache distributors.
Compile-time jsparser included into ergonomics testsuite
---
.../ide.ergonomics/nbproject/project.properties| 3 +-
ergonomics/ide.ergonomics/nbproject/project.xml| 10 +
.../modules/ide/ergonomics/fod/Bundle.properties | 4 +-
.../ide/ergonomics/fod/ConfigurationPanel.form | 2 +-
.../ide/ergonomics/fod/ConfigurationPanel.java | 67 +++-
.../ide/ergonomics/fod/FindComponentModules.java | 48 ++-
.../ide/ergonomics/fod/FoDUpdateUnitProvider.java | 12 +-
.../ide/ergonomics/newproject/DescriptionStep.java | 24 +-
ergonomics/ide.ergonomics/webcommon.properties | 2 +
.../org/netbeans/nbbuild/extlibs/ignored-binaries | 4 +
.../core/validation/ValidateModulesTest.java | 78 -
webcommon/libs.nashorn/build.xml | 17 +
.../com.oracle.js.parser-ba7a8bc42268-license.txt | 2 +-
webcommon/libs.nashorn/manifest.mf | 2 +-
.../libs.nashorn/nbproject/project.properties | 2 -
webcommon/libs.nashorn/nbproject/project.xml | 5 +-
webcommon/libs.nashorn/test/unit/src/.gitignore| 3 +
webcommon/libs.oracle.jsparser/.gitignore | 1 +
webcommon/libs.oracle.jsparser/LICENSE | 347 +
webcommon/libs.oracle.jsparser/build.xml | 70 +
.../libs.oracle.jsparser/external/binaries-list| 3 +-
.../com.oracle.js.parser-ba7a8bc42268-license.txt | 2 +-
webcommon/libs.oracle.jsparser/manifest.mf | 7 +
.../nbproject/project.properties | 4 +-
.../nbproject/project.xml | 5 +-
.../libs/oracle/jsparser/Bundle.properties | 6 +-
26 files changed, 688 insertions(+), 42 deletions(-)
diff --git a/ergonomics/ide.ergonomics/nbproject/project.properties
b/ergonomics/ide.ergonomics/nbproject/project.properties
index 52f5fbd..b11a5b9 100644
--- a/ergonomics/ide.ergonomics/nbproject/project.properties
+++ b/ergonomics/ide.ergonomics/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
@@ -38,3 +38,4 @@ test.config.stableBTD.excludes=\
**/FodDataObjectFactoryTest.class,\
**/FodDataObjectXMLFactoryTest.class,\
**/OpenEditorEnablesEditMenuFactoryTest.class
+
diff --git a/ergonomics/ide.ergonomics/nbproject/project.xml
b/ergonomics/ide.ergonomics/nbproject/project.xml
index fa65dd9..7243568 100644
--- a/ergonomics/ide.ergonomics/nbproject/project.xml
+++ b/ergonomics/ide.ergonomics/nbproject/project.xml
@@ -262,6 +262,16 @@
org.netbeans.modules.server
+
+
org.netbeans.modules.java.source.nbjavac
+
+
+
+
+
org.netbeans.libs.nashorn
+
+
+
diff --git
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/Bundle.properties
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/Bundle.properties
index 270ee56..321fdea 100644
---
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/Bundle.properties
+++
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/Bundle.properties
@@ -35,7 +35,9 @@ LBL_DownloadInfo=In order to use {0}, it is recommended to
download & install ad
LBL_EnableInfo=In order to use this functionality, support for {0} must be
activated.
LBL_Download= and Activate...
LBL_Enable=
-
+MSG_MissingRequiredModules=The feature {0} is missing required modules: {1}
+MSG_MissingRecommendedModules=Recommended module(s) for feature {0} are
missing: {1}
+ERR_UpdateComponents=Errors encountered obtaining update information: {0}
# {0} cluster name
# {1} reason for enable
diff --git
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/ConfigurationPanel.form
b/ergono
[incubator-netbeans] branch master updated: [NETBEANS-1481] Fix handling of eager module fragments (regression against netbeans 9.0) (#978)
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 efae804 [NETBEANS-1481] Fix handling of eager module fragments
(regression against netbeans 9.0) (#978)
efae804 is described below
commit efae804a8fec48cb57c0c0c2425a2d78f4c4112d
Author: Florian Vogler
AuthorDate: Tue Nov 13 20:10:59 2018 +0100
[NETBEANS-1481] Fix handling of eager module fragments (regression against
netbeans 9.0) (#978)
---
.../src/org/netbeans/ModuleManager.java| 6 ++--
.../data/jars/fragment-module-missing-token.mf | 5 +++
.../org/foo2/FragmentContent.java | 26 +++
.../unit/src/org/netbeans/ModuleManagerTest.java | 38 ++
4 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
index 4db13c7..2a48209 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
@@ -1681,7 +1681,9 @@ public final class ModuleManager extends Modules {
private void maybeAddToEnableList(Set willEnable, Set
mightEnable, Module m, boolean okToFail) {
if (! missingDependencies(m).isEmpty()) {
-assert okToFail : "Module " + m + " had unexpected problems: " +
missingDependencies(m) + " (willEnable: " + willEnable + " mightEnable: " +
mightEnable + ")";
+if (!okToFail) {
+Util.err.warning("Module " + m + " had unexpected problems: "
+ missingDependencies(m) + " (willEnable: " + willEnable + " mightEnable: " +
mightEnable + ")");
+}
// Cannot satisfy its dependencies, exclude it.
return;
}
@@ -1747,7 +1749,7 @@ public final class ModuleManager extends Modules {
Collection frags = getAttachedFragments(m);
for (Module fragMod : frags) {
if (! fragMod.isEnabled()) {
-maybeAddToEnableList(willEnable, mightEnable, fragMod, false);
+maybeAddToEnableList(willEnable, mightEnable, fragMod,
fragMod.isEager());
}
}
}
diff --git
a/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token.mf
b/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token.mf
new file mode 100644
index 000..bb2ed93
--- /dev/null
+++
b/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.foo.fragment.missing.token
+OpenIDE-Module-Fragment-Host: org.foo.host
+OpenIDE-Module-Name: Fragment Content Module with missing token
+OpenIDE-Module-Requires: missing.token
diff --git
a/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token/org/foo2/FragmentContent.java
b/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token/org/foo2/FragmentContent.java
new file mode 100644
index 000..9591f2c
--- /dev/null
+++
b/platform/o.n.bootstrap/test/unit/data/jars/fragment-module-missing-token/org/foo2/FragmentContent.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.foo;
+// Does not do anything, just needs to be here & loadable.
+public class FragmentContent {
+protected String something() {
+return "I am an added fragment with missing token";
+}
+}
diff --git
a/platform/o.n.bootstrap/test/unit/src/org/netbeans/ModuleManagerTest.java
b/platform/o.n.bootstrap/test/unit/src/org/netbeans/ModuleManagerTest.java
index 187c779..343edfa 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/ModuleManagerTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/ModuleManagerTest.java
@@ -2760,6 +2760,44 @@ public class ModuleManagerTest extends SetupHid {
Module client = mgr.create(jar, null, false, fa
[incubator-netbeans] branch master updated: [NETBEANS-1147, NETBEANS-1298] Autoupdated fragment restarts only if its host is already ON
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 b7a074d [NETBEANS-1147,NETBEANS-1298] Autoupdated fragment restarts
only if its host is already ON
b7a074d is described below
commit b7a074d205ad45d603554fe05bb0c89aec2a3dd0
Author: Svata Dedic
AuthorDate: Thu Sep 20 09:41:59 2018 +0200
[NETBEANS-1147,NETBEANS-1298] Autoupdated fragment restarts only if its
host is already ON
---
.../autoupdate/services/InstallSupportImpl.java| 47 +++
.../services/OperationContainerImpl.java | 2 +
.../modules/autoupdate/services/Utilities.java | 36 +++-
.../updateprovider/AutoupdateCatalogParser.java| 17 ++--
.../updateprovider/AutoupdateInfoParser.java | 4 +
.../updateprovider/InstalledModuleItem.java| 5 +-
.../autoupdate/updateprovider/ModuleItem.java | 10 +++
.../autoupdate/updateprovider/UpdateItemImpl.java | 6 +-
.../netbeans/api/autoupdate/DefaultTestCase.java | 6 +-
.../autoupdate/data/org-yourorghere-fragment.nbm | Bin 0 -> 3303 bytes
.../data/{updates.xml => updates-bad-fragment.xml} | 4 +
.../org/netbeans/api/autoupdate/data/updates.xml | 4 +
.../services/FragmentDisabledNoRestartTest.java| 57 +
.../services/FragmentIEnabledRestartTest.java | 49 +++
.../services/FragmentInstallHostModuleTest.java| 53
.../FragmentMissingInCatalogRestartTest.java | 55
.../services/FragmentModuleTestBase.java | 93 +
17 files changed, 434 insertions(+), 14 deletions(-)
diff --git
a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/InstallSupportImpl.java
b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/InstallSupportImpl.java
index 656f929..e70e04c 100644
---
a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/InstallSupportImpl.java
+++
b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/InstallSupportImpl.java
@@ -34,6 +34,7 @@ import java.security.cert.Certificate;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
@@ -46,8 +47,12 @@ import org.netbeans.api.autoupdate.InstallSupport.Validator;
import org.netbeans.api.autoupdate.OperationContainer.OperationInfo;
import org.netbeans.api.autoupdate.OperationSupport.Restarter;
import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.modules.autoupdate.updateprovider.AutoupdateInfoParser;
+import org.netbeans.modules.autoupdate.updateprovider.ModuleItem;
import org.netbeans.modules.autoupdate.updateprovider.NetworkAccess;
import org.netbeans.modules.autoupdate.updateprovider.NetworkAccess.Task;
+import org.netbeans.modules.autoupdate.updateprovider.UpdateItemImpl;
+import org.netbeans.spi.autoupdate.UpdateItem;
import org.netbeans.updater.ModuleDeactivator;
import org.netbeans.updater.ModuleUpdater;
import org.netbeans.updater.UpdateTracking;
@@ -59,6 +64,7 @@ import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.NbCollections;
+import org.xml.sax.SAXException;
/**
*
@@ -1083,6 +1089,8 @@ public class InstallSupportImpl {
break;
}
}
+updateFragmentStatus(impl, nbmFile);
+
} catch (IOException ioe) {
LOG.log (Level.INFO, ioe.getMessage (), ioe);
res = "BAD_DOWNLOAD";
@@ -1099,6 +1107,45 @@ public class InstallSupportImpl {
return el.getDownloadSize ();
}
+private void updateFragmentStatus(UpdateElementImpl el, File nbmFile)
throws IOException {
+UpdateItemImpl impl = el.getInstallInfo().getUpdateItemImpl();
+if (!(impl instanceof ModuleItem)) {
+return;
+}
+ModuleItem mod = (ModuleItem)impl;
+if (mod.isFragment()) {
+String fhost = mod.getFragmentHost();
+Module m = Utilities.toModule(fhost);
+if (m != null && m.isEnabled()) {
+impl.setNeedsRestart(Boolean.TRUE);
+}
+}
+
+Map items;
+try {
+items = AutoupdateInfoParser.getUpdateItems(nbmFile);
+} catch (SAXException ex) {
+throw new IOException(ex);
+}
+for (UpdateItem realItem : items.values()) {
+UpdateItemImpl realImpl = Trampoline.SPI.impl(realItem);
+if (realImpl instanceof ModuleItem) {
+ModuleItem realMod = (ModuleItem)realImpl;
+
[incubator-netbeans] 01/01: Merge pull request #1047 from sdedic/feature/autoupdate_enable_download_100
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch release100 in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git commit 3a163c6e37251940c3b39e47e9d3704a8335a123 Merge: 0907730 a4fb36a Author: Svatopluk Dedic AuthorDate: Tue Dec 4 14:17:46 2018 +0100 Merge pull request #1047 from sdedic/feature/autoupdate_enable_download_100 [Backport] Enhance AU to install missing feature parts (PR-1044) .../modules/ide/ergonomics/fod/Bundle.properties | 2 +- .../ide/ergonomics/fod/ConfigurationPanel.java | 42 +++-- .../modules/ide/ergonomics/fod/FeatureInfo.java| 59 +- .../ide/ergonomics/fod/FeatureProjectFactory.java | 65 +-- .../ide/ergonomics/fod/FindComponentModules.java | 205 ++--- .../ide/ergonomics/fod/FoDUpdateUnitProvider.java | 32 +++- .../ide/ergonomics/newproject/DescriptionStep.java | 5 +- .../modules/ide/ergonomics/DynamicVerifyTest.java | 14 +- platform/autoupdate.services/apichanges.xml| 14 ++ platform/autoupdate.services/manifest.mf | 2 +- .../nbproject/project.properties | 2 +- .../api/autoupdate/OperationContainer.java | 9 + .../services/FeatureUpdateElementImpl.java | 28 ++- .../autoupdate/services/FeatureUpdateUnitImpl.java | 2 + .../autoupdate/services/InstallSupportImpl.java| 2 + .../services/OperationContainerImpl.java | 35 +++- .../autoupdate/services/OperationValidator.java| 51 + .../autoupdate/services/UpdateManagerImpl.java | 42 - .../org/netbeans/spi/autoupdate/UpdateItem.java| 5 +- .../netbeans/api/autoupdate/RefreshItemsTest.java | 2 +- .../api/autoupdate/RefreshProvidersTest.java | 2 +- .../autoupdate.ui/nbproject/project.properties | 2 +- platform/autoupdate.ui/nbproject/project.xml | 2 +- .../modules/autoupdate/ui/PluginManagerUI.java | 2 +- .../netbeans/modules/autoupdate/ui/UnitTab.form| 1 - .../netbeans/modules/autoupdate/ui/UnitTab.java| 86 +++-- .../netbeans/modules/autoupdate/ui/Utilities.java | 23 +++ .../autoupdate/ui/wizards/Bundle.properties| 2 + .../modules/autoupdate/ui/wizards/InstallStep.java | 71 +-- .../ui/wizards/InstallUnitWizardIterator.java | 88 + .../ui/wizards/InstallUnitWizardModel.java | 8 +- ...dIterator.java => InstallableIteratorBase.java} | 86 - .../autoupdate/ui/wizards/LicenseApprovalStep.java | 8 +- .../ui/wizards/OperationDescriptionStep.java | 30 ++- .../ui/wizards/OperationWizardModel.java | 187 ++- .../autoupdate/ui/wizards/UninstallUnitWizard.java | 20 +- .../ui/wizards/UninstallUnitWizardIterator.java| 78 +--- .../ui/wizards/UninstallUnitWizardModel.java | 70 ++- .../src/org/netbeans/ModuleManager.java| 14 +- 39 files changed, 1106 insertions(+), 292 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
[incubator-netbeans] branch release100 updated (0907730 -> 3a163c6)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch release100
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from 0907730 Release100 apidocbranding (#1043)
add 05d090b Backport: Using multiple regular expression to specify the
needed modules, part of 4b8d8a788dce05
add af8e133 Add required extra modules to FoD feature for AU
add 494a76a Only report required restart if the fragment host module is
running
add f1d47de Refresh caches of provides-requires after install change
add 645b250 Adjusted tests to added fragment module in test data
add 3848032 Support for uninstalled feature parts. Unknown parts reported
through API. Integrated Enable wizard with Install steps
add a4fb36a Feature enable inspect modules in depth; project open hook
displays missing modules
new 3a163c6 Merge pull request #1047 from
sdedic/feature/autoupdate_enable_download_100
The 1 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/ide/ergonomics/fod/Bundle.properties | 2 +-
.../ide/ergonomics/fod/ConfigurationPanel.java | 42 +++--
.../modules/ide/ergonomics/fod/FeatureInfo.java| 59 +-
.../ide/ergonomics/fod/FeatureProjectFactory.java | 65 +--
.../ide/ergonomics/fod/FindComponentModules.java | 205 ++---
.../ide/ergonomics/fod/FoDUpdateUnitProvider.java | 32 +++-
.../ide/ergonomics/newproject/DescriptionStep.java | 5 +-
.../modules/ide/ergonomics/DynamicVerifyTest.java | 14 +-
platform/autoupdate.services/apichanges.xml| 14 ++
platform/autoupdate.services/manifest.mf | 2 +-
.../nbproject/project.properties | 2 +-
.../api/autoupdate/OperationContainer.java | 9 +
.../services/FeatureUpdateElementImpl.java | 28 ++-
.../autoupdate/services/FeatureUpdateUnitImpl.java | 2 +
.../autoupdate/services/InstallSupportImpl.java| 2 +
.../services/OperationContainerImpl.java | 35 +++-
.../autoupdate/services/OperationValidator.java| 51 +
.../autoupdate/services/UpdateManagerImpl.java | 42 -
.../org/netbeans/spi/autoupdate/UpdateItem.java| 5 +-
.../netbeans/api/autoupdate/RefreshItemsTest.java | 2 +-
.../api/autoupdate/RefreshProvidersTest.java | 2 +-
.../autoupdate.ui/nbproject/project.properties | 2 +-
platform/autoupdate.ui/nbproject/project.xml | 2 +-
.../modules/autoupdate/ui/PluginManagerUI.java | 2 +-
.../netbeans/modules/autoupdate/ui/UnitTab.form| 1 -
.../netbeans/modules/autoupdate/ui/UnitTab.java| 86 +++--
.../netbeans/modules/autoupdate/ui/Utilities.java | 23 +++
.../autoupdate/ui/wizards/Bundle.properties| 2 +
.../modules/autoupdate/ui/wizards/InstallStep.java | 71 +--
.../ui/wizards/InstallUnitWizardIterator.java | 88 +
.../ui/wizards/InstallUnitWizardModel.java | 8 +-
...dIterator.java => InstallableIteratorBase.java} | 86 -
.../autoupdate/ui/wizards/LicenseApprovalStep.java | 8 +-
.../ui/wizards/OperationDescriptionStep.java | 30 ++-
.../ui/wizards/OperationWizardModel.java | 187 ++-
.../autoupdate/ui/wizards/UninstallUnitWizard.java | 20 +-
.../ui/wizards/UninstallUnitWizardIterator.java| 78 +---
.../ui/wizards/UninstallUnitWizardModel.java | 70 ++-
.../src/org/netbeans/ModuleManager.java| 14 +-
39 files changed, 1106 insertions(+), 292 deletions(-)
copy
platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/{InstallUnitWizardIterator.java
=> InstallableIteratorBase.java} (71%)
-
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
[incubator-netbeans] 01/01: Merge pull request #917 from dukescript/JavaFX11
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 commit 56231e681d1737b1ab85544b3f5864d49befc010 Merge: 04893fe 2766cac Author: Svatopluk Dedic AuthorDate: Thu Nov 22 12:43:03 2018 +0100 Merge pull request #917 from dukescript/JavaFX11 Fragments for libs.javafx with JavaFX 11 implementation ergonomics/ide.ergonomics/java.properties | 1 + .../ide/ergonomics/fod/ConfigurationPanel.java | 19 +- .../modules/ide/ergonomics/fod/FeatureInfo.java| 37 +- .../ide/ergonomics/fod/FindComponentModules.java | 24 +- ...achingPreventsLoadingOfModuleManifestsTest.java | 2 +- .../libs.javafx.linux}/build.xml | 10 +- .../libs.javafx.linux/external/binaries-list | 14 +- .../external/javafx-base-11-linux.jar.external | 2 + .../external/javafx-controls-11-linux.jar.external | 2 + .../external/javafx-graphics-11-linux.jar.external | 2 + .../external/javafx-linux-11-license.txt | 435 + .../external/javafx-media-11-linux.jar.external| 2 + .../external/javafx-swing-11-linux.jar.external| 2 + .../external/javafx-web-11-linux.jar.external | 2 + extra/libs.javafx.linux/manifest.mf| 8 + .../libs.javafx.linux/nbproject/project.properties | 36 ++ extra/libs.javafx.linux/nbproject/project.xml | 72 .../netbeans/libs/javafx/linux/Bundle.properties | 12 +- .../libs.javafx.macosx}/build.xml | 10 +- .../libs.javafx.macosx/external/binaries-list | 14 +- .../external/javafx-base-11-mac.jar.external | 2 + .../external/javafx-controls-11-mac.jar.external | 2 + .../external/javafx-graphics-11-mac.jar.external | 2 + .../external/javafx-mac-11-license.txt | 435 + .../external/javafx-media-11-mac.jar.external | 2 + .../external/javafx-swing-11-mac.jar.external | 2 + .../external/javafx-web-11-mac.jar.external| 2 + extra/libs.javafx.macosx/manifest.mf | 8 + .../nbproject/project.properties | 36 ++ extra/libs.javafx.macosx/nbproject/project.xml | 72 .../netbeans/libs/javafx/macosx/Bundle.properties | 12 +- .../libs.javafx.win}/build.xml | 10 +- .../libs.javafx.win/external/binaries-list | 14 +- .../external/javafx-base-11-win.jar.external | 2 + .../external/javafx-controls-11-win.jar.external | 2 + .../external/javafx-graphics-11-win.jar.external | 2 + .../external/javafx-media-11-win.jar.external | 2 + .../external/javafx-swing-11-win.jar.external | 2 + .../external/javafx-web-11-win.jar.external| 2 + .../external/javafx-win-11-license.txt | 435 + extra/libs.javafx.win/manifest.mf | 8 + extra/libs.javafx.win/nbproject/project.properties | 36 ++ extra/libs.javafx.win/nbproject/project.xml| 72 .../org/netbeans/libs/javafx/win/Bundle.properties | 12 +- .../maven/embedder/impl/MavenProtocolHandler.java | 2 +- nb/updatecenters/build.xml | 23 ++ .../updatecenters/resources/Bundle.properties | 4 + .../modules/updatecenters/resources/mf-layer.xml | 10 + nbbuild/cluster.properties | 11 + nbbuild/rat-exclusions.txt | 1 + .../netbeans/core/startup/MavenRepoURLHandler.java | 75 51 files changed, 1903 insertions(+), 103 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
[incubator-netbeans] branch master updated (04893fe -> 56231e6)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git. from 04893fe [NETBEANS-1719] Removing accidentally added jar files. add 377bae6 Fragment for libs.javafx with JavaFX implementation for Linux add 142c75c Fragment with implementation of JavaFX for Windows add 710f302 Fragment with implementation of JavaFX for Mac OS X add dbc778c libs.javafx needs one of its fragments, but the other ones have to stay disabled add 4a7f7ba Defining JavaFX libraries as external in their NBMs add 0a1ebde Licensing information for compile time only JavaFX implementation JARs add fb7eabc Ignore external/*.external files in the rat check add b2bce33 Put JavaFX implementation wrappers into extra cluster. Make them available in a packaged in update center. add 7a31423 The external file is licensed under GPL-2-CP add 175b2b2 Simple handler for m2: protocol in the platform add 73bec19 Merge remote-tracking branch 'origin/master' into JavaFX11 add 4b8d8a7 Using multiple regular expression to specify the needed modules add 565e294 Only install JavaFX on JDK11 and newer add beeab07 Synchronizing with latest development add a18fe06 Make sure the module is also found on Mac add 8c95ef5 Resolve to central URL when local copy isn't present add 2766cac Ignore extra directory in the test new 56231e6 Merge pull request #917 from dukescript/JavaFX11 The 1 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: ergonomics/ide.ergonomics/java.properties | 1 + .../ide/ergonomics/fod/ConfigurationPanel.java | 19 +- .../modules/ide/ergonomics/fod/FeatureInfo.java| 37 +- .../ide/ergonomics/fod/FindComponentModules.java | 24 +- ...achingPreventsLoadingOfModuleManifestsTest.java | 2 +- .../libs.javafx.linux}/build.xml | 10 +- .../libs.javafx.linux/external/binaries-list | 14 +- .../external/javafx-base-11-linux.jar.external | 2 + .../external/javafx-controls-11-linux.jar.external | 2 + .../external/javafx-graphics-11-linux.jar.external | 2 + .../external/javafx-linux-11-license.txt | 435 + .../external/javafx-media-11-linux.jar.external| 2 + .../external/javafx-swing-11-linux.jar.external| 2 + .../external/javafx-web-11-linux.jar.external | 2 + extra/libs.javafx.linux/manifest.mf| 8 + .../libs.javafx.linux/nbproject/project.properties | 36 ++ extra/libs.javafx.linux/nbproject/project.xml | 72 .../netbeans/libs/javafx/linux/Bundle.properties | 12 +- .../libs.javafx.macosx}/build.xml | 10 +- .../libs.javafx.macosx/external/binaries-list | 14 +- .../external/javafx-base-11-mac.jar.external | 2 + .../external/javafx-controls-11-mac.jar.external | 2 + .../external/javafx-graphics-11-mac.jar.external | 2 + .../external/javafx-mac-11-license.txt | 435 + .../external/javafx-media-11-mac.jar.external | 2 + .../external/javafx-swing-11-mac.jar.external | 2 + .../external/javafx-web-11-mac.jar.external| 2 + extra/libs.javafx.macosx/manifest.mf | 8 + .../nbproject/project.properties | 36 ++ extra/libs.javafx.macosx/nbproject/project.xml | 72 .../netbeans/libs/javafx/macosx/Bundle.properties | 12 +- .../libs.javafx.win}/build.xml | 10 +- .../libs.javafx.win/external/binaries-list | 14 +- .../external/javafx-base-11-win.jar.external | 2 + .../external/javafx-controls-11-win.jar.external | 2 + .../external/javafx-graphics-11-win.jar.external | 2 + .../external/javafx-media-11-win.jar.external | 2 + .../external/javafx-swing-11-win.jar.external | 2 + .../external/javafx-web-11-win.jar.external| 2 + .../external/javafx-win-11-license.txt | 435 + extra/libs.javafx.win/manifest.mf | 8 + extra/libs.javafx.win/nbproject/project.properties | 36 ++ extra/libs.javafx.win/nbproject/project.xml| 72 .../org/netbeans/libs/javafx/win/Bundle.properties | 12 +- .../maven/embedder/impl/MavenProtocolHandler.java | 2 +- nb/updatecenters/build.xml | 23 ++ .../updatecenters/resources/Bundle.properties | 4 + .../modules/updatecenters/resources/mf-layer.xml | 10 + nbbuild/cluster.properties | 11 + nbbuild/rat-exclusions.txt | 1 + .../netbeans/core/startup/MavenRepoURLHandler.java
[incubator-netbeans] branch master updated: NETBEANS-1698: Listview only performs action on left-doubleclick. Consumed doubleclicks do nothing (#1023)
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 d97e554 NETBEANS-1698: Listview only performs action on
left-doubleclick. Consumed doubleclicks do nothing (#1023)
d97e554 is described below
commit d97e554b27aa777502ece1bcd96de1e3b6767f0c
Author: Svatopluk Dedic
AuthorDate: Tue Nov 20 10:24:14 2018 +0100
NETBEANS-1698: Listview only performs action on left-doubleclick. Consumed
doubleclicks do nothing (#1023)
---
platform/openide.awt/src/org/openide/awt/MouseUtils.java | 4
platform/openide.explorer/src/org/openide/explorer/view/ListView.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/platform/openide.awt/src/org/openide/awt/MouseUtils.java
b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
index d349b7f..0d61232 100644
--- a/platform/openide.awt/src/org/openide/awt/MouseUtils.java
+++ b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
@@ -76,6 +76,10 @@ public class MouseUtils extends Object {
if ((e.getID() != MouseEvent.MOUSE_CLICKED) || (e.getClickCount() ==
0)) {
return false;
}
+// do not report already consumed events
+if (e.isConsumed()) {
+return false;
+}
return ((e.getClickCount() % 2) == 0) || isDoubleClickImpl(e);
}
diff --git
a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
index 59bcbaa..5c1819d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
@@ -1301,7 +1301,7 @@ public class ListView extends JScrollPane implements
Externalizable {
@Override
public void mouseClicked(MouseEvent e) {
-if (MouseUtils.isDoubleClick(e)) {
+if (SwingUtilities.isLeftMouseButton(e) &&
MouseUtils.isDoubleClick(e)) {
int index = list.locationToIndex(e.getPoint());
performObjectAt(index, e.getModifiers());
}
-
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
[incubator-netbeans] branch master updated: Moved incorrectly merged buildscript (#864)
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 7ecc2b9 Moved incorrectly merged buildscript (#864) 7ecc2b9 is described below commit 7ecc2b9f25bcf6c1fa0aced70bd454e2aed5e332 Author: Svatopluk Dedic AuthorDate: Wed Sep 12 17:12:37 2018 +0200 Moved incorrectly merged buildscript (#864) --- libs.jstestdriver/build.xml | 51 --- webcommon/libs.jstestdriver/build.xml | 3 ++- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/libs.jstestdriver/build.xml b/libs.jstestdriver/build.xml deleted file mode 100644 index d3062db..000 --- a/libs.jstestdriver/build.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - -Builds, tests, and runs the project libs.jstestdriver - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webcommon/libs.jstestdriver/build.xml b/webcommon/libs.jstestdriver/build.xml index 66a09fa..59dfe7c 100644 --- a/webcommon/libs.jstestdriver/build.xml +++ b/webcommon/libs.jstestdriver/build.xml @@ -23,7 +23,7 @@ Builds, tests, and runs the project libs.jstestdriver - + @@ -46,5 +46,6 @@ + - 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
[incubator-netbeans] branch master updated: Relicensed leftover file, excluded cordova testing data (#872)
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 962cb67 Relicensed leftover file, excluded cordova testing data (#872) 962cb67 is described below commit 962cb6731abf49c48ea6614687a9ab2ffcdb5885 Author: Svatopluk Dedic AuthorDate: Thu Sep 13 22:04:18 2018 +0200 Relicensed leftover file, excluded cordova testing data (#872) --- .../modules/cordova/platforms/ios/disconnected.xml | 20 .../modules/cordova/platforms/ios/jsoncommand.xml | 20 .../modules/cordova/platforms/ios/listing.xml | 20 .../modules/cordova/platforms/ios/toback.xml | 20 .../modules/cordova/platforms/ios/tofront.xml | 20 .../html/knockout/api/KODataBindTokenId.java | 53 ++ 6 files changed, 114 insertions(+), 39 deletions(-) diff --git a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/disconnected.xml b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/disconnected.xml index 84d6ada..6f614da 100644 --- a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/disconnected.xml +++ b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/disconnected.xml @@ -1,4 +1,24 @@ + http://www.apple.com/DTDs/PropertyList-1.0.dtd;> diff --git a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/jsoncommand.xml b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/jsoncommand.xml index 6f346eb..35a11ed 100644 --- a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/jsoncommand.xml +++ b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/jsoncommand.xml @@ -1,4 +1,24 @@ + http://www.apple.com/DTDs/PropertyList-1.0.dtd;> diff --git a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/listing.xml b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/listing.xml index db6cf2c..3e4c27a 100644 --- a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/listing.xml +++ b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/listing.xml @@ -1,4 +1,24 @@ + http://www.apple.com/DTDs/PropertyList-1.0.dtd;> diff --git a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/toback.xml b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/toback.xml index 40c17c2..d3de45c 100644 --- a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/toback.xml +++ b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/toback.xml @@ -1,4 +1,24 @@ + http://www.apple.com/DTDs/PropertyList-1.0.dtd;> diff --git a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/tofront.xml b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/tofront.xml index 3564d96..5ea60f5 100644 --- a/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/tofront.xml +++ b/webcommon/cordova.platforms.ios/test/unit/src/org/netbeans/modules/cordova/platforms/ios/tofront.xml @@ -1,4 +1,24 @@ + http://www.apple.com/DTDs/PropertyList-1.0.dtd;> diff --git a/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/api/KODataBindTokenId.java b/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/api/KODataBindTokenId.java index dbeca77..c95449a 100644 --- a/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/api/KODataBindTokenId.java +++ b/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/api/KODataBindTokenId.java @@ -1,45 +1,20 @@ /* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. - * - *
[incubator-netbeans] branch master updated: Weaker dependency on IOS platform plugin (removed from webcommon cluster in std. build)
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 6d4b423 Weaker dependency on IOS platform plugin (removed from webcommon cluster in std. build) 6d4b423 is described below commit 6d4b423f3e27f8b100b92f2142c8d49db3479786 Author: Svata Dedic AuthorDate: Wed Sep 12 15:02:15 2018 +0200 Weaker dependency on IOS platform plugin (removed from webcommon cluster in std. build) --- webcommon/cordova/manifest.mf | 2 ++ webcommon/cordova/nbproject/project.xml | 6 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/webcommon/cordova/manifest.mf b/webcommon/cordova/manifest.mf index 39d59a9..1751e41 100644 --- a/webcommon/cordova/manifest.mf +++ b/webcommon/cordova/manifest.mf @@ -3,3 +3,5 @@ OpenIDE-Module: org.netbeans.modules.cordova OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/Bundle.properties OpenIDE-Module-Specification-Version: 1.36 OpenIDE-Module-Layer: org/netbeans/modules/cordova/resources/layer.xml +OpenIDE-Module-Recommends: cnb.org.netbeans.modules.cordova.platforms.ios + diff --git a/webcommon/cordova/nbproject/project.xml b/webcommon/cordova/nbproject/project.xml index 655edfa..31b25de 100644 --- a/webcommon/cordova/nbproject/project.xml +++ b/webcommon/cordova/nbproject/project.xml @@ -101,12 +101,6 @@ - org.netbeans.modules.cordova.platforms.ios - -1.11 - - - org.netbeans.modules.extexecution - 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
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module Review libs.jstestdriver (#857)
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 41067c9 [NETBEANS-1074] Module Review libs.jstestdriver (#857) 41067c9 is described below commit 41067c9eb729d97253d25a12863a2044cca7e488 Author: Svatopluk Dedic AuthorDate: Wed Sep 12 15:24:07 2018 +0200 [NETBEANS-1074] Module Review libs.jstestdriver (#857) [NETBEANS-1074] Module Review libs.jstestdriver --- libs.jstestdriver/build.xml| 51 + webcommon/libs.jstestdriver/external/binaries-list | 19 +- .../external/jstestdriver-1.3.5-license.txt| 209 + .../libs.jstestdriver/nbproject/project.properties | 8 +- 4 files changed, 282 insertions(+), 5 deletions(-) diff --git a/libs.jstestdriver/build.xml b/libs.jstestdriver/build.xml new file mode 100644 index 000..d3062db --- /dev/null +++ b/libs.jstestdriver/build.xml @@ -0,0 +1,51 @@ + + + +Builds, tests, and runs the project libs.jstestdriver + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/webcommon/libs.jstestdriver/external/binaries-list b/webcommon/libs.jstestdriver/external/binaries-list index f39c548..2112d61 100644 --- a/webcommon/libs.jstestdriver/external/binaries-list +++ b/webcommon/libs.jstestdriver/external/binaries-list @@ -1 +1,18 @@ -08FE518AB60FFA2E5440B75B4D9F8502E0791B3C libs.jstestdriver-ext.jar +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +7A29ACE71B9D5A82F5F0ABE0EA22B73D7FD07826 com.google.jstestdriver:jstestdriver:1.3.5 + diff --git a/webcommon/libs.jstestdriver/external/jstestdriver-1.3.5-license.txt b/webcommon/libs.jstestdriver/external/jstestdriver-1.3.5-license.txt new file mode 100644 index 000..aad1254 --- /dev/null +++ b/webcommon/libs.jstestdriver/external/jstestdriver-1.3.5-license.txt @@ -0,0 +1,209 @@ +Name: JS Test Driver +Version: 1.3.5 +License: Apache-2.0 +Description: Google JS Test Driver for JS TDD development +Origin: https://code.google.com/archive/p/js-test-driver/ +Comment: JS Test driver is only used at compile time, to produce helper classes. Only the helpers are distributed, JS Test driver is not. +Type: compile-time + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + &qu
[netbeans] branch master updated: Fix launcher on macOS after changes from #573 * Remove extra " in app.conf * Check for old default_mac_userdir variable in case RCP has a custom app.conf with old set
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e124ee6 Fix launcher on macOS after changes from #573 * Remove extra
" in app.conf * Check for old default_mac_userdir variable in case RCP has a
custom app.conf with old settings; otherwise use default_userdir
new a01e4c2 Merge pull request #1203 from oyarzun/app-conf
e124ee6 is described below
commit e124ee61512a483cc79932269850785f069c59ba
Author: Christian Oyarzun
AuthorDate: Wed Apr 17 11:06:53 2019 -0400
Fix launcher on macOS after changes from #573
* Remove extra " in app.conf
* Check for old default_mac_userdir variable in case RCP has a custom
app.conf with old settings; otherwise use default_userdir
---
harness/apisupport.harness/release/etc/app.conf | 2 +-
harness/apisupport.harness/release/launchers/app.sh | 6 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/harness/apisupport.harness/release/etc/app.conf
b/harness/apisupport.harness/release/etc/app.conf
index 779225a..dfd9236 100644
--- a/harness/apisupport.harness/release/etc/app.conf
+++ b/harness/apisupport.harness/release/etc/app.conf
@@ -54,7 +54,7 @@
#
default_userdir="${DEFAULT_USERDIR_ROOT}/dev"
-default_cachedir=""${DEFAULT_CACHEDIR_ROOT}/dev"
+default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
# options used by the launcher by default, can be overridden by explicit
# command line switches
diff --git a/harness/apisupport.harness/release/launchers/app.sh
b/harness/apisupport.harness/release/launchers/app.sh
index 7e67408..e42e1d4 100644
--- a/harness/apisupport.harness/release/launchers/app.sh
+++ b/harness/apisupport.harness/release/launchers/app.sh
@@ -57,7 +57,11 @@ args=""
case "`uname`" in
Darwin*)
-userdir="${default_mac_userdir}"
+if [ ! -z "$default_mac_userdir" ]; then
+ userdir="${default_mac_userdir}"
+else
+ userdir="${default_userdir}"
+fi
;;
*)
userdir="${default_userdir}"
-
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] branch master updated: [NETBEANS-2577] Prevent Maven libraries from being exluded
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new ee2ad24 [NETBEANS-2577] Prevent Maven libraries from being exluded
new 4a8d8bf Merge pull request #1271 from
sdedic/bugfix/2577-filtering_modules
ee2ad24 is described below
commit ee2ad247a45cc9d177a11a9c932cf27ade4f8b34
Author: Svata Dedic
AuthorDate: Thu May 30 15:01:01 2019 +0200
[NETBEANS-2577] Prevent Maven libraries from being exluded
---
.../org/netbeans/nbbuild/ModuleSelector.java | 36 +++---
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
index 321c156..fbe61a4 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java
@@ -78,24 +78,6 @@ public final class ModuleSelector extends BaseExtendSelector
{
}
String module = null;
-if (file.getName().endsWith(".jar")) {
-try (JarFile jar = new JarFile(file)) {
-Manifest m = jar.getManifest();
-if (m != null) {
-module = m.getMainAttributes().getValue("OpenIDE-Module");
// NOI18N
-if (module == null && !isExt(file)) {
-module =
m.getMainAttributes().getValue("Bundle-SymbolicName"); // NOI18N
-int semicolon = module == null ? -1 :
module.indexOf(';');
-if (semicolon >= 0) {
-module = module.substring(0, semicolon);
-}
-}
-}
-} catch (IOException ex) {
-throw new BuildException("Problem with " + file + ": " + ex,
ex, getLocation());
-}
-}
-
String name = file.getName();
File p = file.getParentFile();
for(;;) {
@@ -124,6 +106,24 @@ public final class ModuleSelector extends
BaseExtendSelector {
name = p.getName() + '/' + name;
p = p.getParentFile();
}
+
+if (module == null && name.endsWith(".jar")) {
+try (JarFile jar = new JarFile(file)) {
+Manifest m = jar.getManifest();
+if (m != null) {
+module = m.getMainAttributes().getValue("OpenIDE-Module");
// NOI18N
+if (module == null && !isExt(file)) {
+module =
m.getMainAttributes().getValue("Bundle-SymbolicName"); // NOI18N
+int semicolon = module == null ? -1 :
module.indexOf(';');
+if (semicolon >= 0) {
+module = module.substring(0, semicolon);
+}
+}
+}
+} catch (IOException ex) {
+throw new BuildException("Problem with " + file + ": " + ex,
ex, getLocation());
+}
+}
if (module == null) {
log("No module in: " + file, Project.MSG_VERBOSE);
-
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] branch master updated (3f00957 -> 7ec8391)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 3f00957 Merge pull request #1482 from jGauravGupta/JEDDICT-322-db-metadata-model new b2acf68 [NETBEANS-3250] Abstract annotation Processors report SourceVersion.latest new 5d32a99 [NETBEANS-3250] Core annotation processors return SourceVersion.latest(). new 467f689 [NETBEANS-3250] All annotation processors updated to work with SourceVersion.latest() new 3126f70 [NETBEANS-3250] New hint to fix obsolete @SupportedSourceVersion on annotation processors. new daf3583 [NETBEANS-3250] Added code generator to return SourceVersion.latest() from annotation processor. new 7ec8391 Merge pull request #1578 from sdedic/bugfix/serviceProcessorAnnotation The 3097 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: .../junit/internal/RandomlyFailsProcessor.java | 7 +- .../debugger/registry/DebuggerProcessor.java | 4 - .../BugtrackingRegistrationProcessor.java | 3 - .../org/netbeans/core/ide/ServiceTabProcessor.java | 3 - .../csl/core/LanguageRegistrationProcessor.java| 3 - .../lib2/EditorActionRegistrationProcessor.java| 3 - .../StartupExtenderRegistrationProcessor.java | 3 - .../gsf/testrunner/CoreManagerProcessor.java | 3 - .../testrunner/TestCreatorProviderProcessor.java | 5 - .../EmbeddingProviderRegistrationProcessor.java| 3 - .../indexing/IndexerRegistrationProcessor.java | 3 - .../PathRecognizerRegistrationProcessor.java | 3 - .../modules/project/ant/AntBasedProcessor.java | 4 - .../LookupProviderAnnotationProcessor.java | 3 - .../ui/convertor/ProjectConvertorProcessor.java| 3 - ...mpositeCategoryProviderAnnotationProcessor.java | 3 - .../uiapi/NodeFactoryAnnotationProcessor.java | 3 - .../spi/impl/ScopeAnnotationProcessor.java | 3 - .../schema2beansdev/Schema2BeansProcessor.java | 8 +- .../debugger/ui/registry/DebuggerProcessor.java| 3 - .../NavigatorPanelRegistrationProcessor.java | 3 - .../palette/PaletteItemRegistrationProcessor.java | 3 - .../lexer/CreateRegistrationProcessor.java | 3 - .../versioning/core/VCSRegistrationProcessor.java | 3 - .../versioning/VCSRegistrationProcessor.java | 3 - .../jpda/apiregistry/DebuggerProcessor.java| 3 - .../java/hints/jdk/AnnotationProcessors.java | 457 + .../modules/java/hints/jdk/Bundle.properties | 7 + .../java/hints/ui/AnnoProcessorGenerator.java | 142 +++ .../java/testrunner/ui/NodeOpenerProcessor.java| 3 - .../jpda/ui/apiregistry/DebuggerProcessor.java | 3 - .../processor/JavaHintsAnnotationProcessor.java| 5 - .../AnnotationLineParserRegistrationProcessor.java | 3 - .../PhpAnnotationsRegistrationProcessor.java | 3 - .../PhpDocumentationRegistrationProcessor.java | 3 - .../PhpFrameworkRegistrationProcessor.java | 3 - .../PhpOptionsPanelControllerProcessor.java| 3 - .../PhpTestingRegistrationProcessor.java | 3 - .../common/proc/StaticResourceProcessor.java | 7 +- .../modules/htmlui/HTMLDialogProcessor.java| 7 +- .../netbeans/modules/htmlui/HTMLViewProcessor.java | 3 - .../modules/intent/OpenUriHandlerProcessor.java| 3 - .../modules/templates/TemplateProcessor.java | 3 - .../core/multiview/MultiViewProcessor.java | 3 - .../mimelookup/CreateRegistrationProcessor.java| 3 - .../javahelp/HelpSetRegistrationProcessor.java | 3 - .../modules/openide/awt/ActionProcessor.java | 3 - platform/openide.filesystems/apichanges.xml| 25 ++ .../declmime/MIMEResolverProcessor.java| 3 - .../annotations/LayerGeneratingProcessor.java | 21 + .../filesystems/annotations/LayerBuilderTest.java | 36 +- .../annotations/LayerGeneratingProcessorTest.java | 3 - .../annotations/LayerGenerationExceptionTest.java | 3 - .../loaders/DataObjectFactoryProcessor.java| 3 - .../openide/nodes/NodesAnnotationProcessor.java| 3 - platform/openide.util.lookup/apichanges.xml| 24 ++ .../openide/util/NamedServiceProcessor.java| 4 - .../openide/util/ServiceProviderProcessor.java | 3 - .../implspi/AbstractServiceProviderProcessor.java | 25 +- .../util/test/AnnotationProcessorTestUtils.java| 21 +- .../modules/openide/util/NbBundleProcessor.java| 7 +- .../openide/windows/TopComponentProcessor.java | 8 - .../options/OptionsPanelControllerProcessor.java | 4 - .../sendopts/OptionAnno
[netbeans] branch master updated: [NETBEANS-1985] Honour initial values of stateful delegate actions. (#1579)
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 97b6f5e [NETBEANS-1985] Honour initial values of stateful delegate
actions. (#1579)
97b6f5e is described below
commit 97b6f5e3ac44870a0b85a4ab95a2750fdd9d8bb1
Author: Svatopluk Dedic
AuthorDate: Wed Nov 13 14:15:57 2019 +0100
[NETBEANS-1985] Honour initial values of stateful delegate actions. (#1579)
[NETBEANS-1985] Honour initial values of stateful delegate actions.
---
.../src/org/openide/awt/{awt => }/ActionState.java | 0
.../src/org/openide/awt/ContextAction.java | 8 +-
.../src/org/openide/awt/GeneralAction.java | 8 +-
.../org/openide/awt/{awt => }/PropertyMonitor.java | 0
.../org/openide/awt/{awt => }/StatefulAction.java | 28 +++
.../org/openide/awt/ContextActionNonAWTTest.java | 16 ++
.../src/org/openide/awt/ContextActionTest.java | 231 -
7 files changed, 283 insertions(+), 8 deletions(-)
diff --git a/platform/openide.awt/src/org/openide/awt/awt/ActionState.java
b/platform/openide.awt/src/org/openide/awt/ActionState.java
similarity index 100%
rename from platform/openide.awt/src/org/openide/awt/awt/ActionState.java
rename to platform/openide.awt/src/org/openide/awt/ActionState.java
diff --git a/platform/openide.awt/src/org/openide/awt/ContextAction.java
b/platform/openide.awt/src/org/openide/awt/ContextAction.java
index bea899b..3510e38 100644
--- a/platform/openide.awt/src/org/openide/awt/ContextAction.java
+++ b/platform/openide.awt/src/org/openide/awt/ContextAction.java
@@ -276,10 +276,7 @@ implements Action, ContextAwareAction, ChangeListener,
Runnable {
@Override
public int hashCode() {
-int t = type.hashCode();
-int m = selectMode.hashCode();
-int p = performer.hashCode();
-return (t << 2) + (m << 1) + p;
+return Objects.hash(type, selectMode, performer, enableMonitor);
}
@Override
@@ -293,7 +290,8 @@ implements Action, ContextAwareAction, ChangeListener,
Runnable {
return type.equals(c.type) &&
selectMode.equals(c.selectMode) &&
-performer.equals(c.performer);
+performer.equals(c.performer) &&
+Objects.equals(enableMonitor, c.enableMonitor);
}
return false;
}
diff --git a/platform/openide.awt/src/org/openide/awt/GeneralAction.java
b/platform/openide.awt/src/org/openide/awt/GeneralAction.java
index 960caac..eda09c6 100644
--- a/platform/openide.awt/src/org/openide/awt/GeneralAction.java
+++ b/platform/openide.awt/src/org/openide/awt/GeneralAction.java
@@ -470,7 +470,13 @@ final class GeneralAction {
}
BaseDelAction other = copyDelegate(f, actionContext);
if (attrs != null) {
-other.attrs = new HashMap(attrs);
+if (other.attrs == null) {
+other.attrs = new HashMap<>(attrs);
+} else {
+for (String k : attrs.keySet()) {
+other.attrs.putIfAbsent(k, attrs.get(k));
+}
+}
}
return other;
}
diff --git a/platform/openide.awt/src/org/openide/awt/awt/PropertyMonitor.java
b/platform/openide.awt/src/org/openide/awt/PropertyMonitor.java
similarity index 100%
rename from platform/openide.awt/src/org/openide/awt/awt/PropertyMonitor.java
rename to platform/openide.awt/src/org/openide/awt/PropertyMonitor.java
diff --git a/platform/openide.awt/src/org/openide/awt/awt/StatefulAction.java
b/platform/openide.awt/src/org/openide/awt/StatefulAction.java
similarity index 84%
rename from platform/openide.awt/src/org/openide/awt/awt/StatefulAction.java
rename to platform/openide.awt/src/org/openide/awt/StatefulAction.java
index 8c2cd1f..a1bfa69 100644
--- a/platform/openide.awt/src/org/openide/awt/awt/StatefulAction.java
+++ b/platform/openide.awt/src/org/openide/awt/StatefulAction.java
@@ -19,6 +19,7 @@
package org.openide.awt;
import java.util.Collections;
+import java.util.Objects;
import java.util.logging.Level;
import javax.swing.Action;
import org.openide.util.Lookup;
@@ -82,6 +83,33 @@ final class StatefulAction extends ContextAction {
}
@Override
+public int hashCode() {
+int hash = super.hashCode();
+hash = 97 * hash + Objects.hashCode(this.checkValueMonitor);
+return hash;
+}
+
+/**
+ * Overrides ContextAction. Must found in the {@link #checkValueMonitor}
otherwise
+ * two actions driven by different property could clash in {@link
ContextManager}
+ * and won't get 'enable' notification when data appears.
+ *
+ * @param obj other object
+ * @return
[netbeans] branch master updated: [NETBEANS-3387] classes loaded from scanned path should get CodeSource.location
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 495e8b3 [NETBEANS-3387] classes loaded from scanned path should get
CodeSource.location
new 84e18b5 Merge pull request #1627 from
sdedic/bugfix/annotation-processor-codesource
495e8b3 is described below
commit 495e8b312e1ecd564d530e70fcde69712c93f241
Author: Svata Dedic
AuthorDate: Thu Nov 14 12:17:32 2019 +0100
[NETBEANS-3387] classes loaded from scanned path should get
CodeSource.location
---
.../source/parsing/CachingArchiveClassLoader.java | 40 ++
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
index e11d592..22de204 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchiveClassLoader.java
@@ -40,9 +40,16 @@ import javax.tools.JavaFileObject;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.java.classpath.ClassPath;
+import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.Pair;
import org.openide.util.Parameters;
+import java.nio.file.FileStore;
+import java.security.CodeSigner;
+import java.security.CodeSource;
+import java.security.ProtectionDomain;
+import java.util.HashMap;
+import java.util.Map;
/**
*
@@ -55,6 +62,7 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
//Todo: Performance Trie
private static final ReentrantReadWriteLock LOCK = new
ReentrantReadWriteLock();
+private final Map codeDomains = new HashMap<>();
private final List> archives;
private final Optional> usedRoots;
private byte[] buffer;
@@ -68,6 +76,19 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
this.archives = archives;
this.usedRoots = Optional.>ofNullable(usedRoots);
}
+
+/**
+ * Creates a ProtectionDomain for the location. Caches instances since
more classes
+ * is likely to be loaded.
+ * @param location location
+ * @return ProtectionDomain object.
+ */
+private ProtectionDomain createCodeDomain(URL location) {
+return codeDomains.computeIfAbsent(location,
+(l) -> new ProtectionDomain(
+new CodeSource(l, (CodeSigner[])null), null)
+);
+}
@Override
protected Class findClass(final String name) throws
ClassNotFoundException {
@@ -78,8 +99,9 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
c = readAction(new Callable>() {
@Override
public Class call() throws Exception {
-final FileObject file = findFileObject(sb.toString());
-if (file != null) {
+final Pair locFile =
findFileObject(sb.toString());
+if (locFile != null) {
+final FileObject file = locFile.second();
try {
final int len = readJavaFileObject(file);
int lastDot = name.lastIndexOf('.');
@@ -96,7 +118,8 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
//-buffer
//+com.sun.tools.hc.LambdaMetafactory.translateClassFile(buffer,0,len),
0,
-len);
+len,
+createCodeDomain(locFile.first()));
} catch (FileNotFoundException fnf) {
LOG.log(Level.FINE, "Resource: {0} does not
exist.", file.toUri()); //NOI18N
} catch (IOException ioe) {
@@ -121,7 +144,8 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
file = readAction(new Callable() {
@Override
public FileObject call() throws Exception {
-return findFileObject(name);
+Pair p = findFileObject(name);
+return p == null ? null : p.second();
}
});
} catch (Exception e) {
@@ -190,7 +214,7 @@ public final class CachingArchiveClassLoader extends
ClassLoader {
return len;
}
-private FileObject findFileObject(final String resName) {
+private Pair findFileObject(final St
[netbeans] branch master updated: [NETBEANS-3346] -Upgrade asm-all-5.0.1 version to asm-7.2 -Add constructor parameter to use ASMv7 API -Visit @ConstructorDelegate parameters as array. (by sdedic) -Us
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 7eb2c43 [NETBEANS-3346] -Upgrade asm-all-5.0.1 version to asm-7.2
-Add constructor parameter to use ASMv7 API -Visit @ConstructorDelegate
parameters as array. (by sdedic) -Use only one license file for both jars
new ef55a1a Merge pull request #1620 from pepness/asm72v3
7eb2c43 is described below
commit 7eb2c431c259e1b5eb37cc6061e8d23c2329778a
Author: Jose Contreras
AuthorDate: Thu Nov 7 18:50:53 2019 -0600
[NETBEANS-3346]
-Upgrade asm-all-5.0.1 version to asm-7.2
-Add constructor parameter to use ASMv7 API
-Visit @ConstructorDelegate parameters as array. (by sdedic)
-Use only one license file for both jars
---
.../javaee/wildfly/WildflyDeploymentFactory.java | 2 +-
harness/apisupport.harness/build.xml | 4 +-
.../netbeans/lib/jshell/agent/NbJShellAgent.java | 4 +-
java/lib.jshell.agent/nbproject/project.properties | 2 +-
nbbuild/templates/common.xml | 6 +-
.../src/org/netbeans/core/startup/Asm.java | 67 ++
...m-all-5.0.1-license.txt => asm-7.2-license.txt} | 16 +++---
platform/libs.asm/external/binaries-list | 3 +-
platform/libs.asm/nbproject/project.properties | 7 ++-
platform/libs.asm/nbproject/project.xml| 16 ++
10 files changed, 83 insertions(+), 44 deletions(-)
diff --git
a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
b/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
index 01e3246..4068b8c 100644
---
a/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
+++
b/contrib/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentFactory.java
@@ -153,7 +153,7 @@ public class WildflyDeploymentFactory implements
DeploymentFactory {
return super.getCommonSuperClass(string,
string1);
}
};
-ClassNode node = new ClassNode();
+ClassNode node = new ClassNode(Opcodes.ASM7);
cr.accept(node, 0);
for (MethodNode m : (Collection)
node.methods) {
diff --git a/harness/apisupport.harness/build.xml
b/harness/apisupport.harness/build.xml
index 548620f..d97a498 100644
--- a/harness/apisupport.harness/build.xml
+++ b/harness/apisupport.harness/build.xml
@@ -39,13 +39,13 @@
-2F7553F50B0D14ED811B849C282DA8C1FFC32AAE
org.ow2.asm:asm-all:5.0.1
+FA637EB67EB7628C915D73762B681AE7FF0B9731
org.ow2.asm:asm:7.2
-
+
diff --git
a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
index 7282ae2..8fd0ee3 100644
---
a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
+++
b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
@@ -377,7 +377,7 @@ public class NbJShellAgent implements Runnable,
ClassFileTransformer {
*/
private void insertClassInit(String className, ClassNode target) {
// method void static clinit()
-MethodNode clinit = new MethodNode(Opcodes.ASM5,
+MethodNode clinit = new MethodNode(Opcodes.ASM7,
Opcodes.ACC_STATIC | Opcodes.ACC_SYNTHETIC,
CLASS_INIT_NAME,
CLASS_INIT_DESC,
@@ -400,7 +400,7 @@ public class NbJShellAgent implements Runnable,
ClassFileTransformer {
istm = new ByteArrayInputStream(classfileBuffer);
ClassReader reader = new ClassReader(istm);
ClassWriter wr = new ClassWriter(reader, 0);
-ClassNode clazz = new ClassNode();
+ClassNode clazz = new ClassNode(Opcodes.ASM7);
reader.accept(clazz, 0);
boolean found = false;
diff --git a/java/lib.jshell.agent/nbproject/project.properties
b/java/lib.jshell.agent/nbproject/project.properties
index 6641c35..0020ac6 100644
--- a/java/lib.jshell.agent/nbproject/project.properties
+++ b/java/lib.jshell.agent/nbproject/project.properties
@@ -21,5 +21,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
-agentsrc.asm.cp=${libs.asm.dir}/core/asm-all-5.0.1.jar
+agentsrc.asm.cp=${libs.asm.dir}/core/asm-7.2.jar
agentsrc.jshell.cp=${nb_all}/java/libs.jshell.comp
[netbeans] branch master updated: [NETBEANS-3733] Suggest surefire 2.22 for JUnit5 tests.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 78778ee [NETBEANS-3733] Suggest surefire 2.22 for JUnit5 tests.
new cd600b0 Merge pull request #2144 from
sdedic/bugfix/NETBEANS-3733_surefire-junit5
78778ee is described below
commit 78778ee66febfb65da6e9e1f1f3c19b48581bb6f
Author: Svata Dedic
AuthorDate: Sun May 17 10:17:48 2020 +0200
[NETBEANS-3733] Suggest surefire 2.22 for JUnit5 tests.
---
.../netbeans/modules/maven/ActionProviderImpl.java | 29 +++---
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
index a3aac55..a9dd035 100644
--- a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
@@ -211,6 +211,8 @@ public class ActionProviderImpl implements ActionProvider {
//TODO these effectively need updating once in a while
private static final String SUREFIRE_VERSION_SAFE = "2.15"; //2.16 is
broken
+// surefire 2.22 is needed for JUnit 5
+private static final String SUREFIRE_VERSION_SAFE_5 = "2.22.0";
private static final String JUNIT_VERSION_SAFE = "4.11";
@Override public void invokeAction(final String action, final Lookup
lookup) {
@@ -288,14 +290,17 @@ public class ActionProviderImpl implements ActionProvider
{
@Messages({
"run_single_method_disabled=Surefire 2.8+ with JUnit 4.8+ or TestNG
needed to run a single test method.",
+"run_single_method_disabled5=Surefire 2.22.0 is required to run a
single test method with JUnit5.",
"TIT_RequiresUpdateOfPOM=Feature requires update of POM",
-"TXT_Run_Single_method=Executing single test method requires
Surefire 2.8+ and JUnit in version 4.8 and bigger. Update your
pom.xml?"
+"TXT_Run_Single_method=Executing single test method requires
Surefire 2.8+ and JUnit in version 4.8 and bigger. Update your
pom.xml?",
+"TXT_Run_Single_method5=Executing single test method with JUnit
5 requires Surefire 2.22.0. Update your pom.xml?"
})
private boolean checkSurefire(final String action) {
if (action.equals(SingleMethod.COMMAND_RUN_SINGLE_METHOD) ||
action.equals(SingleMethod.COMMAND_DEBUG_SINGLE_METHOD)) {
if (!runSingleMethodEnabled()) {
+boolean ju5 = usingJUnit5();
if
(NbPreferences.forModule(ActionProviderImpl.class).getBoolean(SHOW_SUREFIRE_WARNING,
true)) {
-WarnPanel pnl = new WarnPanel(TXT_Run_Single_method());
+WarnPanel pnl = new WarnPanel(ju5 ?
TXT_Run_Single_method5() : TXT_Run_Single_method());
Object o = DialogDisplayer.getDefault().notify(new
NotifyDescriptor.Confirmation(pnl, TIT_RequiresUpdateOfPOM(),
NotifyDescriptor.YES_NO_OPTION));
if (pnl.disabledWarning()) {
NbPreferences.forModule(ActionProviderImpl.class).putBoolean(SHOW_SUREFIRE_WARNING,
false);
@@ -304,9 +309,24 @@ public class ActionProviderImpl implements ActionProvider {
RequestProcessor.getDefault().post(new Runnable() {
@Override
public void run() {
+String surefireVersion = null;
+String junitVersion = null;
+
+if (ju5 && !usingSurefire2_22()) {
+surefireVersion = SUREFIRE_VERSION_SAFE_5;
+} else if (!usingSurefire28()) {
+surefireVersion = SUREFIRE_VERSION_SAFE;
+}
+if (!ju5) {
+junitVersion = usingJUnit4() ||
usingTestNG() ? null : JUNIT_VERSION_SAFE;
+}
+
Utilities.performPOMModelOperations(
proj.getProjectDirectory().getFileObject("pom.xml"),
-Collections.singletonList(new
UpdateSurefireOperation(usingSurefire28() ? null : SUREFIRE_VERSION_SAFE,
usingJUnit4() || usingTestNG() ? null : JUNIT_VERSION_SAFE)));
+Collections.singletonList(new
UpdateSurefireOperation(
+surefireVersion, junitVersion
+))
+
[netbeans] branch master updated (794e55a -> 5b96857)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 794e55a [NETBEANS-4832] Avoid assertion & NPE in fxml code completion (#2399) new f1616eb Removed dependencies to pre65 formatting from Java, java.editor.lib remains for older code. new 3fadff6 Deprecated unused java folding; package depends on pre-6.5 APIs. new 0b25953 Cleaned references to BaseDocument from APIs, old methods deprecated. new 580d925 Webpage content MIME type query moved to web.common. new dce0544 HtmlIndex API separated, release mods updated not to use auto-deps. new bab0ace Javascript HTML support separated. new adf33ac Headless mode fixes. new a273209 Always call LoadOpenProjects.waitFinished to ensure the loading of project is started new 6d8108b Missing parameter means stdio; cleanup new 5b96857 Merge pull request #2424 from sdedic/sdedic/modularizing2 The 4452 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: enterprise/j2ee.common/nbproject/project.xml | 9 -- enterprise/j2ee.ejbcore/nbproject/project.xml | 9 -- .../j2ee.ejbjarproject/nbproject/project.xml | 9 -- enterprise/web.core.syntax/nbproject/project.xml | 2 +- enterprise/web.el/nbproject/project.xml| 9 -- enterprise/web.jsf.editor/nbproject/project.xml| 3 +- .../web/jsf/editor/InjectCompositeComponent.java | 4 +- enterprise/web.jsf/nbproject/project.xml | 2 +- enterprise/web.struts/nbproject/project.xml| 9 -- enterprise/websvc.core/nbproject/project.xml | 9 -- groovy/groovy.gsp/nbproject/project.xml| 2 +- ide/csl.api/apichanges.xml | 25 +++ ide/csl.api/nbproject/project.properties | 2 +- .../modules/csl/api/AbstractCamelCasePosition.java | 9 +- .../modules/csl/api/CamelCaseOperations.java | 28 ++-- .../src/org/netbeans/modules/csl/api/EditList.java | 52 ++- .../modules/csl/api/GoToDeclarationAction.java | 3 +- .../modules/csl/api/InstantRenameAction.java | 8 +- .../modules/csl/api/SelectCodeElementAction.java | 4 +- .../modules/csl/api/ToggleBlockCommentAction.java | 97 ++-- .../netbeans/modules/csl/core/GsfIndentTask.java | 4 +- .../modules/csl/core/LanguageRegistry.java | 47 +++--- .../netbeans/modules/csl/spi/CommentHandler.java | 9 +- .../org/netbeans/modules/csl/spi/GsfUtilities.java | 111 - .../netbeans/modules/csl/api/test/CslTestBase.java | 38 +++-- ide/css.editor/nbproject/project.xml | 1 + ide/css.lib/nbproject/project.xml | 1 + ide/css.visual/nbproject/project.xml | 2 +- .../css/visual/actions/EditCSSRulesNodeAction.java | 9 +- .../modules/editor/lib2/EditorPreferencesKeys.java | 6 - ide/html.custom/nbproject/project.xml | 2 +- ide/html.editor.lib/nbproject/project.xml | 1 + .../modules/html/editor/lib/XmlSTElements.java | 2 - ide/html.editor/manifest.mf| 2 +- ide/html.editor/module-auto-deps.xml | 39 + ide/html.editor/nbproject/project.xml | 14 +- .../modules/html/editor/HtmlErrorFilter.java | 13 +- .../modules/html/editor/HtmlExtensions.java| 4 +- .../modules/html/editor/HtmlSourceUtils.java | 17 +- .../netbeans/modules/html/editor/api/Utils.java| 10 +- .../editor/api/completion/HtmlCompletionItem.java | 8 +- .../html/editor/api/gsf/HtmlParserResult.java | 29 +++- .../editor/completion/HtmlCompletionQuery.java | 3 +- .../html/editor/gsf/HtmlDeclarationFinder.java | 4 +- .../html/editor/gsf/HtmlSemanticAnalyzer.java | 4 +- .../html/editor/hints/HtmlHintsProvider.java | 20 +-- .../editor/hints/css/AddStylesheetLinkHintFix.java | 7 +- .../editor/hints/css/CreateRuleInStylesheet.java | 6 +- .../modules/html/editor/indexing/Entry.java| 6 +- .../html/editor/indexing/HtmlFileModel.java| 18 ++- .../modules/html/editor/indexing/HtmlIndexer.java | 8 +- .../html/editor/indexing/HtmlLinkEntry.java| 12 +- .../ExtractInlinedStyleRefactoringPlugin.java | 8 +- ide/html.indexing/build.xml| 25 +++ ide/html.indexing/manifest.mf | 6 + .../nbproject/project.properties | 9 +- .../html.indexing}/nbproject/project.xml | 62 ++-- .../modules/html/editor/api/index/HtmlIndex.java | 29 +++- .../modules/html/indexing/Bundle.properties| 8 +- .../html/indexing}/DependentFile
[netbeans] branch master updated: Commit-validation on apple.
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/netbeans.git The following commit(s) were added to refs/heads/master by this push: new ae2e6d9 Commit-validation on apple. new 6a9d4bd Merge pull request #2407 from sdedic/feature/commit-validation-mac ae2e6d9 is described below commit ae2e6d9c05778d3c31f131fa204e3e8c85a3cdf2 Author: Svata Dedic AuthorDate: Tue Sep 29 10:54:02 2020 +0200 Commit-validation on apple. --- .github/workflows/main.yml | 3 +++ platform/applemenu/src/org/netbeans/modules/applemenu/layer.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef44ca8..55319db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -253,6 +253,9 @@ jobs: ant -f platform/masterfs.macosx test ant -f platform/core.network test + - name: Validate consistency and basic tests +run: ant -Dcluster.config=release commit-validation + commit-validation: name: Commit-validation (on Linux) runs-on: ubuntu-18.04 diff --git a/platform/applemenu/src/org/netbeans/modules/applemenu/layer.xml b/platform/applemenu/src/org/netbeans/modules/applemenu/layer.xml index 9d435d3..a2dc08e 100644 --- a/platform/applemenu/src/org/netbeans/modules/applemenu/layer.xml +++ b/platform/applemenu/src/org/netbeans/modules/applemenu/layer.xml @@ -92,6 +92,9 @@ + + + - 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] branch master updated (39734a3 -> 3130438)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 39734a3 [NETBEANS-4762] It seems supporting MODULE_PROCESSOR_PATH in Gradle breaks annotation processor detection. add 3130438 commit-validation fixes: Display categories, registration order (#2360) No new revisions were added by this update. Summary of changes: .../modules/cpplite/debugger/resources/mf-layer.xml | 20 +++- .../modules/cpplite/editor/file/CPPDataObject.java | 2 +- .../modules/cpplite/editor/file/HDataObject.java | 3 ++- .../modules/cpplite/editor/file/HPPDataObject.java | 3 ++- .../org/netbeans/modules/cpplite/editor/layer.xml| 1 + .../org/netbeans/modules/cpplite/project/layer.xml | 1 + .../j2ee/clientproject/ui/resources/layer.xml| 2 +- enterprise/javaee.wildfly/manifest.mf| 2 +- .../org/netbeans/modules/payara/eecommon/layer.xml | 2 +- enterprise/payara.jakartaee/manifest.mf | 2 +- .../org/netbeans/modules/payara/jakartaee/layer.xml | 2 +- .../fish/payara/micro/project/ReloadAction.java | 2 +- .../modules/web/project/ui/resources/layer.xml | 2 +- .../netbeans/modules/gradle/ActionProviderImpl.java | 4 ++-- .../org/netbeans/modules/gradle/ReloadAction.java| 2 +- .../gradle/src/org/netbeans/modules/gradle/layer.xml | 8 .../org/netbeans/libs/javafx/linux/Bundle.properties | 1 + .../netbeans/libs/javafx/macosx/Bundle.properties| 1 + .../org/netbeans/libs/javafx/win/Bundle.properties | 1 + .../netbeans/modules/groovy/gsp/resources/layer.xml | 2 +- harness/jellytools.platform/manifest.mf | 1 + .../modules/jellytools/platform/Bundle.properties| 1 + .../src/org/netbeans/core/ide/resources/layer.xml| 5 - .../autosave/AutoSaveOptionsPanelController.java | 2 +- .../src/org/netbeans/libs/flexmark/Bundle.properties | 1 + .../netbeans/modules/lsp/client/Bundle.properties| 1 + .../lsp/client/bindings/HyperlinkProviderImpl.java | 2 +- .../LanguageServersOptionsPanelController.java | 3 ++- .../xml/text/completion/XMLCompletionProvider.java | 6 ++ .../netbeans/modules/xml/text/resources/mf-layer.xml | 8 .../netbeans/modules/gradle/htmlui/Bundle.properties | 1 + .../modules/j2ee/persistence/ui/resources/layer.xml | 7 --- .../api/common/singlesourcefile/package-info.java| 2 +- .../java/hints/ui/AnnoProcessorGenerator.java| 2 +- .../modules/java/lsp/server/Bundle.properties| 1 + .../netbeans/modules/java/openjdk/project/layer.xml | 11 +-- .../netbeans/modules/kotlin/editor/Bundle.properties | 1 + .../netbeans/modules/kotlin/editor/package-info.java | 3 ++- java/libs.corba.omgapi/manifest.mf | 2 +- .../SpringXMLConfigCompletionProvider.java | 2 ++ .../hyperlink/SpringXMLConfigHyperlinkProvider.java | 2 ++ .../modules/spring/beans/resources/layer.xml | 16 .../testng/ui/wizards/NewTestWizardIterator.java | 2 +- .../modules/php/composer/resources/layer.xml | 11 --- .../composer/ui/actions/ComposerScriptsAction.java | 2 +- .../editor/completion/TplCompletionProvider.java | 2 ++ platform/core.multitabs/manifest.mf | 2 +- platform/core.multitabs/nbproject/project.properties | 1 + .../src/org/netbeans/core/ui/resources/layer.xml | 1 + platform/core.windows/manifest.mf| 1 + platform/openide.actions/manifest.mf | 1 + platform/openide.util.ui.svg/manifest.mf | 2 ++ .../openide.util.ui.svg/nbproject/project.properties | 1 + .../org/netbeans/modules/print/resources/layer.xml | 8 webcommon/languages.apacheconf/manifest.mf | 2 +- .../src/org/netbeans/libs/graaljs/Bundle.properties | 1 + .../modules/typescript/editor/Bundle.properties | 1 + .../modules/typescript/editor/package-info.java | 3 ++- 58 files changed, 88 insertions(+), 96 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
[netbeans] branch master updated (3130438 -> 720520e)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 3130438 commit-validation fixes: Display categories, registration
order (#2360)
new 050a9a1 Do not report unsatisfied autoload fragments triggered by
host module.
new 0029626 Prevent edges-to-self in topological sort.
new 720520e Merge pull request #2390 from
sdedic/bugfix/autoload-fragment-warning
The 4378 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:
.../src/org/netbeans/ModuleManager.java| 8 +-
platform/o.n.bootstrap/src/org/netbeans/Util.java | 10 +-
.../unit/data/jars/client-module-depend-broken.mf | 6 +
.../unit/data/jars/client-module-depend-frag.mf| 6 +
.../unit/data/jars/client-module-depend-host.mf| 6 +
.../unit/data/jars/client-module-needs-broken.mf | 6 +
.../test/unit/data/jars/client-module.mf | 5 +
.../org/foo/Something.java | 0
.../test/unit/data/jars/fragment-module-auto.mf| 5 +
.../data/jars/fragment-module-missing-token.mf | 3 +
.../test/unit/data/jars/fragment-module-reg.mf | 6 +
.../test/unit/data/jars/fragment-module.mf | 2 +
.../test/unit/data/jars/host-module.mf | 2 +-
.../unit/src/org/netbeans/ModuleManagerTest.java | 188 -
.../core/validation/ValidateModulesTest.java | 37 +++-
15 files changed, 281 insertions(+), 9 deletions(-)
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/client-module-depend-broken.mf
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/client-module-depend-frag.mf
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/client-module-depend-host.mf
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/client-module-needs-broken.mf
create mode 100644 platform/o.n.bootstrap/test/unit/data/jars/client-module.mf
copy platform/o.n.bootstrap/test/unit/data/jars/{host-module =>
client-module}/org/foo/Something.java (100%)
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/fragment-module-auto.mf
create mode 100644
platform/o.n.bootstrap/test/unit/data/jars/fragment-module-reg.mf
-
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] branch master updated (bb0e205 -> dd427e8)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from bb0e205 Merge pull request #2383 from pepness/ga-javadoc-15
new b54371e Positions always generated for MIME services; Ordering does
not warn if all files or all dirs are unordered.
new b75cef3 Do not generate spurious MAXINT positions.
new 3a191af Lambda causes linkage error during tests (nbjavac not present
on cp).
new c008c90 Do not fail on smaller cluster.configs
new 3dad068 Fixed checking in Ordering, relaxed only for configfs
new 15447f6 Add webcommon for testing
new 8e5d5d1 Collect more errors in one run.
new 69bdff9 Various fixes that may affect code. Pending review:
NETBEANS-4826, NETBEANS-4828
new 5b7f336 Ignore java failures for eager modules as well.
new 4c86f65 Removed unused performance.* modules.
new 166f1d1 Added release to cpplite
new b3bbf3c Wait for Updater to finish before testing.
new dd427e8 Merge pull request #2359 from
sdedic/bugfix/commit-validation/positions-codefixes
The 4370 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:
.../cpplite.kit}/release/VERSION.txt | 2 +-
enterprise/j2ee.kit/nbproject/project.xml | 7 +++
.../modules/javaee/api/javaee-endorsed-api-6.0.xml | 3 +-
.../dd/loader/PayaraDescriptorDataObject.java | 10 +++-
.../modules/groovy/editor/resources/layer.xml | 7 ++-
.../testrunner/TestCreatorProviderProcessor.java | 13 -
.../java/project/ui/NewJavaFileWizardIterator.java | 32 +++
nbbuild/cluster.properties | 8 +--
.../netbeans/core/startup/ConsistencyVerifier.java | 2 +-
.../validation/ValidateLayerConsistencyTest.java | 55 --
.../core/validation/ValidateModulesTest.java | 2 +-
.../core/validation/ValidateNbinstTest.java| 4 ++
.../src/org/openide/filesystems/Ordering.java | 19 +-
.../src/org/openide/filesystems/OrderingTest.java | 67 ++
.../jquery/JQueryCodeCompletionSelectorsTest.java | 4 +-
15 files changed, 185 insertions(+), 50 deletions(-)
copy {groovy/groovy.kit => cpplite/cpplite.kit}/release/VERSION.txt (99%)
-
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] branch master updated: Recovered missing sun-resource DTDs.
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/netbeans.git The following commit(s) were added to refs/heads/master by this push: new a79c49d Recovered missing sun-resource DTDs. new f6c3794 Merge pull request #2370 from sdedic/bugfix/missing-sun-resources a79c49d is described below commit a79c49d40c811926c70b3289fbf7e59a935f2181 Author: Svata Dedic AuthorDate: Tue Sep 15 12:08:25 2020 +0200 Recovered missing sun-resource DTDs. --- enterprise/j2ee.sun.dd/licenseinfo.xml | 2 + .../sun/dd/impl/resources/sun-resources_1_2.dtd| 659 .../sun/dd/impl/resources/sun-resources_1_4.dtd| 830 + 3 files changed, 1491 insertions(+) diff --git a/enterprise/j2ee.sun.dd/licenseinfo.xml b/enterprise/j2ee.sun.dd/licenseinfo.xml index 94dd900..aa8c396 100644 --- a/enterprise/j2ee.sun.dd/licenseinfo.xml +++ b/enterprise/j2ee.sun.dd/licenseinfo.xml @@ -46,7 +46,9 @@ src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-ejb-jar_3_0-1.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-ejb-jar_3_1-0.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_0.dtd + src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_2.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_3.dtd + src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_4.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-web-app_2_3-0.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-web-app_2_4-0.dtd src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-web-app_2_4-1.dtd diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_2.dtd b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_2.dtd new file mode 100644 index 000..2724290 --- /dev/null +++ b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_2.dtd @@ -0,0 +1,659 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_4.dtd b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_4.dtd new file mode 100644 index 000..1e0b42f --- /dev/null +++ b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/resources/sun-resources_1_4.dtd @@ -0,0 +1,830 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 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] branch master updated: Include both KDE4 and KDE5 proxy settings.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c420a66 Include both KDE4 and KDE5 proxy settings.
new a589a6f Merge pull request #2259 from sdedic/bugfix/kde5-proxy
c420a66 is described below
commit c420a667e00150092311a6c189d538df56f65d08
Author: Svata Dedic
AuthorDate: Thu Jul 16 18:34:12 2020 +0200
Include both KDE4 and KDE5 proxy settings.
---
.../core/network/proxy/kde/KdeNetworkProxy.java| 70 +++---
1 file changed, 48 insertions(+), 22 deletions(-)
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
index 553d1e5..dc165ac 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
@@ -25,7 +25,13 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -59,11 +65,13 @@ public class KdeNetworkProxy implements
NetworkProxyResolver {
private final static String KIOSLAVERC_PROXY_TYPE_PAC = "2"; //NOI18N
private final static String KIOSLAVERC_PROXY_TYPE_AUTO = "3"; //NOI18N
private final static String KIOSLAVERC_PROXY_TYPE_SYSTEM = "4"; //NOI18N
-private final static String KIOSLAVERC_PATH_IN_HOME =
".kde/share/config/kioslaverc"; //NOI18N
-private final String KIOSLAVERC_PATH;
+private final static String KIOSLAVERC_PATH_IN_HOME =
".config/kioslaverc"; //NOI18N
+private final static String KIOSLAVERC_PATH_IN_HOME_KDE4 =
".kde/share/config/kioslaverc"; //NOI18N
+
+private final List KIOSLAVERC_PATHS;
public KdeNetworkProxy() {
-KIOSLAVERC_PATH = getKioslavercPath();
+KIOSLAVERC_PATHS = getKioslavercPaths();
}
@Override
@@ -77,14 +85,21 @@ public class KdeNetworkProxy implements
NetworkProxyResolver {
return new NetworkProxySettings(false);
}
-if (proxyType.equals(KIOSLAVERC_PROXY_TYPE_NONE) ||
proxyType.equals(KIOSLAVERC_PROXY_TYPE_AUTO)) {
+if (proxyType.equals(KIOSLAVERC_PROXY_TYPE_NONE)) {
LOGGER.log(Level.INFO, "KDE system proxy resolver: direct (proxy
type: {0})", proxyType); //NOI18N
return new NetworkProxySettings();
}
-if (proxyType.equals(KIOSLAVERC_PROXY_TYPE_PAC)) {
-LOGGER.log(Level.INFO, "KDE system proxy resolver: auto - PAC");
//NOI18N
-String pacFileUrl =
kioslavercMap.get(KIOSLAVERC_PROXY_CONFIG_SCRIPT);
+if (proxyType.equals(KIOSLAVERC_PROXY_TYPE_PAC) ||
proxyType.equals(KIOSLAVERC_PROXY_TYPE_AUTO)) {
+String pacFileUrl;
+
+if (proxyType.equals(KIOSLAVERC_PROXY_TYPE_AUTO)) {
+LOGGER.log(Level.INFO, "KDE system proxy resolver: auto");
//NOI18N
+pacFileUrl = "http://wpad/wpad.dat;; // NOI18N
+} else {
+LOGGER.log(Level.INFO, "KDE system proxy resolver: auto -
PAC"); //NOI18N
+pacFileUrl = kioslavercMap.get(KIOSLAVERC_PROXY_CONFIG_SCRIPT);
+}
if (pacFileUrl != null) {
LOGGER.log(Level.INFO, "KDE system proxy resolver: PAC URL
({0})", pacFileUrl); //NOI18N
return new NetworkProxySettings(pacFileUrl);
@@ -129,14 +144,16 @@ public class KdeNetworkProxy implements
NetworkProxyResolver {
* @return Map of keys and values from kioslaverc group Proxy settings.
*/
private Map getKioslavercMap() {
-File kioslavercFile = new File(KIOSLAVERC_PATH);
-Map map = new HashMap();
-
-if (kioslavercFile.exists()) {
-try {
-FileInputStream fis = new FileInputStream(kioslavercFile);
-DataInputStream dis = new DataInputStream(fis);
-BufferedReader br = new BufferedReader(new
InputStreamReader(dis));
+boolean fileExists = false;
+for (Path p : KIOSLAVERC_PATHS) {
+if (!Files.isRegularFile(p)) {
+continue;
+}
+fileExists = true;
+Map map = new HashMap();
+boolean groupFound = false;
+
+try (BufferedReader br = Files.newBufferedReader(p)) {
[netbeans] branch master updated: [NETBEANS-4123] PAC evaluator scripts runs just one at a time.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new d0ef478 [NETBEANS-4123] PAC evaluator scripts runs just one at a time.
new eb15c28 Merge pull request #2260 from
sdedic/bugfix/synchronized-pac-eval
d0ef478 is described below
commit d0ef478a8a571dd363405b1e76c4adb2076888bf
Author: Svata Dedic
AuthorDate: Thu Jul 16 18:33:06 2020 +0200
[NETBEANS-4123] PAC evaluator scripts runs just one at a time.
---
.../netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java
b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java
index 11c97b4..52def8a 100644
---
a/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java
+++
b/platform/core.network/src/org/netbeans/core/network/proxy/pac/impl/NbPacScriptEvaluator.java
@@ -204,7 +204,7 @@ public class NbPacScriptEvaluator implements
PacScriptEvaluator {
resultCache = null;
}
}
-
+
@Override
public List findProxyForURL(URI uri) throws PacValidationException {
@@ -218,7 +218,10 @@ public class NbPacScriptEvaluator implements
PacScriptEvaluator {
}
}
try {
-Object jsResult =
scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost());
+Object jsResult;
+synchronized (scriptEngine) {
+jsResult =
scriptEngine.findProxyForURL(PacUtils.toStrippedURLStr(uri), uri.getHost());
+}
jsResultAnalyzed = analyzeResult(uri, jsResult);
if (canUseURLCaching && (resultCache != null)) {
resultCache.put(uri, jsResultAnalyzed); // save the result
in the cache
-
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] branch master updated (d80a1dc -> a88a3de)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d80a1dc Merge pull request #2635 from KacerCZ/netbeans-5210-export-inspection-settings new 2da8145 Support for default Progress action moved to non-UI. new e66e616 Upgrade client library to 0.10; support ProgressHandles as WorkDoneProgress. new 7ecdf4c Retrofitted some modules to use now-base ProgressHandle. new 998d3d4 Run action will terminate LSP client exec session on process exit. new 13992e2 Added handler for workDone cancel notifications. new 2f6ca95 DAP piggybacks on LSP progress support; disabled cancel for debug/run. new da30cc6 Allow to temporarily substitute different ProgressEnv for tests. new a88a3de Merge pull request #2641 from sdedic/sdedic/lsp_progress The 4819 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: extide/gradle/nbproject/project.xml| 10 +- .../api/execute/GradleDistributionManager.java | 3 +- .../gradle/execute/GradleDaemonExecutor.java | 3 +- ide/extexecution/nbproject/project.xml | 10 +- .../api/extexecution/ExecutionService.java | 3 +- ide/projectui/nbproject/project.xml| 10 +- .../modules/project/ui/OpenProjectList.java| 5 +- .../netbeans/modules/project/ui/groups/Group.java | 3 +- .../netbeans/modules/project/ui/zip/ExportZIP.java | 4 +- .../netbeans/modules/project/ui/zip/ImportZIP.java | 3 +- java/java.lsp.server/external/binaries-list| 10 +- ...-0.9.0-license.txt => lsp4j-0.10.0-license.txt} | 4 +- .../nbcode/integration/nbproject/project.xml | 9 + .../nbcode/integration/LspProgressEnvironment.java | 14 +- java/java.lsp.server/nbproject/project.properties | 10 +- java/java.lsp.server/nbproject/project.xml | 29 ++- .../java/lsp/server/debugging/Debugger.java| 51 +++- .../server/debugging/launch/NbLaunchDelegate.java | 5 + .../launch/NbLaunchWithoutDebuggingDelegate.java | 6 + .../lsp/server/progress/LspInternalHandle.java | 204 .../lsp/server/progress/LspProgressUIWorker.java | 91 +++ .../java/lsp/server/progress/OperationContext.java | 269 + .../server/protocol/NbCodeClientCapabilities.java | 20 +- .../lsp/server/protocol/NbCodeClientWrapper.java | 12 + .../modules/java/lsp/server/protocol/Server.java | 80 +- .../lsp/server/ui/AbstractProgressEnvironment.java | 135 +++ java/java.lsp.server/vscode/src/extension.ts | 2 + java/maven/nbproject/project.xml | 10 +- .../modules/maven/actions/CreateLibraryAction.java | 3 +- .../netbeans/modules/maven/api/NbMavenProject.java | 11 +- .../maven/execute/AbstractMavenExecutor.java | 3 +- .../maven/execute/MavenCommandLineExecutor.java| 4 +- .../maven/execute/ui/DebugPluginSourceAction.java | 2 +- .../maven/execute/ui/GotoPluginSourceAction.java | 8 +- .../modules/maven/newproject/BasicPanelVisual.java | 6 +- .../modules/maven/nodes/DependenciesNode.java | 6 +- .../modules/maven/nodes/DependencyNode.java| 8 +- .../maven/operations/RenameProjectPanel.java | 4 +- .../maven/queries/MavenSourceJavadocAttacher.java | 6 +- platform/api.progress.nb/apichanges.xml| 14 ++ platform/api.progress.nb/manifest.mf | 2 +- .../api.progress.nb/nbproject/project.properties | 2 +- platform/api.progress.nb/nbproject/project.xml | 15 +- .../api/progress/ProgressHandleFactory.java| 189 ++- .../aggregate/AggregateProgressFactory.java| 13 +- .../progress/spi/ProgressUIWorkerProvider.java | 10 + .../modules/progress/spi/UIInternalHandle.java | 34 ++- .../progress/module/UIInternalHandleAccessor.java} | 41 ++-- .../api/progress/ProgressHandleFactoryTest.java| 59 + .../api/progress/TestProgressEnvironment.java} | 42 +++- platform/api.progress/apichanges.xml | 16 ++ platform/api.progress/manifest.mf | 2 +- .../org/netbeans/api/progress/ProgressHandle.java | 63 - .../aggregate/BasicAggregateProgressFactory.java | 37 +++ .../netbeans/modules/progress/spi/Controller.java | 16 +- .../modules/progress/spi/InternalHandle.java | 57 - .../modules/progress/spi/ProgressEvent.java| 23 ++ platform/autoupdate.services/nbproject/project.xml | 10 +- .../autoupdate/services/OperationSupportImpl.java | 11 +- platform/openide.loaders/nbproject/project.xml | 2 +- .../src/org/openide/loaders/DataObject.java| 2 +-
[netbeans] branch master updated: Remove redundant scope check.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 484df4d Remove redundant scope check.
new fe04570 Merge pull request #2650 from sdedic/lsp/hotfix-failing-tests
484df4d is described below
commit 484df4d05c82ace34e43a1ec152488cdc8ec86c7
Author: Svata Dedic
AuthorDate: Fri Jan 8 15:19:43 2021 +0100
Remove redundant scope check.
---
ide/parsing.api/src/org/netbeans/modules/parsing/api/Source.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/ide/parsing.api/src/org/netbeans/modules/parsing/api/Source.java
b/ide/parsing.api/src/org/netbeans/modules/parsing/api/Source.java
index 95d076d..6fd7899 100644
--- a/ide/parsing.api/src/org/netbeans/modules/parsing/api/Source.java
+++ b/ide/parsing.api/src/org/netbeans/modules/parsing/api/Source.java
@@ -537,7 +537,6 @@ public final class Source implements Lookup.Provider {
@NonNull final Lookup context) {
synchronized (Source.class) {
final Source source =
SourceFactory.getDefault().createSource(fileObject, mimeType, context);
-assert source.context == context;
return source;
}
}
-
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] branch master updated (96f51a7 -> 8a2ad2f)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 96f51a7 Various fixes for LSP codeAction and rename requests. (#2655) add 8a2ad2f Support executor ProgressHandle cancel over DAP protocol. (#2653) No new revisions were added by this update. Summary of changes: .../lsp/server/debugging/DebugAdapterContext.java | 22 ++ .../launch/NbDisconnectRequestHandler.java | 2 ++ .../server/debugging/launch/NbLaunchDelegate.java | 9 + .../lsp/server/progress/LspInternalHandle.java | 15 +++ .../java/lsp/server/progress/OperationContext.java | 9 ++--- .../lsp/server/ui/AbstractProgressEnvironment.java | 2 +- 6 files changed, 55 insertions(+), 4 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
[netbeans] branch master updated (e7d693d -> 894e4b5)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e7d693d Fix broken links to images in the extension's readme. (#2686) new cf4ee2f Core execution engine passes default Lookup to task. Recommendation added to spec. new 167d3da Server tests should run in headless mode. new 9fabbae DAP listens even on delayed operation's ProgressHandle creation. new 970712d Modules needed to properly terminate mvn build/run process subtree. new 0b3e340 HID test extended to cover Lookup propagation. Core Execution engine tested with Lookup. new 6c90ce5 Add functional test for maven-controlled start/stop. new 1c6a14d Fixing test for dev env: extra cluster ignored. new 894e4b5 Merge pull request #2679 from sdedic/lsp/maven-execution-stop The 4900 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: .../java.lsp.server/nbcode/integration/manifest.mf | 1 + .../nbcode/nbproject/platform.properties | 2 - .../server/debugging/launch/NbLaunchDelegate.java | 15 ++- .../lsp/server/progress/LspInternalHandle.java | 20 +++- .../java/lsp/server/progress/OperationContext.java | 112 +- .../server/progress/ProgressOperationEvent.java| 64 ++ .../server/progress/ProgressOperationListener.java | 45 +++ .../java/lsp/server/protocol/ServerTest.java | 1 + java/java.lsp.server/vscode/package-lock.json | 31 - java/java.lsp.server/vscode/package.json | 8 +- .../vscode/src/test/suite/extension.test.ts| 94 ++- platform/core.execution/manifest.mf| 4 +- .../netbeans/core/execution/ExecutionEngine.java | 2 +- .../netbeans/core/execution/RunClassThread.java| 60 ++ .../execution/CoreExecutionCompatibilityTest.java | 3 +- .../openide.execution/nbproject/project.properties | 2 +- .../src/org/openide/execution/ExecutionEngine.java | 24 ++-- .../execution/ExecutionCompatibilityTest.java | 12 +- .../org/openide/execution/ExecutionEngineHid.java | 129 +++-- 19 files changed, 539 insertions(+), 90 deletions(-) create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/ProgressOperationEvent.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/progress/ProgressOperationListener.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
[netbeans] branch master updated (188dd8c -> cebe93e)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 188dd8c Merge pull request #2999 from
JaroslavTulach/jtulach/NewProjectAction
new 6be2255 Simple handling of generics, see NETBEANS-5787
new 6e06542 Groovy CC supports LSP interface.
new d38ee49 Can optional skip items in a golden file.
new c78bf81 Adapted Groovy tests to check results in CompletionCollector,
too
new cebe93e Merge pull request #3001 from sdedic/groovy/lsp-completion
The 5548 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:
groovy/groovy.editor/manifest.mf | 2 +-
groovy/groovy.editor/nbproject/project.xml | 9 +
.../editor/api/completion/CompletionHandler.java | 361 +
.../editor/api/completion/CompletionItem.java | 91 +++-
.../completion/provider/CompletionAccessor.java| 11 +
.../provider/GroovyCompletionCollector.java| 600 +
.../provider/GroovyCompletionImpl.java}| 392 ++
.../provider/GroovyElementsProvider.java | 18 +-
.../provider}/HTMLJavadocParser.java | 2 +-
.../completion/provider/JavaElementHandler.java| 47 +-
.../completion/provider/TransformationHandler.java | 25 +-
.../modules/groovy/editor/utils/GroovyUtils.java | 10 +
...r1.groovy.testCompletionInsideFor1_2.completion | 4 +-
...groovy.testCompletionNoPrefixString1.completion | 2 +-
...groovy.testCompletionNoPrefixString2.completion | 2 +-
testSpreadOperator1_stringArray_all.completion | 2 +-
.../groovy/editor/api/completion/AccessCCTest.java | 1 +
.../editor/api/completion/CamelCaseCCTest.java | 55 ++
.../editor/api/completion/CodeCompletionTest.java | 11 +-
.../editor/api/completion/DuplicatesCCTest.java| 11 +-
.../groovy/editor/api/completion/FieldCCTest.java | 11 +-
.../editor/api/completion/GroovyCCTestBase.java| 256 -
.../editor/api/completion/InferenceCCTest.java | 10 +-
.../editor/api/completion/NewVarsCCTest.java | 10 +-
.../netbeans/modules/csl/api/test/CslTestBase.java | 103 +++-
25 files changed, 1277 insertions(+), 769 deletions(-)
create mode 100644
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/completion/provider/GroovyCompletionCollector.java
copy
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/{api/completion/CompletionHandler.java
=> completion/provider/GroovyCompletionImpl.java} (54%)
rename
groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/{api/completion =>
completion/provider}/HTMLJavadocParser.java (99%)
-
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] branch master updated: LSP server informs client about unsuccessful launch.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 34f4dc9 LSP server informs client about unsuccessful launch.
new 778adbf Merge pull request #3006 from sdedic/lsp/check-launch-enabled
34f4dc9 is described below
commit 34f4dc95e9dd5065eea965f3d3d3f9c30fa2d2ab
Author: Svata Dedic
AuthorDate: Fri Jun 18 15:10:22 2021 +0200
LSP server informs client about unsuccessful launch.
---
.../server/debugging/launch/NbLaunchDelegate.java | 135 -
1 file changed, 104 insertions(+), 31 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 7aa03ad..e9e9de4 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
@@ -29,15 +29,20 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
+import org.eclipse.lsp4j.MessageParams;
+import org.eclipse.lsp4j.MessageType;
+import org.eclipse.lsp4j.debug.TerminatedEventArguments;
import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseError;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
+import org.eclipse.lsp4j.services.LanguageClient;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
@@ -73,6 +78,7 @@ import org.netbeans.spi.project.SingleMethod;
import org.openide.filesystems.FileObject;
import org.openide.util.BaseUtilities;
import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
import org.openide.util.Pair;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.Lookups;
@@ -82,6 +88,19 @@ import org.openide.util.lookup.ProxyLookup;
*
* @author martin
*/
+@NbBundle.Messages({
+"ERR_UnsupportedLaunchDebug=Debugging is not supported in this project.",
+"ERR_UnsupportedLaunch=Running is not supported in this project.",
+"# {0} - the selected configuration",
+"# {1} - the suggested configuration",
+"ERR_UnsupportedLaunchDebugConfig=Debugging is not supported in
configuration \"{0}\", please switch to {1}",
+"# {0} - the selected configuration",
+"# {1} - the suggested configuration",
+"ERR_UnsupportedLaunchConfig=Running is not supported in configuration
\"{0}\", please switch to {1}.",
+"ERR_LaunchDefaultConfiguration=the default one.",
+"# {0} - the recommended configuration",
+"ERR_LaunchSupportiveConfigName=\"{0}\"",
+})
public abstract class NbLaunchDelegate {
private final RequestProcessor requestProcessor = new
RequestProcessor(NbLaunchDelegate.class);
@@ -146,36 +165,6 @@ public abstract class NbLaunchDelegate {
W writer = new W();
CompletableFuture> commandFuture =
findTargetWithPossibleRebuild(toRun, singleMethod, debug, testRun, ioContext);
commandFuture.thenAccept((providerAndCommand) -> {
-context.setInputSinkProvider(() -> writer);
-if (debug) {
-
DebuggerManager.getDebuggerManager().addDebuggerListener(new
DebuggerManagerAdapter() {
-@Override
-public void sessionAdded(Session session) {
-JPDADebugger debugger = session.lookupFirst(null,
JPDADebugger.class);
-if (debugger != null) {
-
DebuggerManager.getDebuggerManager().removeDebuggerListener(this);
-Map properties = session.lookupFirst(null,
Map.class);
-NbSourceProvider sourceProvider =
context.getSourceProvider();
-sourceProvider.setSourcePath(properties !=
null ? (ClassPath) properties.getOrDefault("sourcepath", ClassPath.EMPTY) :
ClassPath.EMPTY);
-
debugger.addPropertyChangeListener(JPDADebugger.PROP_STATE, new
PropertyChangeListener() {
-@Override
-public void
propertyChange(Pr
[netbeans] branch master updated (778adbf -> 553191f)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 778adbf Merge pull request #3006 from sdedic/lsp/check-launch-enabled new 9e0bb4f GradleActionProviders can force-disable an action. new 5e9a82a Gradle/java disables debug actions in continuous mode. new 553191f Merge pull request #3004 from sdedic/gradle/disable-project-action The 5560 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: extide/gradle/apichanges.xml | 15 ++ extide/gradle/manifest.mf | 2 +- .../modules/gradle/ActionProviderImpl.java | 14 +- .../modules/gradle/actions/ActionToTaskUtils.java | 17 +- .../actions/ConfigurableActionsProviderImpl.java | 69 .../actions/CustomActionRegistrationSupport.java | 6 +- .../gradle/actions/DefaultActionMapping.java | 5 + .../modules/gradle/api/execute/ActionMapping.java | 23 ++- .../modules/gradle/api/execute/RunUtils.java | 21 ++- .../gradle/customizer/BuildActionsCustomizer.form | 90 ++- .../gradle/customizer/BuildActionsCustomizer.java | 173 +++-- .../modules/gradle/customizer/Bundle.properties| 18 ++- .../gradle/customizer/CustomActionMapping.java | 4 +- .../gradle/spi/actions/GradleActionsProvider.java | 5 + .../spi/actions/ProjectActionMappingProvider.java | 6 + .../test/unit/src/META-INF/generated-layer.xml | 16 ++ .../ConfigurableActionsProviderImplTest.java | 91 ++- .../modules/gradle/actions/declarative-actions.xml | 7 + .../gradle/actions/declarative-actions2.xml| 22 +-- java/gradle.java/nbproject/project.xml | 2 +- .../modules/gradle/java/JavaActionProvider.java| 7 +- .../modules/gradle/java/action-mapping.xml | 16 ++ 22 files changed, 552 insertions(+), 77 deletions(-) copy enterprise/gradle.javaee/src/org/netbeans/modules/gradle/javaee/action-mapping.xml => extide/gradle/test/unit/src/org/netbeans/modules/gradle/actions/declarative-actions2.xml (67%) - 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] branch master updated: Temporary configuration takes precedence, does not fire changes.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 3b6914c Temporary configuration takes precedence, does not fire
changes.
new 50076ae Merge pull request #3017 from sdedic/maven/hotfix-tests
3b6914c is described below
commit 3b6914cbef6848fde91289e69993f14290d4f686
Author: Svata Dedic
AuthorDate: Thu Jun 24 22:02:10 2021 +0200
Temporary configuration takes precedence, does not fire changes.
---
.../netbeans/modules/maven/configurations/M2ConfigProvider.java| 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
b/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
index db6b8eb..cc09849 100644
---
a/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
+++
b/java/maven/src/org/netbeans/modules/maven/configurations/M2ConfigProvider.java
@@ -260,8 +260,13 @@ public class M2ConfigProvider implements
ProjectConfigurationProvider confs;
Boolean b = inConfigInit.get();
+_active = activeOverride.get();
+if (_active != null) {
+// explicit temporary override, skip all the 'is still there' &
fire change logic.
+return _active;
+}
synchronized (this) {
-_active = internalActive();
+_active = active;
confs = getConfigurations(false);
String initAct = getInitialActive();
OUTER: if (initAct != null) {
-
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] branch master updated: Workspace shared IO supports close on input stream.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b4fef94 Workspace shared IO supports close on input stream.
new e9d9555 Merge pull request #3019 from sdedic/lsp/deadlock-workspaceio
b4fef94 is described below
commit b4fef94cff545e4e52c790b8bfec396e64850674
Author: Svata Dedic
AuthorDate: Fri Jun 25 13:24:29 2021 +0200
Workspace shared IO supports close on input stream.
---
.../lsp/server/protocol/WorkspaceIOContext.java| 32 ++---
.../server/ui/AbstractLspInputOutputProvider.java | 6 ++-
.../lsp/server/protocol/WorkspaceContextTest.java | 56 ++
3 files changed, 76 insertions(+), 18 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceIOContext.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceIOContext.java
index e0a3bc5..0de30b1 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceIOContext.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceIOContext.java
@@ -26,8 +26,6 @@ import org.eclipse.lsp4j.services.LanguageClient;
import org.netbeans.modules.java.lsp.server.ui.IOContext;
abstract class WorkspaceIOContext extends IOContext {
-private final InputStream inputSink = new EmptyBlockingInputStream();
-
WorkspaceIOContext() {
}
@@ -38,7 +36,7 @@ abstract class WorkspaceIOContext extends IOContext {
@Override
protected InputStream getStdIn() throws IOException {
-return inputSink;
+return new EmptyBlockingInputStream();
}
@Override
@@ -68,20 +66,40 @@ abstract class WorkspaceIOContext extends IOContext {
protected abstract LanguageClient client();
+/**
+ * This should mimic Streams provided by core.output2 module; those
InputStreams
+ * support asynchronous close() without blocking, but close only
temporarilyl the
+ * first reader gets -1, then the stream resets internally and is ready to
be read
+ * again (i.e. reused tab).
+ */
private static class EmptyBlockingInputStream extends InputStream {
+private boolean closed = false;
+
@Override
public int read() throws IOException {
synchronized (this) {
-try {
-wait();
-} catch (InterruptedException ex) {
-throw new IOException(ex);
+if (!closed) {
+try {
+wait();
+} catch (InterruptedException ex) {
+throw new IOException(ex);
+}
}
+closed = false;
}
return -1;
}
@Override
+public void close() throws IOException {
+synchronized (this) {
+closed = true;
+notifyAll();
+}
+return;
+}
+
+@Override
public boolean markSupported() {
return false;
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
index e128015..e5a54f6 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
@@ -20,6 +20,7 @@ package org.netbeans.modules.java.lsp.server.ui;
import java.io.CharArrayReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Reader;
@@ -144,11 +145,12 @@ public abstract class AbstractLspInputOutputProvider
implements InputOutputProvi
this.err = new PrintWriter(new LspWriter(false));
Reader in;
try {
-in = new InputStreamReader(ioCtx.getStdIn(), "UTF-8") {
+InputStream is = ioCtx.getStdIn();
+in = new InputStreamReader(is, "UTF-8") {
@Override
public void close() throws IOException {
// the underlying StreamDecoder would just block on
synchronized read(); close the underlying stream.
-ioCtx.getStdIn().close();
+is.close();
super.close();
}
};
diff --git
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceContextTest.java
b/java/java.lsp.serv
[netbeans] branch master updated (ebce17f -> 7235059)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from ebce17f LSP: Provide hover information in Micronaut yaml files. (#2955) new 0af54c8 Removed unused leftover from 6da12ea7c new b182fef NPE in testsuite: use NULL in case of null InputOutput. new 82be519 [NETBEANS-5623] Do not increase quality from FALLBACK to EVALUATED on invalidation. new 4018151 [NETBEANS-5627] Load from disk cache on Project creation. new 61e166b [NETBEANS-5629] Defined Plugin Lookup order. new 06aeeb9 [NETBEANS-5627] ClassPath available immediately for Gradle project. new 663d166 apichanges updated, tests added. toQuality changed to CompletionStage. new 7235059 Merge pull request #2924 from sdedic/gradle/load-lookup The 5442 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: extide/gradle/apichanges.xml | 16 + extide/gradle/manifest.mf | 2 +- .../modules/gradle/ActionProviderImpl.java | 31 +- .../org/netbeans/modules/gradle/GradleProject.java | 8 +- .../modules/gradle/NbGradleProjectFactory.java | 7 +- .../modules/gradle/NbGradleProjectImpl.java| 398 + .../org/netbeans/modules/gradle/ReloadAction.java | 11 +- .../gradle/ReloadProjectDependenciesDecorator.java | 2 +- .../modules/gradle/api/NbGradleProject.java| 28 ++ .../gradle/loaders/DiskCacheProjectLoader.java | 1 - .../gradle/loaders/GradleProjectLoaderImpl.java| 1 - .../gradle/loaders/LegacyProjectLoader.java| 4 +- .../gradle/AbstractGradleProjectTestCase.java | 9 +- .../modules/gradle/NbGradleProjectImplTest.java| 310 .../netbeans/modules/gradle/ProjectTrustTest.java | 2 +- .../java/classpath/ClassPathProviderImpl.java | 128 +-- .../modules/gradle/GradleCoreAccessor.java | 31 ++ .../java/classpath/ClassPathProviderImplTest.java | 262 ++ 18 files changed, 1101 insertions(+), 150 deletions(-) create mode 100644 extide/gradle/test/unit/src/org/netbeans/modules/gradle/NbGradleProjectImplTest.java create mode 100644 java/gradle.java/test/unit/src/org/netbeans/modules/gradle/GradleCoreAccessor.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
[netbeans] branch master updated (7235059 -> 1ea9a57)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 7235059 Merge pull request #2924 from sdedic/gradle/load-lookup new 96192ff [NETBEANS-5672] Plugin Lookup API implemented new 0114633 [NETBEANS-5670] [NETBEANS-5394] Support for plugin-implied Project Configurations. new c7d1e3d Support for declarative action providers. new 5af4e2b [NETBEANS-5394] Added Micronaut 'dev mode' Project Configuration. new c34c576 Export ProjectConfigurations over LSP. Show as launchConfigurations in vscode ext. new 7293724 Sentece reworded new c474296 ASF license. new 1ea9a57 Merge pull request #2948 from sdedic/micronaut/maven-dev-mode2 The 5450 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: enterprise/micronaut/nbproject/project.xml | 8 + .../netbeans/modules/micronaut/resources/layer.xml | 13 + .../micronaut/resources/micronaut-actions.xml | 58 + .../org/netbeans/spi/project/ActionProvider.java | 4 +- java/api.maven/apichanges.xml | 17 +- java/api.maven/manifest.mf | 2 +- java/api.maven/nbproject/project.xml | 27 +- .../src/org/netbeans/api/maven/MavenActions.java | 82 +++ .../test/unit/src/META-INF/generated-layer.xml | 18 +- .../org/netbeans/api/maven/MavenActionsTest.java | 97 .../org/netbeans/api/maven/test-maven-actions.xml | 56 + .../modules/maven/configurations/Bundle.properties | 18 ++ .../nbcode/nbproject/platform.properties | 1 - .../server/debugging/launch/NbLaunchDelegate.java | 33 ++- .../modules/java/lsp/server/protocol/Server.java | 8 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 30 +++ java/java.lsp.server/vscode/package.json | 7 + java/java.lsp.server/vscode/src/extension.ts | 43 java/maven/apichanges.xml | 14 ++ java/maven/arch.xml| 17 ++ java/maven/manifest.mf | 2 +- .../netbeans/modules/maven/ActionProviderImpl.java | 38 ++- .../netbeans/modules/maven/NbMavenProjectImpl.java | 71 +- .../netbeans/modules/maven/api/NbMavenProject.java | 19 ++ .../modules/maven/api/customizer/ModelHandle.java | 9 +- .../modules/maven/api/customizer/ModelHandle2.java | 42 +++- .../modules/maven/configurations/Bundle.properties | 6 + .../maven/configurations/M2ConfigProvider.java | 203 +-- .../maven/configurations/M2Configuration.java | 77 -- .../maven/customizer/CustomizerProviderImpl.java | 17 ++ .../modules/maven/execute/ActionToGoalUtils.java | 52 ++-- .../maven/execute/model/NetbeansActionProfile.java | 26 +- .../io/xpp3/NetbeansBuildActionXpp3Reader.java | 2 + .../io/xpp3/NetbeansBuildActionXpp3Writer.java | 3 + .../spi/actions/AbstractMavenActionsProvider.java | 122 + .../modules/maven/NbMavenProjectImplTest.java | 39 +++ .../modules/maven/execute/MockMavenExec.java | 60 + .../modules/maven/problems/PrimingActionTest.java | 30 +-- .../spi/actions/ProvidedConfigurationsTest.java| 272 + .../modules/maven/spi/actions/providedActions.xml | 95 +++ 40 files changed, 1608 insertions(+), 130 deletions(-) create mode 100644 enterprise/micronaut/src/org/netbeans/modules/micronaut/resources/micronaut-actions.xml create mode 100644 java/api.maven/src/org/netbeans/api/maven/MavenActions.java copy enterprise/micronaut/src/org/netbeans/modules/micronaut/resources/layer.xml => java/api.maven/test/unit/src/META-INF/generated-layer.xml (60%) create mode 100644 java/api.maven/test/unit/src/org/netbeans/api/maven/MavenActionsTest.java create mode 100644 java/api.maven/test/unit/src/org/netbeans/api/maven/test-maven-actions.xml create mode 100644 java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-maven.jar/org/netbeans/modules/maven/configurations/Bundle.properties create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/execute/MockMavenExec.java create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/ProvidedConfigurationsTest.java create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/spi/actions/providedActions.xml - 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] branch master updated: Fixes NPE and potential lockup in tests.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1f6b584 Fixes NPE and potential lockup in tests.
new 392357a Merge pull request #2982 from sdedic/sdedic/ioprovider-npes
1f6b584 is described below
commit 1f6b584576c608d65596d41a7c2a04822f5f3687
Author: Svata Dedic
AuthorDate: Mon May 31 11:15:02 2021 +0200
Fixes NPE and potential lockup in tests.
---
.../src/org/openide/execution/ExecutionEngine.java | 3 ++-
platform/openide.io/src/org/openide/windows/IOProvider.java| 7 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git
a/platform/openide.execution/src/org/openide/execution/ExecutionEngine.java
b/platform/openide.execution/src/org/openide/execution/ExecutionEngine.java
index 6655b84..9ed92b5 100644
--- a/platform/openide.execution/src/org/openide/execution/ExecutionEngine.java
+++ b/platform/openide.execution/src/org/openide/execution/ExecutionEngine.java
@@ -127,13 +127,14 @@ public abstract class ExecutionEngine extends Object {
private RequestProcessor.Task task;
private int resultValue;
private final String name;
-private InputOutput io;
+private final InputOutput io;
public ET(Runnable run, String name, InputOutput io) {
super(run);
this.originalLookup = Lookup.getDefault();
this.resultValue = resultValue;
this.name = name;
+this.io = io;
task = RequestProcessor.getDefault().post(this);
}
diff --git a/platform/openide.io/src/org/openide/windows/IOProvider.java
b/platform/openide.io/src/org/openide/windows/IOProvider.java
index 53f2f3f..fbd5f21 100644
--- a/platform/openide.io/src/org/openide/windows/IOProvider.java
+++ b/platform/openide.io/src/org/openide/windows/IOProvider.java
@@ -191,7 +191,12 @@ public abstract class IOProvider {
/** Fallback implementation. */
private static final class Trivial extends IOProvider {
-private static final Reader in = new BufferedReader(new
InputStreamReader(System.in));
+private static final Reader in = new BufferedReader(new
InputStreamReader(System.in)) {
+public void close() {
+// do nothing, prevent blocking between System.in.read() and
System.in.close();
+}
+};
+
private static final PrintStream out = System.out;
private static final PrintStream err = System.err;
-
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] branch master updated: [NETBEANS-5744] Avoid java.io deadlock of close vs. pending read.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new ba5bb8a [NETBEANS-5744] Avoid java.io deadlock of close vs. pending
read.
new 1ca0470 Merge pull request #2986 from sdedic/lsp/consoleInputLockup
ba5bb8a is described below
commit ba5bb8ab4977793354265d0d9f46ef3a4da98c0f
Author: Svata Dedic
AuthorDate: Thu Jun 3 15:36:32 2021 +0200
[NETBEANS-5744] Avoid java.io deadlock of close vs. pending read.
---
.../server/debugging/launch/NbProcessConsole.java | 14 ++-
.../server/ui/AbstractLspInputOutputProvider.java | 10 +-
.../debugging/launch/NbProcessConsoleTest.java | 114 +
.../modules/java/lsp/server/ui/LspIOAccessor.java | 36 +++
4 files changed, 171 insertions(+), 3 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsole.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsole.java
index ce857f6..55d39da 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsole.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsole.java
@@ -71,7 +71,18 @@ public final class NbProcessConsole extends IOContext {
protected InputStream getStdIn() throws IOException {
synchronized (this) {
if (inputSink == null) {
-inputSink = new PipedInputStream(inputSource);
+inputSink = new PipedInputStream(inputSource) {
+@Override
+public void close() throws IOException {
+synchronized(this) {
+super.close();
+// Bug in Piped*Stream: in.close() closes, but does
+// not unblock waiters, nor returns -1 from writer
to
+// stop waiting. Close the writer - will also
notifyAll().
+inputSource.close();
+}
+}
+};
}
}
return inputSink;
@@ -85,6 +96,7 @@ public final class NbProcessConsole extends IOContext {
}
inputBuffer.write(line);
inputBuffer.newLine();
+inputBuffer.flush();
}
@Override
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
index fb9acfd..e128015 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractLspInputOutputProvider.java
@@ -30,7 +30,6 @@ import org.netbeans.api.io.OutputColor;
import org.netbeans.api.io.ShowOperation;
import
org.netbeans.modules.java.lsp.server.ui.AbstractLspInputOutputProvider.LspIO;
import org.netbeans.spi.io.InputOutputProvider;
-import org.openide.util.Exceptions;
import org.openide.util.Lookup;
public abstract class AbstractLspInputOutputProvider implements
InputOutputProvider {
@@ -145,7 +144,14 @@ public abstract class AbstractLspInputOutputProvider
implements InputOutputProvi
this.err = new PrintWriter(new LspWriter(false));
Reader in;
try {
-in = new InputStreamReader(ioCtx.getStdIn(), "UTF-8");
+in = new InputStreamReader(ioCtx.getStdIn(), "UTF-8") {
+@Override
+public void close() throws IOException {
+// the underlying StreamDecoder would just block on
synchronized read(); close the underlying stream.
+ioCtx.getStdIn().close();
+super.close();
+}
+};
} catch (IOException ex) {
err.write(ex.getLocalizedMessage());
in = new CharArrayReader(new char[0]) {
diff --git
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsoleTest.java
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsoleTest.java
new file mode 100644
index 000..7f7fd85
--- /dev/null
+++
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbProcessConsoleTest.java
@@ -0,0 +1,114 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this f
[netbeans] branch master updated: Completion items imported from Java delegate to ElementJavadoc to get the content.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 96d18cd Completion items imported from Java delegate to
ElementJavadoc to get the content.
new a15d4b6 Merge pull request #2984 from sdedic/groovy/completion-javadoc
96d18cd is described below
commit 96d18cdc3a1e9e9a2edb7db1df931a59de56c226
Author: Svata Dedic
AuthorDate: Tue Jun 1 16:38:13 2021 +0200
Completion items imported from Java delegate to ElementJavadoc to get the
content.
---
groovy/groovy.editor/nbproject/project.xml | 2 +-
.../editor/api/completion/CompletionHandler.java | 53 +++-
.../editor/api/completion/CompletionItem.java | 113 +++-
.../groovy/editor/completion/MethodCompletion.java | 25 +-
.../groovy/editor/completion/TypesCompletion.java | 27 +-
.../completion/provider/CompletionAccessor.java| 64 +
.../provider/GroovyElementsProvider.java | 35 ++-
.../completion/provider/JavaElementHandler.java| 59 +++-
.../groovy/editor/java/JavaElementHandle.java | 304 +
9 files changed, 632 insertions(+), 50 deletions(-)
diff --git a/groovy/groovy.editor/nbproject/project.xml
b/groovy/groovy.editor/nbproject/project.xml
index 0cdabe9..d971f65 100644
--- a/groovy/groovy.editor/nbproject/project.xml
+++ b/groovy/groovy.editor/nbproject/project.xml
@@ -92,7 +92,7 @@
2
-2.21
+2.43
diff --git
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
index 79812ed..30c574f 100644
---
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
+++
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/completion/CompletionHandler.java
@@ -22,12 +22,18 @@ import groovy.lang.MetaMethod;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.File;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.lang.model.element.Element;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.codehaus.groovy.ast.ASTNode;
@@ -36,6 +42,8 @@ import org.codehaus.groovy.ast.expr.ArgumentListExpression;
import org.codehaus.groovy.reflection.CachedClass;
import org.netbeans.api.java.platform.JavaPlatform;
import org.netbeans.api.java.platform.JavaPlatformManager;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.ui.ElementJavadoc;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.editor.BaseDocument;
@@ -53,12 +61,14 @@ import
org.netbeans.modules.groovy.editor.api.lexer.GroovyTokenId;
import org.netbeans.modules.groovy.editor.api.lexer.LexUtilities;
import org.netbeans.modules.groovy.editor.utils.GroovyUtils;
import
org.netbeans.modules.groovy.editor.api.completion.util.CompletionContext;
+import org.netbeans.modules.groovy.editor.java.JavaElementHandle;
import org.netbeans.modules.groovy.support.api.GroovySettings;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
-public class CompletionHandler implements CodeCompletionHandler {
+public class CompletionHandler implements CodeCompletionHandler2 {
private static final Logger LOG =
Logger.getLogger(CompletionHandler.class.getName());
private final PropertyChangeListener docListener;
@@ -433,7 +443,7 @@ public class CompletionHandler implements
CodeCompletionHandler {
String error = NbBundle.getMessage(CompletionHandler.class,
"GroovyCompletion_NoJavaDocFound");
String doctext = null;
-
+
if (element instanceof ASTMethod) {
ASTMethod ame = (ASTMethod) element;
@@ -630,4 +640,43 @@ public class CompletionHandler implements
CodeCompletionHandler {
}
return ParameterInfo.NONE;
}
+
+@Override
+public Documentation documentElement(ParserResult info, ElementHandle
handle, Callable cancel) {
+if (handle instanceof JavaElementHandle) {
+// let Java support do the hard work.
+ElementJavadoc jdoc;
+
[netbeans] branch master updated (c47c7f2 -> 46d829a)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from c47c7f2 Debugger attach in VSCode extension. (#5346) new 074e0ec Workaround: include micronaut, since we have it in the IDE. new f7fe282 ProjectConfiguration support added. new daf48ea Configurations can be extracted from actions-config.xmls. new c337f37 ActionProvider respects active or selected config. new 0929bdf Gradle/Java adds Continuous Mode support. new b29671f stdin of launched process connected to LSP evaluateRequest new f3c6dd0 Added utility to validate filenames. new 00b1df7 Bugfixes for configuration impl. new cbd631b Project Configuration UI. new bbcddf4 Some unit tests. new 5391287 Actions panel adapted. new 8367bcd Fixed wording, enabled completion for conf arguments. new 590b388 Bugfixes and polishing. new 4f7e33e Config provider now supports Customize... item. new 3fc6895 Config settings are combined with action on gradle exec. new ba8d5ab ProjectConfigurationSupport moved to private package, just effective configuration exported. new 1e90375 Stabilized order of configs. new 551c807 Allowed Continuous mode for test tasks new 414cc1a Added APL 2.0 headers. Excluded golden files from RAT. new 7ef15be Bugfix: primeProject() needs project instance if already primed. new ecf603f Allow action ordering / priorities new 8c6ab00 Documentation, arch changes, examples, bugfixes. new d49b531 Apichanges updated for isValidFileName. new 46d829a Merge pull request #2969 from sdedic/gradle/configurations3 The 5502 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: extide/gradle/apichanges.xml | 33 + extide/gradle/arch.xml | 11 + extide/gradle/licenseinfo.xml | 11 + extide/gradle/manifest.mf | 2 +- .../gradle/tooling/NbProjectInfoBuilder.groovy | 3 +- .../modules/gradle/ActionProviderImpl.java | 41 +- .../modules/gradle/DeleteOperationImpl.java| 2 +- .../modules/gradle/NbGradleProjectImpl.java| 4 +- .../gradle/actions/ActionMappingScanner.java | 75 +- .../gradle/actions/ActionPersistenceUtils.java | 198 ++ .../modules/gradle/actions/ActionToTaskUtils.java | 45 +- .../actions/ConfigurableActionsProviderImpl.java | 767 + .../actions/CustomActionRegistrationSupport.java | 181 +++-- .../actions/ProjectActionMappingProviderImpl.java | 5 +- .../modules/gradle/actions/action-mapping.dtd | 7 +- .../gradle/api/execute/GradleCommandLine.java | 2 +- .../api/execute/GradleExecConfiguration.java | 231 +++ .../modules/gradle/api/execute/RunConfig.java | 19 +- .../modules/gradle/api/execute/RunUtils.java | 47 +- .../gradle/configurations/Bundle.properties| 49 ++ .../configurations/ConfigurationSnapshot.java | 310 + .../gradle/configurations/ConfigurationsPanel.form | 224 ++ .../gradle/configurations/ConfigurationsPanel.java | 424 .../ConfigurationsPanelProvider.java | 78 +++ .../configurations/NewConfigurationPanel.form | 175 + .../configurations/NewConfigurationPanel.java | 321 + .../gradle/customizer/BuildActionsCustomizer.form | 162 +++-- .../gradle/customizer/BuildActionsCustomizer.java | 218 -- .../modules/gradle/customizer/Bundle.properties| 1 + .../customizer/GradleCustomizerProvider.java | 6 +- .../gradle/execute/AbstractGradleExecutor.java | 2 +- .../gradle/execute/ConfigPersistenceUtils.java | 180 + .../gradle/execute/ConfigurableActionProvider.java | 72 ++ .../gradle/execute/GradleDaemonExecutor.java | 40 +- .../modules/gradle/execute/GradleExecAccessor.java | 111 +++ .../modules/gradle/execute/GradleExecutor.java | 1 + .../gradle/execute/GradleExecutorOptionsPanel.java | 9 +- .../execute/GradleProjectConfigProvider.java | 379 ++ .../execute/ProjectConfigurationSupport.java | 136 .../execute/ProjectConfigurationUpdater.java | 67 ++ .../spi/actions/DefaultGradleActionsProvider.java | 101 +++ .../gradle/spi/actions/GradleActionsProvider.java | 51 +- .../test/unit/src/META-INF/generated-layer.xml | 60 ++ .../gradle/AbstractGradleProjectTestCase.java | 2 +- .../ConfigurableActionsProviderImplTest.java | 263 +++ .../modules/gradle/actions/action-mapping.xml | 76 +- .../modules/gradle/actions/declarative-actions.xml | 21 + ..
[netbeans] branch master updated (d1927a4 -> 51b649e)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from d1927a4 Merge pull request #3039 from MartinBalin/vscode_readme_12.5
new 9442e8e Allow tests to override gradle user home.
new 9bfaa92 Properly report null (failure) when nothing was provided.
new 83a5554 Fixed typo: inverted condition. Tests added.
new 51b649e Merge pull request #3040 from
sdedic/gradle/disabled-source-attach
The 5632 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:
.../gradle/api/execute/GradleCommandLine.java | 33
.../api/execute/GradleExecConfiguration.java | 8 +
.../gradle/execute/GradleDaemonExecutor.java | 5 +-
.../modules/gradle/execute/GradleExecAccessor.java | 10 +-
java/gradle.java/nbproject/project.xml | 4 +
.../java/queries/GradleSourceAttacherImpl.java | 2 +-
.../api/execute/GradleExecApiTrampoline.java | 32
.../queries/GradleSourceAttacherImplTest.java | 176 +
.../java/j2seplatform/api/Bundle_da.properties | 0
.../java/j2seplatform/api/Bundle_no.properties | 0
.../queries/SourceJavadocAttacherUtil.java | 3 +-
11 files changed, 268 insertions(+), 5 deletions(-)
create mode 100644
java/gradle.java/test/unit/src/org/netbeans/modules/gradle/api/execute/GradleExecApiTrampoline.java
create mode 100644
java/gradle.java/test/unit/src/org/netbeans/modules/gradle/queries/GradleSourceAttacherImplTest.java
copy java/{java.j2seplatform =>
gradle.java}/test/unit/src/org/netbeans/modules/java/j2seplatform/api/Bundle_da.properties
(100%)
copy java/{java.j2seplatform =>
gradle.java}/test/unit/src/org/netbeans/modules/java/j2seplatform/api/Bundle_no.properties
(100%)
-
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] branch master updated: Readme prep for 12.5 and name shortening.
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/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 9322cdc Readme prep for 12.5 and name shortening. new d1927a4 Merge pull request #3039 from MartinBalin/vscode_readme_12.5 9322cdc is described below commit 9322cdcc64fdfb5ab70a54f0a13e690bb1285dda Author: Martin Balin AuthorDate: Sat Jul 3 15:22:36 2021 +0200 Readme prep for 12.5 and name shortening. --- java/java.lsp.server/vscode/README.md| 49 +++ java/java.lsp.server/vscode/images/debuggers.png | Bin 0 -> 34385 bytes java/java.lsp.server/vscode/images/run.png | Bin 0 -> 3787 bytes java/java.lsp.server/vscode/package.json | 2 +- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/java/java.lsp.server/vscode/README.md b/java/java.lsp.server/vscode/README.md index 753c58b..4867262 100644 --- a/java/java.lsp.server/vscode/README.md +++ b/java/java.lsp.server/vscode/README.md @@ -23,33 +23,48 @@ This is a technology preview of [Apache NetBeans](http://netbeans.org) based extension for VS Code. Use it to get all the _goodies of NetBeans_ -via the VS Code user interface! Run on __JDK8__[*], __JDK11__, __JDK15__, etc. - -[*]: <http://github.com/oracle/nb-javac> "Running on JDK8 requires additional download of GPLv2 with ClassPath Exception code" - -Invoke "Open Folder" action to open project directories with `pom.xml` or `build.gradle` -build scripts. Edit, compile and debug (with the __Java 8+__ debugger configuration) -the `.java` application and test files in such projects. Debug not only Java code, -but JavaScript, Python, Ruby polyglot programs at once. +via the VS Code user interface! Runs on __JDK8__[*] and all newer versions. +Apache NetBeans Language Server brings full featured Java development (edit-compile-debug & test cycle) for Maven and Gradle projects to VSCode. As well as other features. ## Getting Started +1. Set JDK in `VSCode | Preferences | Settings ...` __Netbeans: Jdkhome__ setting to point to JDK which Language Server will run on and projects will be compiled with. More below in section [Selecting the JDK](#selecting-the-jdk) -Follow the -[online instructions](https://cwiki.apache.org/confluence/display/NETBEANS/Apache+NetBeans+extension+for+Visual+Studio+Code) -to set your environment up to support -[typical development use-cases](https://cwiki.apache.org/confluence/display/NETBEANS/Apache+NetBeans+extension+for+Visual+Studio+Code). +2. Use __Java: New Project...__ " command to start creating new project, or +3. Open the folder with existing __pom.xml__ for Maven or ___Gradle___ project files (_build.gradle, gradle.properties_). +* Language Server opens the project, performs priming build and might ask for Resolving problems, usually related to opening +subprojects etc. +4. Or simply create a new Java class file with `public static void main(String[] args)` method in opened folder and start coding, compiling, debugging. Works on JDK 8 and newer. -## Supported Actions +## Supported Actions +* __Java: New Project...__ allows creation of new Maven or Gradle project +* __Java: New from Template...__ add various files to currently selected open project. Files are: +* Java - broad selection of various predefined Java classes +* Unit tests - JUnit and TestNB templates for test suites and test cases +* HTML5/JavaScript - Templates for JS, HTML, CSS,... files +* Other - various templates for JSON, YAML, properties, ... files * __Java: Compile Workspace__ - invoke Maven or Gradle build -* __GraalVM: Pause in Script__ - place a breakpoint into first executed polyglot script -* Debugger __Java 8+__ - start test or main class on JDK8+ in polyglot mode +* Debugger __Java 8+...__ - start main class or test on JDK8+. More in [Debugger section](#debugger-and-launch-configurations) * Progress shown for long running operations with cancel support for selected types * __Native Image Debugger__ is a new Run configuration added which allows Java style debugging of Ahead of Time compiled native-images, produced by GraalVM. It is experimental feature which works with GDB on Linux. GDB 7.11 or GDB 10.1+ is required due to known issue [#26139](https://sourceware.org/bugzilla/show_bug.cgi?id=26139) in GDB 8 and 9. * __Micronaut and Spring__ support especially for YAML configuration files with code completion and source code navigation to Java. * __Test Explorer__ for Java tests results visualization and execution including editor code Lenses. -* Improved Maven and Gradle support including multi-project projects, subprojects opening and Gradle priming builds. - +* Maven and Gradle support including multi-project projects, subprojects opening and Gradle priming builds.
[netbeans] branch master updated (5fb463f -> 6a3825c)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 5fb463f Do not proceed with launch with disabled action.
new c282a25 MavenActionProvider can disable an action.
new fd774af Micronaut disables Debug* in development mode
new 4bcb96a Temporarily reset to default config, to get toplevel profile
definitions.
new a401cec UI support for disabled actions.
new 6a3825c Merge pull request #3016 from
sdedic/maven/disable-project-action
The 5568 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:
enterprise/micronaut/nbproject/project.xml | 2 +-
.../micronaut/resources/micronaut-actions.xml | 39
java/api.maven/manifest.mf | 2 +-
.../test/unit/src/META-INF/generated-layer.xml | 5 ++
.../org/netbeans/api/maven/MavenActionsTest.java | 55 ++--
.../org/netbeans/api/maven/test-maven-actions.xml | 5 ++
.../netbeans/api/maven/test-maven-actions2.xml}| 14 +++--
java/maven/apichanges.xml | 14 +
java/maven/manifest.mf | 2 +-
.../maven/configurations/M2ConfigProvider.java | 8 ++-
.../modules/maven/customizer/ActionMappings.form | 15 -
.../modules/maven/customizer/ActionMappings.java | 73 +++---
.../modules/maven/customizer/Bundle.properties | 3 +-
.../modules/maven/execute/ActionToGoalUtils.java | 41
.../maven/spi/actions/MavenActionsProvider.java| 6 ++
15 files changed, 247 insertions(+), 37 deletions(-)
copy java/{maven/src/org/netbeans/modules/maven/nbactions.xml =>
api.maven/test/unit/src/org/netbeans/api/maven/test-maven-actions2.xml} (75%)
-
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] branch master updated (b5b34b6 -> 9557ac0)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from b5b34b6 Merge pull request #3033 from nigjo/build-profiler-on-win new 692e758 Types are resolved by Groovy primarily. new 0759b68 Works better with instantiated generics new 0f98822 Allowed real type in place of generic type parameter. Tests updated. new 3ed8152 Disabling failing tests until NETBEANS-5822 is fixed. new 9557ac0 Merge pull request #3034 from sdedic/groovy/parser-fixes The 5619 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: .../groovy/editor/compiler/CompilationUnit.java| 51 +++--- .../provider/CompleteElementHandler.java | 19 - .../completion/provider/JavaElementHandler.java| 82 +- ...roovy.testCompletionReturnType1_1.11.completion | 1 - ...1.groovy.testCompletionReturnType1_1.completion | 1 - ...roovy.testCompletionReturnType1_2.11.completion | 1 - ...1.groovy.testCompletionReturnType1_2.completion | 1 - ...roovy.testCompletionReturnType1_3.11.completion | 1 - ...1.groovy.testCompletionReturnType1_3.completion | 1 - ...roovy.testCompletionReturnType1_4.11.completion | 1 - ...1.groovy.testCompletionReturnType1_4.completion | 1 - ...roovy.testCompletionReturnType1_5.11.completion | 1 - ...1.groovy.testCompletionReturnType1_5.completion | 1 - ...roovy.testCompletionReturnType1_6.11.completion | 1 - ...1.groovy.testCompletionReturnType1_6.completion | 1 - ...roovy.testCompletionReturnType1_7.11.completion | 1 - ...1.groovy.testCompletionReturnType1_7.completion | 1 - ...roovy.testCompletionForLiteral1_3.11.completion | 1 - ...1.groovy.testCompletionForLiteral1_3.completion | 1 - ...ovy.testCompletionNoPrefixString1.11.completion | 1 - ...ovy.testCompletionNoPrefixString1.12.completion | 1 - ...ovy.testCompletionNoPrefixString1.13.completion | 1 - ...oovy.testCompletionNoPrefixString1.9.completion | 1 - ...groovy.testCompletionNoPrefixString1.completion | 1 - ...ovy.testCompletionNoPrefixString2.11.completion | 1 - ...ovy.testCompletionNoPrefixString2.12.completion | 1 - ...ovy.testCompletionNoPrefixString2.13.completion | 1 - ...oovy.testCompletionNoPrefixString2.9.completion | 1 - ...groovy.testCompletionNoPrefixString2.completion | 1 - ...stSpreadOperator1_stringArray_all.11.completion | 1 - ...stSpreadOperator1_stringArray_all.12.completion | 1 - ...stSpreadOperator1_stringArray_all.13.completion | 1 - ...estSpreadOperator1_stringArray_all.9.completion | 1 - testSpreadOperator1_stringArray_all.completion | 1 - ...te1_interfaceDelegator_withoutPrefix.completion | 2 +- groovy.testSingleton2_withGetPrefix.completion | 2 +- groovy.testSingleton3_withoutPrefix.completion | 2 +- .../editor/occurrences/AliasOccurrencesTest.java | 11 ++- 38 files changed, 120 insertions(+), 80 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
[netbeans] branch master updated: Avoid NPEs when Finder returns DeclarationLocation.NONE or no FObject.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 469f33d Avoid NPEs when Finder returns DeclarationLocation.NONE or no
FObject.
new 44738fc Merge pull request #3030 from sdedic/lsp/npe-hyperlink2
469f33d is described below
commit 469f33d64f3303ed1c69a5d592334ec13ba91c66
Author: Svata Dedic
AuthorDate: Thu Jul 1 10:23:01 2021 +0200
Avoid NPEs when Finder returns DeclarationLocation.NONE or no FObject.
---
ide/api.lsp/src/org/netbeans/api/lsp/HyperlinkLocation.java| 2 +-
.../src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ide/api.lsp/src/org/netbeans/api/lsp/HyperlinkLocation.java
b/ide/api.lsp/src/org/netbeans/api/lsp/HyperlinkLocation.java
index 2069379..f790674 100644
--- a/ide/api.lsp/src/org/netbeans/api/lsp/HyperlinkLocation.java
+++ b/ide/api.lsp/src/org/netbeans/api/lsp/HyperlinkLocation.java
@@ -152,7 +152,7 @@ public final class HyperlinkLocation {
List locations = new
ArrayList<>(futures.length);
for (CompletableFuture future : futures) {
HyperlinkLocation location = future.getNow(null);
-if (location != null) {
+if (location != null && location.getFileObject() != null) {
locations.add(location);
}
}
diff --git
a/ide/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java
b/ide/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java
index 30f3ed5..b6386ae 100644
--- a/ide/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java
+++ b/ide/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java
@@ -98,7 +98,8 @@ public class GoToSupport {
public static CompletableFuture getGoToLocation(final
Document doc, final int offset) {
DeclarationLocation[] location = new DeclarationLocation[1];
perform(doc, offset, false, location, new AtomicBoolean());
-return CompletableFuture.completedFuture(location[0] == null ? null :
HyperlinkLocationProvider.createHyperlinkLocation(location[0].getFileObject(),
location[0].getOffset(), location[0].getOffset()));
+return CompletableFuture.completedFuture(location[0] == null ||
location[0] == DeclarationLocation.NONE ?
+null :
HyperlinkLocationProvider.createHyperlinkLocation(location[0].getFileObject(),
location[0].getOffset(), location[0].getOffset()));
}
private static String perform(final Document doc, final int offset, final
boolean tooltip, final DeclarationLocation[] location, final AtomicBoolean
cancel) {
-
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] branch master updated: Avoid NPE if hyperlink belongs to another provider.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a650888 Avoid NPE if hyperlink belongs to another provider.
new 575c97d Merge pull request #3026 from sdedic/sdedic/hyperlink-npe
a650888 is described below
commit a650888e41f4abac2ca2f7b815ac476dbaa1a0d2
Author: Svata Dedic
AuthorDate: Wed Jun 30 10:36:38 2021 +0200
Avoid NPE if hyperlink belongs to another provider.
---
ide/editor/src/org/netbeans/modules/editor/url/HyperlinkImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ide/editor/src/org/netbeans/modules/editor/url/HyperlinkImpl.java
b/ide/editor/src/org/netbeans/modules/editor/url/HyperlinkImpl.java
index 5ffe996..fa093a2 100644
--- a/ide/editor/src/org/netbeans/modules/editor/url/HyperlinkImpl.java
+++ b/ide/editor/src/org/netbeans/modules/editor/url/HyperlinkImpl.java
@@ -277,7 +277,9 @@ public final class HyperlinkImpl implements
HyperlinkProviderExt, HyperlinkLocat
@Override
public CompletableFuture getHyperlinkLocation(Document
doc, int offset) {
int[] span = this.getHyperlinkSpan(doc, offset,
HyperlinkType.GO_TO_DECLARATION);
-
+if (span == null) {
+return CompletableFuture.completedFuture(null);
+}
return CompletableFuture.supplyAsync(() -> {
try {
String urlText = doc.getText(span[0], span[1] - span[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] branch master updated (5efd304 -> bb9f9d6)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 5efd304 Merge pull request #3028 from JaroslavTulach/jtulach/GradleProjectWithSettingsOnly new 6957660 A caller waiting on ActionProgress must be notified on failure/disabled. new c8dbcb2 Report download actions as enabled. new bb9f9d6 Merge pull request #3029 from sdedic/gradle/javadoc-attacher The 5608 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/gradle/ActionProviderImpl.java | 20 +--- .../modules/gradle/java/JavaActionProvider.java | 14 ++ .../java/queries/GradleSourceAttacherImpl.java | 16 +++- 3 files changed, 38 insertions(+), 12 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
[netbeans] branch master updated (bb9f9d6 -> 2697c82)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from bb9f9d6 Merge pull request #3029 from sdedic/gradle/javadoc-attacher new 868e5e7 Fast return if project is unavailable new 03bbc6d Do not block LSP comm thread by HintsInvoker. new 2697c82 Merge pull request #3011 from sdedic/lsp/noproject-files The 5611 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/java/lsp/server/protocol/Server.java | 3 +++ .../server/protocol/TextDocumentServiceImpl.java | 29 ++ 2 files changed, 21 insertions(+), 11 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
[netbeans] branch master updated: Exported more packages to allow transformation loading, prevents LinkageErrors.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0d85660 Exported more packages to allow transformation loading,
prevents LinkageErrors.
new 74b9e17 Merge pull request #3027 from sdedic/groovy/classloading-fixes
0d85660 is described below
commit 0d856604d00b330f39a39c25fdb860ddb5565f66
Author: Svata Dedic
AuthorDate: Wed Jun 30 10:39:39 2021 +0200
Exported more packages to allow transformation loading, prevents
LinkageErrors.
---
groovy/groovy.editor/nbproject/project.xml | 2 +-
.../org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java | 6 --
groovy/libs.groovy/manifest.mf | 2 +-
groovy/libs.groovy/nbproject/project.xml | 7 +--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/groovy/groovy.editor/nbproject/project.xml
b/groovy/groovy.editor/nbproject/project.xml
index 1aeea86..e77eb00 100644
--- a/groovy/groovy.editor/nbproject/project.xml
+++ b/groovy/groovy.editor/nbproject/project.xml
@@ -258,7 +258,7 @@
-2.11
+2.12
diff --git
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
index b53c49e..65a05b9 100644
---
a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
+++
b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/PathFinderVisitor.java
@@ -260,13 +260,7 @@ public class PathFinderVisitor extends
ClassCodeVisitorSupport {
@Override
public void visitMethodCallExpression(MethodCallExpression node) {
if (isInside(node, line, column)) {
-// FIXME http://jira.codehaus.org/browse/GROOVY-3263
-if (node.isImplicitThis()) {
-node.getMethod().visit(this);
-node.getArguments().visit(this);
-} else {
super.visitMethodCallExpression(node);
-}
}
}
diff --git a/groovy/libs.groovy/manifest.mf b/groovy/libs.groovy/manifest.mf
index e28f718..6ce61d5 100644
--- a/groovy/libs.groovy/manifest.mf
+++ b/groovy/libs.groovy/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.libs.groovy
OpenIDE-Module-Layer: org/netbeans/modules/libs/groovy/layer.xml
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/libs/groovy/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.11
+OpenIDE-Module-Specification-Version: 2.12
diff --git a/groovy/libs.groovy/nbproject/project.xml
b/groovy/libs.groovy/nbproject/project.xml
index 2ec959d..6e04e95 100644
--- a/groovy/libs.groovy/nbproject/project.xml
+++ b/groovy/libs.groovy/nbproject/project.xml
@@ -29,8 +29,7 @@
org.netbeans.modules.groovy.editor
org.netbeans.modules.groovy.refactoring
org.netbeans.modules.groovy.support
-groovy.lang
-groovy.lang.groovydoc
+groovy
groovyjarjarantlr
groovyjarjarasm.asm
org.codehaus.groovy
@@ -41,15 +40,19 @@
org.codehaus.groovy.ast.stmt
org.codehaus.groovy.ast.tools
org.codehaus.groovy.classgen
+org.codehaus.groovy.classgen.asm
org.codehaus.groovy.control
org.codehaus.groovy.control.customizers
org.codehaus.groovy.control.customizers.builder
+org.codehaus.groovy.control.io
org.codehaus.groovy.control.messages
org.codehaus.groovy.reflection
org.codehaus.groovy.runtime
org.codehaus.groovy.runtime.callsite
org.codehaus.groovy.syntax
org.codehaus.groovy.transform
+org.codehaus.groovy.transform.sc
+org.codehaus.groovy.transform.trait
org.codehaus.groovy.transform.stc
-
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] branch master updated (10a2659 -> aae2033)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 10a2659 Merge pull request #3041 from apache/ebarboni-buildinfo new 7a1f0fa Add temp support to disable indexing. new ce04d6f VScode ext Option to disable Groovy support. Disables Groovy indexing in NBJLS. Co-authored-by: Jan Lahoda new aae2033 Merge pull request #3042 from sdedic/lsp/disable-groovy-support The 5637 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: groovy/groovy.editor/manifest.mf | 2 +- .../modules/groovy/editor/api/GroovyIndexer.java | 25 +- .../groovy/editor/api/parser/GroovyParser.java | 12 +++ .../modules/groovy/editor/utils/GroovyUtils.java | 21 ++ .../server/protocol/NbCodeClientCapabilities.java | 17 +++ .../modules/java/lsp/server/protocol/Server.java | 24 +++-- .../lsp/server/protocol/WorkspaceServiceImpl.java | 3 ++- java/java.lsp.server/vscode/package.json | 5 + java/java.lsp.server/vscode/src/extension.ts | 25 ++ 9 files changed, 120 insertions(+), 14 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
[netbeans] branch master updated (aae2033 -> 67c8245)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from aae2033 Merge pull request #3042 from sdedic/lsp/disable-groovy-support new 70aa870 Allow template Handler to report progress new 6c772f7 Create content asynchronously, do not block lsp message thread. new 67c8245 Merge pull request #3044 from sdedic/lsp/new-project-progress The 5640 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: .../gradle/spi/newproject/BaseGradleWizardIterator.java | 7 ++- .../modules/java/lsp/server/protocol/LspTemplateUI.java | 15 +++ 2 files changed, 17 insertions(+), 5 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
[netbeans] branch master updated: Improved messages when project is opened bcs of file being worked on.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 8cffc9c Improved messages when project is opened bcs of file being
worked on.
new 0e13308 Merge pull request #2930 from sdedic/lsp/project-message
8cffc9c is described below
commit 8cffc9cbdb41ec4dde1b68c67cc04a28cebd8c93
Author: Svata Dedic
AuthorDate: Fri Apr 30 09:27:48 2021 +0200
Improved messages when project is opened bcs of file being worked on.
---
.../src/org/netbeans/modules/java/lsp/server/protocol/Server.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 607d328..371a54b 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
@@ -342,7 +342,7 @@ public final class Server {
@NbBundle.Messages({
"PROMPT_AskOpenProjectForFile=File {0} belongs to project {1}. To
enable all features, the project should be opened"
+ " and initialized by the Language Server. Do you want to
proceed ?",
-"PROMPT_AskOpenProjectForFileNoName=File {0} belongs to a project.
To enable all features, the project should be opened"
+"PROMPT_AskOpenProject=To enable all features of project {0}, it
should be opened"
+ " and initialized by the Language Server. Do you want to
proceed ?",
"PROMPT_AskOpenProjectForFile_Yes=Open and initialize",
"PROMPT_AskOpenProjectForFile_No=No",
@@ -399,10 +399,10 @@ public final class Server {
yes,
new
MessageActionItem(Bundle.PROMPT_AskOpenProjectForFile_No())
));
-if (dispName.equals(prj.getProjectDirectory().getPath())) {
-
smrp.setMessage(Bundle.PROMPT_AskOpenProjectForFileNoName(file.getPath()));
+if (prj.getProjectDirectory() == file) {
+
smrp.setMessage(Bundle.PROMPT_AskOpenProject(dispName));
} else {
-
smrp.setMessage(Bundle.PROMPT_AskOpenProjectForFile(file.getPath(), dispName));
+
smrp.setMessage(Bundle.PROMPT_AskOpenProjectForFile(file.getNameExt(),
dispName));
}
smrp.setType(MessageType.Info);
-
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] branch master updated: [NETBEANS-5638] Insane should ignore stub classes in traversal.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e64c8de [NETBEANS-5638] Insane should ignore stub classes in
traversal.
new 4fd403d Merge pull request #2923 from sdedic/sdedic/insane-securityex
e64c8de is described below
commit e64c8de432ab7c367cfca6e548a508cbe0f83cd5
Author: Svata Dedic
AuthorDate: Thu Apr 29 13:38:25 2021 +0200
[NETBEANS-5638] Insane should ignore stub classes in traversal.
---
.../src/org/netbeans/insane/impl/InsaneEngine.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/harness/o.n.insane/src/org/netbeans/insane/impl/InsaneEngine.java
b/harness/o.n.insane/src/org/netbeans/insane/impl/InsaneEngine.java
index e1a1b5b..8b9fd36 100644
--- a/harness/o.n.insane/src/org/netbeans/insane/impl/InsaneEngine.java
+++ b/harness/o.n.insane/src/org/netbeans/insane/impl/InsaneEngine.java
@@ -83,7 +83,17 @@ public final class InsaneEngine {
// dispatch the recognition
if (o instanceof Class) {
-recognizeClass((Class)o);
+try {
+recognizeClass((Class)o);
+} catch (SecurityException ex) {
+if (ex.getMessage() == null ||
!ex.getMessage().contains("java.lang")) {
+throw ex;
+}
+// just report: possibly an upwards-compatible method
+// not linkable on current runtime.
+System.err.println("Failed analysing class " +
((Class)o).getName() +
+" because of " + ex.getMessage());
+}
} else {
recognizeObject(o);
}
-
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] branch delivery updated (f6dfdf3 -> 09d83f0)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git. from f6dfdf3 [NETBEANS-419] Fixed grammar in About dialog new 664e7ec Assure that the TerminatedEvent is sent only after the debuggee finishes. new cf30670 Change the Run code lens action to start through debugging with noDebug=true. new cb0f5db Extension debug types corrected. new 09d83f0 Merge pull request #2725 from entlicher/vscodeext_CodelensOutputFixes The 4968 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: .../lsp/server/debugging/NbSourceProvider.java | 13 +++-- .../java/lsp/server/debugging/NbThreads.java | 10 .../debugging/launch/NbLaunchRequestHandler.java | 21 ++- .../launch/NbLaunchWithDebuggingDelegate.java | 13 + .../modules/java/lsp/server/protocol/Server.java | 5 +- .../server/protocol/TextDocumentServiceImpl.java | 4 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 67 -- java/java.lsp.server/vscode/package-lock.json | 6 +- java/java.lsp.server/vscode/package.json | 4 +- java/java.lsp.server/vscode/src/extension.ts | 15 - 10 files changed, 59 insertions(+), 99 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
[netbeans] branch master updated (2db694e -> c65d63c)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 2db694e Merge pull request #2694 from sdedic/lsp/source-attacher-branding-api new 8acc860 Project problems are resolved in headless environment. new fe35901 Only set the status when result message is non-null new c65d63c Merge pull request #2652 from sdedic/lsp/bugfix-project-problems The 4925 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: .../ui/problems/BrokenReferencesCustomizer.java| 23 +++- .../project/ui/problems/BrokenReferencesImpl.java | 41 +- .../lsp/server/ui/AbstractLspStatusDisplayer.java | 4 +-- 3 files changed, 57 insertions(+), 11 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
[netbeans] branch master updated (f78623f -> 2db694e)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from f78623f [NETBEANS-5004] Replace script with native macOS executable
(#2563)
new f436517 Allow "Attach sources/javadoc" UIs to be branded out.
new 572079a Branded out source/javadoc questions in NBcode. Branded out
in LSP tests.
new 2db694e Merge pull request #2694 from
sdedic/lsp/source-attacher-branding-api
The 4922 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:
java/java.j2seplatform/apichanges.xml | 121 ++
java/java.j2seplatform/arch.xml| 49 +-
java/java.j2seplatform/manifest.mf | 2 +-
.../java.j2seplatform/nbproject/project.properties | 1 +
.../java/j2seplatform/api/Bundle.properties} | 18 +-
.../queries/SourceJavadocAttacherUtil.java | 62 ---
.../j2seplatform/AbstractJ2SEAttacherTestBase.java | 185 +
.../java/j2seplatform/api/Bundle_da.properties}| 18 +-
.../java/j2seplatform/api/Bundle_no.properties}| 17 +-
.../J2SELibrarySourceJavadocAttacherTest.java | 58 +++
.../JavadocForBinaryQueryLibraryImplTest.java | 23 +--
.../j2seplatform/libraries/LibraryTestUtils.java | 84 ++
.../SourceForBinaryQueryLibraryImplTest.java | 23 +--
.../libraries/TestLibraryProviderImpl.java | 2 -
.../J2SEPlatformSourceJavadocAttacherTest.java | 48 ++
.../queries/DefaultSourceJavadocAttacherTest.java | 137 +++
.../java/j2seplatform/api/Bundle.properties} | 18 +-
.../java/j2seplatform/api/Bundle.properties} | 17 +-
18 files changed, 739 insertions(+), 144 deletions(-)
create mode 100644 java/java.j2seplatform/apichanges.xml
copy java/java.j2seplatform/{nbproject/project.properties =>
src/org/netbeans/modules/java/j2seplatform/api/Bundle.properties} (59%)
create mode 100644
java/java.j2seplatform/test/unit/src/org/netbeans/modules/java/j2seplatform/AbstractJ2SEAttacherTestBase.java
copy java/java.j2seplatform/{nbproject/project.properties =>
test/unit/src/org/netbeans/modules/java/j2seplatform/api/Bundle_da.properties}
(59%)
copy java/java.j2seplatform/{nbproject/project.properties =>
test/unit/src/org/netbeans/modules/java/j2seplatform/api/Bundle_no.properties}
(59%)
create mode 100644
java/java.j2seplatform/test/unit/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibrarySourceJavadocAttacherTest.java
create mode 100644
java/java.j2seplatform/test/unit/src/org/netbeans/modules/java/j2seplatform/libraries/LibraryTestUtils.java
create mode 100644
java/java.j2seplatform/test/unit/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformSourceJavadocAttacherTest.java
create mode 100644
java/java.j2seplatform/test/unit/src/org/netbeans/modules/java/j2seplatform/queries/DefaultSourceJavadocAttacherTest.java
copy java/{java.j2seplatform/nbproject/project.properties =>
java.lsp.server/nbcode/branding/modules/org.netbeans.modules.java.j2seplatform.jar/org/netbeans/modules/java/j2seplatform/api/Bundle.properties}
(59%)
copy java/{java.j2seplatform/nbproject/project.properties =>
java.lsp.server/test/unit/src/org/netbeans/modules/java/j2seplatform/api/Bundle.properties}
(59%)
-
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] branch master updated: Fixed ProjectUtils.parentOf() for gradle subprojects.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 89fa99b Fixed ProjectUtils.parentOf() for gradle subprojects.
new 8897045 Merge pull request #2815 from sdedic/gradle/parentProviderFix
89fa99b is described below
commit 89fa99b91369ccc84e14bcbd4e06a60fdf06097a
Author: Svata Dedic
AuthorDate: Thu Mar 18 15:10:07 2021 +0100
Fixed ProjectUtils.parentOf() for gradle subprojects.
---
.../gradle/queries/ParentRootProviderImpl.java | 28 ++--
.../gradle/queries/ParentRootProviderTest.java | 173 +
2 files changed, 189 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
b/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
index 1883b2e..9d2611a 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/queries/ParentRootProviderImpl.java
@@ -51,18 +51,22 @@ public class ParentRootProviderImpl implements
ParentProjectProvider, RootProjec
GradleBaseProject gbp = GradleBaseProject.get(project);
if ((gbp != null) && !gbp.isRoot()) {
int lastcol = gbp.getPath().lastIndexOf(':');
-if (lastcol > 0) {
-String parentPath = gbp.getPath().substring(0, lastcol);
-Project root = getRootProject();
-GradleBaseProject rbp = GradleBaseProject.get(root);
-File parentDir = rbp.getSubProjects().get(parentPath);
-if (parentDir != null) {
-FileObject fo = FileUtil.toFileObject(parentDir);
-try {
-ret = ProjectManager.getDefault().findProject(fo);
-} catch (IllegalArgumentException | IOException ex) {
-ErrorManager.getDefault().notify(ex);
-}
+if (lastcol == -1) {
+return null;
+}
+String parentPath = gbp.getPath().substring(0, lastcol);
+Project root = getRootProject();
+if (parentPath.isEmpty()) {
+return root;
+}
+GradleBaseProject rbp = GradleBaseProject.get(root);
+File parentDir = rbp.getSubProjects().get(parentPath);
+if (parentDir != null) {
+FileObject fo = FileUtil.toFileObject(parentDir);
+try {
+ret = ProjectManager.getDefault().findProject(fo);
+} catch (IllegalArgumentException | IOException ex) {
+ErrorManager.getDefault().notify(ex);
}
}
}
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
new file mode 100644
index 000..6a6460d
--- /dev/null
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/ParentRootProviderTest.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.gradle.queries;
+
+import java.io.IOException;
+import java.util.Random;
+import java.util.Set;
+import static junit.framework.TestCase.assertNotNull;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectManager;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.gradle.AbstractGradleProjectTestCase;
+import org.netbeans.modules.gradle.ProjectTrust;
+import org.netbeans.modules.project.uiapi.ProjectOpenedTrampoline;
+import org.netbeans.spi.project.ui.ProjectOpenedHook;
+import org.openide.filesystems.FileObject;
+
+/**
+ *
+ * @author sdedic
+ */
+public class ParentRootProviderTest extends AbstractGradleProjectTestCase {
+/**
+ * The root project, usually
+ */
+private Project projectA;
+private Project projectB;
+
[netbeans] branch master updated: [NETBEANS-5430] Implemened ActionProvider.COMMAND_PRIME for gradle projects.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 137a803 [NETBEANS-5430] Implemened ActionProvider.COMMAND_PRIME for
gradle projects.
new decaf33 Merge pull request #2816 from sdedic/gradle/primingAction
137a803 is described below
commit 137a803e33ed585b525c2398688fdc7179023a84
Author: Svata Dedic
AuthorDate: Thu Mar 18 15:14:01 2021 +0100
[NETBEANS-5430] Implemened ActionProvider.COMMAND_PRIME for gradle projects.
---
extide/gradle/manifest.mf | 2 +-
.../modules/gradle/ActionProviderImpl.java | 36 ++-
.../gradle/GradleProjectProblemProvider.java | 29
.../modules/gradle/NbGradleProjectImpl.java| 51 ++
4 files changed, 96 insertions(+), 22 deletions(-)
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index a6c045d..fd992b0 100644
--- a/extide/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.8
+OpenIDE-Module-Specification-Version: 2.9
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
index a12e23a..3404b5e 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
@@ -60,6 +60,7 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
+import java.util.logging.Level;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static javax.swing.Action.NAME;
@@ -123,15 +124,42 @@ public class ActionProviderImpl implements ActionProvider
{
for (GradleActionsProvider provider : providers) {
actions.addAll(provider.getSupportedActions());
}
+// add a fixed 'prime build' action
+actions.add(ActionProvider.COMMAND_PRIME);
return actions.toArray(new String[actions.size()]);
}
-
+
@Override
public void invokeAction(String command, Lookup context) throws
IllegalArgumentException {
if (COMMAND_DELETE.equals(command)) {
DefaultProjectOperations.performDefaultDeleteOperation(project);
return;
}
+if (ActionProvider.COMMAND_PRIME.equals(command)) {
+// delegate to prooblem provider we know exists & is registered
+NbGradleProjectImpl prjImpl =
project.getLookup().lookup(NbGradleProjectImpl.class);
+ActionProgress prg = ActionProgress.start(context);
+LOG.log(Level.FINER, "Priming build starting for {0}", project);
+if (prjImpl.isProjectPrimingRequired()) {
+prjImpl.primeProject().
+thenAccept(gp -> {
+LOG.log(Level.FINER, "Priming build of {0}
finished with status {1}, ", new Object[] { project,
prjImpl.isProjectPrimingRequired() });
+prg.finished(prjImpl.isProjectPrimingRequired());
+}).
+exceptionally((e) -> {
+LOG.log(Level.FINER, e, () ->
String.format("Priming build errored: %s", project));
+prg.finished(false);
+return null;
+});
+return;
+} else {
+// no action, but report finish to unblock potential observers
+LOG.log(Level.FINER, "Priming build unncessary for {0}",
project);
+prg.finished(true);
+return;
+}
+
+}
ActionMapping mapping = ActionToTaskUtils.getActiveMapping(command,
project);
invokeProjectAction(project, mapping, context, false);
}
@@ -142,6 +170,12 @@ public class ActionProviderImpl implements ActionProvider {
GradleBaseProject gbp = GradleBaseProject.get(project);
return gbp != null && gbp.getSubProjects().isEmpty() &&
ProjectOperations.isDeleteOperationSupported(project);
}
+if (ActionProvider.COMMAND_PRIME.equals(command)) {
+NbGradleProjectImpl prjImpl =
project.getLookup().lookup(NbGradleProjectImpl.class);
+boolean enabled = prjImpl.isProjectPrimingRequired();
+LOG.log(Level.FINEST, "Priming build action for {0} is: {1}", new
Object[] { project, enabled });
+
[netbeans] branch master updated: Fixing build for older ant versions.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 4c50d87 Fixing build for older ant versions.
new 724720c Merge pull request #2838 from sdedic/ergonomics/fix-build
4c50d87 is described below
commit 4c50d87339fe9e3461a476a72b9d74ef407c8ff8
Author: Svata Dedic
AuthorDate: Mon Mar 29 11:50:27 2021 +0200
Fixing build for older ant versions.
---
.../src-ant/org/netbeans/modules/ide/ergonomics/ant/ExtractLayer.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/ergonomics/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/ExtractLayer.java
b/ergonomics/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/ExtractLayer.java
index a63ac7e..6eadbf1 100644
---
a/ergonomics/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/ExtractLayer.java
+++
b/ergonomics/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/ExtractLayer.java
@@ -543,12 +543,10 @@ implements FileNameMapper, URIResolver, EntityResolver {
return delegate.size();
}
-@Override
public Stream stream() {
return delegate.stream();
}
-@Override
public boolean isEmpty() {
return delegate.isEmpty();
}
-
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] branch master updated (724720c -> 9175df3)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 724720c Merge pull request #2838 from sdedic/ergonomics/fix-build new 73c4756 [NETBEANS-5482] Support for ExplicitProcessParameters in gradle/java projects new 95a7996 Closed ProjectActions for extension. Fixed test. new 9175df3 Merge pull request #2828 from sdedic/gradle/explicitParameters2 The 5190 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: extide/gradle/apichanges.xml | 12 + extide/gradle/arch.xml | 6 + .../gradle/tooling/NetBeansRunSinglePlugin.groovy | 13 +- java/gradle.java/.gitignore| 2 + java/gradle.java/apichanges.xml| 18 +- java/gradle.java/arch.xml | 12 + java/gradle.java/manifest.mf | 2 +- java/gradle.java/nbproject/project.properties | 2 + java/gradle.java/nbproject/project.xml | 11 +- .../modules/gradle/java/action-mapping.xml | 8 +- .../modules/gradle/java/api/ProjectActions.java| 55 + .../gradle/java/execute/JavaExecTokenProvider.java | 183 +++ .../test/unit/data/javasimple/build.gradle | 8 + .../data/javasimple/src/main/java/test/App.java| 19 ++ .../test/unit/data/nonjava/build.gradle| 0 .../gradle/api/GradleBaseProjectTrampoline.java| 32 +++ .../java/execute/JavaExecTokenProviderTest.java| 246 + .../gradle/java/execute/example-action-mapping.xml | 34 +++ 18 files changed, 655 insertions(+), 8 deletions(-) create mode 100644 java/gradle.java/.gitignore create mode 100644 java/gradle.java/src/org/netbeans/modules/gradle/java/api/ProjectActions.java create mode 100644 java/gradle.java/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProvider.java create mode 100644 java/gradle.java/test/unit/data/javasimple/build.gradle create mode 100644 java/gradle.java/test/unit/data/javasimple/src/main/java/test/App.java copy php/php.smarty/src/org/netbeans/modules/php/smarty/resources/TplTemplate.tpl => java/gradle.java/test/unit/data/nonjava/build.gradle (100%) create mode 100644 java/gradle.java/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTrampoline.java create mode 100644 java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/JavaExecTokenProviderTest.java create mode 100644 java/gradle.java/test/unit/src/org/netbeans/modules/gradle/java/execute/example-action-mapping.xml - 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] branch master updated (472c46f -> f5dfe1e)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 472c46f Merge pull request #2835 from JaroslavTulach/jtulach/WarningAsError add f5dfe1e [NETBEANS-5499] Felix removed in favour of Netbinox, fixes URLStreamHandlerFactory. add-opens added for jdk.compiler. (#2844) No new revisions were added by this update. Summary of changes: java/java.lsp.server/nbcode/nbproject/platform.properties | 1 + java/java.lsp.server/script/etc/nbcode.conf | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) - 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] branch master updated (3c3f8df -> 5b5a8bd)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 3c3f8df Merge pull request #2793 from neilcsmith-net/spec-versions-nb124 new 46f8260 Graceful handling of renamed/deleted files. new 5b5a8bd Merge pull request #2800 from sdedic/lsp/deleteRenameFile The 5077 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: .../server/protocol/TextDocumentServiceImpl.java | 187 + .../java/lsp/server/protocol/ServerTest.java | 60 +++ 2 files changed, 216 insertions(+), 31 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
[netbeans] branch master updated (5b5a8bd -> bfa3853)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 5b5a8bd Merge pull request #2800 from sdedic/lsp/deleteRenameFile
add bfa3853 NonUI compatibility: Trust project question uses standard
dialogs. (#2769)
No new revisions were added by this update.
Summary of changes:
extide/gradle/apichanges.xml | 12 ++
extide/gradle/arch.xml | 5 +
.../modules/gradle/api/execute/Bundle.properties | 10 +-
.../modules/gradle/api/execute/RunUtils.java | 170 +++--
.../modules/gradle/execute/TrustProjectPanel.form | 79 --
.../modules/gradle/execute/TrustProjectPanel.java | 113 --
.../gradle/api/execute}/TestBundle.properties | 12 +-
7 files changed, 190 insertions(+), 211 deletions(-)
delete mode 100644
extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.form
delete mode 100644
extide/gradle/src/org/netbeans/modules/gradle/execute/TrustProjectPanel.java
copy
{ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod
=>
extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/execute}/TestBundle.properties
(67%)
-
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] branch master updated (ad8c5be -> 09e2823)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from ad8c5be Merge pull request #2805 from saulotoledo/fix/incorrect_xdebug3_clipboard_config new 33efb0b Fixing XML that does not validate. new cc0f894 Workaround for deadlock while reading input, see JDK-4859836. new 666ab66 Fixed exception during workdone/Cancel call. Test added. new 09e2823 Merge pull request #2799 from sdedic/lsp/cancellation The 5088 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: .../nbcode/integration/nbproject/project.xml | 2 +- java/java.lsp.server/nbproject/project.xml | 17 +++ .../modules/java/lsp/server/protocol/Server.java | 5 + .../java/lsp/server/protocol/ServerTest.java | 158 + .../nbcode/integration/LspInputOutputProvider.java | 30 .../nbcode/integration/LspProgressEnvironment.java | 33 + .../maven/indexer/NexusRepositoryIndexerImpl.java | 2 +- .../maven/execute/CommandLineOutputHandler.java| 14 +- 8 files changed, 230 insertions(+), 31 deletions(-) create mode 100644 java/java.lsp.server/test/unit/src/org/netbeans/modules/nbcode/integration/LspInputOutputProvider.java create mode 100644 java/java.lsp.server/test/unit/src/org/netbeans/modules/nbcode/integration/LspProgressEnvironment.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
[netbeans] branch master updated: Fixed failing test.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new deb0599 Fixed failing test.
new 5c8f27d Merge pull request #2807 from sdedic/bugfix/primingActionTest
deb0599 is described below
commit deb0599130abf10794e6dec659b0ebeca36631e5
Author: Svata Dedic
AuthorDate: Fri Mar 12 17:30:00 2021 +0100
Fixed failing test.
---
.../org/netbeans/modules/maven/problems/PrimingActionTest.java| 8
1 file changed, 8 deletions(-)
diff --git
a/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java
b/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java
index ae9f710..d9c0cae 100644
---
a/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java
+++
b/java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.java
@@ -80,14 +80,6 @@ public class PrimingActionTest extends NbTestCase {
+ " m"
+ " g"
+ "0"
-+ " "
-+ ""
-+ " io.micronaut"
-+ " micronaut-validation"
-+ " 2.3.3"
-+ " compile"
-+ ""
-+ " "
+ "");
}
-
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] branch master updated: [NETBEANS-5545] ParentProject and RootProject query support for Maven projects.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f819786 [NETBEANS-5545] ParentProject and RootProject query support
for Maven projects.
new ed5e2e2 Merge pull request #2811 from
sdedic/sdedic/mavenRootParentQuery
f819786 is described below
commit f8197864d9c8a93e89dd03392b18579bcc1e5bfe
Author: Svata Dedic
AuthorDate: Mon Mar 15 17:43:47 2021 +0100
[NETBEANS-5545] ParentProject and RootProject query support for Maven
projects.
---
java/maven/.gitignore | 1 +
java/maven/manifest.mf | 2 +-
.../modules/maven/queries/MavenParentRootImpl.java | 131 +
.../unit/data/parent-projects/basic/child/pom.xml | 29
.../test/unit/data/parent-projects/basic/pom.xml | 33 +
.../data/parent-projects/multi/first/child/pom.xml | 29
.../unit/data/parent-projects/multi/first/pom.xml | 32
.../test/unit/data/parent-projects/multi/pom.xml | 34 +
.../unit/data/parent-projects/multi/second/pom.xml | 29
.../parent-projects/nested/first/child/pom.xml | 29
.../test/unit/data/parent-projects/nested/pom.xml | 34 +
.../data/parent-projects/nested/second/pom.xml | 29
.../test/unit/data/parent-projects/single/pom.xml | 29
.../parent-projects/skipped/first/child/pom.xml| 29
.../data/parent-projects/skipped/first/pom.xml | 29
.../test/unit/data/parent-projects/skipped/pom.xml | 35 +
.../data/parent-projects/skipped/second/pom.xml| 29
.../data/parent-projects/unrelated/child/pom.xml | 29
.../unit/data/parent-projects/unrelated/pom.xml| 29
.../maven/queries/MavenParentRootImplTest.java | 163 +
20 files changed, 783 insertions(+), 1 deletion(-)
diff --git a/java/maven/.gitignore b/java/maven/.gitignore
new file mode 100644
index 000..e9cf619
--- /dev/null
+++ b/java/maven/.gitignore
@@ -0,0 +1 @@
+test/unit/data/parent-projects/**/target/
diff --git a/java/maven/manifest.mf b/java/maven/manifest.mf
index f973198..87efdbd 100644
--- a/java/maven/manifest.mf
+++ b/java/maven/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.145
+OpenIDE-Module-Specification-Version: 2.146
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
AutoUpdate-Show-In-Client: false
diff --git
a/java/maven/src/org/netbeans/modules/maven/queries/MavenParentRootImpl.java
b/java/maven/src/org/netbeans/modules/maven/queries/MavenParentRootImpl.java
new file mode 100644
index 000..370d22c
--- /dev/null
+++ b/java/maven/src/org/netbeans/modules/maven/queries/MavenParentRootImpl.java
@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.maven.queries;
+
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.maven.api.NbMavenProject;
+import org.netbeans.spi.project.ParentProjectProvider;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.netbeans.spi.project.RootProjectProvider;
+import org.openide.filesystems.FileObject;
+
+/**
+ *
+ * @author sdedic
+ */
+@ProjectServiceProvider(service = {ParentProjectProvider.class,
RootProjectProvider.class}, projectType="org-netbeans-modules-maven")
+public class MavenParentRootImpl implements ParentProjectProvider,
RootProjectProvider {
+private final Project project;
+
+/**
+ * Cached parent project, or {@link #NO_PROJECT} if none.
+ */
+// @GuardedBy(this)
+private Reference parent = new WeakReference<>(null);
+
+/**
+ * Cached root project, in worst case this project itself.
+ */
+// @GuardedBy(this)
+private Reference root = new WeakReference<>(nu
[netbeans] branch master updated (921f707 -> cd3434f)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 921f707 Merge pull request #2821 from philippefichet/master
new 5f90f78 [NETBEANS-5458] Update Batik SVG to version 1.14
new 055bebf Disabled external xlink references; test added.
new cd3434f Merge pull request #2817 from sdedic/sd/batik114
The 5117 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:
...tik-1.12-license.txt => batik-1.14-license.txt} | 4 +-
...batik-1.12-notice.txt => batik-1.14-notice.txt} | 2 +-
platform/libs.batik.read/external/binaries-list| 30 +++
...nse.txt => xmlgraphics-commons-2.6-license.txt} | 3 +-
...tice.txt => xmlgraphics-commons-2.6-notice.txt} | 2 +-
.../libs.batik.read/nbproject/project.properties | 58 ++---
platform/libs.batik.read/nbproject/project.xml | 60 ++---
platform/openide.util.ui.svg/manifest.mf | 2 +-
.../nbproject/project.properties | 2 +-
platform/openide.util.ui.svg/nbproject/project.xml | 14
.../src/org/openide/util/svg/SVGIcon.java | 12 ++-
.../org/openide/util/svg/SVGLoaderImplTest.java| 79 +
.../unit/src/org/openide/util/svg/externalHref.svg | 98 ++
.../unit/src/org/openide/util/svg/innocent.svg | 98 ++
14 files changed, 382 insertions(+), 82 deletions(-)
rename platform/libs.batik.read/external/{batik-1.12-license.txt =>
batik-1.14-license.txt} (97%)
rename platform/libs.batik.read/external/{batik-1.12-notice.txt =>
batik-1.14-notice.txt} (92%)
rename platform/libs.batik.read/external/{xmlgraphics-commons-2.4-license.txt
=> xmlgraphics-commons-2.6-license.txt} (99%)
rename platform/libs.batik.read/external/{xmlgraphics-commons-2.4-notice.txt
=> xmlgraphics-commons-2.6-notice.txt} (71%)
create mode 100644
platform/openide.util.ui.svg/test/unit/src/org/openide/util/svg/SVGLoaderImplTest.java
create mode 100644
platform/openide.util.ui.svg/test/unit/src/org/openide/util/svg/externalHref.svg
create mode 100644
platform/openide.util.ui.svg/test/unit/src/org/openide/util/svg/innocent.svg
-
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] branch master updated: Change invokeLaters to Mutex.EVENT.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 255a250 Change invokeLaters to Mutex.EVENT.
new d0a9324 Merge pull request #2823 from sdedic/lsp/edt2mutex
255a250 is described below
commit 255a250194f75ea9a62ffe89a848518764b72e8b
Author: Svata Dedic
AuthorDate: Mon Mar 22 13:36:05 2021 +0100
Change invokeLaters to Mutex.EVENT.
---
.../src/org/netbeans/api/java/source/UiUtils.java | 24 +++--
java/java.source/test/unit/data/jdk/Table.java | 27 +++
.../org/netbeans/api/java/source/UiUtilsTest.java | 10 +++---
.../netbeans/core/windows/WindowManagerImpl.java | 40 +++---
.../org/openide/text/CloneableEditorSupport.java | 15
.../src/org/openide/text/DocumentOpenClose.java| 6 ++--
6 files changed, 60 insertions(+), 62 deletions(-)
diff --git a/java/java.source/src/org/netbeans/api/java/source/UiUtils.java
b/java/java.source/src/org/netbeans/api/java/source/UiUtils.java
index 3b9d24f..0f966d0 100644
--- a/java/java.source/src/org/netbeans/api/java/source/UiUtils.java
+++ b/java/java.source/src/org/netbeans/api/java/source/UiUtils.java
@@ -34,7 +34,6 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
import javax.swing.Icon;
-import javax.swing.SwingUtilities;
import javax.swing.text.StyledDocument;
import org.netbeans.modules.java.source.pretty.VeryPretty;
import org.netbeans.modules.java.source.save.DiffContext;
@@ -50,6 +49,7 @@ import org.openide.text.Line;
import org.openide.text.Line.ShowOpenType;
import org.openide.text.Line.ShowVisibilityType;
import org.openide.text.NbDocument;
+import org.openide.util.Mutex;
import org.openide.util.NbBundle;
import org.openide.util.UserQuestionException;
@@ -377,27 +377,13 @@ public final class UiUtils {
}
private static void doShow(final Line l, final int column) {
-if (SwingUtilities.isEventDispatchThread()) {
-l.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, column);
-} else {
-SwingUtilities.invokeLater(new Runnable() {
-public void run() {
-l.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS,
column);
-}
-});
-}
+Mutex.EVENT.readAccess(() ->
+l.show(ShowOpenType.OPEN, ShowVisibilityType.FOCUS, column)
+);
}
private static void doOpen(final OpenCookie oc) {
-if (SwingUtilities.isEventDispatchThread()) {
-oc.open();
-} else {
-SwingUtilities.invokeLater(new Runnable() {
-public void run() {
-oc.open();
-}
-});
-}
+Mutex.EVENT.readAccess(oc::open);
}
private static int getOffset(FileObject fo, final ElementHandle handle) throws IOException {
diff --git a/java/java.source/test/unit/data/jdk/Table.java
b/java/java.source/test/unit/data/jdk/Table.java
new file mode 100644
index 000..ea7cf5f
--- /dev/null
+++ b/java/java.source/test/unit/data/jdk/Table.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package test;
+
+public class Table {
+
+}
+
+
+
diff --git
a/java/java.source/test/unit/src/org/netbeans/api/java/source/UiUtilsTest.java
b/java/java.source/test/unit/src/org/netbeans/api/java/source/UiUtilsTest.java
index 27ad84b..b15467f 100644
---
a/java/java.source/test/unit/src/org/netbeans/api/java/source/UiUtilsTest.java
+++
b/java/java.source/test/unit/src/org/netbeans/api/java/source/UiUtilsTest.java
@@ -46,7 +46,7 @@ import org.openide.util.Utilities;
* @author Tomas Zezula
*/
public class UiUtilsTest extends NbTestCase {
-private static final String JTABLE_DATA = "jdk/JTable.java";//NOI18N
+private static final String JTABLE_DATA = "jdk/Table.java";//NOI18N
public UiUtilsTest(String testName) {
super(testName);
@
[netbeans] branch master updated: Fixed invalid branding directory name.
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/netbeans.git The following commit(s) were added to refs/heads/master by this push: new c26d0f4 Fixed invalid branding directory name. new d54d02d Merge pull request #2810 from sdedic/lsp/invalid_branding c26d0f4 is described below commit c26d0f4937b14f9edcc6b1feefbb824a332a7e9d Author: Svata Dedic AuthorDate: Mon Mar 15 14:23:37 2021 +0100 Fixed invalid branding directory name. --- .../org/netbeans/modules/java/j2seplatform/api/Bundle.properties | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/java/java.lsp.server/nbcode/branding/modules/org.netbeans.modules.java.j2seplatform.jar/org/netbeans/modules/java/j2seplatform/api/Bundle.properties b/java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-java-j2seplatform.jar/org/netbeans/modules/java/j2seplatform/api/Bundle.properties similarity index 100% rename from java/java.lsp.server/nbcode/branding/modules/org.netbeans.modules.java.j2seplatform.jar/org/netbeans/modules/java/j2seplatform/api/Bundle.properties rename to java/java.lsp.server/nbcode/branding/modules/org-netbeans-modules-java-j2seplatform.jar/org/netbeans/modules/java/j2seplatform/api/Bundle.properties - 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] branch master updated: Auto-open project owner of the opened file.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5b0e52c Auto-open project owner of the opened file.
new eff78c8 Merge pull request #2806 from
sdedic/lsp/openImediateProjectOwner
5b0e52c is described below
commit 5b0e52cb2b68424ac2c8869c3d991a252e1fd178
Author: Svata Dedic
AuthorDate: Fri Mar 12 14:33:21 2021 +0100
Auto-open project owner of the opened file.
---
.../modules/java/lsp/server/LspServerState.java| 18 ++
.../modules/java/lsp/server/protocol/Server.java | 205 +++--
.../server/protocol/TextDocumentServiceImpl.java | 6 +-
3 files changed, 211 insertions(+), 18 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/LspServerState.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/LspServerState.java
index 366099e..bb66851 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/LspServerState.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/LspServerState.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.java.lsp.server;
import java.util.List;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import org.eclipse.lsp4j.services.TextDocumentService;
import org.netbeans.api.project.Project;
@@ -51,6 +52,23 @@ public interface LspServerState {
public CompletableFuture
asyncOpenSelectedProjects(List fileCandidates);
/**
+ * Opens project on behalf of a file. This makes the project 'second-class
citizen' in LSP: it will be
+ * opened in OpenProjects to be reachable for all supports, but will track
it separately from projects
+ * opened by {@link #asyncOpenSelectedProjects}.
+ *
+ * The user may be asked, if the opened project is not part of existing
workspace projects or opened
+ * projects. If the user cancels, the returned future completes
exceptionally with {@link CancellationException}.
+ *
+ * If the file is not owned by a project, or the project open fails, the
returned future will return
+ * {@code null}.
+ *
+ * @param file file owned by a project
+ * @return future that completes when the project is opened, or opening
cancelled.
+ * @see CancellationException
+ */
+public CompletableFuture asyncOpenFileOwner(FileObject file);
+
+/**
* Accesses TextDocumentService instance.
* @return TextDocumentService
*/
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 5dab251..82e802c 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
@@ -24,10 +24,16 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -67,12 +73,15 @@ import org.eclipse.lsp4j.services.LanguageClientAware;
import org.eclipse.lsp4j.services.LanguageServer;
import org.eclipse.lsp4j.services.TextDocumentService;
import org.eclipse.lsp4j.services.WorkspaceService;
+import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.source.ClasspathInfo;
import org.netbeans.api.java.source.JavaSource;
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectUtils;
+import static org.netbeans.api.project.ProjectUtils.parentOf;
import org.netbeans.api.project.Sources;
import org.netbeans.api.project.ui.OpenProjects;
import org.netbeans.modules.java.lsp.server.LspServerState;
@@ -84,6 +93,7 @@ import org.netbeans.spi.project.ActionProvider;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.util.lookup.AbstractLookup;
import org.openide.util.lookup.InstanceContent;
@@ -227,12 +237,50 @@ public final class Server {
}
}
-// change to a greater throughput if the initialization waits
[netbeans] branch master updated (4bee741 -> a3eb5fb)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 4bee741 Merge pull request #2775 from matthiasblaesing/update-typescript new ed3170b Introducing COMMAND_PRIME action. new a3b2977 Implemented "priming build" action for Maven projects. new 225cae8 Invoke priming build before project open. new a3eb5fb Merge pull request #2795 from sdedic/project/primingBuildAction The 5070 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: ide/projectapi/apichanges.xml | 15 + ide/projectapi/manifest.mf | 2 +- .../org/netbeans/spi/project/ActionProvider.java | 7 + java/java.lsp.server/nbproject/project.xml | 2 +- .../modules/java/lsp/server/LspServerState.java| 58 .../modules/java/lsp/server/protocol/Server.java | 161 +-- .../server/protocol/TextDocumentServiceImpl.java | 46 ++- .../lsp/server/protocol/WorkspaceServiceImpl.java | 12 +- java/maven/manifest.mf | 2 +- java/maven/nbproject/project.xml | 2 +- .../netbeans/modules/maven/ActionProviderImpl.java | 26 +- .../modules/maven/InternalActionDelegate.java | 29 ++ .../maven/problems/MavenModelProblemsProvider.java | 139 - .../modules/maven/problems/SanityBuildAction.java | 86 -- .../modules/maven/problems/PrimingActionTest.java | 315 + 15 files changed, 830 insertions(+), 72 deletions(-) create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/LspServerState.java create mode 100644 java/maven/src/org/netbeans/modules/maven/InternalActionDelegate.java create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/problems/PrimingActionTest.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
[netbeans] branch master updated: Trust priming build, as the user already saw the warning.
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/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2ccf446 Trust priming build, as the user already saw the warning.
new 2691d4a Merge pull request #2787 from sdedic/gradle/trustPrimingBuild
2ccf446 is described below
commit 2ccf4467602226a4becf95c41583d0ff82fd3423
Author: Svata Dedic
AuthorDate: Tue Mar 2 11:39:47 2021 +0100
Trust priming build, as the user already saw the warning.
---
.../src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
index 230ce55..ee95173 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/GradleProjectProblemProvider.java
@@ -102,6 +102,7 @@ public class GradleProjectProblemProvider implements
ProjectProblemsProvider {
@Override
public Result call() throws Exception {
+ProjectTrust.getDefault().trustProject(project);
NbGradleProjectImpl impl =
project.getLookup().lookup(NbGradleProjectImpl.class);
GradleProject gradleProject = GradleProjectCache.loadProject(impl,
FULL_ONLINE, true, true);
impl.fireProjectReload(false);
-
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
