This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 a481104 [NETBEANS-3480] Fixed compiler warnings concerning rawtypes LinkedHashSet a481104 is described below commit a481104a17a7aa83d3b12359cf477730fab06992 Author: Martin Klähn <mkla...@apache.org> AuthorDate: Wed Nov 27 12:44:10 2019 +0100 [NETBEANS-3480] Fixed compiler warnings concerning rawtypes LinkedHashSet --- .../codetemplates/storage/ui/CodeTemplatesModel.java | 4 ++-- .../errorstripe/AnnotationViewDataImplTest.java | 20 ++++++++++---------- .../php/samples/PHPSamplesWizardIterator.java | 2 +- .../netbeans/modules/templatesui/AbstractWizard.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesModel.java b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesModel.java index de9a72a..a1372e5 100644 --- a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesModel.java +++ b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesModel.java @@ -306,9 +306,9 @@ final class CodeTemplatesModel { if (ret == null) { CodeTemplateDescription ctd = codeTemplatesMap.get(abbreviation); final boolean[] afterInit = {false}; - ret = new LinkedHashSet() { + ret = new LinkedHashSet<String>() { @Override - public boolean add(Object e) { + public boolean add(String e) { boolean b = super.add(e); if (b && afterInit[0]) { TM.this.fireChanged(); diff --git a/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImplTest.java b/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImplTest.java index 7822c12..929f740 100644 --- a/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImplTest.java +++ b/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImplTest.java @@ -218,10 +218,10 @@ public class AnnotationViewDataImplTest extends NbTestCase { TestMark mark2 = new TestMark(Status.STATUS_OK, null, null, new int[] {2, 2}); TestMark mark3 = new TestMark(Status.STATUS_OK, null, null, new int[] {4, 6}); - List marks = Arrays.asList(new Mark[]{mark1, mark2}); - List marksOnlyFirst = Arrays.asList(new Mark[]{mark1}); - List marksOnlySecond = Arrays.asList(new Mark[]{mark2}); - List marksFirstAndThird = Arrays.asList(new Mark[]{mark1, mark3}); + List<Mark> marks = Arrays.asList(new Mark[]{mark1, mark2}); + List<Mark> marksOnlyFirst = Arrays.asList(new Mark[]{mark1}); + List<Mark> marksOnlySecond = Arrays.asList(new Mark[]{mark2}); + List<Mark> marksFirstAndThird = Arrays.asList(new Mark[]{mark1, mark3}); TestMarkProvider provider = new TestMarkProvider(marks, UpToDateStatus.UP_TO_DATE_OK); TestMarkProviderCreator creator = TestMarkProviderCreator.getDefault(); @@ -231,12 +231,12 @@ public class AnnotationViewDataImplTest extends NbTestCase { AnnotationView aView = new AnnotationView(editor); AnnotationViewDataImpl data = (AnnotationViewDataImpl) aView.getData(); - Collection mergedMarks; - SortedMap map; + Collection<Mark> mergedMarks; + SortedMap<Integer, List<Mark>> map; mergedMarks = data.getMergedMarks(); - assertEquals(new LinkedHashSet(marks), mergedMarks); + assertEquals(new LinkedHashSet<Mark>(marks), mergedMarks); map = data.getMarkMap(); @@ -247,7 +247,7 @@ public class AnnotationViewDataImplTest extends NbTestCase { mergedMarks = data.getMergedMarks(); - assertEquals(new LinkedHashSet(marksOnlyFirst), mergedMarks); + assertEquals(new LinkedHashSet<Mark>(marksOnlyFirst), mergedMarks); map = data.getMarkMap(); @@ -258,7 +258,7 @@ public class AnnotationViewDataImplTest extends NbTestCase { mergedMarks = data.getMergedMarks(); - assertEquals(new LinkedHashSet(marksFirstAndThird), mergedMarks); + assertEquals(new LinkedHashSet<Mark>(marksFirstAndThird), mergedMarks); map = data.getMarkMap(); @@ -283,7 +283,7 @@ public class AnnotationViewDataImplTest extends NbTestCase { mergedMarks = data.getMergedMarks(); - assertEquals(new LinkedHashSet(marksFirstAndThird), mergedMarks); + assertEquals(new LinkedHashSet<Mark>(marksFirstAndThird), mergedMarks); map = data.getMarkMap(); diff --git a/php/php.samples/src/org/netbeans/modules/php/samples/PHPSamplesWizardIterator.java b/php/php.samples/src/org/netbeans/modules/php/samples/PHPSamplesWizardIterator.java index 6f454b8..1205309 100644 --- a/php/php.samples/src/org/netbeans/modules/php/samples/PHPSamplesWizardIterator.java +++ b/php/php.samples/src/org/netbeans/modules/php/samples/PHPSamplesWizardIterator.java @@ -79,7 +79,7 @@ public class PHPSamplesWizardIterator implements WizardDescriptor./*Progress*/In } public Set/*<FileObject>*/ instantiate(/*ProgressHandle handle*/) throws IOException { - Set resultSet = new LinkedHashSet(); + Set<FileObject> resultSet = new LinkedHashSet<>(); File dirF = FileUtil.normalizeFile((File) wiz.getProperty(WizardProperties.PROJ_DIR)); createFolder(dirF); diff --git a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java index ba421ca..886652b 100644 --- a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java +++ b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java @@ -121,7 +121,7 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> { name(tw.getTargetName()). withParameters(params).build(); - Set<DataObject> objs = new LinkedHashSet(result.size() * 2); + Set<DataObject> objs = new LinkedHashSet<>(result.size() * 2); for (FileObject fileObject : result) { objs.add(DataObject.find(fileObject)); } --------------------------------------------------------------------- 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