Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java?rev=804542&r1=804541&r2=804542&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java Sun Aug 16 00:33:20 2009 @@ -37,19 +37,19 @@ public class ObjectTableModel extends DefaultTableModel { private static final Logger log = LoggingManager.getLoggerForClass(); - private static final long serialVersionUID = 233L; + private static final long serialVersionUID = 240L; - private transient ArrayList objects = new ArrayList(); + private transient ArrayList<Object> objects = new ArrayList<Object>(); - private transient List headers = new ArrayList(); + private transient List<String> headers = new ArrayList<String>(); - private transient ArrayList classes = new ArrayList(); + private transient ArrayList<Class<?>> classes = new ArrayList<Class<?>>(); - private transient ArrayList readFunctors = new ArrayList(); + private transient ArrayList<Functor> readFunctors = new ArrayList<Functor>(); - private transient ArrayList writeFunctors = new ArrayList(); + private transient ArrayList<Functor> writeFunctors = new ArrayList<Functor>(); - private transient Class objectClass = null; // if provided + private transient Class<?> objectClass = null; // if provided /** * The ObjectTableModel is a TableModel whose rows are objects; @@ -61,7 +61,7 @@ * @param writeFunctors - used to set the values * @param editorClasses - class for each column */ - public ObjectTableModel(String[] headers, Class _objClass, Functor[] readFunctors, Functor[] writeFunctors, Class[] editorClasses) { + public ObjectTableModel(String[] headers, Class<?> _objClass, Functor[] readFunctors, Functor[] writeFunctors, Class<?>[] editorClasses) { this(headers, readFunctors, writeFunctors, editorClasses); this.objectClass=_objClass; } @@ -75,11 +75,11 @@ * @param writeFunctors - used to set the values * @param editorClasses - class for each column */ - public ObjectTableModel(String[] headers, Functor[] readFunctors, Functor[] writeFunctors, Class[] editorClasses) { + public ObjectTableModel(String[] headers, Functor[] readFunctors, Functor[] writeFunctors, Class<?>[] editorClasses) { this.headers.addAll(Arrays.asList(headers)); this.classes.addAll(Arrays.asList(editorClasses)); - this.readFunctors = new ArrayList(Arrays.asList(readFunctors)); - this.writeFunctors = new ArrayList(Arrays.asList(writeFunctors)); + this.readFunctors = new ArrayList<Functor>(Arrays.asList(readFunctors)); + this.writeFunctors = new ArrayList<Functor>(Arrays.asList(writeFunctors)); int numHeaders = headers.length; @@ -101,15 +101,15 @@ } private Object readResolve() { - objects = new ArrayList(); - headers = new ArrayList(); - classes = new ArrayList(); - readFunctors = new ArrayList(); - writeFunctors = new ArrayList(); + objects = new ArrayList<Object>(); + headers = new ArrayList<String>(); + classes = new ArrayList<Class<?>>(); + readFunctors = new ArrayList<Functor>(); + writeFunctors = new ArrayList<Functor>(); return this; } - public Iterator iterator() { + public Iterator<?> iterator() { return objects.iterator(); } @@ -122,7 +122,7 @@ public void addRow(Object value) { log.debug("Adding row value: " + value); if (objectClass != null) { - final Class valueClass = value.getClass(); + final Class<?> valueClass = value.getClass(); if (!objectClass.isAssignableFrom(valueClass)){ throw new IllegalArgumentException("Trying to add class: "+valueClass.getName() +"; expecting class: "+objectClass.getName()); @@ -137,25 +137,19 @@ super.fireTableRowsInserted(index, index + 1); } - /** - * @see javax.swing.table.TableModel#getColumnCount() - */ + /** {...@inheritdoc} */ @Override public int getColumnCount() { return headers.size(); } - /** - * @see javax.swing.table.TableModel#getColumnName(int) - */ + /** {...@inheritdoc} */ @Override public String getColumnName(int col) { - return (String) headers.get(col); + return headers.get(col); } - /** - * @see javax.swing.table.TableModel#getRowCount() - */ + /** {...@inheritdoc} */ @Override public int getRowCount() { if (objects == null) { @@ -164,9 +158,7 @@ return objects.size(); } - /** - * @see javax.swing.table.TableModel#getValueAt(int, int) - */ + /** {...@inheritdoc} */ @Override public Object getValueAt(int row, int col) { log.debug("Getting row value"); @@ -174,27 +166,23 @@ if(headers.size() == 1 && col >= readFunctors.size()) { return value; } - Functor getMethod = (Functor) readFunctors.get(col); + Functor getMethod = readFunctors.get(col); if (getMethod != null && value != null) { return getMethod.invoke(value); } return null; } - /** - * @see javax.swing.table.TableModel#isCellEditable(int, int) - */ + /** {...@inheritdoc} */ @Override public boolean isCellEditable(int arg0, int arg1) { return true; } - /** - * @see javax.swing.table.DefaultTableModel#moveRow(int, int, int) - */ + /** {...@inheritdoc} */ @Override public void moveRow(int start, int end, int to) { - List subList = objects.subList(start, end); + List<Object> subList = objects.subList(start, end); for (int x = end - 1; x >= start; x--) { objects.remove(x); } @@ -202,24 +190,20 @@ super.fireTableChanged(new TableModelEvent(this)); } - /** - * @see javax.swing.table.DefaultTableModel#removeRow(int) - */ + /** {...@inheritdoc} */ @Override public void removeRow(int row) { objects.remove(row); super.fireTableRowsDeleted(row, row); } - /** - * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) - */ + /** {...@inheritdoc} */ @Override public void setValueAt(Object cellValue, int row, int col) { if (row < objects.size()) { Object value = objects.get(row); if (col < writeFunctors.size()) { - Functor setMethod = (Functor) writeFunctors.get(col); + Functor setMethod = writeFunctors.get(col); if (setMethod != null) { setMethod.invoke(value, new Object[] { cellValue }); super.fireTableDataChanged(); @@ -232,12 +216,10 @@ } } - /** - * @see javax.swing.table.TableModel#getColumnClass(int) - */ + /** {...@inheritdoc} */ @Override - public Class getColumnClass(int arg0) { - return (Class) classes.get(arg0); + public Class<?> getColumnClass(int arg0) { + return classes.get(arg0); } /** @@ -253,7 +235,7 @@ * * @return false if at least one Functor cannot be found. */ - public boolean checkFunctors(Object _value, Class caller){ + public boolean checkFunctors(Object _value, Class<?> caller){ Object value; if (_value == null && objectClass != null) { try { @@ -270,14 +252,14 @@ } boolean status = true; for(int i=0;i<getColumnCount();i++){ - Functor setMethod = (Functor) writeFunctors.get(i); + Functor setMethod = writeFunctors.get(i); if (setMethod != null) { if (!setMethod.checkMethod(value,getColumnClass(i))){ status=false; log.warn(caller.getName()+" is attempting to use nonexistent "+setMethod.toString()); } } - Functor getMethod = (Functor) readFunctors.get(i); + Functor getMethod = readFunctors.get(i); if (getMethod != null) { if (!getMethod.checkMethod(value)){ status=false;
Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java?rev=804542&r1=804541&r2=804542&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java (original) +++ jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java Sun Aug 16 00:33:20 2009 @@ -53,12 +53,12 @@ return inc; } - public Object[] filterArray(List items) { - Iterator itr = items.iterator(); - ArrayList newlist = new ArrayList(); + public Object[] filterArray(List<String> items) { + Iterator<String> itr = items.iterator(); + ArrayList<Object> newlist = new ArrayList<Object>(); while (itr.hasNext()) { - Object item = itr.next(); - if (include((String)item)) { + String item = itr.next(); + if (include(item)) { newlist.add(item); } } Modified: jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=804542&r1=804541&r2=804542&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java (original) +++ jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java Sun Aug 16 00:33:20 2009 @@ -53,9 +53,6 @@ /** Logging */ private static final Logger log = LoggingManager.getLoggerForClass(); - /** The name of the classnameCombo JComboBox */ - private static final String CLASSNAMECOMBO = "classnamecombo"; - /** A combo box allowing the user to choose a test class. */ private JComboBox classnameCombo; @@ -90,6 +87,7 @@ init(); } + /** {...@inheritdoc} */ public String getLabelResource() { return "java_request_defaults"; // $NON-NLS-1$ } @@ -119,7 +117,7 @@ * @return a panel containing the relevant components */ private JPanel createClassnamePanel() { - List possibleClasses = new ArrayList(); + List<String> possibleClasses = new ArrayList<String>(); try { // Find all the classes which implement the JavaSamplerClient @@ -139,7 +137,6 @@ classnameCombo = new JComboBox(possibleClasses.toArray()); classnameCombo.addActionListener(this); - classnameCombo.setName(CLASSNAMECOMBO); classnameCombo.setEditable(false); label.setLabelFor(classnameCombo); @@ -217,7 +214,7 @@ return argsPanel; } - /* Overrides AbstractJMeterGuiComponent.configure(TestElement) */ + /** {...@inheritdoc} */ @Override public void configure(TestElement config) { super.configure(config); @@ -227,14 +224,14 @@ classnameCombo.setSelectedItem(config.getPropertyAsString(JavaSampler.CLASSNAME)); } - /* Implements JMeterGUIComponent.createTestElement() */ + /** {...@inheritdoc} */ public TestElement createTestElement() { JavaConfig config = new JavaConfig(); modifyTestElement(config); return config; } - /* Implements JMeterGUIComponent.modifyTestElement(TestElement) */ + /** {...@inheritdoc} */ public void modifyTestElement(TestElement config) { configureTestElement(config); ((JavaConfig) config).setArguments((Arguments) argsPanel.createTestElement()); Modified: jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java?rev=804542&r1=804541&r2=804542&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java (original) +++ jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java Sun Aug 16 00:33:20 2009 @@ -132,7 +132,7 @@ if (args instanceof LDAPArguments) { arguments = (LDAPArguments) args; arguments.clear(); - Iterator<LDAPArgument> modelData = tableModel.iterator(); + Iterator<LDAPArgument> modelData = (Iterator<LDAPArgument>) tableModel.iterator(); while (modelData.hasNext()) { LDAPArgument arg = modelData.next(); arg.setMetaData("="); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java?rev=804542&r1=804541&r2=804542&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/control/TestSwitchController.java Sun Aug 16 00:33:20 2009 @@ -252,7 +252,7 @@ */ public void testFunction() throws Exception { JMeterContext jmctx = JMeterContextService.getContext(); - Map<?, ?> variables = new HashMap<Object, Object>(); + Map<String, String> variables = new HashMap<String, String>(); ReplaceStringWithFunctions transformer = new ReplaceStringWithFunctions(new CompoundVariable(), variables); jmctx.setVariables(new JMeterVariables()); JMeterVariables jmvars = jmctx.getVariables(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
