You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2020/12/28 19:40:49 UTC
[netbeans] branch master updated: [NETBEANS-5187] - cleanup Vector
raw type warnings..
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0ada627 [NETBEANS-5187] - cleanup Vector raw type warnings..
new f126988 Merge pull request #2611 from BradWalker/cleanup_vector_rawtype
0ada627 is described below
commit 0ada62723c782e1871458d23c93271a4971bf3a0
Author: Brad Walker <bw...@musings.com>
AuthorDate: Sun Dec 27 19:50:46 2020 -0700
[NETBEANS-5187] - cleanup Vector raw type warnings..
Cleanup a bunch of the follow raw type warnings related to the use of Vector..
[repeat] /home/bwalker/src/netbeans/enterprise/payara.eecommon/build/classes-generated/org/netbeans/modules/payara/eecommon/dd/impl/web/model_4/SessionConfig.java:22: warning: [rawtypes] found raw type: Vector
[repeat] static Vector comparators = new Vector();
[repeat] ^
[repeat] missing type arguments for generic class Vector<E>
[repeat] where E is a type-variable:
[repeat] E extends Object declared in class Vector
This check-in cleans up a lot of these..
---
.../org/netbeans/modules/cpplite/debugger/CallStackModel.java | 8 +++-----
.../org/netbeans/modules/cpplite/debugger/VariablesModel.java | 8 +++-----
.../org/netbeans/modules/cpplite/debugger/WatchesModel.java | 8 +++-----
.../modules/cpplite/debugger/breakpoints/BreakpointModel.java | 8 +++-----
.../modules/glassfish/eecommon/api/ProgressEventSupport.java | 10 +++++-----
.../modules/glassfish/eecommon/api/VerifierSupport.java | 2 +-
.../org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java | 4 ++--
.../modules/j2ee/ddloaders/client/ClientDataObject.java | 4 ++--
.../modules/payara/eecommon/api/ProgressEventSupport.java | 2 +-
.../netbeans/modules/payara/eecommon/api/VerifierSupport.java | 2 +-
.../org/netbeans/modules/web/monitor/client/Controller.java | 4 ++--
.../src/org/netbeans/modules/web/monitor/data/ClientData.java | 2 +-
.../netbeans/modules/web/monitor/data/ContextAttributes.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/ContextData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/CookieIn.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/CookieOut.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/CookiesData.java | 2 +-
.../org/netbeans/modules/web/monitor/data/DispatchData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/Dispatches.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/EngineData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/Headers.java | 4 ++--
.../src/org/netbeans/modules/web/monitor/data/MonitorData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/Param.java | 2 +-
.../netbeans/modules/web/monitor/data/RequestAttributesIn.java | 2 +-
.../modules/web/monitor/data/RequestAttributesOut.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/RequestData.java | 4 ++--
.../src/org/netbeans/modules/web/monitor/data/ServletData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/SessionData.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/SessionIn.java | 2 +-
.../src/org/netbeans/modules/web/monitor/data/SessionOut.java | 2 +-
.../src/org/netbeans/spi/debugger/ActionsProviderSupport.java | 6 +++---
.../netbeans/modules/docker/ui/build2/BuildOptionsVisual.java | 6 +++---
.../modules/docker/ui/run/RunContainerPropertiesVisual.java | 6 +++---
.../org/netbeans/modules/xml/catalog/CatalogMounterModel.java | 2 +-
.../xml/tax/beans/editor/TreeNodeFilterCustomEditor.java | 8 ++++----
ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java | 2 +-
ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java | 6 ++++--
.../src/org/netbeans/modules/ant/debugger/CallStackModel.java | 8 +++-----
.../src/org/netbeans/modules/ant/debugger/VariablesModel.java | 8 +++-----
.../src/org/netbeans/modules/ant/debugger/WatchesModel.java | 8 +++-----
.../modules/ant/debugger/breakpoints/BreakpointModel.java | 8 +++-----
.../j2semodule/ui/customizer/J2SEModularProjectProperties.java | 2 +-
.../java/j2seproject/ui/customizer/J2SEProjectProperties.java | 2 +-
.../nashorn/execution/options/JavaScriptNashornPanel.java | 2 +-
.../modules/xml/tools/java/generator/ElementBindings.java | 2 +-
45 files changed, 82 insertions(+), 96 deletions(-)
diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
index e55eb9d..e11cf36 100644
--- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
+++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CallStackModel.java
@@ -47,7 +47,7 @@ NodeActionsProvider, TableModel {
"org/netbeans/modules/debugger/resources/callStackView/CurrentFrame";
private CPPLiteDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public CallStackModel (ContextProvider contextProvider) {
@@ -325,11 +325,9 @@ NodeActionsProvider, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged (this));
}
}
diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/VariablesModel.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/VariablesModel.java
index 44fe24e..1502fb0 100644
--- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/VariablesModel.java
+++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/VariablesModel.java
@@ -38,7 +38,7 @@ public class VariablesModel implements TreeModel, NodeModel, TableModel {
"org/netbeans/modules/debugger/resources/localsView/LocalVariable";
private CPPLiteDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public VariablesModel (ContextProvider contextProvider) {
@@ -264,11 +264,9 @@ public class VariablesModel implements TreeModel, NodeModel, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
}
diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/WatchesModel.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/WatchesModel.java
index 41048d3..1817344 100644
--- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/WatchesModel.java
+++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/WatchesModel.java
@@ -42,7 +42,7 @@ public class WatchesModel implements NodeModelFilter, TableModel {
"org/netbeans/modules/debugger/resources/watchesView/Watch";
private CPPLiteDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public WatchesModel (ContextProvider contextProvider) {
@@ -212,12 +212,10 @@ public class WatchesModel implements NodeModelFilter, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
}
diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/BreakpointModel.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/BreakpointModel.java
index e58eb67..895f4d5 100644
--- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/BreakpointModel.java
+++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/breakpoints/BreakpointModel.java
@@ -44,7 +44,7 @@ public class BreakpointModel implements NodeModel {
public static final String DISABLED_LINE_BREAKPOINT =
"org/netbeans/modules/debugger/resources/editor/DisabledBreakpoint";
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
// NodeModel implementation ................................................
@@ -138,12 +138,10 @@ public class BreakpointModel implements NodeModel {
public void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
private static CPPLiteDebugger getDebugger () {
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
index 114e168..856ecc9 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ProgressEventSupport.java
@@ -66,7 +66,7 @@ public class ProgressEventSupport {
public synchronized void addProgressListener (ProgressListener lsnr) {
boolean notify = false;
if (listeners == null) {
- listeners = new java.util.Vector<ProgressListener>();
+ listeners = new Vector<ProgressListener>();
}
listeners.addElement(lsnr);
if (status != null && !status.isRunning ()) {
@@ -97,17 +97,17 @@ public class ProgressEventSupport {
status = sCode;
tmID = targetModuleID;
- Vector targets = null;
+ Vector<ProgressListener> targets = null;
synchronized (this) {
if (listeners != null) {
- targets = (Vector) listeners.clone();
+ targets = (Vector<ProgressListener>)listeners.clone();
}
}
if (targets != null) {
for (int i = 0; i < targets.size(); i++) {
- ProgressListener target = (ProgressListener)targets.elementAt(i);
- target.handleProgressEvent (evt);
+ ProgressListener target = targets.elementAt(i);
+ target.handleProgressEvent(evt);
}
}
}
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
index 137ebe1..f778f26 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
@@ -133,7 +133,7 @@ public class VerifierSupport extends TopComponent {
private Vector<Test> failResults = new Vector<>();
private Vector<Error> errorResults = new Vector<>();
private Vector<Test> warnResults = new Vector<>();
- private Vector naResults = new Vector();
+ private Vector<Test> naResults = new Vector<>();
private Vector notImplementedResults = new Vector();
private Vector notRunResults = new Vector();
private Vector defaultResults = new Vector();
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 39961ed..2abc371 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
@@ -92,7 +92,7 @@ public class EarDataObject extends DD2beansDataObject
private boolean unparsable=true;
/** List of updates to ejbs that should be processed */
- private Vector updates;
+ private Vector<DDChangeEvent> updates;
private RequestProcessor.Task updateTask;
@@ -353,7 +353,7 @@ public class EarDataObject extends DD2beansDataObject
public void deploymentChange (DDChangeEvent evt) {
synchronized (this) {
if (updates == null) {
- updates = new Vector ();
+ updates = new Vector<>();
}
updates.addElement (evt);
}
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
index 94e71b1..1d806ec 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/ClientDataObject.java
@@ -88,7 +88,7 @@ public class ClientDataObject extends DDMultiViewDataObject
private transient FileObject srcRoots[];
/** List of updates to servlets that should be processed */
- private Vector updates;
+ private Vector<DDChangeEvent> updates;
private transient RequestProcessor.Task updateTask;
@@ -162,7 +162,7 @@ public class ClientDataObject extends DDMultiViewDataObject
public void deploymentChange(DDChangeEvent evt) {
synchronized (this) {
if (updates == null) {
- updates = new Vector();
+ updates = new Vector<>();
}
updates.addElement(evt);
}
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ProgressEventSupport.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ProgressEventSupport.java
index c198eb8..2af3144 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ProgressEventSupport.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ProgressEventSupport.java
@@ -97,7 +97,7 @@ public class ProgressEventSupport {
status = sCode;
tmID = targetModuleID;
- Vector targets = null;
+ Vector<ProgressListener> targets = null;
synchronized (this) {
if (listeners != null) {
targets = (Vector) listeners.clone();
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
index d965692..30abecb 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
@@ -133,7 +133,7 @@ public class VerifierSupport extends TopComponent {
private Vector<Test> failResults = new Vector<>();
private Vector<Test> warnResults = new Vector<>();
private Vector<Error> errorResults = new Vector<>();
- private Vector naResults = new Vector();
+ private Vector<Test> naResults = new Vector<>();
private Vector notImplementedResults = new Vector();
private Vector notRunResults = new Vector();
private Vector defaultResults = new Vector();
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
index 127fa0e..3ccfb0e 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
@@ -927,7 +927,7 @@ class Controller {
}
Enumeration e = null;
- Vector nodes = new Vector();
+ Vector<TransactionNode> nodes = new Vector<>();
int numtns = 0;
TransactionNode[] tns = null;
FileObject fo = null;
@@ -977,7 +977,7 @@ class Controller {
savedTrans.remove(savedTrans.getNodes());
- nodes = new Vector();
+ nodes = new Vector<>();
e = saveDir.getData(false);
while(e.hasMoreElements()) {
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
index 82d8267..db4df87 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
@@ -30,7 +30,7 @@ import org.netbeans.modules.schema2beans.Version;
public class ClientData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
public ClientData() {
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
index 7e208c5..3ddfe7f 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
@@ -43,7 +43,7 @@ import org.netbeans.modules.schema2beans.Version;
public class ContextAttributes extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
index c9a5044..8f9e625 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
@@ -41,7 +41,7 @@ import org.netbeans.modules.schema2beans.Version;
public class ContextData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; //NOI18N
static public final String CONTEXTATTRIBUTES =
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
index eacdf80..f75454f 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beans.Version;
public class CookieIn extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
public CookieIn() {
this(Common.USE_DEFAULT_VALUES);
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
index b73b5be..2de38a7 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beans.Common;
public class CookieOut extends BaseBean
{
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
public CookieOut()
{
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
index 8d19607..dc60d70 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beans.Version;
public class CookiesData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String COOKIEIN = "CookieIn"; // NOI18N
static public final String COOKIEOUT = "CookieOut"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
index 0c94d5e..d0ffdbb 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
@@ -33,7 +33,7 @@ public class DispatchData extends BaseBean implements DataRecord {
private final static boolean debug = false;
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String CLIENTDATA = "ClientData"; // NOI18N
static public final String SESSIONDATA = "SessionData"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
index dedbba9..3a01868 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
@@ -28,7 +28,7 @@ import org.netbeans.modules.schema2beans.Common;
public class Dispatches extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String DISPATCHDATA = "DispatchData"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
index 9009c71..59d8062 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
@@ -30,7 +30,7 @@ import org.netbeans.modules.schema2beans.Version;
public class EngineData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
public EngineData() {
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
index 9bdc677..5d75823 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
@@ -39,7 +39,7 @@ import org.netbeans.modules.schema2beans.Version;
public class Headers extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; // NOI18N
@@ -111,7 +111,7 @@ public class Headers extends BaseBean {
//
public Enumeration getHeaders(String name) {
int len = this.size(PARAM);
- Vector v = new Vector();
+ Vector<String> v = new Vector<>();
for(int i=0; i<len; ++i) {
if(getParam(i).getName().equalsIgnoreCase(name))
v.add(getParam(i).getValue());
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
index c9f5f2f..5fb0902 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
@@ -44,7 +44,7 @@ public class MonitorData extends BaseBean implements DataRecord {
private final static boolean debug = false;
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String CLIENTDATA = "ClientData"; // NOI18N
static public final String SESSIONDATA = "SessionData"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
index 79a4a42..c93691e 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
@@ -30,7 +30,7 @@ import org.netbeans.modules.schema2beans.Version;
public class Param extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
public Param() {
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
index 4bf325f..d59a8fe 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
@@ -43,7 +43,7 @@ import org.netbeans.modules.schema2beans.Version;
public class RequestAttributesIn extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
index 4012cd1..279145f 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
@@ -43,7 +43,7 @@ import org.netbeans.modules.schema2beans.Version;
public class RequestAttributesOut extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
index bf00018..56dfc31 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
@@ -36,7 +36,7 @@ import org.w3c.dom.Node;
public class RequestData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; //NOI18N
static public final String HEADERS = "Headers"; //NOI18N
@@ -272,7 +272,7 @@ public class RequestData extends BaseBean {
if(cookieStr == null || cookieStr.equals("")) //NOI18N
return new Param[0];
- Vector cookies = new Vector();
+ Vector<Param> cookies = new Vector<>();
StringTokenizer tok = new StringTokenizer(cookieStr,
";", false); // NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
index b0b819c..5c92ba7 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beans.Version;
public class ServletData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; //NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
index 67187a4..dc46a39 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beans.Version;
public class SessionData extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String SESSIONIN = "SessionIn"; //NOI18N
static public final String SESSIONOUT = "SessionOut"; //NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
index 3b56592..93b874c 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
@@ -44,7 +44,7 @@ import org.netbeans.modules.schema2beans.Version;
public class SessionIn extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; //NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
index d1bb24e..0550cd6 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
@@ -45,7 +45,7 @@ import org.netbeans.modules.schema2beans.Version;
public class SessionOut extends BaseBean {
- static Vector comparators = new Vector();
+ static Vector<BeanComparator> comparators = new Vector<>();
static public final String PARAM = "Param"; //NOI18N
diff --git a/ide/api.debugger/src/org/netbeans/spi/debugger/ActionsProviderSupport.java b/ide/api.debugger/src/org/netbeans/spi/debugger/ActionsProviderSupport.java
index 41f911c..a04dfeb 100644
--- a/ide/api.debugger/src/org/netbeans/spi/debugger/ActionsProviderSupport.java
+++ b/ide/api.debugger/src/org/netbeans/spi/debugger/ActionsProviderSupport.java
@@ -33,7 +33,7 @@ import java.util.Vector;
public abstract class ActionsProviderSupport extends ActionsProvider {
private HashSet enabled = new HashSet ();
- private Vector listeners = new Vector ();
+ private Vector<ActionsProviderListener> listeners = new Vector<>();
/**
@@ -80,10 +80,10 @@ public abstract class ActionsProviderSupport extends ActionsProvider {
* @param enabled the new state
*/
protected void fireActionStateChanged (Object action, boolean enabled) {
- Vector v = (Vector) listeners.clone ();
+ Vector<ActionsProviderListener> v = (Vector<ActionsProviderListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ActionsProviderListener) v.elementAt (i)).actionStateChange (
+ v.elementAt (i).actionStateChange (
action, enabled
);
}
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java b/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
index 7687070..4e1b906 100644
--- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
+++ b/ide/docker.ui/src/org/netbeans/modules/docker/ui/build2/BuildOptionsVisual.java
@@ -87,9 +87,9 @@ public final class BuildOptionsVisual extends JPanel {
buildargsTable.getCellEditor().stopCellEditing();
}
for (Object o : model.getDataVector()) {
- Vector v = (Vector) o;
- String name = (String) v.elementAt(0);
- String value = (String) v.elementAt(1);
+ Vector<String> v = (Vector<String>)o;
+ String name = v.elementAt(0);
+ String value = v.elementAt(1);
if (name != null && value != null) {
result.put(name, value);
}
diff --git a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java b/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
index 2df05b1..4f06280 100644
--- a/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
+++ b/ide/docker.ui/src/org/netbeans/modules/docker/ui/run/RunContainerPropertiesVisual.java
@@ -138,9 +138,9 @@ public class RunContainerPropertiesVisual extends javax.swing.JPanel {
volumesTable.getCellEditor().stopCellEditing();
}
for (Object o : model.getDataVector()) {
- Vector v = (Vector) o;
- String target = (String) v.elementAt(0);
- String source = (String) v.elementAt(1);
+ Vector<String> v = (Vector<String>)o;
+ String target = v.elementAt(0);
+ String source = v.elementAt(1);
if (target != null && source != null) {
result.put(target, source);
}
diff --git a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogMounterModel.java b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogMounterModel.java
index 5db9802..576e139 100644
--- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogMounterModel.java
+++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogMounterModel.java
@@ -49,7 +49,7 @@ final class CatalogMounterModel extends Object {
/** Creates new CatalogMounterModel */
public CatalogMounterModel(Iterator providers) {
- Vector providersList = new Vector();
+ Vector<Entry> providersList = new Vector<>();
while (providers.hasNext()) {
providersList.add(new Entry((Class)providers.next()));
}
diff --git a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
index f27bf42..22c98ff 100644
--- a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
+++ b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
@@ -520,12 +520,12 @@ public class TreeNodeFilterCustomEditor extends JPanel implements EnhancedCustom
//
/** */
- private static Vector publicNodeTypesInheritanceTree;
+ private static Vector<Item> publicNodeTypesInheritanceTree;
/**
*/
- private static Vector getPublicNodeTypesInheritanceTree () {
+ private static Vector<Item> getPublicNodeTypesInheritanceTree () {
if ( publicNodeTypesInheritanceTree == null ) {
if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug ("Init Set"); // NOI18N
@@ -542,7 +542,7 @@ public class TreeNodeFilterCustomEditor extends JPanel implements EnhancedCustom
}
}
- publicNodeTypesInheritanceTree = new Vector();
+ publicNodeTypesInheritanceTree = new Vector<>();
fillPublicNodeTypesInheritanceTree (rootItem.layer, ""); // NOI18N
Item.itemMap.clear();
@@ -728,7 +728,7 @@ public class TreeNodeFilterCustomEditor extends JPanel implements EnhancedCustom
// debug
public static final void main (String[] args) throws Exception {
- Vector vector = getPublicNodeTypesInheritanceTree();
+// Vector vector = getPublicNodeTypesInheritanceTree();
// Iterator it = vector.iterator();
// System.out.println ("+==================================="); // NOI18N
diff --git a/ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java b/ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java
index 4eb18c8..406be14 100644
--- a/ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java
+++ b/ide/xml/src/org/netbeans/modules/xml/sync/SyncSupport.java
@@ -176,7 +176,7 @@ public abstract class SyncSupport {
// look for comodifications
- Vector modified = new Vector();
+ Vector<Representation> modified = new Vector<>();
for (int i=0; i<all.length; i++) {
if (all[i].represents(type)) {
master = all[i];
diff --git a/ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java b/ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java
index 6f7be46..7b5a36f 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/grammar/ResultNode.java
@@ -19,6 +19,8 @@
package org.netbeans.modules.xsl.grammar;
+import java.util.Vector;
+
import org.w3c.dom.*;
/**
@@ -220,10 +222,10 @@ public class ResultNode implements Node {
}
public class ResultNodeList implements NodeList{
- java.util.Vector nodeVector;
+ Vector<Node> nodeVector;
public ResultNodeList(NodeList list) {
- nodeVector = new java.util.Vector(list.getLength());
+ nodeVector = new Vector<>(list.getLength());
for (int ind = 0; ind < list.getLength(); ind++) {
Node node = list.item(ind);
if (node.getNodeName() != null && hasAllowedPrefix(node.getNodeName())) {
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/CallStackModel.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/CallStackModel.java
index 4efe6eb..dbc8a5c8 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/CallStackModel.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/CallStackModel.java
@@ -46,7 +46,7 @@ NodeActionsProvider, TableModel {
"org/netbeans/modules/debugger/resources/callStackView/CurrentFrame";
private AntDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public CallStackModel (ContextProvider contextProvider) {
@@ -356,11 +356,9 @@ NodeActionsProvider, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get (i).modelChanged(new ModelEvent.TreeChanged(this));
}
}
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VariablesModel.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VariablesModel.java
index 01ce40c..25cb6af 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VariablesModel.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VariablesModel.java
@@ -38,7 +38,7 @@ public class VariablesModel implements TreeModel, NodeModel, TableModel {
"org/netbeans/modules/debugger/resources/localsView/LocalVariable";
private AntDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public VariablesModel (ContextProvider contextProvider) {
@@ -264,11 +264,9 @@ public class VariablesModel implements TreeModel, NodeModel, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
}
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/WatchesModel.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/WatchesModel.java
index f6381e2..db46a5e 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/WatchesModel.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/WatchesModel.java
@@ -42,7 +42,7 @@ public class WatchesModel implements NodeModelFilter, TableModel {
"org/netbeans/modules/debugger/resources/watchesView/Watch";
private AntDebugger debugger;
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
public WatchesModel (ContextProvider contextProvider) {
@@ -212,12 +212,10 @@ public class WatchesModel implements NodeModelFilter, TableModel {
// other mothods ...........................................................
void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
}
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/breakpoints/BreakpointModel.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/breakpoints/BreakpointModel.java
index 17b0b42..9ec05bc 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/breakpoints/BreakpointModel.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/breakpoints/BreakpointModel.java
@@ -44,7 +44,7 @@ public class BreakpointModel implements NodeModel {
public static final String DISABLED_LINE_BREAKPOINT =
"org/netbeans/modules/debugger/resources/editor/DisabledBreakpoint";
- private Vector listeners = new Vector ();
+ private Vector<ModelListener> listeners = new Vector<>();
// NodeModel implementation ................................................
@@ -138,12 +138,10 @@ public class BreakpointModel implements NodeModel {
public void fireChanges () {
- Vector v = (Vector) listeners.clone ();
+ Vector<ModelListener> v = (Vector<ModelListener>)listeners.clone();
int i, k = v.size ();
for (i = 0; i < k; i++)
- ((ModelListener) v.get (i)).modelChanged (
- new ModelEvent.TreeChanged (this)
- );
+ v.get(i).modelChanged(new ModelEvent.TreeChanged(this));
}
private static AntDebugger getDebugger () {
diff --git a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/J2SEModularProjectProperties.java b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/J2SEModularProjectProperties.java
index 1feb5cc..d8b4fc4 100644
--- a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/J2SEModularProjectProperties.java
+++ b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/customizer/J2SEModularProjectProperties.java
@@ -771,7 +771,7 @@ public class J2SEModularProjectProperties {
}
private void storeRoots( ModuleRoots roots, DefaultTableModel tableModel ) throws MalformedURLException {
- Vector data = tableModel.getDataVector();
+ Vector<Vector> data = tableModel.getDataVector();
URL[] rootURLs = new URL[data.size()];
String []rootPaths = new String[data.size()];
final LinkedList<URL> oldRootURLs = new LinkedList<>(Arrays.asList (roots.getRootURLs (false)));
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java
index 1e58950..b015ad7 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java
@@ -772,7 +772,7 @@ public class J2SEProjectProperties {
}
private void storeRoots( SourceRoots roots, DefaultTableModel tableModel ) throws MalformedURLException {
- Vector data = tableModel.getDataVector();
+ Vector<Vector> data = tableModel.getDataVector();
URL[] rootURLs = new URL[data.size()];
String []rootLabels = new String[data.size()];
final LinkedList<URL> oldRootURLs = new LinkedList<URL>(Arrays.asList (roots.getRootURLs (false)));
diff --git a/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java b/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java
index 897d2f6..1c77627 100644
--- a/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java
+++ b/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java
@@ -224,7 +224,7 @@ public class JavaScriptNashornPanel extends javax.swing.JPanel {
}// </editor-fold>//GEN-END:initComponents
ComboBoxModel<String> initEngineSelector() {
- Vector<String> names = new Vector();
+ Vector<String> names = new Vector<>();
JavaPlatform p = getSelectedPlatform();
if (NashornPlatform.isNashornSupported(p)) {
names.add(nashorn);
diff --git a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
index b8ed928..e7de1b1 100644
--- a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
+++ b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
@@ -283,7 +283,7 @@ public class ElementBindings extends HashMap {
* Return suitable types (Vector<Strings>) for given element.
*/
public static final Vector displayTypesFor(ElementDeclarations.Entry entry) {
- Vector list = new Vector(4);
+ Vector<String> list = new Vector<>(4);
list.add(IGNORE_HANDLING);
if ((entry.getType() & ElementDeclarations.Entry.DATA) == 1)
list.add(DATA_HANDLING);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists