/hg/release/icedtea-web-1.5: Remove slipped in Java 7 language c...

[gitne at icedtea.classpath.org]

changeset af2c7b195ed8 in /hg/release/icedtea-web-1.5
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.5?cmd=changeset;node=af2c7b195ed8
author: Jacob Wisor <gitne at gmx.de>
date: Thu Jun 26 18:13:30 2014 +0200

	Remove slipped in Java 7 language construct and API call

	2014-06-26  Jacob Wisor  <gitne at gmx.de>

		* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java:
		(sortBy) Remove slipped in Java 7 language construct


diffstat:

 ChangeLog                                                     |  5 +++++
 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java |  4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 93a3b303c280 -r af2c7b195ed8 ChangeLog
--- a/ChangeLog	Thu Jun 26 17:52:52 2014 +0200
+++ b/ChangeLog	Thu Jun 26 18:13:30 2014 +0200
@@ -1,3 +1,8 @@
+2014-06-26  Jacob Wisor  <gitne at gmx.de>
+
+	* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java:
+	(sortBy) Remove slipped in Java 7 language construct and API call
+
 2014-06-26  Jacob Wisor  <gitne at gmx.de>
 
 	* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java: Formatting
diff -r 93a3b303c280 -r af2c7b195ed8 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java	Thu Jun 26 17:52:52 2014 +0200
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java	Thu Jun 26 18:13:30 2014 +0200
@@ -102,7 +102,7 @@
         showPreInit = new JCheckBox();
         sortByLabel = new JLabel();
         regExLabel = new JCheckBox();
-        sortBy = new JComboBox<>();
+        sortBy = new JComboBox();
         searchLabel = new JLabel();
         autorefresh = new JCheckBox();
         refresh = new JButton();
@@ -958,7 +958,7 @@
     private final JCheckBox showThread2;
     private final JCheckBox showUser;
     private final JCheckBox sortCopyAll;
-    private final JComboBox<String> sortBy;
+    private final JComboBox sortBy;
     private final JLabel sortByLabel;
     private final JLabel statistics;
     private final JCheckBox wordWrap;