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 6fea7b8 [NETBEANS-6023] - cleanup SQLParser.java warning errors (#3177) 6fea7b8 is described below commit 6fea7b8858e9bca9a9a023c93a6c4a56487bbd45 Author: Brad Walker <bwal...@musings.com> AuthorDate: Mon Sep 20 11:29:46 2021 -0600 [NETBEANS-6023] - cleanup SQLParser.java warning errors (#3177) I wanted to explore the SQL capabilities of Netbeans. As a result, I cleaned up some of the warnings in SQLParser.jj and friends. [repeat] /home/bwalker/src/netbeans/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.java:75: warning: [rawtypes] found raw type: ArrayList [repeat] SelectNode SQLSelect() throws ParseException {ArrayList selctItemList=new ArrayList(); [repeat] ^ [repeat] missing type arguments for generic class ArrayList<E> [repeat] where E is a type-variable: [repeat] E extends Object declared in class ArrayList --- .../org-netbeans-modules-db-sql-visualeditor.sig | 2 +- ide/db.sql.visualeditor/nbproject/project.properties | 3 ++- .../modules/db/sql/visualeditor/parser/SQLParser.jj | 16 ++++++++-------- .../modules/db/sql/visualeditor/querymodel/AndNode.java | 3 ++- .../modules/db/sql/visualeditor/querymodel/FromNode.java | 2 +- .../db/sql/visualeditor/querymodel/GroupByNode.java | 2 +- .../modules/db/sql/visualeditor/querymodel/OrNode.java | 3 ++- .../db/sql/visualeditor/querymodel/OrderByNode.java | 2 +- .../db/sql/visualeditor/querymodel/SelectNode.java | 6 +++--- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ide/db.sql.visualeditor/nbproject/org-netbeans-modules-db-sql-visualeditor.sig b/ide/db.sql.visualeditor/nbproject/org-netbeans-modules-db-sql-visualeditor.sig index 1cc1543..fd8ffd3 100644 --- a/ide/db.sql.visualeditor/nbproject/org-netbeans-modules-db-sql-visualeditor.sig +++ b/ide/db.sql.visualeditor/nbproject/org-netbeans-modules-db-sql-visualeditor.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.44.0 +#Version 2.45.0 CLSS public abstract java.awt.Component cons protected init() diff --git a/ide/db.sql.visualeditor/nbproject/project.properties b/ide/db.sql.visualeditor/nbproject/project.properties index a4e4040..339226d 100644 --- a/ide/db.sql.visualeditor/nbproject/project.properties +++ b/ide/db.sql.visualeditor/nbproject/project.properties @@ -21,9 +21,10 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial javadoc.arch=${basedir}/arch.xml module.javadoc.packages= org.netbeans.modules.db.sql.visualeditor.api + # #javadoc.name=Designtime-API #javadoc.title=Creator Designtime API #javadoc.arch=${basedir}/arch.xml #javadoc.arch=${basedir}/arch/arch-designtime.xml -spec.version.base=2.44.0 +spec.version.base=2.45.0 diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj index 57a2231..3cfb735 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/parser/SQLParser.jj @@ -33,6 +33,7 @@ PARSER_BEGIN(SQLParser) package org.netbeans.modules.db.sql.visualeditor.parser; import java.util.ArrayList; +import java.util.List; import org.netbeans.modules.db.sql.visualeditor.querymodel.*; @@ -191,9 +192,8 @@ QueryNode SQLQuery() : // SELECT [ quantifier ] column (, column)* -SelectNode SQLSelect() : -{ - ArrayList selctItemList=new ArrayList(); +SelectNode SQLSelect() : { + List<ColumnItem> selctItemList=new ArrayList<>(); String q="ALL"; ColumnItem item = null; } @@ -288,7 +288,7 @@ SetFunction SQLSetFunction(int type) : FromNode SQLFrom() : { - ArrayList tableList = new ArrayList(); + List<JoinTableNode> tableList = new ArrayList<>(); JoinTableNode jt=null; } { @@ -308,7 +308,7 @@ FromNode SQLFrom() : GroupByNode SQLGroupBy() : { - ArrayList columnList=new ArrayList(); + List<ColumnItem> columnList=new ArrayList<>(); ColumnItem col; } { @@ -467,7 +467,7 @@ Expression SQLOr() : { // System.out.println("SQLOr"); Expression a; - ArrayList forms = new ArrayList(); + List<Expression> forms = new ArrayList<>(); } { a=SQLAndExpr() @@ -513,7 +513,7 @@ Expression SQLAnd() : { // System.out.println("SQLAnd"); Expression c; - ArrayList forms = new ArrayList(); + List<Expression> forms = new ArrayList<>(); } { c=SQLNot() @@ -625,7 +625,7 @@ Value SQLValue() : OrderByNode SQLOrderBy() : { - ArrayList sortSpecificationList=new ArrayList(); + List<SortSpecification> sortSpecificationList = new ArrayList<>(); SortSpecification ss=null; } { diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/AndNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/AndNode.java index ad54ea9..653cb2c 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/AndNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/AndNode.java @@ -19,6 +19,7 @@ package org.netbeans.modules.db.sql.visualeditor.querymodel; import java.util.ArrayList; +import java.util.List; import org.netbeans.api.db.sql.support.SQLIdentifiers; @@ -32,7 +33,7 @@ public class AndNode extends BooleanExpressionList implements And { // Constructors // - public AndNode(ArrayList expressions) { + public AndNode(List expressions) { _expressions = new ArrayList(); BooleanExpressionList.flattenExpression(expressions, AndNode.class, _expressions); } diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/FromNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/FromNode.java index 73388d8..bdde078 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/FromNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/FromNode.java @@ -41,7 +41,7 @@ public class FromNode implements From { public FromNode() { } - public FromNode(ArrayList tableList) { + public FromNode(List tableList) { _tableList = tableList; } diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/GroupByNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/GroupByNode.java index 66b0e38..ae6fdb9 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/GroupByNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/GroupByNode.java @@ -40,7 +40,7 @@ public class GroupByNode implements GroupBy { public GroupByNode() { } - public GroupByNode(ArrayList columnList) { + public GroupByNode(List columnList) { _columnList = columnList; } diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrNode.java index e383478..bb10c0e 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrNode.java @@ -19,6 +19,7 @@ package org.netbeans.modules.db.sql.visualeditor.querymodel; import java.util.ArrayList; +import java.util.List; import org.netbeans.api.db.sql.support.SQLIdentifiers; @@ -31,7 +32,7 @@ public class OrNode extends BooleanExpressionList implements Or { // // Constructors // - public OrNode(ArrayList expressions) { + public OrNode(List expressions) { _expressions = new ArrayList(); BooleanExpressionList.flattenExpression(expressions, OrNode.class, _expressions); } diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrderByNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrderByNode.java index 230d3bf..f30ad09 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrderByNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/OrderByNode.java @@ -41,7 +41,7 @@ public class OrderByNode implements OrderBy { public OrderByNode() { } - public OrderByNode(ArrayList sortSpecificationList) { + public OrderByNode(List sortSpecificationList) { _sortSpecificationList = sortSpecificationList; } diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/SelectNode.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/SelectNode.java index fb3d7fc..b026c4b 100644 --- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/SelectNode.java +++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/SelectNode.java @@ -41,12 +41,12 @@ public class SelectNode implements Select { public SelectNode() { } - public SelectNode(ArrayList columnList, String quantifier) { + public SelectNode(List columnList, String quantifier) { _selectItemList = columnList; _quantifier = quantifier; } - public SelectNode(ArrayList columnList) { + public SelectNode(List columnList) { this(columnList, ""); // NOI18N } @@ -76,7 +76,7 @@ public class SelectNode implements Select { // Accessors/Mutators - public void setColumnList(ArrayList columnList) { + public void setColumnList(List columnList) { _selectItemList = columnList; } --------------------------------------------------------------------- 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