This is an automated email from the ASF dual-hosted git repository. bwalker 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 9cdf92f [NETBEANS-6045] - cleanup ArrayList warnings (#3185) 9cdf92f is described below commit 9cdf92fac939814e46839536793edd6c313e55f2 Author: Brad Walker <bwal...@musings.com> AuthorDate: Thu Sep 23 07:23:28 2021 -0600 [NETBEANS-6045] - cleanup ArrayList warnings (#3185) * [NETBEANS-6045] - cleanup ArrayList warnings Cleanup a bunch of warnings related to ArrayList.. [repeat] /home/bwalker/src/netbeans/java/java.hints.ui/src/org/netbeans/modules/java/hints/analysis/AnalyzerImpl.java:98: warning: [rawtypes] found raw type: ArrayList [repeat] List todo = new ArrayList(); [repeat] ^ [repeat] missing type arguments for generic class ArrayList [repeat] where E is a type-variable: [repeat] E extends Object declared in class ArrayList --- .../j2ee/dd/impl/webservices/WebServicesProxy.java | 10 +++++---- .../j2ee/dd/impl/application/ApplicationProxy.java | 12 +++++++---- .../j2ee/dd/impl/client/AppClientProxy.java | 10 ++++++--- .../j2ee/dd/impl/common/ComponentBeanMultiple.java | 7 +++++-- .../modules/j2ee/dd/impl/ejb/EjbJarProxy.java | 10 ++++++--- .../modules/j2ee/dd/impl/web/WebAppProxy.java | 14 ++++++++----- .../modules/j2ee/ddloaders/app/EarDataObject.java | 4 ++-- .../multiview/EjbJarMultiViewDataObject.java | 8 ++++---- .../modules/web/jsf/api/ConfigurationUtils.java | 5 +++-- .../groovy/editor/api/lexer/GroovyLexer.java | 7 ++++--- .../visualeditor/querybuilder/QueryBuilder.java | 20 ++++++++---------- .../sql/visualeditor/querybuilder/QueryModel.java | 2 +- .../db/sql/visualeditor/querymodel/QueryNode.java | 4 ++-- .../org/netbeans/jellytools/EditorOperator.java | 3 ++- .../org/netbeans/modules/ant/debugger/Utils.java | 2 +- .../completion/JPACodeCompletionProvider.java | 4 ++-- .../entitygenerator/DbSchemaEjbGenerator.java | 8 ++++---- .../wizard/fromdb/DBSchemaFileList.java | 6 +++--- .../wizard/fromdb/JavaPersistenceGenerator.java | 4 ++-- .../persistence/wizard/fromdb/TableClosure.java | 2 +- .../lsp/server/debugging/variables/ViewModel.java | 24 +++++++++++----------- .../modules/maven/grammar/MavenProjectGrammar.java | 2 +- .../tools/java/generator/SAXGeneratorSupport.java | 4 ++-- .../javafx2/editor/completion/beans/FxBean.java | 2 +- .../openide/explorer/ExternalDragAndDrop.java | 2 +- 25 files changed, 99 insertions(+), 77 deletions(-) diff --git a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java index 6bf45f6..82a4876 100644 --- a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java +++ b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java @@ -28,12 +28,15 @@ package org.netbeans.modules.j2ee.dd.impl.webservices; * * @author Nitya Doraisamy */ +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.List; import org.netbeans.modules.j2ee.dd.api.webservices.Webservices; public class WebServicesProxy implements Webservices { private Webservices webSvc; private String version; - private java.util.List listeners; + private final List<PropertyChangeListener> listeners; private boolean writing = false; private org.xml.sax.SAXParseException error; private int ddStatus; @@ -42,14 +45,13 @@ public class WebServicesProxy implements Webservices { public WebServicesProxy(Webservices webService, String version) { this.webSvc = webService; this.version = version; - listeners = new java.util.ArrayList(); + listeners = new ArrayList<>(); } public void setOriginal(Webservices webSvc) { if (this.webSvc != webSvc) { for (int i=0;i<listeners.size();i++) { - java.beans.PropertyChangeListener pcl = - (java.beans.PropertyChangeListener)listeners.get(i); + PropertyChangeListener pcl = listeners.get(i); if (this.webSvc != null) this.webSvc.removePropertyChangeListener(pcl); if (webSvc != null) webSvc.addPropertyChangeListener(pcl); diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java index 0b804b9..bb507b3 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/application/ApplicationProxy.java @@ -19,16 +19,21 @@ package org.netbeans.modules.j2ee.dd.impl.application; +import java.util.ArrayList; +import java.util.List; import java.math.BigDecimal; + import org.netbeans.modules.j2ee.dd.api.application.Application; +import java.beans.PropertyChangeListener; + /** * @author Nitya Doraisamy */ public class ApplicationProxy implements Application { private Application app; private String version; - private java.util.List listeners; + private List<PropertyChangeListener> listeners; public boolean writing=false; private OutputProvider outputProvider; private org.xml.sax.SAXParseException error; @@ -40,14 +45,13 @@ public class ApplicationProxy implements Application { public ApplicationProxy(Application app, String version) { this.app = app; this.version = version; - listeners = new java.util.ArrayList(); + listeners = new ArrayList<>(); } public void setOriginal(Application app) { if (this.app != app) { for (int i=0;i<listeners.size();i++) { - java.beans.PropertyChangeListener pcl = - (java.beans.PropertyChangeListener)listeners.get(i); + java.beans.PropertyChangeListener pcl = listeners.get(i); if (this.app != null) this.app.removePropertyChangeListener(pcl); if (app != null) app.addPropertyChangeListener(pcl); diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java index ba7376f..a7f5150 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/client/AppClientProxy.java @@ -23,10 +23,14 @@ package org.netbeans.modules.j2ee.dd.impl.client; * * @author Nitya Doraisamy */ +import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.util.Iterator; +import java.util.ArrayList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import org.netbeans.modules.j2ee.dd.api.client.AppClient; import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException; import org.openide.filesystems.FileAlreadyLockedException; @@ -36,7 +40,7 @@ public class AppClientProxy implements AppClient { private AppClient app; private String version; - private java.util.List listeners; + private List<PropertyChangeListener> listeners; public boolean writing=false; private OutputProvider outputProvider; private org.xml.sax.SAXParseException error; @@ -51,7 +55,7 @@ public class AppClientProxy implements AppClient { public AppClientProxy(AppClient app, String version) { this.app = app; this.version = version; - listeners = new java.util.ArrayList(); + listeners = new ArrayList<>(); } public void setOriginal(AppClient app) { @@ -81,7 +85,7 @@ public class AppClientProxy implements AppClient { new java.beans.PropertyChangeEvent(this, PROPERTY_VERSION, version, value); version=value; for (Iterator i = listeners.iterator(); i.hasNext();) { - ((java.beans.PropertyChangeListener) i.next()).propertyChange(evt); + ((PropertyChangeListener) i.next()).propertyChange(evt); } } } diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java index 038f47c..122a806 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java @@ -24,14 +24,17 @@ */ package org.netbeans.modules.j2ee.dd.impl.common; +import java.util.ArrayList; import java.util.logging.Level; import java.util.Map; import java.util.HashMap; +import java.util.List; import java.util.logging.Logger; import org.netbeans.modules.schema2beans.Version; import org.netbeans.modules.j2ee.dd.api.common.IconInterface; import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException; import org.netbeans.modules.j2ee.dd.api.common.DisplayNameInterface; +import org.netbeans.modules.j2ee.dd.api.common.Icon; public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple implements DisplayNameInterface, IconInterface { @@ -340,8 +343,8 @@ public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple impl } public void removeIcon(String locale, boolean isSmall) throws VersionNotSupportedException { - org.netbeans.modules.j2ee.dd.api.common.Icon[] icons = getIcon(); - java.util.List iconList = new java.util.ArrayList(); + Icon[] icons = getIcon(); + List<Icon> iconList = new ArrayList<>(); for (int i=0;i<icons.length;i++) { String loc=icons[i].getXmlLang(); if ((locale==null && loc==null) || (locale!=null && locale.equalsIgnoreCase(loc))) { diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java index 5f0a481..09cb8a6 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/EjbJarProxy.java @@ -29,8 +29,12 @@ import org.openide.loaders.DataObject; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileLock; +import java.beans.PropertyChangeListener; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; import java.io.OutputStream; + import org.w3c.dom.Element; /** @@ -40,7 +44,7 @@ import org.w3c.dom.Element; public class EjbJarProxy implements EjbJar { private EjbJar ejbJar; private String version; - private java.util.List listeners; + private List<PropertyChangeListener> listeners; public boolean writing=false; private org.xml.sax.SAXParseException error; private int ddStatus; @@ -50,7 +54,7 @@ public class EjbJarProxy implements EjbJar { public EjbJarProxy(EjbJar ejbJar, String version) { this.ejbJar=ejbJar; this.version = version; - listeners = new java.util.ArrayList(); + listeners = new ArrayList<>(); addPropertyChangeListener(reindentationListener); } @@ -58,7 +62,7 @@ public class EjbJarProxy implements EjbJar { if (this.ejbJar!=ejbJar) { for (int i=0;i<listeners.size();i++) { java.beans.PropertyChangeListener pcl = - (java.beans.PropertyChangeListener)listeners.get(i); + listeners.get(i); if (this.ejbJar!=null) this.ejbJar.removePropertyChangeListener(pcl); if (ejbJar!=null) ejbJar.addPropertyChangeListener(pcl); diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java index 1c3bfc9..f8c1c06 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/WebAppProxy.java @@ -20,6 +20,7 @@ package org.netbeans.modules.j2ee.dd.impl.web; import org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException; +import org.netbeans.modules.j2ee.dd.api.web.AbsoluteOrdering; import org.netbeans.modules.j2ee.dd.api.web.JspConfig; import org.netbeans.modules.j2ee.dd.api.web.WebApp; import org.netbeans.modules.j2ee.dd.impl.common.DDProviderDataObject; @@ -27,8 +28,12 @@ import org.netbeans.modules.schema2beans.Schema2BeansUtil; import org.netbeans.modules.schema2beans.BaseBean; import org.openide.loaders.DataObject; import org.openide.filesystems.FileLock; + +import java.beans.PropertyChangeListener; + import java.io.OutputStream; -import org.netbeans.modules.j2ee.dd.api.web.AbsoluteOrdering; +import java.util.ArrayList; +import java.util.List; /** * @author mk115033 @@ -36,7 +41,7 @@ import org.netbeans.modules.j2ee.dd.api.web.AbsoluteOrdering; public class WebAppProxy implements WebApp { private WebApp webApp; private String version; - private java.util.List listeners; + private final List<PropertyChangeListener> listeners; public boolean writing=false; private org.xml.sax.SAXParseException error; private int ddStatus; @@ -46,15 +51,14 @@ public class WebAppProxy implements WebApp { public WebAppProxy(WebApp webApp, String version) { this.webApp=webApp; this.version = version; - listeners = new java.util.ArrayList(); + listeners = new ArrayList<>(); addPropertyChangeListener(reindentationListener); } public void setOriginal(WebApp webApp) { if (this.webApp!=webApp) { for (int i=0;i<listeners.size();i++) { - java.beans.PropertyChangeListener pcl = - (java.beans.PropertyChangeListener)listeners.get(i); + java.beans.PropertyChangeListener pcl = listeners.get(i); if (this.webApp!=null) this.webApp.removePropertyChangeListener(pcl); if (webApp!=null) webApp.addPropertyChangeListener(pcl); diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java index 2abc371..b379a37 100644 --- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java +++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java @@ -498,12 +498,12 @@ public class EarDataObject extends DD2beansDataObject private RequestProcessor.Task elementTask; private List deletedEjbNames; - private List newFileNames; + private List<String> newFileNames; private void elementCreated(final String elementName) { synchronized (this) { if (newFileNames==null) { - newFileNames=new ArrayList(); + newFileNames=new ArrayList<>(); } newFileNames.add(elementName); } diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java index a70ad79..3ad49a6 100644 --- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java +++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java @@ -291,13 +291,13 @@ public class EjbJarMultiViewDataObject extends DDMultiViewDataObject } private RequestProcessor.Task elementTask; - private List deletedEjbNames; - private List newFileNames; + private List<String> deletedEjbNames; + private List<String> newFileNames; private void elementCreated(final String elementName) { synchronized (this) { if (newFileNames == null) { - newFileNames = new ArrayList(); + newFileNames = new ArrayList<>(); } newFileNames.add(elementName); } @@ -388,7 +388,7 @@ public class EjbJarMultiViewDataObject extends DDMultiViewDataObject if (resourceName.equals(ejbs[i].getEjbClass())) { synchronized (this) { if (deletedEjbNames == null) { - deletedEjbNames = new ArrayList(); + deletedEjbNames = new ArrayList<>(); } deletedEjbNames.add(resourceName); } diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java index cef5c17..bf09b56 100644 --- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java +++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/ConfigurationUtils.java @@ -21,8 +21,9 @@ package org.netbeans.modules.web.jsf.api; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import java.util.WeakHashMap; +import java.util.List; import java.util.Map; +import java.util.WeakHashMap; import java.lang.ref.WeakReference; import org.netbeans.modules.j2ee.dd.api.web.DDProvider; import org.netbeans.modules.j2ee.dd.api.web.Servlet; @@ -151,7 +152,7 @@ public class ConfigurationUtils { if (documentBase == null) { return new FileObject [0]; } - ArrayList files = new ArrayList(); + List<FileObject> files = new ArrayList<>(); FileObject file; for (int i = 0; i < sFiles.length; i++){ file = documentBase.getFileObject(sFiles[i]); diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java index 9c69e6c..13e8b63 100644 --- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java +++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/lexer/GroovyLexer.java @@ -27,6 +27,7 @@ import groovyjarjarantlr.TokenStreamException; import java.io.IOException; import java.io.Reader; import java.util.ArrayList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import org.codehaus.groovy.antlr.parser.GroovyRecognizer; @@ -233,7 +234,7 @@ public final class GroovyLexer implements Lexer<GroovyTokenId> { public void setState(State d) { if (d != null) { stringCtorState = d.stringCtorState; - parenLevelStack = new ArrayList(d.parenLevelStack); + parenLevelStack = new ArrayList<>(d.parenLevelStack); } } } @@ -246,11 +247,11 @@ public final class GroovyLexer implements Lexer<GroovyTokenId> { private static class State { private final int stringCtorState; - private final ArrayList parenLevelStack; + private final List parenLevelStack; public State(int stringCtorState, ArrayList parenLevelStack) { this.stringCtorState = stringCtorState; - this.parenLevelStack = new ArrayList(parenLevelStack); + this.parenLevelStack = new ArrayList<>(parenLevelStack); } @Override diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryBuilder.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryBuilder.java index 155b495..8d276c5 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryBuilder.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryBuilder.java @@ -789,7 +789,7 @@ public class QueryBuilder extends TopComponent } // now check the columns in the condition if any. - List fromColumns = new ArrayList(); + List<Column> fromColumns = new ArrayList<>(); ( (JoinTable) fromTables.get(i) ).getReferencedColumns(fromColumns); for ( int j = 0; j < fromColumns.size(); j++ ) { Column fromColumn = (Column) fromColumns.get(j); @@ -810,7 +810,7 @@ public class QueryBuilder extends TopComponent if (DEBUG) System.out.println("checkSelect called. _queryModel.getSelect() = " + _queryModel.getSelect() ); // NOI18N if ( _queryModel.getSelect() != null ) { - ArrayList selectColumns = new ArrayList(); + List<Column> selectColumns = new ArrayList<>(); _queryModel.getSelect().getReferencedColumns(selectColumns); if ( ! checkColumns( selectColumns ) ) return false; @@ -825,7 +825,7 @@ public class QueryBuilder extends TopComponent if (DEBUG) System.out.println("checkWhere called... " ); // NOI18N if ( _queryModel.getWhere() != null ) { - ArrayList whereColumns = new ArrayList(); + List<Column> whereColumns = new ArrayList<>(); _queryModel.getWhere().getReferencedColumns(whereColumns); if ( ! checkColumns( whereColumns ) ) return false; @@ -840,7 +840,7 @@ public class QueryBuilder extends TopComponent if (DEBUG) System.out.println("checkGroupBy called... " ); // NOI18N if ( _queryModel.getGroupBy() != null ) { - ArrayList groupByColumns = new ArrayList(); + List<Column> groupByColumns = new ArrayList<>(); _queryModel.getGroupBy().getReferencedColumns(groupByColumns); if ( ! checkColumns( groupByColumns ) ) return false; } @@ -854,7 +854,7 @@ public class QueryBuilder extends TopComponent if (DEBUG) System.out.println("checkHaving called... " ); // NOI18N if ( _queryModel.getHaving() != null ) { - ArrayList havingColumns = new ArrayList(); + List<Column> havingColumns = new ArrayList<>(); _queryModel.getHaving().getReferencedColumns(havingColumns); if ( ! checkColumns( havingColumns ) ) return false; } @@ -869,10 +869,10 @@ public class QueryBuilder extends TopComponent System.out.println("checkOrderBy called... " ); // NOI18N OrderBy orderBy = _queryModel.getOrderBy(); if ( orderBy != null ) { - ArrayList orderByColumns = new ArrayList(); + List<Column> orderByColumns = new ArrayList<>(); for ( int i = 0; i < orderBy.getSortSpecificationCount(); i++ ) { Column sortColumn = orderBy.getSortSpecification(i).getColumn(); - orderByColumns.add( sortColumn); + orderByColumns.add(sortColumn); } if ( ! checkColumns( orderByColumns ) ) return false; } @@ -889,7 +889,7 @@ public class QueryBuilder extends TopComponent // case 3 : <alias_table_name>.<column_name> // case 4 : <column_name> // - private boolean checkColumns( ArrayList columns ) throws SQLException { + private boolean checkColumns(List<Column> columns) throws SQLException { Log.getLogger().entering("QueryBuilder", "checkColumns"); // NOI18N for ( int i = 0; i < columns.size(); i++ ) { Column column = (Column) columns.get(i); @@ -1141,7 +1141,7 @@ public class QueryBuilder extends TopComponent { if ( getParseErrorMessage() == null && _queryModel.isParameterized()) { - ArrayList list = new ArrayList(); + List<String> list = new ArrayList<>(); _queryModel.getParameterizedPredicates(list); String[] parameters = new String[list.size()]; String[] values = new String[list.size()]; @@ -1182,10 +1182,8 @@ public class QueryBuilder extends TopComponent } else if (paramCount != 0) { // we have a query which can not be parsed. - ArrayList list = new ArrayList(paramCount); if (DEBUG) { System.out.println(" param count = " + paramCount); - System.out.println(" list size = " + list.size()); } String[] parameters = new String[paramCount]; String[] values = new String[paramCount]; diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryModel.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryModel.java index bbb28da..3649f37 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryModel.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querybuilder/QueryModel.java @@ -205,7 +205,7 @@ class QueryModel { Column findSelectColumn(String tableSpec, String columnName) { - ArrayList columns = new ArrayList(); + List<Column> columns = new ArrayList<>(); _query.getSelect().getReferencedColumns(columns); for (int i=0; i<columns.size(); i++) { Column col = (Column)columns.get(i); diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/QueryNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/QueryNode.java index 5afb62b..0d75316 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/QueryNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/QueryNode.java @@ -168,7 +168,7 @@ public class QueryNode implements Query { if (_select.hasAsteriskQualifier()) { // NOI18N // Hack - if there's a star, just replace the whole list - ArrayList columns = new ArrayList(); + List<ColumnNode> columns = new ArrayList<>(); // Get the list of table objects from FROM List<Table> tables = _from.getTables(); @@ -177,7 +177,7 @@ public class QueryNode implements Query { for (int i=0; i<tables.size(); i++) { TableNode tbl = (TableNode) tables.get(i); String fullTableName = tbl.getFullTableName(); - List columnNames = new ArrayList(); + List<String> columnNames = new ArrayList<>(); tableReader.getColumnNames(fullTableName, columnNames); String corrName=tbl.getCorrName(); String tableName=tbl.getTableName(); diff --git a/ide/jellytools.ide/src/org/netbeans/jellytools/EditorOperator.java b/ide/jellytools.ide/src/org/netbeans/jellytools/EditorOperator.java index 31909a4..af765cf 100644 --- a/ide/jellytools.ide/src/org/netbeans/jellytools/EditorOperator.java +++ b/ide/jellytools.ide/src/org/netbeans/jellytools/EditorOperator.java @@ -24,6 +24,7 @@ import java.awt.event.KeyEvent; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.List; import java.util.Iterator; import javax.swing.JComponent; import javax.swing.JToolBar; @@ -649,7 +650,7 @@ public class EditorOperator extends TopComponentOperator { Class annotationsClass = Class.forName("org.netbeans.editor.Annotations"); Field lineAnnotationsArrayField = annotationsClass.getDeclaredField("lineAnnotationsArray"); lineAnnotationsArrayField.setAccessible(true); - ArrayList lineAnnotationsArray = (ArrayList) lineAnnotationsArrayField.get(getAnnotationsInstance()); + List lineAnnotationsArray = (List) lineAnnotationsArrayField.get(getAnnotationsInstance()); // loop through all lines for (int i = 0; i < lineAnnotationsArray.size(); i++) { result.addAll(getAnnotations(lineAnnotationsArray.get(i))); diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/Utils.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/Utils.java index be428e9..3c5cbc7 100644 --- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/Utils.java +++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/Utils.java @@ -355,7 +355,7 @@ public class Utils { if (line [0] == 0) return null; int ln = line [0] - 1; - List annotatables = new ArrayList (); + List<Annotatable> annotatables = new ArrayList<>(); if (nextTargetName != null) { Line fLine = lineCookie.getLineSet ().getCurrent (ln); int inx = findIndexOf(fLine.getText (), nextTargetName); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACodeCompletionProvider.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACodeCompletionProvider.java index e23f5b8..88ebd56 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACodeCompletionProvider.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACodeCompletionProvider.java @@ -171,7 +171,7 @@ public class JPACodeCompletionProvider implements CompletionProvider { if (prefix.length() == 0) { return data; } - List ret = new ArrayList(); + List<CompletionItem> ret = new ArrayList<>(); for (Iterator<JPACompletionItem> it = data.iterator(); it.hasNext();) { CompletionItem itm = it.next(); if (itm.getInsertPrefix().toString().startsWith(prefix)) { @@ -607,4 +607,4 @@ public class JPACodeCompletionProvider implements CompletionProvider { } } private static final String EMPTY = ""; //NOI18N -} \ No newline at end of file +} diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java index f21b9f3..7e6779a 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java @@ -50,7 +50,7 @@ public class DbSchemaEjbGenerator { private GeneratedTables genTables; private Map beans = new HashMap(); - private List relations = new ArrayList(); + private List<EntityRelation> relations = new ArrayList<>(); private SchemaElement schemaElement; private Set<String> tablesReferecedByOtherTables; private Set<String> primaryKeyIsForeignKeyTables; @@ -583,7 +583,7 @@ public class DbSchemaEjbGenerator { } private List getFieldNames(EntityClass bean) { - List result = new ArrayList(); + List<String> result = new ArrayList<>(); for (Iterator i = bean.getFields().iterator(); i.hasNext();) { EntityMember member = (EntityMember)i.next(); result.add(member.getMemberName()); @@ -600,7 +600,7 @@ public class DbSchemaEjbGenerator { */ private EntityRelation[] makeRelationsUnique() { EntityRelation[] r = getRelations(); - List relationNames = new ArrayList(r.length); + List<String> relationNames = new ArrayList<>(r.length); for (int i = 0; i < r.length; i++) { r[i].makeRoleNamesUnique(); String baseName = r[i].getRelationName(); @@ -612,7 +612,7 @@ public class DbSchemaEjbGenerator { /** * return name generated or base name if this was ok */ - private static String uniqueAlgorithm(List names, String baseName, String sep) { + private static String uniqueAlgorithm(List<String> names, String baseName, String sep) { String newName = baseName; int unique = 0; while (names.contains(newName)) { diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/DBSchemaFileList.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/DBSchemaFileList.java index 0393131..4ab5f95 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/DBSchemaFileList.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/DBSchemaFileList.java @@ -40,8 +40,8 @@ import org.openide.util.NbBundle; */ public class DBSchemaFileList { - private final Map<FileObject,String> dbschema2DisplayName = new HashMap<FileObject,String>(); - private final List dbschemaList; + private final Map<FileObject, String> dbschema2DisplayName = new HashMap<>(); + private final List<FileObject> dbschemaList; public DBSchemaFileList(Project project, FileObject configFilesFolder) { SourceGroup[] sourceGroups = SourceGroups.getJavaSourceGroups(project); @@ -56,7 +56,7 @@ public class DBSchemaFileList { searchRoot(configFilesFolder, configFilesDisplayName); } - List tempDBSchemaList = new ArrayList(dbschema2DisplayName.keySet()); + List<FileObject> tempDBSchemaList = new ArrayList<>(dbschema2DisplayName.keySet()); Collections.sort(tempDBSchemaList, new DBSchemaComparator()); dbschemaList = Collections.unmodifiableList(tempDBSchemaList); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java index 55ac914..b3ff1c8 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/JavaPersistenceGenerator.java @@ -715,7 +715,7 @@ public class JavaPersistenceGenerator implements PersistenceGenerator { // Add @Basic(optional=false) for not nullable columns if (!m.isNullable()) { - List<ExpressionTree> basicAnnArguments = new ArrayList(); + List<ExpressionTree> basicAnnArguments = new ArrayList<>(); basicAnnArguments.add(genUtils.createAnnotationArgument("optional", false)); //NOI18N annotations.add(genUtils.createAnnotation("javax.persistence.Basic", basicAnnArguments)); //NOI18N //Add @NotNull constraint @@ -729,7 +729,7 @@ public class JavaPersistenceGenerator implements PersistenceGenerator { annotations.add(genUtils.createAnnotation("javax.persistence.Lob")); // NOI18N } - List<ExpressionTree> columnAnnArguments = new ArrayList(); + List<ExpressionTree> columnAnnArguments = new ArrayList<>(); String memberName = m.getMemberName(); String memberType = getMemberType(m); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableClosure.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableClosure.java index c4e9c19..9e69ee9 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableClosure.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableClosure.java @@ -363,7 +363,7 @@ public class TableClosure { public Queue(Set<T> initialContents) { assert !initialContents.contains(null); - queue = new ArrayList(initialContents); + queue = new ArrayList<>(initialContents); contents = new HashSet(initialContents); } diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/variables/ViewModel.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/variables/ViewModel.java index ef50db5..c10022a 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/variables/ViewModel.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/variables/ViewModel.java @@ -179,40 +179,40 @@ final class ViewModel { models.add(joinLists(tableModels)); } synchronized (tableModelFilters) { - models.add(new ArrayList<Object>(tableModelFilters)); + models.add(new ArrayList<>(tableModelFilters)); } synchronized (nodeActionsProviders) { - models.add(new ArrayList<Object>(nodeActionsProviders)); + models.add(new ArrayList<>(nodeActionsProviders)); } synchronized (nodeActionsProviderFilters) { - models.add(new ArrayList<Object>(nodeActionsProviderFilters)); + models.add(new ArrayList<>(nodeActionsProviderFilters)); } synchronized (columnModels) { - models.add(new ArrayList<Object>(columnModels)); + models.add(new ArrayList<>(columnModels)); } synchronized (mm) { - models.add(new ArrayList<Object>(mm)); + models.add(new ArrayList<>(mm)); } synchronized (treeExpansionModelFilters) { - models.add(new ArrayList<Object>(treeExpansionModelFilters)); + models.add(new ArrayList<>(treeExpansionModelFilters)); } synchronized (asynchModelFilters) { - models.add(new ArrayList<Object>(asynchModelFilters)); + models.add(new ArrayList<>(asynchModelFilters)); } synchronized (tableRenderers) { - models.add(new ArrayList(tableRenderers)); + models.add(new ArrayList<>(tableRenderers)); } synchronized (tableRendererFilters) { - models.add(new ArrayList(tableRendererFilters)); + models.add(new ArrayList<>(tableRendererFilters)); } synchronized (tableHTMLModelFilters) { - models.add(new ArrayList(tableHTMLModelFilters)); + models.add(new ArrayList<>(tableHTMLModelFilters)); } synchronized (tablePropertyEditors) { - models.add(new ArrayList(tablePropertyEditors)); + models.add(new ArrayList<>(tablePropertyEditors)); } synchronized (tablePropertyEditorsFilters) { - models.add(new ArrayList(tablePropertyEditorsFilters)); + models.add(new ArrayList<>(tablePropertyEditorsFilters)); } boolean haveTreeModels = false; diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java index 4ce49e4..a9e35e4 100644 --- a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java +++ b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java @@ -569,7 +569,7 @@ public class MavenProjectGrammar extends AbstractSchemaBasedGrammar { if (path.endsWith("dependencies/dependency/scope")) { //NOI18N if (path.contains("dependencyManagement")) { - ArrayList<String> lst = new ArrayList(Arrays.asList(SCOPES)); + List<String> lst = new ArrayList<>(Arrays.asList(SCOPES)); lst.add("import"); Collections.sort(lst); return super.createTextValueList(lst.toArray(new String[0]), virtualTextCtx); diff --git a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/SAXGeneratorSupport.java b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/SAXGeneratorSupport.java index a228c89..77d6ff0 100644 --- a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/SAXGeneratorSupport.java +++ b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/SAXGeneratorSupport.java @@ -494,7 +494,7 @@ public final class SAXGeneratorSupport implements XMLGenerateCookie { ClassTree modifiedClass = genUtils.addImplementsClause(javaClass, interfaceName); //add private class fields - List varTree = new ArrayList(); + List<VariableTree> varTree = new ArrayList<>(); ModifiersTree mods = make.Modifiers(EnumSet.of(Modifier.PRIVATE)); Tree tree = make.Identifier(face); VariableTree var = make.Variable(mods, "handler", tree, null); @@ -531,7 +531,7 @@ public final class SAXGeneratorSupport implements XMLGenerateCookie { sb.append("}"); mods = make.Modifiers(EnumSet.of(Modifier.FINAL)); - varTree = new ArrayList(); + varTree = new ArrayList<>(); if (model.hasParslets()) { tree = make.Identifier(face); var = make.Variable(mods, "handler", tree, null); diff --git a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java index 71537dd..fd0b96c 100644 --- a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java +++ b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBean.java @@ -455,7 +455,7 @@ public final class FxBean extends FxDefinition { @SuppressWarnings("unchecked") private void appendMap(StringBuilder sb, Map m) { - List al = new ArrayList(m.keySet()); + List<String> al = new ArrayList<>(m.keySet()); Collections.sort(al); for (Object o : al) { diff --git a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExternalDragAndDrop.java b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExternalDragAndDrop.java index 977dbbc..c69c9c1 100644 --- a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExternalDragAndDrop.java +++ b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExternalDragAndDrop.java @@ -59,7 +59,7 @@ public class ExternalDragAndDrop { Transferable res = multi; try { MultiTransferObject mto = (MultiTransferObject) multi.getTransferData(ExTransferable.multiFlavor); - final ArrayList fileList = new ArrayList( mto.getCount() ); + final List fileList = new ArrayList<>( mto.getCount() ); for( int i=0; i<mto.getCount(); i++ ) { if( mto.isDataFlavorSupported( i, DataFlavor.javaFileListFlavor ) ) { List<?> list = (List<?>)mto.getTransferData( i, DataFlavor.javaFileListFlavor ); --------------------------------------------------------------------- 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