(netbeans) 01/01: Merge pull request #6819 from apache/php-nb21-features
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 commit 120f2129a8dbc25b7a52542c359fe5a7a2569c60 Merge: a450a2f24b 480ad74e9b Author: Junichi Yamamoto AuthorDate: Sat Dec 9 08:32:26 2023 +0900 Merge pull request #6819 from apache/php-nb21-features PHP features for NB21 php/php.api.phpmodule/manifest.mf |2 +- .../org/netbeans/modules/php/api/PhpVersion.java | 18 + php/php.editor/nbproject/project.properties|2 +- php/php.editor/nbproject/project.xml |2 +- .../org/netbeans/modules/php/editor/CodeUtils.java | 98 +- .../modules/php/editor/api/QualifiedName.java | 10 +- .../php/editor/api/elements/AliasedFunction.java |5 + .../editor/api/elements/BaseFunctionElement.java |6 + .../php/editor/api/elements/FieldElement.java |1 + .../php/editor/api/elements/ParameterElement.java |4 + .../editor/api/elements/TypeConstantElement.java | 13 +- .../editor/completion/CompletionContextFinder.java | 175 +- .../modules/php/editor/completion/DocRenderer.java | 120 +- .../php/editor/completion/PHPCodeCompletion.java | 137 +- .../php/editor/completion/PHPCompletionItem.java | 11 +- .../php/editor/csl/DeclarationFinderImpl.java | 48 +- .../modules/php/editor/csl/NavigatorScanner.java | 107 +- .../modules/php/editor/csl/SemanticAnalysis.java | 14 +- .../elements/BaseFunctionElementSupport.java | 101 +- .../php/editor/elements/ClassElementImpl.java | 48 +- .../php/editor/elements/FieldElementImpl.java | 32 +- .../php/editor/elements/FunctionElementImpl.java | 20 + .../php/editor/elements/IndexQueryImpl.java|6 +- .../php/editor/elements/MethodElementImpl.java | 44 +- .../php/editor/elements/ParameterElementImpl.java | 75 +- .../php/editor/elements/TraitElementImpl.java | 15 +- .../editor/elements/TypeConstantElementImpl.java | 47 +- .../php/editor/elements/TypeResolverImpl.java |4 +- .../modules/php/editor/indent/CodeStyle.java |4 + .../modules/php/editor/indent/FmtOptions.java |2 + .../modules/php/editor/indent/FormatToken.java |3 + .../modules/php/editor/indent/FormatVisitor.java | 63 +- .../modules/php/editor/indent/TokenFormatter.java | 13 + .../modules/php/editor/indent/ui/Bundle.properties |5 +- .../modules/php/editor/indent/ui/FmtSpaces.java|1 + .../modules/php/editor/index/PHPIndexer.java |2 +- .../modules/php/editor/lexer/LexUtilities.java | 13 +- .../php/editor/lexer/PHP5ColoringLexer.java| 2692 +++ .../php/editor/model/ClassConstantElement.java | 12 +- .../modules/php/editor/model/FunctionScope.java|1 + .../modules/php/editor/model/Parameter.java|6 + .../model/impl/ClassConstantElementImpl.java | 15 +- .../php/editor/model/impl/ClassScopeImpl.java | 22 +- .../php/editor/model/impl/FieldElementImpl.java| 13 +- .../php/editor/model/impl/FunctionScopeImpl.java | 93 +- .../php/editor/model/impl/MethodScopeImpl.java |7 + .../php/editor/model/impl/ModelVisitor.java| 134 +- .../php/editor/model/impl/OccurenceBuilder.java|9 +- .../php/editor/model/impl/ParameterImpl.java | 33 +- .../modules/php/editor/model/impl/Type.java| 52 +- .../php/editor/model/impl/VariousUtils.java| 77 +- .../model/nodes/ClassConstantDeclarationInfo.java |6 + .../editor/model/nodes/FormalParameterInfo.java| 19 +- .../model/nodes/FunctionDeclarationInfo.java |3 +- .../model/nodes/LambdaFunctionDeclarationInfo.java |2 +- .../model/nodes/MagicMethodDeclarationInfo.java| 25 +- .../editor/model/nodes/MethodDeclarationInfo.java |3 +- .../model/nodes/SingleFieldDeclarationInfo.java| 21 +- .../modules/php/editor/parser/ASTPHP5Parser.java | 3815 +- .../modules/php/editor/parser/ASTPHP5Scanner.java | 316 +- .../modules/php/editor/parser/ASTPHP5Symbols.java |2 +- .../php/editor/parser/EncodedActionTable1.java | 6076 .../php/editor/parser/EncodedActionTable10.java| 6626 +- .../php/editor/parser/EncodedActionTable11.java| 6924 +- .../php/editor/parser/EncodedActionTable12.java| 6430 - .../php/editor/parser/EncodedActionTable13.java| 5046 ++--- .../php/editor/parser/EncodedActionTable14.java| 5530 +++ .../php/editor/parser/EncodedActionTable15.java| 5822 +++ .../php/editor/parser/EncodedActionTable16.java| 6160 .../php/editor/parser/EncodedActionTable17.java| 6726 +- .../php/editor/parser/EncodedActionTable18.java| 4944 ++---
[jira] [Commented] (NETBEANS-585) Clicking in Output Window places caret in wrong position
[ https://issues.apache.org/jira/browse/NETBEANS-585?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17794844#comment-17794844 ] Michael Bien commented on NETBEANS-585: --- there is also https://github.com/apache/netbeans/issues/6300 > Clicking in Output Window places caret in wrong position > > > Key: NETBEANS-585 > URL: https://issues.apache.org/jira/browse/NETBEANS-585 > Project: NetBeans > Issue Type: Bug > Components: platform - Output Window >Affects Versions: 9.0 > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-245-on-20180327) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Major > Labels: HiDPI > > Repro steps: > 1. Run a Java Maven application that outputs to the console > 2. Click somewhere in a line of text in the Output Window (wrap-text is > disabled) > 3. Notice that the caret lands many characters to the left of where you click > It is extremely difficult to copy/paste text because we cannot control where > the caret begins copy/pasting from. > This issue might be related to NETBEANS-235 -- 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] [Comment Edited] (NETBEANS-585) Clicking in Output Window places caret in wrong position
[ https://issues.apache.org/jira/browse/NETBEANS-585?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17794839#comment-17794839 ] Michael Bien edited comment on NETBEANS-585 at 12/8/23 7:36 PM: I remember Neil fixing the terminal which gave wrong results with certain fonts: [https://github.com/apache/netbeans/pull/6163] Output window is a different code path, however, this here might be font related too - assuming it is still an issue. but if nobody here can reproduce this anymore we should still close it. Every time I look at Jira when i try to find an older bug - i close 5-10 already fixed issues nobody bothered to close. was (Author: mbien): I remember Neil fixing the terminal which gave wrong results with certain fonts: [https://github.com/apache/netbeans/pull/6163] Output window is a different code path, however, this here might be font related too - assuming it is still an issue. but if nobody here can reproduce this anymore we should still close it. Every time I look at Jira when i try to find an older bug - i close 5-10 already fixed issues nobody bothered to close i notice while searching. > Clicking in Output Window places caret in wrong position > > > Key: NETBEANS-585 > URL: https://issues.apache.org/jira/browse/NETBEANS-585 > Project: NetBeans > Issue Type: Bug > Components: platform - Output Window >Affects Versions: 9.0 > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-245-on-20180327) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Major > Labels: HiDPI > > Repro steps: > 1. Run a Java Maven application that outputs to the console > 2. Click somewhere in a line of text in the Output Window (wrap-text is > disabled) > 3. Notice that the caret lands many characters to the left of where you click > It is extremely difficult to copy/paste text because we cannot control where > the caret begins copy/pasting from. > This issue might be related to NETBEANS-235 -- 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] [Comment Edited] (NETBEANS-585) Clicking in Output Window places caret in wrong position
[ https://issues.apache.org/jira/browse/NETBEANS-585?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17794839#comment-17794839 ] Michael Bien edited comment on NETBEANS-585 at 12/8/23 7:35 PM: I remember Neil fixing the terminal which gave wrong results with certain fonts: [https://github.com/apache/netbeans/pull/6163] Output window is a different code path, however, this here might be font related too - assuming it is still an issue. but if nobody here can reproduce this anymore we should still close it. Every time I look at Jira when i try to find an older bug - i close 5-10 already fixed issues nobody bothered to close i notice while searching. was (Author: mbien): I remember Neil fixing the terminal which gave wrong results with certain fonts: [https://github.com/apache/netbeans/pull/6163] Output window is a different code path, however, this here might be font related too - assuming it is still an issue. but if nobody here can reproduce this anymore we should still close it. Every time I look at Jira since i try to find an older bug - i close 5-10 already fixed issues nobody bothered to close i notice while searching. > Clicking in Output Window places caret in wrong position > > > Key: NETBEANS-585 > URL: https://issues.apache.org/jira/browse/NETBEANS-585 > Project: NetBeans > Issue Type: Bug > Components: platform - Output Window >Affects Versions: 9.0 > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-245-on-20180327) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Major > Labels: HiDPI > > Repro steps: > 1. Run a Java Maven application that outputs to the console > 2. Click somewhere in a line of text in the Output Window (wrap-text is > disabled) > 3. Notice that the caret lands many characters to the left of where you click > It is extremely difficult to copy/paste text because we cannot control where > the caret begins copy/pasting from. > This issue might be related to NETBEANS-235 -- 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] [Commented] (NETBEANS-585) Clicking in Output Window places caret in wrong position
[ https://issues.apache.org/jira/browse/NETBEANS-585?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17794839#comment-17794839 ] Michael Bien commented on NETBEANS-585: --- I remember Neil fixing the terminal which gave wrong results with certain fonts: [https://github.com/apache/netbeans/pull/6163] Output window is a different code path, however, this here might be font related too - assuming it is still an issue. but if nobody here can reproduce this anymore we should still close it. Every time I look at Jira since i try to find an older bug - i close 5-10 already fixed issues nobody bothered to close i notice while searching. > Clicking in Output Window places caret in wrong position > > > Key: NETBEANS-585 > URL: https://issues.apache.org/jira/browse/NETBEANS-585 > Project: NetBeans > Issue Type: Bug > Components: platform - Output Window >Affects Versions: 9.0 > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-245-on-20180327) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Major > Labels: HiDPI > > Repro steps: > 1. Run a Java Maven application that outputs to the console > 2. Click somewhere in a line of text in the Output Window (wrap-text is > disabled) > 3. Notice that the caret lands many characters to the left of where you click > It is extremely difficult to copy/paste text because we cannot control where > the caret begins copy/pasting from. > This issue might be related to NETBEANS-235 -- 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] [Commented] (NETBEANS-585) Clicking in Output Window places caret in wrong position
[ https://issues.apache.org/jira/browse/NETBEANS-585?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17794834#comment-17794834 ] Eirik Bakke commented on NETBEANS-585: -- Hmm, at the moment I can't reproduce the issue anymore, even though it was there for a very long time. I'm on Windows 11 with 150% HiDPI scaling, on NetBeans 18 and Java 17.0.9. It's possible something changed in recent JDK versions that impacted font metrics. Maybe good to hear if others are observing the bug still. > Clicking in Output Window places caret in wrong position > > > Key: NETBEANS-585 > URL: https://issues.apache.org/jira/browse/NETBEANS-585 > Project: NetBeans > Issue Type: Bug > Components: platform - Output Window >Affects Versions: 9.0 > Environment: Product Version: Apache NetBeans IDE Dev (Build > incubator-netbeans-release-245-on-20180327) > Java: 9.0.4; Java HotSpot(TM) 64-Bit Server VM 9.0.4+11 > Runtime: Java(TM) SE Runtime Environment 9.0.4+11 > System: Windows 10 version 10.0 running on amd64; Cp1252; en_CA (nb) > User directory: C:\Users\Gili\AppData\Roaming\NetBeans\dev > Cache directory: C:\Users\Gili\AppData\Local\NetBeans\Cache\dev >Reporter: Gili >Priority: Major > Labels: HiDPI > > Repro steps: > 1. Run a Java Maven application that outputs to the console > 2. Click somewhere in a line of text in the Output Window (wrap-text is > disabled) > 3. Notice that the caret lands many characters to the left of where you click > It is extremely difficult to copy/paste text because we cannot control where > the caret begins copy/pasting from. > This issue might be related to NETBEANS-235 -- 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] [Closed] (NETBEANS-6491) New NB platform application w/ maven does not offer NB's own release
[ https://issues.apache.org/jira/browse/NETBEANS-6491?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Michael Bien closed NETBEANS-6491. -- Fix Version/s: 21 Resolution: Fixed mitigated via [https://github.com/apache/netbeans/pull/6751] its hardcoded, but among a group of other Strings which need to be updated periodically anyway so its probably not needed to infer the NB version over other means. > New NB platform application w/ maven does not offer NB's own release > > > Key: NETBEANS-6491 > URL: https://issues.apache.org/jira/browse/NETBEANS-6491 > Project: NetBeans > Issue Type: Bug > Components: apisupport - Maven >Affects Versions: NB13 >Reporter: Svatopluk Dedic >Priority: Major > Fix For: 21 > > > I've tried to create NB platform application right after installation and > with a fresh userdir. Only *RELEASE90* and *dev-* versions were offered in > the New from Template wizard. > All releases became available only *after whole central index was downloaded* > and indexed. > * NetBeans own version should be offered - RELEASE130 in this case as I was > using the release binaries downloaded from Apache > * Maven project infra should support version queries for a specific g:a even > though the central repo is not indexed yet - one can do that using HTTP > queries. Would be also useful for completion, too -- 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: Centralize internal maven artifact version queries.
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 92080adcae Centralize internal maven artifact version queries.
new a450a2f24b Merge pull request #6751 from mbien/mvn-version-defaults
92080adcae is described below
commit 92080adcae333ba29161ba06432bf9ff9cd39827
Author: Michael Bien
AuthorDate: Fri Nov 24 22:03:50 2023 +0100
Centralize internal maven artifact version queries.
- put all hardcoded fallback versions in one place
- use index for updates if available
---
.../maven/apisupport/MavenNbModuleImpl.java| 11 +-
.../maven/apisupport/NbmWizardIterator.java| 30 ++
.../maven/apisupport/NbmWizardPanelVisual.java | 4 +
java/maven/manifest.mf | 1 +
.../maven/nbproject/org-netbeans-modules-maven.sig | 7 +-
java/maven/nbproject/project.properties| 1 -
.../org/netbeans/modules/maven/api/ModelUtils.java | 9 +-
.../modules/maven/customizer/CompilePanel.java | 57 +--
.../modules/maven/customizer/SourcesPanel.java | 26 ++---
.../modules/maven/nodes/BootCPNodeFactory.java | 2 +-
.../maven/options/MavenVersionSettings.java| 113 +
11 files changed, 127 insertions(+), 134 deletions(-)
diff --git
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
index 3b46afcd8c..9ad8c1cdec 100644
---
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
+++
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
@@ -69,6 +69,7 @@ import org.netbeans.modules.maven.model.pom.Configuration;
import org.netbeans.modules.maven.model.pom.POMExtensibilityElement;
import org.netbeans.modules.maven.model.pom.POMModel;
import org.netbeans.modules.maven.model.pom.Plugin;
+import org.netbeans.modules.maven.options.MavenVersionSettings;
import org.netbeans.spi.project.AuxiliaryProperties;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.ui.ProjectOpenedHook;
@@ -102,7 +103,6 @@ public class MavenNbModuleImpl implements NbModuleProvider {
public static final String GROUPID_MOJO = "org.codehaus.mojo";
public static final String GROUPID_APACHE =
"org.apache.netbeans.utilities";
public static final String NBM_PLUGIN = "nbm-maven-plugin";
-static final String LATEST_NBM_PLUGIN_VERSION = "4.8";
public static final String NETBEANSAPI_GROUPID = "org.netbeans.api";
@@ -123,14 +123,7 @@ public class MavenNbModuleImpl implements NbModuleProvider
{
* This method will not wait for the index to be downloaded, it will
return a default value instead.
*/
public static String getLatestNbmPluginVersion() {
-RepositoryQueries.Result versionsResult =
RepositoryQueries.getVersionsResult(GROUPID_APACHE, NBM_PLUGIN, null);
-
-// Versions are sorted in descending order
-return versionsResult.getResults().stream()
-.map(NBVersionInfo::getVersion)
-.filter(v -> !v.endsWith("-SNAPSHOT"))
-.findFirst()
-.orElse(LATEST_NBM_PLUGIN_VERSION);
+return MavenVersionSettings.getDefault().getVersion(GROUPID_APACHE,
NBM_PLUGIN);
}
private File getModuleXmlLocation() {
diff --git
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
index 2c1f1723bc..916d4708e5 100644
---
a/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
+++
b/apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/NbmWizardIterator.java
@@ -30,7 +30,6 @@ import java.util.NoSuchElementException;
import java.util.Set;
import javax.swing.JComponent;
import javax.swing.event.ChangeListener;
-import org.apache.maven.artifact.versioning.ComparableVersion;
import org.apache.maven.project.MavenProject;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
@@ -52,29 +51,26 @@ import org.openide.util.NbBundle.Messages;
import static org.netbeans.modules.maven.apisupport.Bundle.*;
import static
org.netbeans.modules.maven.apisupport.MavenNbModuleImpl.APACHE_SNAPSHOT_REPO_ID;
import org.netbeans.modules.maven.embedder.EmbedderFactory;
-import org.netbeans.modules.maven.indexer.api.NBVersionInfo;
-import org.netbeans.modules.maven.indexer.api.RepositoryQueries;
import org.netbeans.modules.maven.model.pom.Plugin;
import org.netbeans.modules.maven.model.pom.PluginManagement;
+import
(netbeans) branch master updated: Better transient maven repo deduplication.
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 b34a0b3662 Better transient maven repo deduplication.
new 2bd51e8d55 Merge pull request #6757 from
mbien/better-transitive-repo-deduplication
b34a0b3662 is described below
commit b34a0b3662fe4e1d0c73212465a2522b01326776
Author: Michael Bien
AuthorDate: Tue Nov 28 15:24:59 2023 +0100
Better transient maven repo deduplication.
Transient repos are added and removed based on what projects are open.
NB does some deduplication since projects may define the same repo
with a different ID or URL. This works fine until projects are closed
and there is nothing to deduplicate anymore - NB might think that
a repo is now new and index it again under a different ID.
this PR makes two changes:
- repo1.maven.org is now tracked as repo.maven.apache.org
- remote repos are registered in the services view once fully indexed,
this makes them no longer transient
---
.../modules/maven/indexer/NexusRepositoryIndexerImpl.java | 4
.../modules/maven/indexer/api/RepositoryPreferences.java | 11 ++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
index 2402b12e48..b62b68c6ef 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -569,6 +569,10 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
removeGroupCache(repo);
fetchUpdateResult =
remoteIndexUpdater.fetchAndUpdateIndex(iur);
storeGroupCache(repo, indexingContext);
+// register indexed repo in services view
+if (fetchUpdateResult.isFullUpdate() &&
fetchUpdateResult.isSuccessful()) {
+
RepositoryPreferences.getInstance().addOrModifyRepositoryInfo(repo);
+}
} catch (IOException | AlreadyClosedException |
IllegalArgumentException ex) {
// AlreadyClosedException can happen in low storage
situations when lucene is trying to handle IOEs
// IllegalArgumentException signals remote archive
format problems
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
index 804a9ecbb4..ed7874e2ea 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
@@ -80,6 +80,7 @@ public final class RepositoryPreferences {
private static final String PROP_INDEX_DOWNLOAD_PERMISSIONS =
"indexDownloadPermissions"; //NOI18N
public static final String PROP_MT_INDEX_EXTRACTION =
"indexMultiThreadedExtraction"; //NOI18N
public static final String PROP_INDEX_DATE_CUTOFF_FILTER =
"indexDateCotoffFilter"; //NOI18N
+private static final String ALT_CENTRAL_URL =
"https://repo1.maven.org/maven2;; //NOI18N
public static final int FREQ_ONCE_WEEK = 0;
public static final int FREQ_ONCE_DAY = 1;
@@ -545,12 +546,12 @@ public final class RepositoryPreferences {
//only register repositories we can safely handle.. #227322
return;
}
+if (url.equals(ALT_CENTRAL_URL) || url.equals(ALT_CENTRAL_URL+"/")) {
+// map to primary URL to avoid duplicates
+url = RepositorySystem.DEFAULT_REMOTE_REPO_URL;
+}
synchronized (infoCache) {
-List infos = transients.get(key);
-if (infos == null) {
-infos = new ArrayList<>();
-transients.put(key, infos);
-}
+List infos = transients.computeIfAbsent(key, k ->
new ArrayList<>());
RepositoryInfo info = new RepositoryInfo(id, displayName, null,
url);
info.setMirrorStrategy(strategy);
infos.add(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: Update maven mirror generator action.
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 a9845e3070 Update maven mirror generator action.
new ea7b98a59b Merge pull request #6766 from
mbien/update-maven-mirror-utils
a9845e3070 is described below
commit a9845e3070f96255d000963ef7039e4a5b3165ad
Author: Michael Bien
AuthorDate: Wed Nov 29 19:30:32 2023 +0100
Update maven mirror generator action.
None of the preset mirrors for maven central exist anymore, this
updates the preset to the last known public mirrors and tweaks the UI
a bit.
Fixed possible NPE when the central list is checked before
NotificationLineSupport was attached.
---
.../modules/maven/codegen/Bundle.properties| 6 +-
.../modules/maven/codegen/MirrorGenerator.java | 2 +-
.../modules/maven/codegen/NewMirrorPanel.form | 37 +-
.../modules/maven/codegen/NewMirrorPanel.java | 85 ++
4 files changed, 58 insertions(+), 72 deletions(-)
diff --git
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties
index 418507d7b4..bd6cbb4899 100644
---
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties
+++
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/Bundle.properties
@@ -30,9 +30,9 @@ NewMirrorPanel.lblUrl.text=Mirror :
NewMirrorPanel.btnLink.text=See Apache Maven documentation
for details.
LBL_Central=Central Repository
LBL_All=All repositories, you have Repository Manager installed
-LBL_NonLocal=All non local repositories (Maven 2.0.9+)
-LBL_AllButFoo=All repositories, with exception of 'foo' (Maven 2.0.9+)
-LBL_List=List of repositories (Maven 2.0.9+)
+LBL_NonLocal=All non local repositories
+LBL_AllButFoo=All repositories, with exception of 'foo'
+LBL_List=List of repositories
NewPluginPanel.chkConfig.text=Configuration Skeleton
NewPluginPanel.lblQuery.text=Name Query:
NewPluginPanel.tfQuery.text=
diff --git
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java
index 2182d71834..c123120ba2 100644
---
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java
+++
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/MirrorGenerator.java
@@ -45,7 +45,7 @@ public class MirrorGenerator extends
AbstractGenerator {
@Override
public List create(Lookup context) {
-ArrayList toRet = new ArrayList();
+ArrayList toRet = new ArrayList<>();
SettingsModel model = context.lookup(SettingsModel.class);
JTextComponent component = context.lookup(JTextComponent.class);
if (model != null) {
diff --git
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form
index abb779e3bb..2e999a7790 100644
---
a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form
+++
b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.form
@@ -1,4 +1,4 @@
-
+
(netbeans-antora-site) branch ebarboni-patch-1 created (now 7a81d87)
This is an automated email from the ASF dual-hosted git repository. skygo pushed a change to branch ebarboni-patch-1 in repository https://gitbox.apache.org/repos/asf/netbeans-antora-site.git at 7a81d87 change name for Windows installer This branch includes the following new commits: new 7a81d87 change name for Windows installer 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. - 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-antora-site) 01/01: change name for Windows installer
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch ebarboni-patch-1
in repository https://gitbox.apache.org/repos/asf/netbeans-antora-site.git
commit 7a81d871b7de885c0630a44586bf603f12dc6e99
Author: Eric Barboni
AuthorDate: Fri Dec 8 11:54:23 2023 +0100
change name for Windows installer
timestamped signed executable has a new name to avoid confusion
---
modules/ROOT/pages/download/nb20/index.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/ROOT/pages/download/nb20/index.adoc
b/modules/ROOT/pages/download/nb20/index.adoc
index c06c73f..5b1ffaf 100644
--- a/modules/ROOT/pages/download/nb20/index.adoc
+++ b/modules/ROOT/pages/download/nb20/index.adoc
@@ -67,7 +67,7 @@
link:{url-download-keychecksum}netbeans/{netbeans-version}/netbeans-{netbeans-ve
*Installers and Packages:*
-*
link:{url-download}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe[Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe]
(link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe.sha512[SHA-512],
+*
link:{url-download}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}r1-bin-windows-x64.exe[Apache-NetBeans-{netbeans-version}r1-bin-windows-x64.exe]
(link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}r1-bin-windows-x64.exe.sha512[SHA-512],
link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}-bin-windows-x64.exe.asc[PGP
ASC])
*
link:{url-download}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}.pkg[Apache-NetBeans-{netbeans-version}.pkg]
(link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}.pkg.sha512[SHA-512],
link:{url-download-keychecksum}netbeans-installers/{netbeans-version}/Apache-NetBeans-{netbeans-version}.pkg.asc[PGP
ASC])
-
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
svn commit: r65945 - /dev/netbeans/netbeans-installers/20/ /dev/netbeans/netbeans-vscode-ext/20.0/ /release/netbeans/netbeans-installers/19/ /release/netbeans/netbeans-installers/20/ /release/netbeans
Author: skygo Date: Fri Dec 8 10:51:51 2023 New Revision: 65945 Log: Apache NetBeans installer r1 for v20 Added: release/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe - copied unchanged from r65944, dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe release/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.asc - copied unchanged from r65944, dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.asc release/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.sha512 - copied unchanged from r65944, dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.sha512 Removed: dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.asc dev/netbeans/netbeans-installers/20/Apache-NetBeans-20r1-bin-windows-x64.exe.sha512 dev/netbeans/netbeans-vscode-ext/20.0/ release/netbeans/netbeans-installers/19/ release/netbeans/netbeans-installers/20/Apache-NetBeans-20-bin-windows-x64.exe release/netbeans/netbeans-installers/20/Apache-NetBeans-20-bin-windows-x64.exe.asc release/netbeans/netbeans-installers/20/Apache-NetBeans-20-bin-windows-x64.exe.sha512 release/netbeans/netbeans/19/ - 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
svn commit: r65944 - in /release/netbeans/netbeans-vscode-ext: 19.0.301/ 19.0/ 20.0/ 20/
Author: skygo Date: Fri Dec 8 10:50:23 2023 New Revision: 65944 Log: cleanup wrong folder Added: release/netbeans/netbeans-vscode-ext/20.0/ - copied from r65729, dev/netbeans/netbeans-vscode-ext/20.0/ Removed: release/netbeans/netbeans-vscode-ext/19.0/ release/netbeans/netbeans-vscode-ext/19.0.301/ release/netbeans/netbeans-vscode-ext/20/ - 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 php-nb21-features updated (16b9fc1287 -> 480ad74e9b)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git from 16b9fc1287 Merge pull request #6752 from junichi11/php83-dynamic-class-constant-fetch new 80e1feed1f PHP 8.3 Support: Typed class constants (Part 1) new 0da18dbb94 PHP 8.3 Support: Typed class constants (Part 2) new 04b0434004 PHP 8.3 Support: Typed class constants (Part 3) new 43b8cebc75 PHP 8.3 Support: Typed class constants (Part 4) new be57ef0ad6 PHP 8.3 Support: Typed class constants (Part 5) new 450cb2075a PHP 8.3 Support: Typed class constants (Part 6) new 480ad74e9b Merge pull request #6793 from junichi11/php83-typed-class-constants The 9317 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: php/php.editor/nbproject/project.properties|2 +- .../editor/api/elements/TypeConstantElement.java | 13 +- .../editor/completion/CompletionContextFinder.java | 139 +- .../php/editor/completion/PHPCodeCompletion.java | 134 +- .../php/editor/completion/PHPCompletionItem.java |5 +- .../modules/php/editor/csl/NavigatorScanner.java | 10 +- .../editor/elements/TypeConstantElementImpl.java | 47 +- .../modules/php/editor/indent/FormatToken.java |1 + .../modules/php/editor/indent/FormatVisitor.java | 21 +- .../modules/php/editor/indent/TokenFormatter.java |4 + .../modules/php/editor/index/PHPIndexer.java |2 +- .../php/editor/lexer/PHP5ColoringLexer.java| 2692 .../php/editor/model/ClassConstantElement.java | 12 +- .../model/impl/ClassConstantElementImpl.java | 15 +- .../php/editor/model/impl/ModelVisitor.java| 38 +- .../modules/php/editor/model/impl/Type.java| 10 + .../php/editor/model/impl/VariousUtils.java| 18 + .../model/nodes/ClassConstantDeclarationInfo.java |6 + .../model/nodes/SingleFieldDeclarationInfo.java| 21 +- .../modules/php/editor/parser/ASTPHP5Parser.java | 1850 ++--- .../modules/php/editor/parser/ASTPHP5Symbols.java |2 +- .../php/editor/parser/EncodedActionTable1.java | 5764 .../php/editor/parser/EncodedActionTable10.java| 5716 .../php/editor/parser/EncodedActionTable11.java| 6640 +- .../php/editor/parser/EncodedActionTable12.java| 6272 - .../php/editor/parser/EncodedActionTable13.java| 5836 .../php/editor/parser/EncodedActionTable14.java| 5980 .../php/editor/parser/EncodedActionTable15.java| 5474 +++ .../php/editor/parser/EncodedActionTable16.java| 6430 +- .../php/editor/parser/EncodedActionTable17.java| 7050 +-- .../php/editor/parser/EncodedActionTable18.java| 4938 +++--- .../php/editor/parser/EncodedActionTable19.java| 4909 +++-- .../php/editor/parser/EncodedActionTable2.java | 5356 +++ ...ctionTable19.java => EncodedActionTable20.java} | 769 ++- .../php/editor/parser/EncodedActionTable3.java | 7186 ++-- .../php/editor/parser/EncodedActionTable4.java | 4680 ++--- .../php/editor/parser/EncodedActionTable5.java | 5952 .../php/editor/parser/EncodedActionTable6.java | 4614 ++--- .../php/editor/parser/EncodedActionTable7.java | 5406 +++ .../php/editor/parser/EncodedActionTable8.java | 3950 +-- .../php/editor/parser/EncodedActionTable9.java | 6064 - .../parser/astnodes/ConstantDeclaration.java | 60 +- .../parser/astnodes/visitors/DefaultVisitor.java |1 + .../php/editor/resources/code-templates.xml| 12 + .../editor/verification/PHP83UnhandledError.java | 13 + .../verification/UnusableTypesHintError.java | 25 +- .../structure/php83/typedClassConstants.pass | 43 + .../context_sensitive_lexer_typed_const_class.pass | 1358 .../context_sensitive_lexer_typed_const_enum.pass | 1358 ...text_sensitive_lexer_typed_const_interface.pass | 1358 .../context_sensitive_lexer_typed_const_trait.pass | 1358 .../parser/php83/typedClassConstants_01.pass | 1953 ++ ...ss.php.testTypedProperties20Class_08.completion |9 - testTypedProperties20Class_08_php73.completion | 11 - ...ss.php.testTypedProperties20Class_18.completion | 26 +- ...it.php.testTypedProperties20Trait_08.completion |9 - testTypedProperties20Trait_08_php73.completion | 11 - ...it.php.testTypedProperties20Trait_19.completion | 25 +- testConstructorPropertyPromotion04a.completion |2 +
