You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mk...@apache.org on 2019/12/09 23:47:17 UTC
[netbeans] branch master updated: [NETBEANS-3503] Fixed compiler
warnings concerning rawtypes IssueNode.IssueProperty
This is an automated email from the ASF dual-hosted git repository.
mklaehn 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 0a0f0b7 [NETBEANS-3503] Fixed compiler warnings concerning rawtypes IssueNode.IssueProperty
0a0f0b7 is described below
commit 0a0f0b707430f185ff54381dc1cd6fd35e305089
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Sat Nov 30 22:00:02 2019 +0100
[NETBEANS-3503] Fixed compiler warnings concerning rawtypes IssueNode.IssueProperty
---
.../org/netbeans/modules/bugtracking/issuetable/IssueNode.java | 4 ++--
.../netbeans/modules/bugtracking/issuetable/IssueTable.java | 5 ++---
.../modules/bugtracking/issuetable/QueryTableCellRenderer.java | 6 +++---
.../bugtracking/issuetable/QueryTableCellRendererTest.java | 10 +++++-----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueNode.java b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueNode.java
index 7e5b0bb..43e35cd 100644
--- a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueNode.java
+++ b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueNode.java
@@ -259,7 +259,7 @@ public abstract class IssueNode<I> extends AbstractNode {
return IssueNode.this.getSummary();
}
@Override
- public int compareTo(IssueProperty p) {
+ public int compareTo(IssueProperty<String> p) {
if(p == null) return 1;
String s1 = IssueNode.this.getSummary();
String s2 = p.getSummary();
@@ -282,7 +282,7 @@ public abstract class IssueNode<I> extends AbstractNode {
return issueImpl.getStatus() == IssueStatusProvider.Status.SEEN;
}
@Override
- public int compareTo(IssueProperty p) {
+ public int compareTo(IssueProperty<Boolean> p) {
if(p == null) return 1;
Boolean b1 = IssueNode.this.wasSeen();
Boolean b2 = p.getStatus() == IssueStatusProvider.Status.SEEN;
diff --git a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueTable.java b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueTable.java
index e341949..be01210 100644
--- a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueTable.java
+++ b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/IssueTable.java
@@ -24,7 +24,6 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.TableColumnModelEvent;
import javax.swing.table.TableColumn;
-import org.netbeans.modules.bugtracking.issuetable.IssueNode.IssueProperty;
import org.openide.util.NbBundle;
import javax.swing.event.AncestorListener;
import javax.swing.event.AncestorEvent;
@@ -114,9 +113,9 @@ public class IssueTable implements MouseListener, AncestorListener, KeyListener,
private final FindInQuerySupport findInQuerySupport;
private boolean isSaved;
- private static final Comparator<IssueProperty> nodeComparator = new Comparator<IssueProperty>() {
+ private static final Comparator<IssueNode<Object>.IssueProperty<Object>> nodeComparator = new Comparator<IssueNode<Object>.IssueProperty<Object>>() {
@Override
- public int compare(IssueProperty p1, IssueProperty p2) {
+ public int compare(IssueNode<Object>.IssueProperty<Object> p1, IssueNode<Object>.IssueProperty<Object> p2) {
Integer sk1 = (Integer) p1.getValue("sortkey"); // NOI18N
if (sk1 != null) {
Integer sk2 = (Integer) p2.getValue("sortkey"); // NOI18N
diff --git a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRenderer.java b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRenderer.java
index a132c5e..be7b5ed 100644
--- a/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRenderer.java
+++ b/ide/bugtracking.commons/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRenderer.java
@@ -292,7 +292,7 @@ public class QueryTableCellRenderer extends DefaultTableCellRenderer {
}
- public static TableCellStyle getCellStyle(JTable table, IssueTable issueTable, IssueProperty p, boolean isSelected, int row) {
+ public static TableCellStyle getCellStyle(JTable table, IssueTable issueTable, IssueNode<?>.IssueProperty<?> p, boolean isSelected, int row) {
TableCellStyle style = getDefaultCellStyle(table, issueTable, p, isSelected, row);
try {
// set text format and background depending on selection and issue status
@@ -343,7 +343,7 @@ public class QueryTableCellRenderer extends DefaultTableCellRenderer {
}
return style;
}
- public static TableCellStyle getDefaultCellStyle(JTable table, IssueTable issueTable, IssueProperty p, boolean isSelected, int row) {
+ public static TableCellStyle getDefaultCellStyle(JTable table, IssueTable issueTable, IssueNode<?>.IssueProperty<?> p, boolean isSelected, int row) {
// set default values
return new TableCellStyle(
null, // format
@@ -354,7 +354,7 @@ public class QueryTableCellRenderer extends DefaultTableCellRenderer {
);
}
- private static Pattern getHightlightPattern(IssueTable issueTable, IssueProperty p) {
+ private static Pattern getHightlightPattern(IssueTable issueTable, IssueNode<?>.IssueProperty<?> p) {
if(p instanceof IssueNode.SummaryProperty) {
SummaryTextFilter f = issueTable.getSummaryFilter();
if(f != null && f.isHighLightingOn()) {
diff --git a/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRendererTest.java b/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRendererTest.java
index 28ceca8..7854bb1 100644
--- a/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRendererTest.java
+++ b/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/QueryTableCellRendererTest.java
@@ -98,7 +98,7 @@ public class QueryTableCellRendererTest {
// issue seen, not selected
RendererIssue rendererIssue = new RendererIssue(rendererRepository, "");
- IssueProperty property = new RendererNode(rendererIssue, "some value", rendererRepository).createProperty();
+ RendererNode.RendererIssueProperty property = new RendererNode(rendererIssue, "some value", rendererRepository).createProperty();
rendererQuery.containsIssue = true;
boolean selected = false;
setIssueValues(rendererRepository, rendererIssue, Status.SEEN, true);
@@ -188,7 +188,7 @@ public class QueryTableCellRendererTest {
RendererRepository rendererRepository = new RendererRepository();
RendererIssue issue = new RendererIssue(rendererRepository, "");
RendererQuery query = new RendererQuery(rendererRepository);
- IssueProperty property = new RendererNode(issue, "some value", rendererRepository).createProperty();
+ RendererNode.RendererIssueProperty property = new RendererNode(issue, "some value", rendererRepository).createProperty();
IssueTable issueTable = new IssueTable(
TestKit.getRepository(rendererRepository).getId(),
@@ -265,7 +265,7 @@ public class QueryTableCellRendererTest {
}
}
- private class RendererNode<TestIssue> extends IssueNode {
+ private class RendererNode extends IssueNode<TestIssue> {
Object propertyValue;
public RendererNode(RendererIssue issue, String value, RendererRepository rendererRepository) {
@@ -279,8 +279,8 @@ public class QueryTableCellRendererTest {
protected Property<?>[] getProperties() {
return new Property[0];
}
- class RendererIssueProperty extends IssueProperty {
- public RendererIssueProperty(String arg0, Class name, String type, String displayName, Object value) {
+ class RendererIssueProperty extends IssueProperty<Object> {
+ public RendererIssueProperty(String arg0, Class<Object> name, String type, String displayName, Object value) {
super(arg0, name, type, displayName);
}
@Override
---------------------------------------------------------------------
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