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 8f29822 [NETBEANS-3659] - clean up List raw type warnings..
new c27f292 Merge pull request #1838 from BradWalker/cleanup_rawtype_list
8f29822 is described below
commit 8f2982284a8261cf8e43de62bf33d403b36fdd6e
Author: Brad Walker <[email protected]>
AuthorDate: Thu Jan 2 11:13:49 2020 -0700
[NETBEANS-3659] - clean up List raw type warnings..
There are a lot of places where we get raw type warnings..
[repeat]
/home/bwalker/src/netbeans/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewPeer.java:1070:
warning: [rawtypes] found raw type: List
[repeat] private List listeners = new ArrayList();
[repeat] ^
[repeat] missing type arguments for generic class List<E>
[repeat] where E is a type-variable:
[repeat] E extends Object declared in interface List
Clean up a bunch of these warnings..
---
.../project/ui/branding/ResourceBundleBrandingPanel.java | 2 +-
.../glassfish/tooling/admin/RunnerRestFetchLogData.java | 2 +-
.../netbeans/modules/web/monitor/client/Controller.java | 2 +-
.../modules/websvc/manager/ui/ReflectionHelper.java | 2 +-
.../modules/websvc/manager/ui/TestWebServiceMethodDlg.java | 2 +-
.../modules/websvc/rest/nodes/RestServiceChildren.java | 2 +-
.../modules/websvc/rest/support/SourceGroupSupport.java | 12 ++++++------
.../netbeans/modules/css/lib/AbstractParseTreeNode.java | 6 ++----
.../org/netbeans/modules/css/visual/CreateRulePanel.java | 4 ++--
.../modules/db/dataview/output/InsertRecordDialog.java | 2 +-
.../api/db/explorer/support/DatabaseExplorerUIs.java | 2 +-
.../org/netbeans/modules/editor/fold/ui/ActionFactory.java | 4 ++--
.../modules/editor/macros/storage/ui/TableSorter.java | 2 +-
.../netbeans/spi/project/support/ant/ReferenceHelper.java | 2 +-
.../spi/project/ui/support/NodeFactorySupport.java | 4 ++--
.../modules/debugger/ui/actions/GestureSubmitter.java | 6 +++---
.../modules/debugger/ui/views/ViewModelListener.java | 8 ++++----
.../netbeans/modules/team/commons/treelist/TreeList.java | 2 +-
.../netbeans/modules/xml/catalog/user/UserXMLCatalog.java | 4 ++--
ide/xml.core/nbproject/project.properties | 2 +-
.../org/netbeans/modules/xml/dtd/grammar/ContentModel.java | 4 ++--
.../org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java | 4 ++--
.../modules/xml/multiview/ui/SectionInnerPanel.java | 2 +-
.../modules/xml/multiview/ui/SimpleDialogPanel.java | 4 +++-
.../org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java | 2 +-
.../src/org/netbeans/modules/ant/debugger/AntDebugger.java | 12 ++++++------
java/beans/nbproject/project.properties | 2 +-
.../org/netbeans/modules/beans/PropertyPatternPanel.java | 2 +-
.../saas/codegen/java/support/SourceGroupSupport.java | 4 ++--
platform/core.multiview/nbproject/project.properties | 2 +-
.../core/multiview/MultiViewTopComponentLookup.java | 2 +-
platform/o.n.swing.outline/nbproject/project.properties | 2 +-
.../src/org/netbeans/swing/etable/ETable.java | 2 +-
.../openide/explorer/propertysheet/RadioInplaceEditor.java | 6 +++---
.../openide.loaders/src/org/openide/loaders/DataNode.java | 2 +-
.../modules/openide/util/DefaultMutexImplementation.java | 6 ++----
platform/openide.util/src/org/openide/util/RE13.java | 6 +++---
.../profiler/attach/providers/TargetPlatformEnum.java | 2 +-
.../modules/profiler/oql/engine/api/impl/Snapshot.java | 14 +++++++-------
.../debugger/eval/ui/EvaluationResultsModel.java | 2 +-
.../modules/websvc/saas/codegen/util/Inflector.java | 6 +++---
41 files changed, 79 insertions(+), 81 deletions(-)
diff --git
a/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
index 6e13a72..64b10ac 100644
---
a/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
+++
b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/ui/branding/ResourceBundleBrandingPanel.java
@@ -502,7 +502,7 @@ public class ResourceBundleBrandingPanel extends
AbstractBrandingPanel
}
private void refreshList() {
- List keys = new ArrayList();
+ List<Node> keys = new ArrayList<>();
Node[] origChildren = original.getChildren().getNodes();
for (Node node : origChildren) {
keys.add(node);
diff --git
a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
index 9e281e0..0c7525b 100644
---
a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
+++
b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/RunnerRestFetchLogData.java
@@ -221,7 +221,7 @@ public class RunnerRestFetchLogData extends RunnerRest {
protected boolean processResponse() {
// Make ArrayList copy of stored lines. ArrayList allows better access
// to log values.
- List logLines = new ArrayList(lines.size());
+ List<String> logLines = new ArrayList<>(lines.size());
for (String line : lines) {
logLines.add(line);
}
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 3904718..127fa0e 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
@@ -938,7 +938,7 @@ class Controller {
if(debug) log("getTransactions removed old nodes"); //NOI18N
e = currDir.getData(false);
- final List fileObjectsToDelete = new ArrayList();
+ final List<FileObject> fileObjectsToDelete = new ArrayList<>();
while(e.hasMoreElements()) {
fo = (FileObject)e.nextElement();
diff --git
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
index a485f71..2eb5580 100644
---
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
+++
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/ReflectionHelper.java
@@ -688,7 +688,7 @@ public class ReflectionHelper {
* 2. from objects to primitives
*/
LinkedList<Class> classList = new LinkedList<>();
- List parameterList = inMethod.getParametersList();
+ List<JavaParameter> parameterList = inMethod.getParametersList();
for (int ii = 0; null != paramValues && ii < paramValues.length;
ii++) {
/**
diff --git
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/TestWebServiceMethodDlg.java
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/TestWebServiceMethodDlg.java
index b776261..5a2750b 100644
---
a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/TestWebServiceMethodDlg.java
+++
b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/ui/TestWebServiceMethodDlg.java
@@ -677,7 +677,7 @@ public class TestWebServiceMethodDlg extends JPanel
implements ActionListener, M
private final LinkedList paramList;
private final JavaMethod javaMethod;
private final URLClassLoader urlClassLoader;
- private final List listeners = new ArrayList();
+ private final List<MethodTaskListener> listeners = new ArrayList<>();
private boolean cancelled=false;
diff --git
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServiceChildren.java
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServiceChildren.java
index d026c60..943e56c 100644
---
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServiceChildren.java
+++
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/nodes/RestServiceChildren.java
@@ -55,7 +55,7 @@ public class RestServiceChildren extends Children.Keys {
}
private void updateKeys() {
- final List keys = new ArrayList();
+ final List<String> keys = new ArrayList<>();
keys.add(KEY_HTTP_METHODS);
keys.add(KEY_SUB_RESOURCE_LOCATORS);
diff --git
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
index 13194ae..9d6e589 100644
---
a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
+++
b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java
@@ -73,7 +73,7 @@ public class SourceGroupSupport {
SourceGroup[] sourceGroups =
ProjectUtils.getSources(project).getSourceGroups(
JavaProjectConstants.SOURCES_TYPE_JAVA);
Set testGroups = getTestSourceGroups(sourceGroups);
- List result = new ArrayList();
+ List<SourceGroup> result = new ArrayList<>();
for (int i = 0; i < sourceGroups.length; i++) {
if (!testGroups.contains(sourceGroups[i])) {
result.add(sourceGroups[i]);
@@ -189,13 +189,13 @@ public class SourceGroupSupport {
return testGroups;
}
- private static List/*<SourceGroup>*/ getTestTargets(SourceGroup
sourceGroup, Map foldersToSourceGroupsMap) {
+ private static List<SourceGroup> getTestTargets(SourceGroup sourceGroup,
Map foldersToSourceGroupsMap) {
final URL[] rootURLs =
UnitTestForSourceQuery.findUnitTests(sourceGroup.getRootFolder());
if (rootURLs.length == 0) {
return new ArrayList();
}
- List result = new ArrayList();
- List sourceRoots = getFileObjects(rootURLs, true);
+ List<SourceGroup> result = new ArrayList<>();
+ List<FileObject> sourceRoots = getFileObjects(rootURLs, true);
for (int i = 0; i < sourceRoots.size(); i++) {
FileObject sourceRoot = (FileObject) sourceRoots.get(i);
SourceGroup srcGroup = (SourceGroup)
foldersToSourceGroupsMap.get(sourceRoot);
@@ -206,8 +206,8 @@ public class SourceGroupSupport {
return result;
}
- private static List/*<FileObject>*/ getFileObjects(URL[] urls, boolean
quiet) {
- List result = new ArrayList();
+ private static List<FileObject> getFileObjects(URL[] urls, boolean quiet) {
+ List<FileObject> result = new ArrayList<>();
for (int i = 0; i < urls.length; i++) {
FileObject sourceRoot = URLMapper.findFileObject(urls[i]);
if (sourceRoot != null) {
diff --git
a/ide/css.lib/src/org/netbeans/modules/css/lib/AbstractParseTreeNode.java
b/ide/css.lib/src/org/netbeans/modules/css/lib/AbstractParseTreeNode.java
index e444047..cc71386 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/AbstractParseTreeNode.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/AbstractParseTreeNode.java
@@ -74,10 +74,8 @@ public abstract class AbstractParseTreeNode extends
ParseTree implements Node {
@Override
@SuppressWarnings(value="unchecked") //antlr 3.3 does not use generics
public List<Node> children() {
- List ch = getChildren();
- return ch == null
- ? Collections.<Node>emptyList()
- : ch;
+ List<Node> ch = getChildren();
+ return ch == null ? Collections.<Node>emptyList() : ch;
}
@Override
diff --git
a/ide/css.visual/src/org/netbeans/modules/css/visual/CreateRulePanel.java
b/ide/css.visual/src/org/netbeans/modules/css/visual/CreateRulePanel.java
index 2e1762f..297cd7a 100644
--- a/ide/css.visual/src/org/netbeans/modules/css/visual/CreateRulePanel.java
+++ b/ide/css.visual/src/org/netbeans/modules/css/visual/CreateRulePanel.java
@@ -1834,14 +1834,14 @@ public class CreateRulePanel extends javax.swing.JPanel
{
*/
public class ExtDefaultComboBoxModel extends AbstractListModel implements
MutableComboBoxModel, Serializable {
- private final List objects;
+ private final List<Object> objects;
private Object selectedObject;
/**
* Constructs an empty DefaultComboBoxModel object.
*/
public ExtDefaultComboBoxModel() {
- objects = new ArrayList();
+ objects = new ArrayList<>();
}
public void setItems(Collection items) {
diff --git
a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java
b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java
index 9dc1139..047a0bf 100644
---
a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java
+++
b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/InsertRecordDialog.java
@@ -437,7 +437,7 @@ private void
removeBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
final Component order[] = new Component[]{rowHeader,
insertRecordTableUI};
FocusTraversalPolicy policy = new FocusTraversalPolicy() {
- List componentList = Arrays.asList(order);
+ List<Component> componentList = Arrays.asList(order);
@Override
public Component getFirstComponent(Container focusCycleRoot) {
diff --git
a/ide/db/src/org/netbeans/api/db/explorer/support/DatabaseExplorerUIs.java
b/ide/db/src/org/netbeans/api/db/explorer/support/DatabaseExplorerUIs.java
index c771ea2..d8f2b46 100644
--- a/ide/db/src/org/netbeans/api/db/explorer/support/DatabaseExplorerUIs.java
+++ b/ide/db/src/org/netbeans/api/db/explorer/support/DatabaseExplorerUIs.java
@@ -123,7 +123,7 @@ public final class DatabaseExplorerUIs {
private static final class ConnectionComboBoxModel extends
AbstractListModel implements ComboBoxModel {
private final ConnectionManager connectionManager;
- private final List connectionList = new ArrayList();
+ private final List<Object> connectionList = new ArrayList<>();
private Object selectedItem; // can be anything, not just a database
connection
private ConnectionListener cl = new ConnectionListener() {
@Override
diff --git
a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
index 333f144..614a643 100644
---
a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
+++
b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
@@ -221,7 +221,7 @@ final class ActionFactory {
if (fold == null) {
return;
}
- List allFolds = new
ArrayList<Fold>(FoldUtilities.findRecursive(fold));
+ List<Fold> allFolds = new
ArrayList<>(FoldUtilities.findRecursive(fold));
Collections.reverse(allFolds);
allFolds.add(0, fold);
hierarchy.expand(allFolds);
@@ -257,7 +257,7 @@ final class ActionFactory {
if (fold == null) {
return;
}
- List allFolds = new
ArrayList<Fold>(FoldUtilities.findRecursive(fold));
+ List<Fold> allFolds = new
ArrayList<>(FoldUtilities.findRecursive(fold));
Collections.reverse(allFolds);
allFolds.add(0, fold);
hierarchy.collapse(allFolds);
diff --git
a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java
b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java
index 6e1eb44..d3d7696 100644
---
a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java
+++
b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java
@@ -67,7 +67,7 @@ public class TableSorter extends AbstractTableModel {
private MouseListener mouseListener;
private TableModelListener tableModelListener;
private Map<Class, Comparator> columnComparators = new HashMap<>();
- private List sortingColumns = new ArrayList();
+ private List<Directive> sortingColumns = new ArrayList<>();
public TableSorter() {
this.mouseListener = new MouseHandler();
diff --git
a/ide/project.ant/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java
b/ide/project.ant/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java
index 41c3fa2..8c6c741 100644
---
a/ide/project.ant/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java
+++
b/ide/project.ant/src/org/netbeans/spi/project/support/ant/ReferenceHelper.java
@@ -1701,7 +1701,7 @@ public final class ReferenceHelper {
if (!REF_NAME.equals(xml.getLocalName()) ||
!REFS_NS2.equals(xml.getNamespaceURI())) {
throw new IllegalArgumentException("bad element name: " +
xml); // NOI18N
}
- List nl = XMLUtil.findSubElements(xml);
+ List<Element> nl = XMLUtil.findSubElements(xml);
if (nl.size() < 6) {
throw new IllegalArgumentException("missing or extra data: " +
xml); // NOI18N
}
diff --git
a/ide/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java
b/ide/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java
index 242696e..736a358 100644
---
a/ide/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java
+++
b/ide/projectuiapi/src/org/netbeans/spi/project/ui/support/NodeFactorySupport.java
@@ -174,7 +174,7 @@ public class NodeFactorySupport {
NodeList<?> lst = factory.createNodes(project);
assert lst != null : "Factory " +
factory.getClass() + " has broken the NodeFactory contract."; //NOI18N
lst.addNotify();
- List objects = lst.keys();
+ List<?> objects = lst.keys();
synchronized (keys) {
nodeLists.add(lst);
addKeys(lst, objects);
@@ -264,7 +264,7 @@ public class NodeFactorySupport {
//to be called under lock.
private void addKeys(NodeList list, List objects) {
assert Thread.holdsLock(keys);
- List<NodeListKeyWrapper> wrps = new
ArrayList<NodeListKeyWrapper>();
+ List<NodeListKeyWrapper> wrps = new ArrayList<>();
for (Object key : objects) {
wrps.add(new NodeListKeyWrapper(key, list));
}
diff --git
a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/actions/GestureSubmitter.java
b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/actions/GestureSubmitter.java
index 858cb64..7242306 100644
---
a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/actions/GestureSubmitter.java
+++
b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/actions/GestureSubmitter.java
@@ -40,7 +40,7 @@ class GestureSubmitter {
//~ Methods
------------------------------------------------------------------------------------------------------------------
static void logDebugProject(Project project) {
- List params = new ArrayList();
+ List<String> params = new ArrayList<>();
if (project != null) {
params.add(0, project.getClass().getName());
}
@@ -48,12 +48,12 @@ class GestureSubmitter {
}
static void logAttach(String attachTypeName) {
- List params = new ArrayList();
+ List<String> params = new ArrayList<>();
params.add(attachTypeName);
log("USG_DEBUG_ATTACH", params); // NOI18N
}
- private static void log(String type, List<Object> params) {
+ private static void log(String type, List<String> params) {
LogRecord record = new LogRecord(Level.INFO, type);
record.setResourceBundle(NbBundle.getBundle(GestureSubmitter.class));
record.setResourceBundleName(GestureSubmitter.class.getPackage().getName() +
".Bundle"); // NOI18N
diff --git
a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java
b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java
index da53f1f..65dc99f 100644
---
a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java
+++
b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/ViewModelListener.java
@@ -114,7 +114,7 @@ public class ViewModelListener extends
DebuggerManagerAdapter {
private String viewType;
private JComponent view;
private JComponent buttonsPane;
- private List models = new ArrayList(11);
+ private List<Object> models = new ArrayList<>(11);
private List hyperModels;
private List<? extends SessionProvider> sessionProviders;
@@ -525,7 +525,7 @@ public class ViewModelListener extends
DebuggerManagerAdapter {
}
private static List joinLists(List[] modelLists) {
- List models = new ArrayList();
+ List<Object> models = new ArrayList<>();
for (List l : modelLists) {
synchronized (l) {
for (Object o : l) {
@@ -637,10 +637,10 @@ public class ViewModelListener extends
DebuggerManagerAdapter {
if (hyperModels != null) {
newModel = Models.createCompoundModel (hyperModels,
propertiesHelpID);
} else if (haveModels) {
- List theModels;
+ List<Object> theModels;
viewTreeDisplayFormat = createTreeDisplayFormat(viewPreferences,
columnModels);
if (viewTreeDisplayFormat != null) {
- theModels = new ArrayList(models);
+ theModels = new ArrayList<>(models);
theModels.add(viewTreeDisplayFormat);
} else {
theModels = models;
diff --git
a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeList.java
b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeList.java
index bd89242..cbb06a0 100644
---
a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeList.java
+++
b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeList.java
@@ -198,7 +198,7 @@ public class TreeList extends JList {
* Determines if popup was called for one of the selected nodes
*/
private boolean isPopupForSelected(TreeListNode node) {
- List selectedValues = getSelectedValuesList();
+ List<TreeListNode> selectedValues = getSelectedValuesList();
for (Object selectedNode : selectedValues) {
if (selectedNode != null && // issue #252821
selectedNode.equals(node))
diff --git
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
index 3d84d82..b1773d9 100644
---
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
+++
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
@@ -51,7 +51,7 @@ import org.xml.sax.ext.LexicalHandler;
public class UserXMLCatalog implements CatalogReader, CatalogWriter,
CatalogDescriptor2, EntityResolver {
private static final String PROPERTY_LEX_HANDLER =
"http://xml.org/sax/properties/lexical-handler";;
private Map publicIds;
- private List catalogListeners;
+ private List<CatalogListener> catalogListeners;
private static final String catalogResource =
"xml/catalogs/UserXMLCatalog.xml"; // NOI18N
private static final String URI_PREFIX = "URI:"; // NOI18N
private static final String PUBLIC_PREFIX = "PUBLIC:"; // NOI18N
@@ -68,7 +68,7 @@ public class UserXMLCatalog implements CatalogReader,
CatalogWriter, CatalogDesc
/** Default constructor for use from layer. */
public UserXMLCatalog() {
- catalogListeners=new ArrayList();
+ catalogListeners=new ArrayList<>();
}
public String resolveURI(String name) {
diff --git a/ide/xml.core/nbproject/project.properties
b/ide/xml.core/nbproject/project.properties
index ca8b43a5..446a453 100644
--- a/ide/xml.core/nbproject/project.properties
+++ b/ide/xml.core/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
spec.version.base=1.50.0
is.autoload=true
diff --git
a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/ContentModel.java
b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/ContentModel.java
index f8b81be..e21febf 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/ContentModel.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/ContentModel.java
@@ -50,7 +50,7 @@ abstract class ContentModel {
private static ContentModel parseContentModel(PushbackStringTokenizer
tokens) {
ContentModel model = null;;
- List models = new ArrayList(7);
+ List<ContentModel> models = new ArrayList<>(7);
char type = 'E';
char ch;
String next;
@@ -551,7 +551,7 @@ abstract class ContentModel {
private static class Food {
// stack emulator
- private final List list = new LinkedList();
+ private final List<String> list = new LinkedList<>();
// source of lazy stack initilization
private final Enumeration en;
diff --git
a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
index 4858057..057882f 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
@@ -56,7 +56,7 @@ class DTDGrammar implements ExtendedGrammarQuery {
/** Set<elementName:String> holding all emenets with <code>EMPTY</code>
content model.*/
private Set emptyElements;
- private List/*<String>*/ resolvedEntities;
+ private List<String> resolvedEntities;
/** Creates new DTDGrammar */
DTDGrammar(Map elementDecls, Map contentModels, Map attrDecls, Map
attrDefs, Map enums, Set entities, Set notations, Set emptyElements) {
@@ -85,7 +85,7 @@ class DTDGrammar implements ExtendedGrammarQuery {
public Enumeration queryEntities(String prefix) {
if (entities == null) return org.openide.util.Enumerations.empty();
- List list = new LinkedList();
+ List<MyEntityReference> list = new LinkedList<>();
Iterator it = entities.iterator();
while ( it.hasNext()) {
String next = (String) it.next();
diff --git
a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
index 90017cc..5088a5c 100644
---
a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
+++
b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionInnerPanel.java
@@ -49,7 +49,7 @@ public abstract class SectionInnerPanel extends
javax.swing.JPanel implements Li
private static final RequestProcessor RP = new
RequestProcessor(SectionInnerPanel.class);
private SectionView sectionView;
- private java.util.List refreshableList = new LinkedList();
+ private java.util.List<Refreshable> refreshableList = new LinkedList<>();
private boolean localFocusListenerInitialized = false;
private FocusListener localFocusListener = new FocusListener() {
diff --git
a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
index e52ec89..7da4323 100644
---
a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
+++
b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SimpleDialogPanel.java
@@ -19,6 +19,8 @@
package org.netbeans.modules.xml.multiview.ui;
+import java.util.List;
+import java.util.ArrayList;
import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
import javax.swing.*;
@@ -100,7 +102,7 @@ public class SimpleDialogPanel extends JPanel {
}
}
if (customizers!=null) {
- java.util.List buttonList = new java.util.ArrayList();
+ List<JButton> buttonList = new ArrayList<>();
int j=0;
for (int i=0;i<customizers.length;i++) {
if (customizers[i]) {
diff --git a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
index dd09311..428cb0a 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
@@ -88,7 +88,7 @@ public final class XSLGrammarQuery implements GrammarQuery{
* defined in the context XSL document. The first prefix in the list is
the actual XSL
* transformation prefix, which is normally defined on the xsl:stylesheet
element.
*/
- private List prefixList = new LinkedList();
+ private List<String> prefixList = new LinkedList<>();
/** A GrammarQuery for the result elements created for the doctype-public"
and
* "doctype-system" attributes of the xsl:output element.*/
diff --git
a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java
b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java
index f998946..d6e6d28 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java
@@ -397,7 +397,7 @@ public class AntDebugger extends ActionsProviderSupport {
//updateTargetsByName(event.getScriptLocation());
TargetLister.Target target = findTarget(targetName,
event.getScriptLocation());
- List originatingTargets = null;
+ List<TargetOriginating> originatingTargets = null;
if (callStackList.size() > 0) {
Object topFrame = callStackList.get(0);
if (topFrame instanceof Task) {
@@ -419,7 +419,7 @@ public class AntDebugger extends ActionsProviderSupport {
callStackList.removeFirst();
originatingIndex--;
} else {
- List path = findPath (event.getScriptLocation(), start,
targetName);
+ List<TargetOriginating> path = findPath
(event.getScriptLocation(), start, targetName);
if (path != null) {
callStackList.removeFirst();
originatingTargets = path;
@@ -434,7 +434,7 @@ public class AntDebugger extends ActionsProviderSupport {
if (start.equals(targetName)) {
continue;
}
- List path = findPath (event.getScriptLocation(), start,
targetName);
+ List<TargetOriginating> path = findPath
(event.getScriptLocation(), start, targetName);
if (path != null) {
originatingTargets = path;
break;
@@ -827,7 +827,7 @@ public class AntDebugger extends ActionsProviderSupport {
return callStack;
}
- private LinkedList findPath (
+ private LinkedList<TargetOriginating> findPath (
File file,
String start,
String end
@@ -837,7 +837,7 @@ public class AntDebugger extends ActionsProviderSupport {
return null; // A non-existing target referenced
}
if (start.equals (end)) {
- LinkedList ll = new LinkedList ();
+ LinkedList<TargetOriginating> ll = new LinkedList<>();
ll.addFirst (new TargetOriginating(null, t));
return ll;
}
@@ -845,7 +845,7 @@ public class AntDebugger extends ActionsProviderSupport {
StringTokenizer st = new StringTokenizer (depends, ",");
while (st.hasMoreTokens ()) {
String newStart = st.nextToken ().trim();
- LinkedList ll = findPath (
+ LinkedList<TargetOriginating> ll = findPath (
file,
newStart,
end
diff --git a/java/beans/nbproject/project.properties
b/java/beans/nbproject/project.properties
index 451fd62..28a5bd3 100644
--- a/java/beans/nbproject/project.properties
+++ b/java/beans/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
spec.version.base=1.58.0
diff --git
a/java/beans/src/org/netbeans/modules/beans/PropertyPatternPanel.java
b/java/beans/src/org/netbeans/modules/beans/PropertyPatternPanel.java
index 59a93da..a8c61e8 100644
--- a/java/beans/src/org/netbeans/modules/beans/PropertyPatternPanel.java
+++ b/java/beans/src/org/netbeans/modules/beans/PropertyPatternPanel.java
@@ -519,7 +519,7 @@ public final class PropertyPatternPanel extends
javax.swing.JPanel
if (TYPES == null) {
String typeList = NbBundle.getMessage(PropertyPatternPanel.class,
"IdxPropertyPatternPanel_Types"); // NOI18N
StringTokenizer st = new StringTokenizer(typeList, "|"); // NOI18N
- List l = new LinkedList();
+ List<String> l = new LinkedList<>();
while (st.hasMoreTokens()) {
String type = st.nextToken().trim();
l.add(type);
diff --git
a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java
b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java
index e94c4b1..eb0f9a1 100644
---
a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java
+++
b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java
@@ -198,8 +198,8 @@ public class SourceGroupSupport {
return result;
}
- private static List/*<FileObject>*/ getFileObjects(URL[] urls, boolean
quiet) {
- List result = new ArrayList();
+ private static List<FileObject> getFileObjects(URL[] urls, boolean quiet) {
+ List<FileObject> result = new ArrayList<>();
for (int i = 0; i < urls.length; i++) {
FileObject sourceRoot = URLMapper.findFileObject(urls[i]);
if (sourceRoot != null) {
diff --git a/platform/core.multiview/nbproject/project.properties
b/platform/core.multiview/nbproject/project.properties
index 1099c6b..84c5a28 100644
--- a/platform/core.multiview/nbproject/project.properties
+++ b/platform/core.multiview/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git
a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
index b3b799c..0a7721e 100644
---
a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
+++
b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
@@ -90,7 +90,7 @@ class MultiViewTopComponentLookup extends Lookup {
private static final class ExclusionResult extends Lookup.Result
implements LookupListener {
private final Lookup.Result delegate;
- private final List listeners = new ArrayList(); // List<LookupListener>
+ private final List<LookupListener> listeners = new ArrayList<>();
private Collection lastResults;
public ExclusionResult(Lookup.Result delegate) {
diff --git a/platform/o.n.swing.outline/nbproject/project.properties
b/platform/o.n.swing.outline/nbproject/project.properties
index 1740f8a..756dde1 100644
--- a/platform/o.n.swing.outline/nbproject/project.properties
+++ b/platform/o.n.swing.outline/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
is.autoload=true
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git
a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
index d05d65c..e0208cf 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
@@ -2156,7 +2156,7 @@ public class ETable extends JTable {
implements DocumentListener, FocusListener {
/** The last search results */
- private List results = new ArrayList();
+ private List<Integer> results = new ArrayList<>();
/** The last selected index from the search results. */
private int currentSelectionIndex;
diff --git
a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
index 6a1c442..4885b37 100644
---
a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
+++
b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
@@ -375,17 +375,17 @@ class RadioInplaceEditor extends JPanel implements
InplaceEditor, ActionListener
private void fireActionPerformed(final java.awt.event.ActionEvent event) {
// System.err.println("Radio editor firing action performed " +
event.getActionCommand());
- java.util.List list;
+ List<ActionListener> list;
synchronized (this) {
if (actionListenerList == null) {
return;
}
- list = (List) ((ArrayList) actionListenerList).clone();
+ list = (List<ActionListener>) ((ArrayList)
actionListenerList).clone();
}
- final java.util.List theList = list;
+ final List<ActionListener> theList = list;
//When used in a table, the typical case is that the editor is
instantiated,
//processes its mouse event, fires an event and is immediately removed.
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
index b9320d3..6401b45 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -864,7 +864,7 @@ public class DataNode extends AbstractNode {
}
/*See #31413*/
- List transmitProperties = Arrays.asList(new String[] {
+ List<String> transmitProperties = Arrays.asList(new String[] {
DataObject.PROP_NAME, DataObject.PROP_FILES,
DataObject.PROP_TEMPLATE});
if (transmitProperties.contains(ev.getPropertyName())) {
firePropertyChange(ev.getPropertyName(), ev.getOldValue(),
ev.getNewValue());
diff --git
a/platform/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
b/platform/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
index 7bec406..c32780e 100644
---
a/platform/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
+++
b/platform/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
@@ -607,7 +607,7 @@ public class DefaultMutexImplementation implements
MutexImplementation {
}
// holds postedMode lock here
- List runnables = info.dequeue(postedMode);
+ List<Runnable> runnables = info.dequeue(postedMode);
final int size = runnables.size();
for (int i = 0; i < size; i++) {
@@ -1099,7 +1099,7 @@ public class DefaultMutexImplementation implements
MutexImplementation {
/** @return a List of enqueued Runnables - may be null */
public List dequeue(int mode) {
- List ret = queues[mode];
+ List<Runnable> ret = queues[mode];
queues[mode] = null;
return ret;
@@ -1286,5 +1286,3 @@ public class DefaultMutexImplementation implements
MutexImplementation {
return registeredThreads;
}
}
-
-
\ No newline at end of file
diff --git a/platform/openide.util/src/org/openide/util/RE13.java
b/platform/openide.util/src/org/openide/util/RE13.java
index 101b2a2..8b68df5 100644
--- a/platform/openide.util/src/org/openide/util/RE13.java
+++ b/platform/openide.util/src/org/openide/util/RE13.java
@@ -163,9 +163,9 @@ ALL:
it.set(pref.substring(0, i));
// next is the list or null
- List listForPref = (List) it.next();
+ List<Object> listForPref = (List<Object>)
it.next();
- ArrayList<Object> switchList = new
ArrayList<Object>();
+ List<Object> switchList = new ArrayList<Object>();
it.set(switchList);
switchList.add(pref.substring(i));
@@ -214,7 +214,7 @@ ALL:
/** Compress tree of Lists into tree of Objects.
*/
- private static Object[] compress(List item) {
+ private static Object[] compress(List<Object> item) {
Object[] arr = new Object[item.size()];
Integer last = null;
diff --git
a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
index ba28b53..366e81d 100644
---
a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
+++
b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/TargetPlatformEnum.java
@@ -67,7 +67,7 @@ public class TargetPlatformEnum {
}
public static Iterator iterator() {
- List jvmList = new ArrayList(7);
+ List<TargetPlatformEnum> jvmList = new ArrayList<>(7);
jvmList.add(JDK5);
jvmList.add(JDK6);
jvmList.add(JDK7);
diff --git
a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
index af60b91..0425b49 100644
---
a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
+++
b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
@@ -65,7 +65,7 @@ public class Snapshot {
weakReferenceClass = findClass("sun.misc.Ref"); // NOI18N
referentFieldIndex = 0;
} else {
- List flds = weakReferenceClass.getFields();
+ List<Field> flds = weakReferenceClass.getFields();
int fldsCount = flds.size();
for (int i = 0; i < fldsCount; i++) {
@@ -205,8 +205,8 @@ public class Snapshot {
}
public Iterator getReferrers(Object obj, boolean includeWeak) {
- List instances = new ArrayList();
- List references = new ArrayList();
+ List<Object> instances = new ArrayList<>();
+ List<Object> references = new ArrayList<>();
if (obj instanceof Instance) {
references.addAll(((Instance)obj).getReferences());
@@ -233,8 +233,8 @@ public class Snapshot {
}
public Iterator getReferees(Object obj, boolean includeWeak) {
- List instances = new ArrayList();
- List values = new ArrayList();
+ List<Object> instances = new ArrayList<>();
+ List<Object> values = new ArrayList<>();
if (obj instanceof Instance) {
Instance o = (Instance)obj;
@@ -278,7 +278,7 @@ public class Snapshot {
Instance queue = ((ObjectFieldValue)
clazz.getValueOfStaticField("queue")).getInstance(); // NOI18N
ObjectFieldValue headFld = (ObjectFieldValue)
queue.getValueOfField("head"); // NOI18N
- List finalizables = new ArrayList();
+ List<Instance> finalizables = new ArrayList<>();
if (headFld != null) {
Instance head = headFld.getInstance();
while (true) {
@@ -319,7 +319,7 @@ public class Snapshot {
}
public GCRoot[] getRootsArray() {
- List rootList = getRootsList();
+ List<GCRoot> rootList = getRootsList();
return (GCRoot[]) rootList.toArray(new GCRoot[0]);
}
diff --git
a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
index e1c02fa..06cf67f 100644
---
a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
+++
b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
@@ -77,7 +77,7 @@ public class EvaluationResultsModel extends VariablesModel {
@Override
public Object[] getChildren(Object parent, int from, int to) throws
UnknownTypeException {
if (parent instanceof HistoryNode) {
- List l = ((HistoryNode) parent).getItems();
+ List<?> l = ((HistoryNode) parent).getItems();
for (Object o : l) {
if (!(o instanceof DefaultHistoryItem)) {
return new Object[]{};
diff --git
a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
index 2851c9c..029f452 100644
---
a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
+++
b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
@@ -141,21 +141,21 @@ public class Inflector {
* <p>List of <code>Replacer</code>s for performing replacement operations
* on matches for plural words.</p>
*/
- private List plurals = new LinkedList();
+ private List<Replacer> plurals = new LinkedList<>();
/**
* <p>List of <code>Replacer</code>s for performing replacement operations
* on matches for addSingular words.</p>
*/
- private List singulars = new ArrayList();
+ private List<Replacer> singulars = new ArrayList<>();
/**
* <p>List of words that represent addUncountable concepts that cannot be
* pluralized or singularized.</p>
*/
- private List uncountables = new LinkedList();
+ private List<String> uncountables = new LinkedList<>();
// ------------------------------------------------------ Instance
Variables
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
