svn commit: r1641179 - /jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java

[pmouawad]

Author: pmouawad
Date: Sun Nov 23 13:32:30 2014
New Revision: 1641179

URL: http://svn.apache.org/r1641179
Log:
Remove Generic JComboBox use as we are on JAVA6

Modified:
    
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1641179&r1=1641178&r2=1641179&view=diff
==============================================================================
--- 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
 Sun Nov 23 13:32:30 2014
@@ -65,7 +65,7 @@ public class HTMLAssertionGui extends Ab
 
     private JCheckBox errorsOnly = null;
 
-    private JComboBox<String> docTypeBox = null;
+    private JComboBox docTypeBox = null;
 
     private JRadioButton htmlRadioButton = null;
 
@@ -213,7 +213,7 @@ public class HTMLAssertionGui extends Ab
 
         // doctype
         HorizontalPanel docTypePanel = new HorizontalPanel();
-        docTypeBox = new JComboBox<String>(new String[] { "omit", "auto", 
"strict", "loose" });
+        docTypeBox = new JComboBox(new String[] { "omit", "auto", "strict", 
"loose" });
         // docTypePanel.add(new
         // JLabel(JMeterUtils.getResString("duration_assertion_label"))); 
//$NON-NLS-1$
         docTypePanel.add(new JLabel("Doctype:"));