[jira] [Assigned] (NETBEANS-5891) C/C++ plugin installation
[ https://issues.apache.org/jira/browse/NETBEANS-5891?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Anonymous reassigned NETBEANS-5891: --- Assignee: (was: a) > C/C++ plugin installation > - > > Key: NETBEANS-5891 > URL: https://issues.apache.org/jira/browse/NETBEANS-5891 > Project: NetBeans > Issue Type: Bug > Components: platform - Plugin Manager >Affects Versions: 12.4 >Reporter: Harshavardhan >Priority: Blocker > Labels: beginner > Attachments: Screenshot 2021-07-31 080401.png > > > When i try to install plugin C \ C++ after downloading the 19mb it shows an > error message like > Cannot complete the validation of downloaded plugins > The validation of downloaded plugins cannot be completed, cause: NBM > C:\Users\harsh\AppData\Roaming\NetBeans\12.4\update\download\org-netbeans-modules-cnd-kit.nbm > needs unpack200 to process following entries: > netbeans/modules/locale/org-netbeans-modules-cnd-kit_ja.jar.pack.gz > netbeans/modules/locale/org-netbeans-modules-cnd-kit_pt_BR.jar.pack.gz > netbeans/modules/locale/org-netbeans-modules-cnd-kit_ru.jar.pack.gz > netbeans/modules/locale/org-netbeans-modules-cnd-kit_zh_CN.jar.pack.gz > netbeans/modules/org-netbeans-modules-cnd-kit.jar.pack.gz -- This message was sent by Atlassian Jira (v8.20.7#820007) - 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: upgrade maven-indexer to 6.2.0 and remove workaround.
This is an automated email from the ASF dual-hosted git repository. mbien 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 71ddacce9c upgrade maven-indexer to 6.2.0 and remove workaround. new 2bfc726a5e Merge pull request #4077 from mbien/indexer620 71ddacce9c is described below commit 71ddacce9ce5ab3e9189f5c1c0f6c187a5f7a332 Author: Michael Bien AuthorDate: Thu Apr 28 01:11:26 2022 +0200 upgrade maven-indexer to 6.2.0 and remove workaround. - reverts 9adf9baacebb0fc25277ff7a8b34a46c0d7ff8a2 --- java/maven.indexer/external/binaries-list | 2 +- ...-core-6.1.1-license.txt => indexer-core-6.2.0-license.txt} | 2 +- ...er-core-6.1.1-notice.txt => indexer-core-6.2.0-notice.txt} | 0 java/maven.indexer/nbproject/project.properties | 2 +- java/maven.indexer/nbproject/project.xml | 4 ++-- .../modules/maven/indexer/CustomArtifactContextProducer.java | 11 --- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list index a85c168251..b94b9cd08a 100644 --- a/java/maven.indexer/external/binaries-list +++ b/java/maven.indexer/external/binaries-list @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -F85DA5C198F2E00086A29EFA47896ED6B41807B2 org.apache.maven.indexer:indexer-core:6.1.1 +DAC8414BE5ED80848526A503A2BE7EDF859825BB org.apache.maven.indexer:indexer-core:6.2.0 75DCF930ECE95581AF3F31AF5692E4963FC7AD8E org.apache.lucene:lucene-core:8.11.1 558A389A0D68AA7CC4C26B9128C72D0D269D471F org.apache.lucene:lucene-highlighter:8.11.1 5A44DF2CB26FA1E0E64BE53FE474C7F1D5A3E634 org.apache.lucene:lucene-queryparser:8.11.1 diff --git a/java/maven.indexer/external/indexer-core-6.1.1-license.txt b/java/maven.indexer/external/indexer-core-6.2.0-license.txt similarity index 99% rename from java/maven.indexer/external/indexer-core-6.1.1-license.txt rename to java/maven.indexer/external/indexer-core-6.2.0-license.txt index 9f725994bf..3c7c61e236 100644 --- a/java/maven.indexer/external/indexer-core-6.1.1-license.txt +++ b/java/maven.indexer/external/indexer-core-6.2.0-license.txt @@ -1,6 +1,6 @@ Name: Maven Indexer Description: Maven remote repository indexing engine. -Version: 6.1.1 +Version: 6.2.0 Origin: Apache Software Foundation License: Apache-2.0 URL: https://repo1.maven.org/maven2/org/apache/maven/indexer/ diff --git a/java/maven.indexer/external/indexer-core-6.1.1-notice.txt b/java/maven.indexer/external/indexer-core-6.2.0-notice.txt similarity index 100% rename from java/maven.indexer/external/indexer-core-6.1.1-notice.txt rename to java/maven.indexer/external/indexer-core-6.2.0-notice.txt diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties index ec48dae76c..5d02339f7c 100644 --- a/java/maven.indexer/nbproject/project.properties +++ b/java/maven.indexer/nbproject/project.properties @@ -19,7 +19,7 @@ test.config.stableBTD.includes=**/*Test.class is.autoload=true javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial -release.external/indexer-core-6.1.1.jar=modules/ext/maven/indexer-core-6.1.1.jar +release.external/indexer-core-6.2.0.jar=modules/ext/maven/indexer-core-6.2.0.jar release.external/lucene-core-8.11.1.jar=modules/ext/maven/lucene-core-8.11.1.jar release.external/lucene-highlighter-8.11.1.jar=modules/ext/maven/lucene-highlighter-8.11.1.jar release.external/lucene-queryparser-8.11.1.jar=modules/ext/maven/lucene-queryparser-8.11.1.jar diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml index 03d7cd3036..41d03c3ad0 100644 --- a/java/maven.indexer/nbproject/project.xml +++ b/java/maven.indexer/nbproject/project.xml @@ -175,8 +175,8 @@ org.netbeans.modules.maven.indexer.spi.impl - ext/maven/indexer-core-6.1.1.jar -external/indexer-core-6.1.1.jar + ext/maven/indexer-core-6.2.0.jar +external/indexer-core-6.2.0.jar ext/maven/lucene-core-8.11.1.jar diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java index 122f3e39f4..9f2a179ea5 100644 --- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java +++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/CustomArtifactContextProducer.java @@ -26,7 +26,6 @@ import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.ArtifactInfoRecord; import org.apache.maven.index.Defaul
[netbeans-html4j] branch master updated: Copy all the annotation attributes when patching the class file
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git The following commit(s) were added to refs/heads/master by this push: new d9dd994e Copy all the annotation attributes when patching the class file d9dd994e is described below commit d9dd994ed564b216779f89c6b1ec80887e0e1182 Author: Jaroslav Tulach AuthorDate: Sun May 8 22:23:17 2022 +0200 Copy all the annotation attributes when patching the class file --- .../java/org/netbeans/html/boot/impl/FnUtils.java | 45 +- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java index ca3c6ce4..0071cdd9 100644 --- a/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java +++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnUtils.java @@ -209,15 +209,26 @@ public final class FnUtils { varr.visit(null, argName); } varr.visitEnd(); -va.visit("javacall", fia.javacall); va.visit("body", fia.body); +if (fia.javacall != null) { +va.visit("javacall", fia.javacall); +} +if (fia.wait4js != null) { +va.visit("wait4js", fia.wait4js); +} +if (fia.wait4java != null) { +va.visit("wait4java", fia.wait4java); +} +if (fia.keepAlive != null) { +va.visit("keepAlive", fia.keepAlive); +} va.visitEnd(); } String body; List args; -if (fia.javacall) { -body = callback(fia.body, !fia.wait4java); +if ((fia.javacall())) { +body = callback(fia.body, fia.usePromise()); args = new ArrayList<>(fia.args); args.add("vm"); } else { @@ -242,7 +253,7 @@ public final class FnUtils { // init Fn super.visitInsn(Opcodes.POP); super.visitLdcInsn(Type.getObjectType(FindInClass.this.name)); -super.visitInsn(fia.keepAlive ? Opcodes.ICONST_1 : Opcodes.ICONST_0); +super.visitInsn(fia.keepAlive() ? Opcodes.ICONST_1 : Opcodes.ICONST_0); super.visitLdcInsn(body); super.visitIntInsn(Opcodes.SIPUSH, args.size()); super.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String"); @@ -412,7 +423,7 @@ public final class FnUtils { FindInMethod.super.visitInsn(Opcodes.AASTORE); } -if (fia.wait4js) { +if (!fia.asyncJavaScript()) { super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "org/netbeans/html/boot/spi/Fn", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;" ); @@ -488,10 +499,10 @@ public final class FnUtils { List args = new ArrayList<>(); String body; -boolean javacall = false; -boolean wait4js = true; -boolean wait4java = true; -boolean keepAlive = true; +Boolean javacall; +Boolean wait4js; +Boolean wait4java; +Boolean keepAlive; public FindInAnno() { super(Opcodes.ASM5); @@ -534,6 +545,22 @@ public final class FnUtils { generateJSBody(this); } } + +boolean usePromise() { +return Boolean.FALSE.equals(wait4java); +} + +boolean javacall() { +return Boolean.TRUE.equals(javacall); +} + +boolean asyncJavaScript() { +return Boolean.FALSE.equals(wait4js); +} + +boolean keepAlive() { +return !Boolean.FALSE.equals(keepAlive); +} } } - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-html4j] branch master updated: Enforce binary name for inner classes in the @JavaScriptBody callbacks
This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-html4j.git The following commit(s) were added to refs/heads/master by this push: new 333650b3 Enforce binary name for inner classes in the @JavaScriptBody callbacks 333650b3 is described below commit 333650b3fbaa3cdbec083f974816e8ae06852ffb Author: Jaroslav Tulach AuthorDate: Sun May 8 21:39:02 2022 +0200 Enforce binary name for inner classes in the @JavaScriptBody callbacks --- .../html/boot/impl/JavaScriptProcesor.java | 41 -- .../java/net/java/html/js/tests/AsyncJava.java | 2 +- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java index 08157278..f8a7cdbb 100644 --- a/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java +++ b/boot/src/main/java/org/netbeans/html/boot/impl/JavaScriptProcesor.java @@ -302,7 +302,7 @@ public final class JavaScriptProcesor extends AbstractProcessor { } else if (preId == ':') { int lastAt = userText.lastIndexOf('@', preIdentifierAt + 1); String maybeClassName = userText.substring(lastAt + 1, preIdentifierAt - 1); -TypeElement maybeClass = processingEnv.getElementUtils().getTypeElement(maybeClassName); +TypeElement maybeClass = findClass(maybeClassName); String instanceName = null; if (lastAt > 0 && userText.charAt(lastAt - 1) == '.') { instanceName = endsWithIdentifier(userText, lastAt - 1); @@ -358,6 +358,37 @@ public final class JavaScriptProcesor extends AbstractProcessor { return Collections.emptyList(); } +final TypeElement findClass(String classname) { +if (classname == null) { +return null; +} +TypeElement clazz = processingEnv.getElementUtils().getTypeElement(classname); +if (clazz != null) { +return clazz; +} +int dolar = classname.indexOf('$'); +if (dolar == -1) { +return null; +} +final String parentName = classname.substring(0, dolar); +TypeElement parent = processingEnv.getElementUtils().getTypeElement(parentName); +if (parent != null) { +String rest = classname.substring(dolar + 1); +for (Element e : parent.getEnclosedElements()) { +if (!e.getKind().isClass() && !e.getKind().isInterface()) { +continue; +} +if (rest.equals(e.getSimpleName().toString())) { +clazz = (TypeElement) e; +break; +} +} +} +String binaryClassName = classname.replace('$', '.'); +clazz = processingEnv.getElementUtils().getTypeElement(binaryClassName); +return clazz; +} + final void wrongArrayError(TypeMirror paramType, Element method) { processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Don't use " + paramType + " array. Use Object[].", method); } @@ -385,13 +416,19 @@ public final class JavaScriptProcesor extends AbstractProcessor { @Override protected CharSequence callMethod(String ident, boolean promise, String fqn, String method, String params) { -final TypeElement type = processingEnv.getElementUtils().getTypeElement(fqn); +final TypeElement type = findClass(fqn); if (type == null) { processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Callback to non-existing class " + fqn, e ); return ""; } +String binName = processingEnv.getElementUtils().getBinaryName(type).toString(); +if (!fqn.equals(binName)) { +processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, +"Use binary classname " + binName + " in the callback", e); +} + ExecutableElement found = null; String paramTypes = null; StringBuilder foundParams = new StringBuilder(); diff --git a/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java b/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java index 76e9cad7..42792318 100644 --- a/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java +++ b/json-tck/src/main/java/net/java/html/js/tests/AsyncJava.java @@ -28,7 +28,7 @@ public class AsyncJava { var result = { x : -1 }; -var facN = f...@net.java.html.js.tests.asyncjava.fac::fac(I)(n); +var facN = f...@net.java.html.js.tests.AsyncJava$Fac::fac(I)(n); facN.then(function (res) { result.x = res; do...@ja