(netbeans) branch master updated: PHP: Fixing cancelability bugs by reverting from a for each loop to a normal loop
This is an automated email from the ASF dual-hosted git repository.
junichi11 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 01ae879656 PHP: Fixing cancelability bugs by reverting from a for each
loop to a normal loop
new 589218b13c Merge pull request #6853 from
troizet/php_cancelability_bug_hints
01ae879656 is described below
commit 01ae879656b3b07a33ad00e68066faaf67fdb29b
Author: Alexey Borokhvostov
AuthorDate: Fri Dec 15 23:48:27 2023 +0700
PHP: Fixing cancelability bugs by reverting from a for each loop to a
normal loop
---
.../php/editor/verification/IncorrectNonAbstractMethodHintError.java | 4 ++--
.../netbeans/modules/php/editor/verification/PHP72UnhandledError.java | 4 ++--
.../netbeans/modules/php/editor/verification/PHP73UnhandledError.java | 4 ++--
.../netbeans/modules/php/editor/verification/PHP80UnhandledError.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java
index a0441a979a..33dd250aa6 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java
@@ -85,13 +85,13 @@ public class IncorrectNonAbstractMethodHintError extends
HintErrorRule {
"IncorrectNonAbstractMethodHintErrorHintDesc=Non-abstract method
\"{0}\" must contain body"
})
private void addIcorrectNonAbstractMethodHints(Set
methodDeclarations, List hints, BaseDocument doc) {
-methodDeclarations.forEach((methodDeclaration) -> {
+for (MethodDeclaration methodDeclaration: methodDeclarations) {
if (CancelSupport.getDefault().isCancelled()) {
return;
}
List fixes = Collections.singletonList(new
AddBodyFix(doc, methodDeclaration));
addHint(methodDeclaration,
Bundle.IncorrectNonAbstractMethodHintErrorHintDesc(CodeUtils.extractMethodName(methodDeclaration)),
hints, fixes);
-});
+}
}
private void addHint(ASTNode node, String description, List hints,
List fixes) {
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP72UnhandledError.java
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP72UnhandledError.java
index ef7ee8936a..4187ed0e09 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP72UnhandledError.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP72UnhandledError.java
@@ -115,7 +115,7 @@ public class PHP72UnhandledError extends UnhandledErrorRule
{
if (ts == null) {
return;
}
-lastUseStatementParts.forEach((lastUseStatementPart) -> {
+for (SingleUseStatementPart lastUseStatementPart:
lastUseStatementParts) {
if (CancelSupport.getDefault().isCancelled()) {
return;
}
@@ -129,7 +129,7 @@ public class PHP72UnhandledError extends UnhandledErrorRule
{
createError(lastUseStatementPart);
}
}
-});
+}
} finally {
document.readUnlock();
lastUseStatementParts.clear();
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
index 0812932106..74a2fcb2bd 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
@@ -161,7 +161,7 @@ public class PHP73UnhandledError extends UnhandledErrorRule
{
}
private void checkFunctionCallTrailingCommas(TokenSequence
ts) {
-nodes.forEach((node) -> {
+for (ASTNode node: nodes) {
if (CancelSupport.getDefault().isCancelled()) {
return;
}
@@ -183,7 +183,7 @@ public class PHP73UnhandledError extends UnhandledErrorRule
{
if (!parameters.isEmpty()) {
createError(parameters.get(parameters.size() - 1));
}
-});
+}
}
@CheckForNull
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP80UnhandledError.java
(netbeans) branch master updated: -Add support for GlassFish 7.0.11 -Add Java SE 23 Enum
This is an automated email from the ASF dual-hosted git repository.
pepness 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 4c3d826c8c -Add support for GlassFish 7.0.11 -Add Java SE 23 Enum
new a30ed67ba6 Merge pull request #6827 from pepness/glassfish-7.0.11
4c3d826c8c is described below
commit 4c3d826c8cf664f5122657b6d580f66b8b7e4601
Author: José Contreras
AuthorDate: Sun Dec 10 17:42:09 2023 -0600
-Add support for GlassFish 7.0.11
-Add Java SE 23 Enum
---
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java| 11 +
.../glassfish/common/wizards/Bundle.properties | 1 +
.../glassfish/tooling/data/GlassFishVersion.java | 10 -
.../server/config/ConfigBuilderProvider.java | 7 +-
.../tooling/server/config/JavaSEPlatform.java | 4 +++-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 ++--
.../tooling/data/GlassFishVersionTest.java | 6 +++--
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++---
9 files changed, 50 insertions(+), 20 deletions(-)
diff --git
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
index e5ad98c3b4..228f2fd82f 100644
---
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
+++
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
@@ -177,6 +177,7 @@ STR_707_SERVER_NAME=GlassFish Server 7.0.7
STR_708_SERVER_NAME=GlassFish Server 7.0.8
STR_709_SERVER_NAME=GlassFish Server 7.0.9
STR_7010_SERVER_NAME=GlassFish Server 7.0.10
+STR_7011_SERVER_NAME=GlassFish Server 7.0.11
# CommonServerSupport.java
MSG_FLAKEY_NETWORK=Network communication problemCould not establish
\
diff --git
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
index feb1f9760c..ac283ad3d5 100644
---
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
+++
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
@@ -400,6 +400,17 @@ public enum ServerDetails {
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.10/glassfish-7.0.10.zip;,
// NOI18N
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.10/glassfish-7.0.10.zip;,
// NOI18N
"http://www.eclipse.org/legal/epl-2.0; //NOI18N
+),
+
+/**
+ * details for an instance of GlassFish Server 7.0.11
+ */
+GLASSFISH_SERVER_7_0_11(NbBundle.getMessage(ServerDetails.class,
"STR_7011_SERVER_NAME", new Object[]{}), // NOI18N
+GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
+GlassFishVersion.GF_7_0_11,
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.11/glassfish-7.0.11.zip;,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.11/glassfish-7.0.11.zip;,
// NOI18N
+"http://www.eclipse.org/legal/epl-2.0; //NOI18N
);
/**
diff --git
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
index 655d0815a8..1c5d8de127 100644
---
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
+++
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties
@@ -178,6 +178,7 @@ STR_707_SERVER_NAME=GlassFish Server 7.0.7
STR_708_SERVER_NAME=GlassFish Server 7.0.8
STR_709_SERVER_NAME=GlassFish Server 7.0.9
STR_7010_SERVER_NAME=GlassFish Server 7.0.10
+STR_7011_SERVER_NAME=GlassFish Server 7.0.11
LBL_SELECT_BITS=Select
LBL_ChooseOne=Choose server to download:
diff --git
a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
index aaf61192f7..98a3b277ed 100644
---
a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
+++
b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java
@@ -118,7 +118,9 @@ public enum GlassFishVersion {
/** GlassFish 7.0.9 */
GF_7_0_9 ((short) 7, (short) 0, (short) 9, (short) 0,
GlassFishVersion.GF_7_0_9_STR),
/** GlassFish 7.0.10 */
-GF_7_0_10 ((short) 7, (short) 0, (short) 10, (short) 0,
GlassFishVersion.GF_7_0_10_STR);
(netbeans) branch master updated: CSS-Refactoring: Fix NullPointerException from folder/file renaming
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 4cc1931e18 CSS-Refactoring: Fix NullPointerException from folder/file
renaming
new 71fb2eda10 Merge pull request #6837 from
matthiasblaesing/css_refactoring_exception
4cc1931e18 is described below
commit 4cc1931e182a7c96d168bfc4d924df997bc9f024
Author: Matthias Bläsing
AuthorDate: Tue Dec 12 21:32:32 2023 +0100
CSS-Refactoring: Fix NullPointerException from folder/file renaming
There are two very different supported refactorings supported in the
CSS context:
1. CSS "internal" refactorings, which are completely rooted and handled
inside the CSS modules (renaming classes, ids, colors, elements)
2. Renaming files/folders
The second category caused NullPointerExceptions because the
refactoring plugin expected a special context object only provided for
the first set of refactorings.
---
.../refactoring/CssRenameRefactoringPlugin.java| 38 +-
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
index 0a2e3379a1..0d58a64847 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssRenameRefactoringPlugin.java
@@ -114,7 +114,19 @@ public class CssRenameRefactoringPlugin implements
RefactoringPlugin {
@Override
public Problem prepare(final RefactoringElementsBag refactoringElements) {
-CssProjectSupport sup =
CssProjectSupport.findFor(context.getFileObject());
+FileObject fileObject;
+
+if (context != null) {
+fileObject = context.getFileObject();
+} else {
+fileObject = lookup.lookup(FileObject.class);
+}
+
+if (fileObject == null) {
+return null;
+}
+
+CssProjectSupport sup = CssProjectSupport.findFor(fileObject);
if (sup == null) {
return null;
}
@@ -173,20 +185,16 @@ public class CssRenameRefactoringPlugin implements
RefactoringPlugin {
}
-} else {
-FileObject fileObject = lookup.lookup(FileObject.class);
-
-if(fileObject != null && !fileObject.isFolder()) {
-//refactor a file in explorer
-refactorFile(modificationResult, fileObject, index);
-} else if (fileObject != null && fileObject.isFolder()) {
-//refactor a folder in explorer
-refactorFolder(modificationResult, fileObject, index);
-//add folder rename element implementation, there doesn't seem
to a default one
-//like for file rename
-// Disabled RenameFolder as it collides with FileRenamePlugin
see #187635
-//refactoringElements.add(refactoring, new
RenameFolder(folderContext.getFileObject()));
-}
+} else if (!fileObject.isFolder()) {
+//refactor a file in explorer
+refactorFile(modificationResult, fileObject, index);
+} else if (fileObject.isFolder()) {
+//refactor a folder in explorer
+refactorFolder(modificationResult, fileObject, index);
+//add folder rename element implementation, there doesn't seem to
a default one
+//like for file rename
+// Disabled RenameFolder as it collides with FileRenamePlugin see
#187635
+//refactoringElements.add(refactoring, new
RenameFolder(folderContext.getFileObject()));
}
//commit the transaction and add the differences to the result
-
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
