You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by wo...@apache.org on 2005/09/20 05:30:49 UTC

cvs commit: jakarta-jmeter/src/jorphan/org/apache/jorphan/gui ObjectTableModel.java

woolfel     2005/09/19 20:30:49

  Modified:    src/jorphan/org/apache/jorphan/gui Tag: rel-2-1
                        ObjectTableModel.java
  Log:
  applying patches from HEAD to 2.1 so the model handles things better
  peter
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.1   +9 -3      jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
  
  Index: ObjectTableModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ObjectTableModel.java	12 Jul 2005 20:50:59 -0000	1.7
  +++ ObjectTableModel.java	20 Sep 2005 03:30:49 -0000	1.7.2.1
  @@ -105,8 +105,10 @@
   	public Object getValueAt(int row, int col) {
   		log.debug("Getting row value");
   		Object value = objects.get(row);
  +		if(headers.size() == 1 && col >= readFunctors.size())
  +			return value;
   		Functor getMethod = (Functor) readFunctors.get(col);
  -		if (getMethod != null) {
  +		if (getMethod != null && value != null) {
   			return getMethod.invoke(value);
   		}
   		return null;
  @@ -152,6 +154,10 @@
   					super.fireTableDataChanged();
   				}
   			}
  +			else if(headers.size() == 1)
  +			{
  +				objects.set(row,cellValue);
  +			}
   		}
   	}
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org