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 8facebf [NETBEANS-2670] - cleanup raw type warnings 8facebf is described below commit 8facebfce84017a66ae2b50d079ed3e7652604c9 Author: Brad Walker <bwal...@musings.com> AuthorDate: Fri Jun 14 11:16:12 2019 -0600 [NETBEANS-2670] - cleanup raw type warnings [repeat] /home/bwalker/netbeans-11.0/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/TabLayoutManager.java:245: warning: [rawtypes] found raw type: ArrayList [repeat] ArrayList<Integer>[] rowIndexes = new ArrayList[rowCount]; [repeat] ^ [repeat] missing type arguments for generic class ArrayList<E> So remove the warnings by doing just simply providing a proper type for the generic class.. --- .../project/ui/branding/ResourceBundleBrandingPanel.java | 2 +- .../modules/j2ee/ejbverification/rules/BusinessMethodExposed.java | 8 ++++---- .../web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java | 4 +++- .../src/org/netbeans/modules/web/struts/StrutsCatalog.java | 5 ++++- .../groovy/editor/api/parser/GroovyVirtualSourceProvider.java | 6 +++--- ide/image/src/org/netbeans/modules/image/ImageViewer.java | 3 +-- .../websvc/saas/codegen/java/support/SourceGroupSupport.java | 8 ++++---- .../xml/tools/java/generator/GenerateDOMScannerSupport.java | 4 ++-- platform/openide.text/src/org/openide/text/LineVector.java | 4 ++-- .../src/org/netbeans/modules/sampler/SamplesOutputStream.java | 8 ++++---- .../netbeans/modules/profiler/heapwalk/AnalysisController.java | 4 ++-- .../netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java | 2 +- .../modules/profiler/heapwalk/NavigationHistoryManager.java | 4 ++-- .../modules/profiler/options/ui/v2/ProfilerOptionsContainer.java | 2 +- .../modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java | 2 +- .../src/org/netbeans/modules/html/ojet/OJETHtmlExtension.java | 2 +- .../src/org/netbeans/modules/html/ojet/data/DataItemImpl.java | 6 +++--- .../src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java | 4 ++-- .../javascript2/requirejs/editor/RequireJSCodeCompletion.java | 8 ++++---- 19 files changed, 45 insertions(+), 41 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 3d9febd..074028c 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 @@ -379,7 +379,7 @@ public class ResourceBundleBrandingPanel extends AbstractBrandingPanel } private void refreshList() { - List<BundleNode> keys = new ArrayList(); + List<BundleNode> keys = new ArrayList<BundleNode>(); for (BundleNode node : resourceBundleNodes) { keys.add(node); } diff --git a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java index 02f19c2..00a93bc 100644 --- a/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java +++ b/enterprise/j2ee.ejbverification/src/org/netbeans/modules/j2ee/ejbverification/rules/BusinessMethodExposed.java @@ -82,8 +82,8 @@ public class BusinessMethodExposed { Profile profile = ejbModule.getJ2eeProfile(); if (profile != null && profile.isAtLeast(Profile.JAVA_EE_6_WEB)) { int intfCount = ctx.getEjbData().getBusinessLocal().length + ctx.getEjbData().getBusinessRemote().length; - localInterfaces = new ArrayList(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessLocal())); - remoteInterfaces = new ArrayList(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessRemote())); + localInterfaces = new ArrayList<TypeElement>(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessLocal())); + remoteInterfaces = new ArrayList<TypeElement>(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessRemote())); if (intfCount == 0 || JavaUtils.hasAnnotation(ctx.getClazz(), EJBAPIAnnotations.LOCAL_BEAN)) { return null; } @@ -95,10 +95,10 @@ public class BusinessMethodExposed { } if (localInterfaces == null) { - localInterfaces = new ArrayList(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessLocal())); + localInterfaces = new ArrayList<TypeElement>(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessLocal())); } if (remoteInterfaces == null) { - remoteInterfaces = new ArrayList(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessRemote())); + remoteInterfaces = new ArrayList<TypeElement>(resolveClasses(hintContext.getInfo(), ctx.getEjbData().getBusinessRemote())); } Collection<ExecutableElement> definedMethods = new ArrayList<>(); diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java index 06bfe15..e9ac5bd 100644 --- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java +++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/JSFCatalog.java @@ -20,6 +20,8 @@ package org.netbeans.modules.web.jsf; +import java.util.List; +import java.util.ArrayList; import org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion; import org.netbeans.modules.xml.catalog.spi.*; @@ -90,7 +92,7 @@ public class JSFCatalog implements CatalogReader, CatalogDescriptor2, org.xml.sa * @return null if cannot proceed, try later. */ public java.util.Iterator getPublicIDs() { - java.util.List list = new java.util.ArrayList(); + List<String> list = new ArrayList<String>(); list.add(JSF_ID_1_0); list.add(JSF_ID_1_1); list.add(JSF_ID_1_2); diff --git a/enterprise/web.struts/src/org/netbeans/modules/web/struts/StrutsCatalog.java b/enterprise/web.struts/src/org/netbeans/modules/web/struts/StrutsCatalog.java index 61070e1..c69451a 100644 --- a/enterprise/web.struts/src/org/netbeans/modules/web/struts/StrutsCatalog.java +++ b/enterprise/web.struts/src/org/netbeans/modules/web/struts/StrutsCatalog.java @@ -25,10 +25,13 @@ package org.netbeans.modules.web.struts; +import java.util.List; +import java.util.ArrayList; import org.netbeans.modules.xml.catalog.spi.*; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; import org.openide.util.Utilities; + /** * * @author Petr Pisl @@ -66,7 +69,7 @@ public class StrutsCatalog implements CatalogReader, CatalogDescriptor2, org.xml * @return null if cannot proceed, try later. */ public java.util.Iterator getPublicIDs() { - java.util.List list = new java.util.ArrayList(); + List<String> list = new ArrayList<String>(); list.add(STRUTS_ID_1_0); list.add(STRUTS_ID_1_1); list.add(STRUTS_ID_1_2); diff --git a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java index c7d2914..2274f32 100644 --- a/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java +++ b/groovy/groovy.editor/src/org/netbeans/modules/groovy/editor/api/parser/GroovyVirtualSourceProvider.java @@ -161,7 +161,7 @@ public class GroovyVirtualSourceProvider implements VirtualSourceProvider { private boolean java5 = false; private boolean requireSuperResolved = false; - private List toCompile = new ArrayList(); + private List<String> toCompile = new ArrayList<String>(); private JavaStubGenerator(final boolean requireSuperResolved, final boolean java5) { this.requireSuperResolved = requireSuperResolved; @@ -313,8 +313,8 @@ public class GroovyVirtualSourceProvider implements VirtualSourceProvider { if (fields == null) { return; } - ArrayList enumFields = new ArrayList(fields.size()); - ArrayList normalFields = new ArrayList(fields.size()); + ArrayList<FieldNode> enumFields = new ArrayList<FieldNode>(fields.size()); + ArrayList<FieldNode> normalFields = new ArrayList<FieldNode>(fields.size()); for (Iterator it = fields.iterator(); it.hasNext();) { FieldNode fieldNode = (FieldNode) it.next(); boolean isEnumField = (fieldNode.getModifiers() & Opcodes.ACC_ENUM) != 0; diff --git a/ide/image/src/org/netbeans/modules/image/ImageViewer.java b/ide/image/src/org/netbeans/modules/image/ImageViewer.java index 73c329a..ce1b07b 100644 --- a/ide/image/src/org/netbeans/modules/image/ImageViewer.java +++ b/ide/image/src/org/netbeans/modules/image/ImageViewer.java @@ -95,8 +95,7 @@ public class ImageViewer extends CloneableTopComponent { private PropertyChangeListener nameChangeL; /** collection of all buttons in the toolbar */ - private final Collection/*<JButton>*/ toolbarButtons - = new ArrayList/*<JButton>*/(11); + private final Collection<JButton> toolbarButtons = new ArrayList<JButton>(11); private Component view; 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 ca31545..e6b62ab 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 @@ -181,15 +181,15 @@ 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<SourceGroup>(); + List<FileObject> sourceRoots = getFileObjects(rootURLs, true); for (int i = 0; i < sourceRoots.size(); i++) { - FileObject sourceRoot = (FileObject) sourceRoots.get(i); + FileObject sourceRoot = sourceRoots.get(i); SourceGroup srcGroup = (SourceGroup) foldersToSourceGroupsMap.get(sourceRoot); if (srcGroup != null) { result.add(srcGroup); diff --git a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java index 5e82bef..ae1ab01 100644 --- a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java +++ b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java @@ -197,7 +197,7 @@ public class GenerateDOMScannerSupport implements XMLGenerateCookie { //add document field Tree tree = make.Identifier(DOM_DOCUMENT); VariableTree var = make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), VARIABLE_DOCUMENT, tree, null); - List varTree = new ArrayList(); + List<VariableTree> varTree = new ArrayList<VariableTree>(); varTree.add(var); ClassTree modifiedClass = genUtils.addClassFields(javaClass, varTree); commentText = "org.w3c.dom.Document document"; @@ -251,7 +251,7 @@ public class GenerateDOMScannerSupport implements XMLGenerateCookie { mods = make.Modifiers(EnumSet.noneOf(Modifier.class)); tree = make.Identifier(DOM_ELEMENT); var = make.Variable(make.Modifiers(EnumSet.noneOf(Modifier.class)), VARIABLE_ELEMENT, tree, null); - varTree = new ArrayList(); + varTree = new ArrayList<VariableTree>(); varTree.add(var); while (it.hasNext()) { TreeElementDecl next = (TreeElementDecl) it.next(); diff --git a/platform/openide.text/src/org/openide/text/LineVector.java b/platform/openide.text/src/org/openide/text/LineVector.java index 3de2866..f5bf218 100644 --- a/platform/openide.text/src/org/openide/text/LineVector.java +++ b/platform/openide.text/src/org/openide/text/LineVector.java @@ -72,7 +72,7 @@ final class LineVector { /** * Line updater that should update lines once the current request completes. */ - private List<LineUpdater> pendingLineUpdaters = new ArrayList(2); + private List<LineUpdater> pendingLineUpdaters = new ArrayList<LineUpdater>(2); LineVector() { this.refArray = new Ref[4]; @@ -163,7 +163,7 @@ final class LineVector { List<LineUpdater> lineUpdaters; synchronized (this) { if (pendingLineUpdaters.size() > 0) { - lineUpdaters = new ArrayList(pendingLineUpdaters); + lineUpdaters = new ArrayList<LineUpdater>(pendingLineUpdaters); pendingLineUpdaters.clear(); } else { lineUpdaters = null; diff --git a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java index 6deb91f..d479fbc 100644 --- a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java +++ b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java @@ -70,13 +70,13 @@ class SamplesOutputStream { // out = new ObjectOutputStream(os); lastThreadInfos = new HashMap(); steCache = new WeakHashMap(8*1024); - samples = new ArrayList(1024); + samples = new ArrayList<Sample>(1024); } void writeSample(ThreadInfo[] infos, long time, long selfThreadId) throws IOException { - List<Long> sameT = new ArrayList(); - List<ThreadInfo> newT = new ArrayList(); - List<Long> tids = new ArrayList(); + List<Long> sameT = new ArrayList<Long>(); + List<ThreadInfo> newT = new ArrayList<ThreadInfo>(); + List<Long> tids = new ArrayList<Long>(); for (ThreadInfo tinfo : infos) { long id; diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java index 4129c47..43f188e 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/AnalysisController.java @@ -79,7 +79,7 @@ public class AnalysisController extends AbstractTopLevelController implements Na public List<Rule> getRules() { if (rules == null) { - rules = new ArrayList(MemoryLint.createRules()); + rules = new ArrayList<Rule>(MemoryLint.createRules()); } return rules; @@ -98,7 +98,7 @@ public class AnalysisController extends AbstractTopLevelController implements Na } public BoundedRangeModel performAnalysis(boolean[] rulesSelection) { - final List<Rule> selectedRules = new ArrayList(); + final List<Rule> selectedRules = new ArrayList<Rule>(); final List<Rule> allRules = getRules(); for (int i = 0; i < rulesSelection.length; i++) { diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java index 1459d25..55cf36b 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java @@ -123,7 +123,7 @@ public class HeapFragmentWalker { } public final void addStateListener(StateListener listener) { - if (stateListeners == null) stateListeners = new ArrayList(); + if (stateListeners == null) stateListeners = new ArrayList<StateListener>(); if (!stateListeners.contains(listener)) stateListeners.add(listener); } diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java index 6830223..7b3663c 100644 --- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java +++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/NavigationHistoryManager.java @@ -78,8 +78,8 @@ public class NavigationHistoryManager { public NavigationHistoryManager(HeapFragmentWalker heapFragmentWalker) { this.heapFragmentWalker = heapFragmentWalker; - backHistory = new ArrayList(); - forwardHistory = new ArrayList(); + backHistory = new ArrayList<NavigationHistoryItem>(); + forwardHistory = new ArrayList<NavigationHistoryItem>(); } //~ Methods ------------------------------------------------------------------------------------------------------------------ diff --git a/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java index 9931e17..5a5f64a 100644 --- a/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java +++ b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/ProfilerOptionsContainer.java @@ -82,7 +82,7 @@ public class ProfilerOptionsContainer extends ProfilerOptionsPanel { int sel = categoriesSelection.getLeadSelectionIndex(); if (sel == -1) sel = 0; - if (panels == null) panels = new ArrayList(); + if (panels == null) panels = new ArrayList<ProfilerOptionsPanel>(); else panels.clear(); panels.addAll(Lookup.getDefault().lookupAll(ProfilerOptionsPanel.class)); diff --git a/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java index a408843..a2ebeef 100644 --- a/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java +++ b/profiler/profiler.options/src/org/netbeans/modules/profiler/options/ui/v2/impl/FiltersOptionsPanel.java @@ -99,7 +99,7 @@ import org.openide.util.lookup.ServiceProvider; @ServiceProvider( service = ProfilerOptionsPanel.class, position = 15 ) public final class FiltersOptionsPanel extends ProfilerOptionsPanel { - private final List<ColoredFilter> colors = new ArrayList(); + private final List<ColoredFilter> colors = new ArrayList<ColoredFilter>(); private final ColorsTableModel colorsModel = new ColorsTableModel(); private JCheckBox coloringChoice; diff --git a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/OJETHtmlExtension.java b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/OJETHtmlExtension.java index 4d67fa5..92c7c77 100644 --- a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/OJETHtmlExtension.java +++ b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/OJETHtmlExtension.java @@ -55,7 +55,7 @@ public class OJETHtmlExtension extends HtmlExtension { case DATA_BINDING: String prefix = OJETUtils.getPrefix(ojContext, document, offset); Collection<DataItem> data = DataProvider.filterByPrefix(DataProviderImpl.getInstance().getBindingOptions(), prefix); - List<CompletionItem> result = new ArrayList(); + List<CompletionItem> result = new ArrayList<CompletionItem>(); for (DataItem item : data) { result.add(new OJETCompletionHtmlItem(item, OJETUtils.getPrefixOffset(ojContext, document, offset))); } diff --git a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataItemImpl.java b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataItemImpl.java index b01ab4e..1e73fca 100644 --- a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataItemImpl.java +++ b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataItemImpl.java @@ -90,7 +90,7 @@ public class DataItemImpl implements DataItem { public Collection<DataItem> getProperies() { if (properties == null) { - properties = new ArrayList(); + properties = new ArrayList<DataItem>(); InputStream in = null; try { in = getInputStream(new URL(getDocUrl())); @@ -201,7 +201,7 @@ public class DataItemImpl implements DataItem { public Collection<DataItem> getOptions() { if (options == null) { - options = new ArrayList(); + options = new ArrayList<DataItem>(); InputStream in = null; try { in = getInputStream(new URL(getDocUrl())); @@ -254,7 +254,7 @@ public class DataItemImpl implements DataItem { public Collection<DataItem> getEvents() { if (events == null) { - events = new ArrayList(); + events = new ArrayList<DataItem>(); InputStream in = null; try { in = getInputStream(new URL(getDocUrl())); diff --git a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java index 1a540dd..3f49325 100644 --- a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java +++ b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java @@ -81,7 +81,7 @@ public class DataProviderImpl extends DataProvider { @Override public Collection<DataItem> getBindingOptions() { - List<DataItem> result = new ArrayList(1); + List<DataItem> result = new ArrayList<DataItem>(1); result.add((new DataItemImpl(OJETUtils.OJ_COMPONENT, null, OJETUtils.OJ_COMPONENT + ": {component: }"))); // NOI18N result.add(new DataItemImpl(OJETUtils.OJ_MODULE, null, OJETUtils.OJ_MODULE + ": ")); return result; @@ -126,7 +126,7 @@ public class DataProviderImpl extends DataProvider { @Override public Collection<String> getAvailableVersions() { File folder = InstalledFileLocator.getDefault().locate(zipFolder, "org.netbeans.modules.html.ojet", false); //NOI18N - List<String> versions = new ArrayList(); + List<String> versions = new ArrayList<String>(); if (folder.exists()) { File[] files = folder.listFiles(); for (File file : files) { diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletion.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletion.java index 74be028..8bb92ac 100644 --- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletion.java +++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletion.java @@ -65,7 +65,7 @@ public class RequireJSCodeCompletion implements CompletionProvider { EditorUtils.CodeCompletionContext context = EditorUtils.findContext(snapshot, offset); if (context == EditorUtils.CodeCompletionContext.CONFIG_PROPERTY_NAME) { - List<CompletionProposal> result = new ArrayList(); + List<CompletionProposal> result = new ArrayList<CompletionProposal>(); Collection<String> names = RequireJsDataProvider.getDefault().getConfigurationOptions(); for (String name : names) { if (name.startsWith(prefix)) { @@ -174,7 +174,7 @@ public class RequireJSCodeCompletion implements CompletionProvider { } if (relativeTo.isEmpty()) { - Collection<String> basePaths = new ArrayList(); + Collection<String> basePaths = new ArrayList<String>(); if (rIndex != null) { basePaths = rIndex.getBasePaths(); relativeTo.add(fo.getParent()); @@ -216,7 +216,7 @@ public class RequireJSCodeCompletion implements CompletionProvider { } } - List<CompletionProposal> result = new ArrayList(); + List<CompletionProposal> result = new ArrayList<CompletionProposal>(); Map<String, FSCompletionItem> ccItems = new HashMap<>(); try { boolean addPrefix = !isClientCode(project, fo); @@ -251,7 +251,7 @@ public class RequireJSCodeCompletion implements CompletionProvider { topFolder = project.getProjectDirectory(); } try { - List<CompletionProposal> tmpResult = new ArrayList(); + List<CompletionProposal> tmpResult = new ArrayList<CompletionProposal>(); while (FileUtil.isParentOf(topFolder, parentFolder)) { tmpResult.add(new FSCompletionItem(parentFolder, writtenPath, addExtensionInCC, offset)); parentFolder = parentFolder.getParent(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists