[netbeans-mavenutils-nbm-maven-plugin] branch dependabot/maven/master/org.apache.maven.plugins-maven-project-info-reports-plugin-3.4.0 created (now 0387ca0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/master/org.apache.maven.plugins-maven-project-info-reports-plugin-3.4.0 in repository https://gitbox.apache.org/repos/asf/netbeans-mavenutils-nbm-maven-plugin.git at 0387ca0 Bump maven-project-info-reports-plugin from 3.3.0 to 3.4.0 No new revisions were added by this update. - 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: NEON - added FlatLaf Dark specific colors to improve legibility
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 597b92df5b NEON - added FlatLaf Dark specific colors to improve legibility 597b92df5b is described below commit 597b92df5b70a3a2e602929ef7564a8011ed8b4a Author: Tomas Prochazka AuthorDate: Sun Jul 17 21:35:31 2022 +0200 NEON - added FlatLaf Dark specific colors to improve legibility --- .../neon/resources/FontAndColors-FlatLafDark.xml | 27 ++ .../modules/languages/neon/resources/layer.xml | 7 ++ 2 files changed, 34 insertions(+) diff --git a/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/FontAndColors-FlatLafDark.xml b/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/FontAndColors-FlatLafDark.xml new file mode 100644 index 00..d5dac25e88 --- /dev/null +++ b/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/FontAndColors-FlatLafDark.xml @@ -0,0 +1,27 @@ + + +http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd;> + + + + + diff --git a/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml b/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml index af13cf78db..d725fa52dc 100644 --- a/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml +++ b/php/languages.neon/src/org/netbeans/modules/languages/neon/resources/layer.xml @@ -125,6 +125,13 @@ + + + + + + + - 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: Add minimal support for Gradle default version catalog
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 64efba0001 Add minimal support for Gradle default version catalog
64efba0001 is described below
commit 64efba000172bc6f2311984cbbd44c70dbb45e4e
Author: Laszlo Kishalmi
AuthorDate: Fri Jul 15 23:18:36 2022 -0700
Add minimal support for Gradle default version catalog
---
extide/gradle/apichanges.xml | 16
extide/gradle/manifest.mf| 2 +-
.../src/org/netbeans/modules/gradle/GradleReport.java| 2 +-
.../netbeans/modules/gradle/nodes/BuildScriptsNode.java | 3 ++-
.../src/org/netbeans/modules/gradle/spi/GradleFiles.java | 13 +
5 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/extide/gradle/apichanges.xml b/extide/gradle/apichanges.xml
index 72dd83e5d4..c88bac86a1 100644
--- a/extide/gradle/apichanges.xml
+++ b/extide/gradle/apichanges.xml
@@ -83,6 +83,22 @@ is the proper place.
+
+
+GradleFiles.Kind.VERSION_CATALOG introduced
+
+
+
+
+
+GradleFiles.Kind.VERSION_CATALOG
+was addedd to represent
$rootDir/gradle.libs.versions.toml file of the project.
+
+GradleFiles.getKind(VERSION_CATALOG)
+ can be used to retrieve the represented file. (The
file might not exists though.)
+
+
+
GradleFiles can be obtained from API
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index 7b68809b62..8376f624ea 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.24
+OpenIDE-Module-Specification-Version: 2.25
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
index c7d09584b6..981bf50b14 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
@@ -51,7 +51,7 @@ public final class GradleReport {
}
public static GradleReport simple(Path script, String message) {
-return new GradleReport(null, script != null ? script.toString() :
null, -1, message, null);
+return new GradleReport(null, Objects.toString(script), -1, message,
null);
}
public GradleReport(Path scriptLocation, String message, GradleReport
causedBy) {
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
index e940261bd1..3be7c4e06f 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
@@ -79,7 +79,7 @@ public final class BuildScriptsNode extends
AnnotatedAbstractNode {
// The order in this array determines the order of the nodes under Build
Scripts
private static final Kind[] SCRIPTS = new Kind[] {
-BUILD_SRC, USER_PROPERTIES, SETTINGS_SCRIPT, ROOT_SCRIPT,
ROOT_PROPERTIES, BUILD_SCRIPT, PROJECT_PROPERTIES
+BUILD_SRC, VERSION_CATALOG, USER_PROPERTIES, SETTINGS_SCRIPT,
ROOT_SCRIPT, ROOT_PROPERTIES, BUILD_SCRIPT, PROJECT_PROPERTIES
};
@Override
@@ -172,6 +172,7 @@ public final class BuildScriptsNode extends
AnnotatedAbstractNode {
case USER_PROPERTIES:
return createBuildFileNode(fo, Bundle.LBL_UserSuffix());
case SETTINGS_SCRIPT:
+case VERSION_CATALOG:
return createBuildFileNode(fo, null);
case BUILD_SRC:
return createSubProjectNode(fo);
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
b/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
index 788aea72de..565251092e 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/spi/GradleFiles.java
@@ -58,11 +58,13 @@ public final class GradleFiles implements Serializable {
PROJECT_PROPERTIES,
ROOT_PROPERTIES,
/** @since 2.4 */
-BUILD_SRC;
+BUILD_SRC,
+/** @since 2.25 */
+VERSION_CATALOG;
public static final Set SCRIPTS = EnumSet.of(ROOT_SCRIPT,
BUILD_SCRIPT, SETTINGS_SCRIPT, BUILD_SRC);
[jira] [Commented] (NETBEANS-6078) Remove `mixed` type from JsonSerializable
[
https://issues.apache.org/jira/browse/NETBEANS-6078?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17567701#comment-17567701
]
Tomáš Procházka commented on NETBEANS-6078:
---
I was not able to reproduce this issue in NetBeans 14.
> Remove `mixed` type from JsonSerializable
> -
>
> Key: NETBEANS-6078
> URL: https://issues.apache.org/jira/browse/NETBEANS-6078
> Project: NetBeans
> Issue Type: Improvement
> Components: php - Code Analysis
>Reporter: Fabian Grutschus
>Assignee: Tomáš Procházka
>Priority: Minor
>
> Hello,
> I get the following error when using JsonSerializable in a PHP project:
> {quote}{className} is not abstract and does not override abstract method
> jsonSerialize() in \JsonSerializable
> {quote}
> The PHP code is the following:
>
> {code:java}
> class ClassName implements JsonSerializable {
> public function jsonSerialize(): array {
> return [];
> }
> }
> {code}
>
> As of PHP 8 {{JsonSerializable::jsonSerialize()}} has the return type mixed
> defined and Netbeans now defines that return type. But it is perfectly fine
> to change the return type of an interface method with return type mixed.
> From the RFC:
> {quote}"The mixed return type could be narrowed in a subclass as this is
> covariant and is allowed in LSP." ([https://wiki.php.net/rfc/mixed_type_v2])
> {quote}
> The error is very misleading and wrong. So I propose removing `mixed` again
> from the interface definition in Netbeans.
> Thank you!
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[jira] [Assigned] (NETBEANS-6078) Remove `mixed` type from JsonSerializable
[
https://issues.apache.org/jira/browse/NETBEANS-6078?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Tomáš Procházka reassigned NETBEANS-6078:
-
Assignee: Tomáš Procházka
> Remove `mixed` type from JsonSerializable
> -
>
> Key: NETBEANS-6078
> URL: https://issues.apache.org/jira/browse/NETBEANS-6078
> Project: NetBeans
> Issue Type: Improvement
> Components: php - Code Analysis
>Reporter: Fabian Grutschus
>Assignee: Tomáš Procházka
>Priority: Minor
>
> Hello,
> I get the following error when using JsonSerializable in a PHP project:
> {quote}{className} is not abstract and does not override abstract method
> jsonSerialize() in \JsonSerializable
> {quote}
> The PHP code is the following:
>
> {code:java}
> class ClassName implements JsonSerializable {
> public function jsonSerialize(): array {
> return [];
> }
> }
> {code}
>
> As of PHP 8 {{JsonSerializable::jsonSerialize()}} has the return type mixed
> defined and Netbeans now defines that return type. But it is perfectly fine
> to change the return type of an interface method with return type mixed.
> From the RFC:
> {quote}"The mixed return type could be narrowed in a subclass as this is
> covariant and is allowed in LSP." ([https://wiki.php.net/rfc/mixed_type_v2])
> {quote}
> The error is very misleading and wrong. So I propose removing `mixed` again
> from the interface definition in Netbeans.
> Thank you!
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
-
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: added tests to org.openide.util.xml.XMLUtil: methods with 100% coverage: toElementContent - found 1 redundant 'if' statement which always evaluates true findSubElemen
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a21b2c60c4 added tests to org.openide.util.xml.XMLUtil: methods with
100% coverage: toElementContent - found 1 redundant 'if' statement which always
evaluates true findSubElement appendChildElement copyDocument - found 1
redundant 'if' statement which always evaluates true toAttributeValue
checkContentCharacters findElement fromHex checkAttributeCharacter toHex
findText
new 6ca3794987 Merge pull request #4294 from lbownik/openide.xml
a21b2c60c4 is described below
commit a21b2c60c4805420e023f50b3620ef79d1db2274
Author: Lukasz Bownik
AuthorDate: Tue Jun 28 10:55:45 2022 -0700
added tests to org.openide.util.xml.XMLUtil:
methods with 100% coverage:
toElementContent - found 1 redundant 'if' statement which always evaluates
true
findSubElement
appendChildElement
copyDocument - found 1 redundant 'if' statement which always evaluates true
toAttributeValue
checkContentCharacters
findElement
fromHex
checkAttributeCharacter
toHex
findText
---
.../test/unit/src/org/openide/xml/XMLUtilTest.java | 804 +
1 file changed, 804 insertions(+)
diff --git
a/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
b/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
new file mode 100644
index 00..796dbf6389
--- /dev/null
+++ b/platform/openide.util/test/unit/src/org/openide/xml/XMLUtilTest.java
@@ -0,0 +1,804 @@
+/*
+ * 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.openide.xml;
+
+import java.io.CharConversionException;
+import java.io.IOException;
+import java.util.List;
+import javax.xml.parsers.DocumentBuilderFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+import static org.openide.xml.XMLUtil.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+
+ */
+public class XMLUtilTest {
+
+private Document document;
+
+
//--
+private static void expectNullPointer(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final NullPointerException e) {
+// good
+}
+}
+
+
//--
+private static void expectIllegalArgument(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final IllegalArgumentException e) {
+// good
+}
+}
+
+
//--
+private static void expectIndexOutOfBounds(final Runnable code) {
+
+try {
+code.run();
+fail("Exception not thrown.");
+} catch (final IndexOutOfBoundsException e) {
+// good
+}
+}
+
+
//--
+private static String[] arrayOf(String... arr) {
+
+return arr;
+}
+
+
//--
+@Before
+public void setUp() throws Exception {
+
+this.document = DocumentBuilderFactory.newInstance().
+newDocumentBuilder().newDocument();
+}
+
+
//--
+@Test
+public void findText_throwsNullPointer_whenGivenNull() {
+
+expectNullPointer(() -> findText(null));
+}
+
+
//--
+@Test
+public void
