You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2017/09/16 12:39:18 UTC
svn commit: r1808536 - in /jmeter/trunk/src:
core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jorphan/org/apache/jorphan/gui/JTreeTable.java
Author: fschumacher
Date: Sat Sep 16 12:39:18 2017
New Revision: 1808536
URL: http://svn.apache.org/viewvc?rev=1808536&view=rev
Log:
Make JMeter compile with java 9.
Java 9 seems to be stricter with generics, so we have to specify them
explicitly by casting. Adapted the javadocs to be more specific, even
if the interface is not.
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1808536&r1=1808535&r2=1808536&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Sat Sep 16 12:39:18 2017
@@ -196,6 +196,6 @@ public class JMeterTreeNode extends Defa
@Override
@SuppressWarnings("unchecked")
public Enumeration<JMeterTreeNode> children() {
- return super.children();
+ return (Enumeration<JMeterTreeNode>) super.children();
}
}
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java?rev=1808536&r1=1808535&r2=1808536&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java Sat Sep 16 12:39:18 2017
@@ -57,11 +57,12 @@ public class JTreeTable extends JTable {
}
/**
- * @param rowData the data for the table
+ * @param rowData the data for the table. Has to be a {@link Vector} of {@link Vector}s.
* @param columnNames the names for the columns
*/
+ @SuppressWarnings("unchecked")
public JTreeTable(Vector<?> rowData, Vector<?> columnNames) {
- super(rowData, columnNames);
+ super((Vector<? extends Vector<?>>) rowData, columnNames);
}
}
Re: svn commit: r1808536 - in /jmeter/trunk/src:
core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jorphan/org/apache/jorphan/gui/JTreeTable.java
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 16.09.2017 um 14:39 schrieb fschumacher@apache.org:
> Author: fschumacher
> Date: Sat Sep 16 12:39:18 2017
> New Revision: 1808536
>
> URL: http://svn.apache.org/viewvc?rev=1808536&view=rev
> Log:
> Make JMeter compile with java 9.
>
> Java 9 seems to be stricter with generics, so we have to specify them
> explicitly by casting. Adapted the javadocs to be more specific, even
> if the interface is not.
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
> jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1808536&r1=1808535&r2=1808536&view=diff
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Sat Sep 16 12:39:18 2017
> @@ -196,6 +196,6 @@ public class JMeterTreeNode extends Defa
> @Override
> @SuppressWarnings("unchecked")
> public Enumeration<JMeterTreeNode> children() {
> - return super.children();
> + return (Enumeration<JMeterTreeNode>) super.children();
I was too fast here. It seems java 9 was complaining, that we can't
override the method children() with one, that is more specific. So
removing it, would probably be the correct option here.
What do you think?
Felix
> }
> }
>
> Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java
> URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java?rev=1808536&r1=1808535&r2=1808536&view=diff
> ==============================================================================
> --- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java (original)
> +++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java Sat Sep 16 12:39:18 2017
> @@ -57,11 +57,12 @@ public class JTreeTable extends JTable {
> }
>
> /**
> - * @param rowData the data for the table
> + * @param rowData the data for the table. Has to be a {@link Vector} of {@link Vector}s.
> * @param columnNames the names for the columns
> */
> + @SuppressWarnings("unchecked")
> public JTreeTable(Vector<?> rowData, Vector<?> columnNames) {
> - super(rowData, columnNames);
> + super((Vector<? extends Vector<?>>) rowData, columnNames);
> }
>
> }
>
>