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 2019/11/26 21:19:57 UTC
[netbeans] branch master updated: [NETBEANS-3377] - cleanup
unchecked conversions
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 e1ef6a5 [NETBEANS-3377] - cleanup unchecked conversions
e1ef6a5 is described below
commit e1ef6a5692716db1efda223cec99d8c6981cf131
Author: Brad Walker <bw...@musings.com>
AuthorDate: Tue Nov 12 09:28:18 2019 -0700
[NETBEANS-3377] - cleanup unchecked conversions
There are a lot of places in the code where unchecked conversions are taking place..
[repeat] /home/bwalker/src/netbeans/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java:259: warning: [unchecked] unchecked conversion
[repeat] Set<Map.Entry> entries = ((Map)o).entrySet();
[repeat] ^
[repeat] required: Set<Entry>
[repeat] found: Set
Cleanup these warning messages..
---
.../modules/glassfish/javaee/Hk2LibraryProvider.java | 2 +-
.../javaee.beanvalidation/nbproject/project.properties | 2 +-
.../modules/payara/jakartaee/Hk2LibraryProvider.java | 2 +-
.../src/org/netbeans/modules/web/project/WebProject.java | 2 +-
.../core/client/wizard/WebServiceClientWizardIterator.java | 2 +-
.../core/dev/wizard/NewWebServiceFromWSDLWizardIterator.java | 2 +-
.../websvc/core/dev/wizard/NewWebServiceWizardIterator.java | 2 +-
.../netbeans/modules/db/explorer/node/NodeDataLookup.java | 2 +-
.../org/netbeans/modules/html/editor/NbReaderProvider.java | 2 +-
.../src/org/netbeans/modules/html/editor/api/Utils.java | 2 +-
.../src/org/netbeans/modules/localhistory/LocalHistory.java | 2 +-
.../src/org/netbeans/modules/tasklist/impl/TaskList.java | 4 ++--
.../src/org/netbeans/modules/xml/catalog/CatalogAction.java | 2 +-
.../org/netbeans/modules/xml/text/syntax/SyntaxElement.java | 6 +++---
ide/xml/nbproject/project.properties | 2 +-
java/ant.debugger/nbproject/project.properties | 2 +-
.../netbeans/modules/ant/debugger/AdvancedActionPanel.java | 2 +-
.../debugger/jpda/expr/formatters/VariablesFormatter.java | 2 +-
.../netbeans/modules/debugger/jpda/models/ThreadsCache.java | 8 ++++----
.../php/nette2/annotations/Nette2AnnotationsProvider.java | 6 +++---
.../modules/selenium2/php/Selenium2PhpSupportImpl.java | 6 +++---
.../netbeans/modules/profiler/heapwalk/OQLController.java | 2 +-
.../projectsupport/AbstractProjectLookupProvider.java | 2 +-
.../modules/javascript2/extjs/ExtJsCodeCompletion.java | 12 ++++++------
.../selenium2/webclient/protractor/ProtractorRunner.java | 2 +-
.../websvc.saas.codegen/nbproject/project.properties | 2 +-
.../websvc/saas/codegen/model/GenericResourceBean.java | 2 +-
.../netbeans/modules/websvc/saas/codegen/model/SaasBean.java | 2 +-
28 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
index 59d2e34..8f19e0a 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/Hk2LibraryProvider.java
@@ -95,7 +95,7 @@ public class Hk2LibraryProvider /*implements JaxRsStackSupportImplementation*/ {
/** Internal {@see GlassFishServer} to {@see Hk2LibraryProvider}
* mapping. */
private static final Map <GlassFishServer, Hk2LibraryProvider> providers
- = new HashMap();
+ = new HashMap<>();
////////////////////////////////////////////////////////////////////////////
// Static methods //
diff --git a/enterprise/javaee.beanvalidation/nbproject/project.properties b/enterprise/javaee.beanvalidation/nbproject/project.properties
index c0af75f..0f4ec98 100644
--- a/enterprise/javaee.beanvalidation/nbproject/project.properties
+++ b/enterprise/javaee.beanvalidation/nbproject/project.properties
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-javac.source=1.6
+javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
index a073aec..bc0bb1e 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/Hk2LibraryProvider.java
@@ -110,7 +110,7 @@ public class Hk2LibraryProvider /*implements JaxRsStackSupportImplementation*/ {
/** Internal {@see PayaraServer} to {@see Hk2LibraryProvider}
* mapping. */
private static final Map <PayaraServer, Hk2LibraryProvider> providers
- = new HashMap();
+ = new HashMap<>();
////////////////////////////////////////////////////////////////////////////
// Static methods //
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/WebProject.java b/enterprise/web.project/src/org/netbeans/modules/web/project/WebProject.java
index 25e0c23..2cb8eeb 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/WebProject.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/WebProject.java
@@ -1526,7 +1526,7 @@ public final class WebProject implements Project {
if (isArchive) {
return TYPES_ARCHIVE;
} else if (projectCap.isEjb31LiteSupported()) {
- Set<String> set = new HashSet(Arrays.asList(TYPES));
+ Set<String> set = new HashSet<>(Arrays.asList(TYPES));
if (projectCap.isEjb31Supported() || serverSupportsEJB31) {
set.addAll(Arrays.asList(TYPES_EJB31));
}
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/WebServiceClientWizardIterator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/WebServiceClientWizardIterator.java
index 02692cb..091f4c3 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/WebServiceClientWizardIterator.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/client/wizard/WebServiceClientWizardIterator.java
@@ -46,7 +46,7 @@ import org.openide.loaders.TemplateWizard;
public class WebServiceClientWizardIterator implements TemplateWizard.Iterator {
private int index = 0;
- private WizardDescriptor.Panel [] panels;
+ private WizardDescriptor.Panel<WizardDescriptor>[] panels;
private TemplateWizard wiz;
// !PW FIXME How to handle freeform???
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceFromWSDLWizardIterator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceFromWSDLWizardIterator.java
index f7b9b7b..aafcec9 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceFromWSDLWizardIterator.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceFromWSDLWizardIterator.java
@@ -92,7 +92,7 @@ public class NewWebServiceFromWSDLWizardIterator implements TemplateWizard.Itera
}
private transient int index;
- private transient WizardDescriptor.Panel[] panels;
+ private transient WizardDescriptor.Panel<WizardDescriptor>[] panels;
private transient TemplateWizard wiz;
private transient WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
diff --git a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceWizardIterator.java b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceWizardIterator.java
index 67183d5..c3732e5 100644
--- a/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceWizardIterator.java
+++ b/enterprise/websvc.core/src/org/netbeans/modules/websvc/core/dev/wizard/NewWebServiceWizardIterator.java
@@ -88,7 +88,7 @@ public class NewWebServiceWizardIterator implements TemplateWizard.Iterator /*,
}
private transient int index;
- private transient WizardDescriptor.Panel[] panels;
+ private transient WizardDescriptor.Panel<WizardDescriptor>[] panels;
private transient TemplateWizard wiz;
private transient WizardDescriptor.Panel<WizardDescriptor> bottomPanel;
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/node/NodeDataLookup.java b/ide/db/src/org/netbeans/modules/db/explorer/node/NodeDataLookup.java
index a9b7d17..935a7f2 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/node/NodeDataLookup.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/node/NodeDataLookup.java
@@ -36,7 +36,7 @@ import org.openide.util.lookup.InstanceContent;
public class NodeDataLookup extends AbstractLookup {
/** the data instances held in the lookup */
- private final Set dataInstances = Collections.synchronizedSet(new HashSet());
+ private final Set<Object> dataInstances = Collections.synchronizedSet(new HashSet<Object>());
/** the content of the underlying AbstractLookup */
private final InstanceContent content;
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/NbReaderProvider.java b/ide/html.editor/src/org/netbeans/modules/html/editor/NbReaderProvider.java
index f3791dc..c4cb0b2 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/NbReaderProvider.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/NbReaderProvider.java
@@ -96,7 +96,7 @@ public class NbReaderProvider implements ReaderProvider {
}
private Map<String, String> parseCatalog(Reader catalogReader) {
- HashMap hashmap = new HashMap();
+ HashMap<String, String> hashmap = new HashMap<>();
LineNumberReader reader = new LineNumberReader(catalogReader);
for (;;) {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/api/Utils.java b/ide/html.editor/src/org/netbeans/modules/html/editor/api/Utils.java
index 55ea826..58b3379 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/api/Utils.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/api/Utils.java
@@ -90,7 +90,7 @@ public class Utils {
}
do {
- Token t = ts.token();
+ Token<HTMLTokenId> t = ts.token();
TokenId id = t.id();
if( id == HTMLTokenId.TAG_OPEN) {
return t;
diff --git a/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java b/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
index ec5df5b..f2199f1 100644
--- a/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
+++ b/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
@@ -110,7 +110,7 @@ public class LocalHistory {
String rootPaths = System.getProperty("netbeans.localhistory.historypath");
if(rootPaths == null || rootPaths.trim().equals("")) {
- userDefinedRoots = Collections.emptySet();
+ userDefinedRoots = Collections.emptySet();
} else {
String[] paths = rootPaths.split(";");
userDefinedRoots = new HashSet<String>(paths.length);
diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskList.java b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskList.java
index 0aa6352..771fde9 100644
--- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskList.java
+++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskList.java
@@ -150,7 +150,7 @@ public class TaskList {
groupTasks.removeAll( toRemove );
}
}
- return toRemove == null ? null : new LinkedList(toRemove);
+ return toRemove == null ? null : new LinkedList<Task>(toRemove);
}
void update( FileTaskScanner scanner, FileObject resource, List<Task> newTasks, TaskFilter filter ) {
@@ -294,7 +294,7 @@ public class TaskList {
groupTasks.removeAll( toRemove );
}
}
- return toRemove == null ? null : new LinkedList(toRemove);
+ return toRemove == null ? null : new LinkedList<Task>(toRemove);
}
void clear( FileObject resource ) {
diff --git a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
index 1052308..571aeb8 100644
--- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
+++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
@@ -103,7 +103,7 @@ public class CatalogAction implements ActionListener {
public void actionPerformed (ActionEvent ev) {
Node [] nodes = (Node []) cp.getExplorerManager ().getSelectedNodes ();
assert nodes != null && nodes.length > 0 : "Selected templates cannot be null or empty.";
- Set nodes2open = getNodes2Open (nodes);
+ Set<Node> nodes2open = getNodes2Open (nodes);
assert ! nodes2open.isEmpty () : "Selected templates to open cannot by empty for nodes " + Arrays.asList (nodes);
Iterator<Node> it = nodes2open.iterator();
while (it.hasNext ()) {
diff --git a/ide/xml.text.obsolete90/src/org/netbeans/modules/xml/text/syntax/SyntaxElement.java b/ide/xml.text.obsolete90/src/org/netbeans/modules/xml/text/syntax/SyntaxElement.java
index a9fbd23..733e018 100644
--- a/ide/xml.text.obsolete90/src/org/netbeans/modules/xml/text/syntax/SyntaxElement.java
+++ b/ide/xml.text.obsolete90/src/org/netbeans/modules/xml/text/syntax/SyntaxElement.java
@@ -81,7 +81,7 @@ public abstract class SyntaxElement implements org.netbeans.modules.xml.text.api
if(cached_first == null) {
try {
TokenItem new_first = support.getTokenChain(offset, offset + 1); //it is a first token offset, so we shouldn't overlap the document length
- first = new WeakReference(new_first);
+ first = new WeakReference<>(new_first);
return new_first;
}catch(BadLocationException e) {
return null;
@@ -101,11 +101,11 @@ public abstract class SyntaxElement implements org.netbeans.modules.xml.text.api
}
void setNext(SyntaxElement se) {
- next = new WeakReference(se);
+ next = new WeakReference<>(se);
}
void setPrevious(SyntaxElement se) {
- previous = new WeakReference(se);
+ previous = new WeakReference<>(se);
}
/**
diff --git a/ide/xml/nbproject/project.properties b/ide/xml/nbproject/project.properties
index a949ee5..a13526e 100644
--- a/ide/xml/nbproject/project.properties
+++ b/ide/xml/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.6
+javac.source=1.8
is.autoload=true
javadoc.packages=\
diff --git a/java/ant.debugger/nbproject/project.properties b/java/ant.debugger/nbproject/project.properties
index c3d1102..10562f6 100644
--- a/java/ant.debugger/nbproject/project.properties
+++ b/java/ant.debugger/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.44.0
test.unit.run.cp.extra=${tools.jar}
# Make the debugger find it, even if it is not on the startup debug classpath:
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AdvancedActionPanel.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AdvancedActionPanel.java
index 38a8a4b..7a893fa 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AdvancedActionPanel.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AdvancedActionPanel.java
@@ -95,7 +95,7 @@ final class AdvancedActionPanel extends javax.swing.JPanel {
FileObject script = project.getFileObject();
assert script != null : "No file found for " + project;
String initialTargets = (String) script.getAttribute(ATTR_TARGETS);
- SortedSet<String> relevantTargets = new TreeSet(Collator.getInstance());
+ SortedSet<String> relevantTargets = new TreeSet<>(Collator.getInstance());
Iterator it = allTargets.iterator();
while (it.hasNext()) {
TargetLister.Target target = (TargetLister.Target) it.next();
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/formatters/VariablesFormatter.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/formatters/VariablesFormatter.java
index 29237cb..7359dbb 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/formatters/VariablesFormatter.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/formatters/VariablesFormatter.java
@@ -327,7 +327,7 @@ public final class VariablesFormatter implements Cloneable {
mapEntry.setClassTypes("java.util.Map$Entry");
mapEntry.setIncludeSubTypes(true);
mapEntry.setUseChildrenVariables(true);
- Map childrenMap = new LinkedHashMap();
+ Map<String, String> childrenMap = new LinkedHashMap<>();
childrenMap.put("key", "getKey()");
childrenMap.put("value", "getValue()");
mapEntry.setChildrenVariables(childrenMap);
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ThreadsCache.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ThreadsCache.java
index 6196931..385c088 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ThreadsCache.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ThreadsCache.java
@@ -221,7 +221,7 @@ public class ThreadsCache implements Executor {
}
public synchronized List<ThreadReference> getAllThreads() {
- return Collections.unmodifiableList(new ArrayList(allThreads));
+ return Collections.<List<ThreadReference>>unmodifiableList(new ArrayList(allThreads));
}
public synchronized List<ThreadGroupReference> getTopLevelThreadGroups() {
@@ -245,7 +245,7 @@ public class ThreadsCache implements Executor {
}
}
}
- return Collections.unmodifiableList(new ArrayList(topGroups));
+ return Collections.<List<ThreadReference>>unmodifiableList(new ArrayList(topGroups));
}
public synchronized List<ThreadReference> getThreads(ThreadGroupReference group) {
@@ -262,7 +262,7 @@ public class ThreadsCache implements Executor {
if (threads == null) {
threads = Collections.emptyList();
} else {
- threads = Collections.unmodifiableList(new ArrayList(threads));
+ threads = Collections.<List<ThreadReference>>unmodifiableList(new ArrayList(threads));
}
return threads;
}
@@ -285,7 +285,7 @@ public class ThreadsCache implements Executor {
if (groups == null) {
groups = Collections.emptyList();
} else {
- groups = Collections.unmodifiableList(new ArrayList(groups));
+ groups = Collections.<List<ThreadReference>>unmodifiableList(new ArrayList(groups));
}
return groups;
}
diff --git a/php/php.nette2/src/org/netbeans/modules/php/nette2/annotations/Nette2AnnotationsProvider.java b/php/php.nette2/src/org/netbeans/modules/php/nette2/annotations/Nette2AnnotationsProvider.java
index cebe851..ad3ab7b 100644
--- a/php/php.nette2/src/org/netbeans/modules/php/nette2/annotations/Nette2AnnotationsProvider.java
+++ b/php/php.nette2/src/org/netbeans/modules/php/nette2/annotations/Nette2AnnotationsProvider.java
@@ -41,12 +41,12 @@ public class Nette2AnnotationsProvider extends AnnotationCompletionTagProvider {
@Override
public List<AnnotationCompletionTag> getFunctionAnnotations() {
- return Collections.emptyList();
+ return Collections.<AnnotationCompletionTag>emptyList();
}
@Override
public List<AnnotationCompletionTag> getTypeAnnotations() {
- return Collections.emptyList();
+ return Collections.<AnnotationCompletionTag>emptyList();
}
@Override
@@ -58,7 +58,7 @@ public class Nette2AnnotationsProvider extends AnnotationCompletionTagProvider {
@Override
public List<AnnotationCompletionTag> getMethodAnnotations() {
- return Collections.emptyList();
+ return Collections.<AnnotationCompletionTag>emptyList();
}
}
diff --git a/php/selenium2.php/src/org/netbeans/modules/selenium2/php/Selenium2PhpSupportImpl.java b/php/selenium2.php/src/org/netbeans/modules/selenium2/php/Selenium2PhpSupportImpl.java
index 11c7ed0..d613394 100644
--- a/php/selenium2.php/src/org/netbeans/modules/selenium2/php/Selenium2PhpSupportImpl.java
+++ b/php/selenium2.php/src/org/netbeans/modules/selenium2/php/Selenium2PhpSupportImpl.java
@@ -113,17 +113,17 @@ public class Selenium2PhpSupportImpl extends Selenium2SupportImpl {
configureProject(refFileObject);
Project p = FileOwnerQuery.getOwner(refFileObject);
if (p == null) {
- return Collections.emptyList();
+ return Collections.<Object>emptyList();
}
PhpSeleniumProvider seleniumProvider = getSeleniumProvider(p);
if(seleniumProvider == null) {
- return Collections.emptyList();
+ return Collections.<Object>emptyList();
}
// selenium test dir was not set by user during configureProject()
// user probably pressed Cancel. Do not bother him with extra
// configuration dialogs.
if(getSeleniumDir(p, false) == null) {
- return Collections.emptyList();
+ return Collections.<Object>emptyList();
}
return seleniumProvider.getTestSourceRoots(createdSourceRoots, refFileObject);
}
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
index 0f9f2e8..6ea630e 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
@@ -256,7 +256,7 @@ public class OQLController extends AbstractTopLevelController
rc = rc.getNext();
}
} else if (o instanceof Map) {
- Set<Map.Entry> entries = ((Map)o).entrySet();
+ Set<Map.Entry> entries = ((Map)o).<Map.Entry>entrySet();
sb.append("<span><b>{</b><br/>"); // NOI18N
boolean first = true;
for(Map.Entry entry : entries) {
diff --git a/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
index afd0547..f5b10f3 100644
--- a/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
+++ b/profiler/profiler.projectsupport/src/org/netbeans/modules/profiler/projectsupport/AbstractProjectLookupProvider.java
@@ -50,7 +50,7 @@ public abstract class AbstractProjectLookupProvider implements LookupProvider {
}
public List<FileObject> getDataFiles() {
- return Collections.emptyList();
+ return Collections.<FileObject>emptyList();
}
};
}
diff --git a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
index c16abbc..39b813e 100644
--- a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
+++ b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
@@ -66,24 +66,24 @@ public class ExtJsCodeCompletion implements CompletionProvider {
@Override
public List<CompletionProposal> complete(CodeCompletionContext ccContext, CompletionContext jsCompletionContext, String prefix) {
if (jsCompletionContext != CompletionContext.OBJECT_PROPERTY_NAME) {
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
// find the object that can be configured
TokenHierarchy<?> th = ccContext.getParserResult().getSnapshot().getTokenHierarchy();
if (th == null) {
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
int carretOffset = ccContext.getCaretOffset();
int eOffset = ccContext.getParserResult().getSnapshot().getEmbeddedOffset(carretOffset);
TokenSequence<? extends JsTokenId> ts = LexUtilities.getJsTokenSequence(th, eOffset);
if (ts == null) {
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
ts.move(eOffset);
if (!ts.moveNext() && !ts.movePrevious()){
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
Token<? extends JsTokenId> token = null;
@@ -100,7 +100,7 @@ public class ExtJsCodeCompletion implements CompletionProvider {
}
}
if (token == null || balance != 0) {
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
// now we should be at the beginning of the object literal.
@@ -129,7 +129,7 @@ public class ExtJsCodeCompletion implements CompletionProvider {
}
return result;
}
- return Collections.emptyList();
+ return Collections.<CompletionProposal>emptyList();
}
@Override
diff --git a/webcommon/selenium2.webclient.protractor/src/org/netbeans/modules/selenium2/webclient/protractor/ProtractorRunner.java b/webcommon/selenium2.webclient.protractor/src/org/netbeans/modules/selenium2/webclient/protractor/ProtractorRunner.java
index c113d56..40ebd46 100644
--- a/webcommon/selenium2.webclient.protractor/src/org/netbeans/modules/selenium2/webclient/protractor/ProtractorRunner.java
+++ b/webcommon/selenium2.webclient.protractor/src/org/netbeans/modules/selenium2/webclient/protractor/ProtractorRunner.java
@@ -355,7 +355,7 @@ class ProtractorRunner {
}
String output2display = testRunnerReporter.processLine(line);
if(output2display == null) {
- return Collections.emptyList();
+ return Collections.<ConvertedLine>emptyList();
}
TestRunnerReporter.CallStackCallback callStackCallback = new TestRunnerReporter.CallStackCallback(runInfo.getProject());
Pair<File, int[]> parsedLocation = callStackCallback.parseLocation(line, false);
diff --git a/websvccommon/websvc.saas.codegen/nbproject/project.properties b/websvccommon/websvc.saas.codegen/nbproject/project.properties
index c81bee4..faba915 100644
--- a/websvccommon/websvc.saas.codegen/nbproject/project.properties
+++ b/websvccommon/websvc.saas.codegen/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
# masterfs needed for the usual reasons; tools.jar needed for Ant's <javac> to work
test.unit.run.cp.extra=${tools.jar}
diff --git a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
index 2ce0f58..1b1e57b 100644
--- a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
+++ b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
@@ -153,7 +153,7 @@ public class GenericResourceBean {
}
public void setMethodTypes(HttpMethodType[] types) {
- methodTypes = new HashSet(Arrays.asList(types));
+ methodTypes = new HashSet<>(Arrays.asList(types));
}
private String[] uriParams = null;
diff --git a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
index 7c26bfa..2c0eb85 100644
--- a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
+++ b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
@@ -482,7 +482,7 @@ public abstract class SaasBean extends GenericResourceBean {
}
private Map<String, Map<String, String>> getArtifactTemplates(SaasMethod m) throws IOException {
- Map<String, Map<String, String>> targetMaps = new HashMap();
+ Map<String, Map<String, String>> targetMaps = new HashMap<>();
CodeGen codegen = m.getSaas().getSaasMetadata().getCodeGen();
if(codegen != null) {
List<Artifacts> artifactsList = codegen.getArtifacts();
---------------------------------------------------------------------
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