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 se...@apache.org on 2005/11/03 01:54:32 UTC

svn commit: r330398 - in /jakarta/jmeter/branches/rel-2-1/src: components/org/apache/jmeter/visualizers/StatVisualizer.java components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java core/org/apache/jmeter/gui/SavePropertyDialog.java

Author: sebb
Date: Wed Nov  2 16:54:25 2005
New Revision: 330398

URL: http://svn.apache.org/viewcvs?rev=330398&view=rev
Log:
Allow serialisation to be checked

Modified:
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/SavePropertyDialog.java

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=330398&r1=330397&r2=330398&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatVisualizer.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/StatVisualizer.java Wed Nov  2 16:54:25 2005
@@ -154,86 +154,86 @@
  * @version $Revision$
  */
 
-class SortFilterModel extends AbstractTableModel {
-	private TableModel model;
-
-	private int sortColumn;
-
-	private Row[] rows;
-
-	public SortFilterModel(TableModel m) {
-		model = m;
-		rows = new Row[model.getRowCount()];
-		for (int i = 0; i < rows.length; i++) {
-			rows[i] = new Row();
-			rows[i].index = i;
-		}
-	}
-
-	public SortFilterModel() {
-	}
-
-	public void setValueAt(Object aValue, int r, int c) {
-		model.setValueAt(aValue, rows[r].index, c);
-	}
-
-	public Object getValueAt(int r, int c) {
-		return model.getValueAt(rows[r].index, c);
-	}
-
-	public boolean isCellEditable(int r, int c) {
-		return model.isCellEditable(rows[r].index, c);
-	}
-
-	public int getRowCount() {
-		return model.getRowCount();
-	}
-
-	public int getColumnCount() {
-		return model.getColumnCount();
-	}
-
-	public String getColumnName(int c) {
-		return model.getColumnName(c);
-	}
-
-	public Class getColumnClass(int c) {
-		return model.getColumnClass(c);
-	}
-
-	public void sort(int c) {
-		sortColumn = c;
-		Arrays.sort(rows);
-		fireTableDataChanged();
-	}
-
-	public void addMouseListener(final JTable table) {
-		table.getTableHeader().addMouseListener(new MouseAdapter() {
-			public void mouseClicked(MouseEvent event) {
-				if (event.getClickCount() < 2) {
-					return;
-				}
-				int tableColumn = table.columnAtPoint(event.getPoint());
-				int modelColumn = table.convertColumnIndexToModel(tableColumn);
-
-				sort(modelColumn);
-			}
-		});
-	}
-
-	private class Row implements Comparable {
-		public int index;
-
-		public int compareTo(Object other) {
-			Row otherRow = (Row) other;
-			Object a = model.getValueAt(index, sortColumn);
-			Object b = model.getValueAt(otherRow.index, sortColumn);
-
-			if (a instanceof Comparable) {
-				return ((Comparable) a).compareTo(b);
-			} else {
-				return index - otherRow.index;
-			}
-		}
-	}
-} // class SortFilterModel
+//class SortFilterModel extends AbstractTableModel {
+//	private TableModel model;
+//
+//	private int sortColumn;
+//
+//	private Row[] rows;
+//
+//	public SortFilterModel(TableModel m) {
+//		model = m;
+//		rows = new Row[model.getRowCount()];
+//		for (int i = 0; i < rows.length; i++) {
+//			rows[i] = new Row();
+//			rows[i].index = i;
+//		}
+//	}
+//
+//	public SortFilterModel() {
+//	}
+//
+//	public void setValueAt(Object aValue, int r, int c) {
+//		model.setValueAt(aValue, rows[r].index, c);
+//	}
+//
+//	public Object getValueAt(int r, int c) {
+//		return model.getValueAt(rows[r].index, c);
+//	}
+//
+//	public boolean isCellEditable(int r, int c) {
+//		return model.isCellEditable(rows[r].index, c);
+//	}
+//
+//	public int getRowCount() {
+//		return model.getRowCount();
+//	}
+//
+//	public int getColumnCount() {
+//		return model.getColumnCount();
+//	}
+//
+//	public String getColumnName(int c) {
+//		return model.getColumnName(c);
+//	}
+//
+//	public Class getColumnClass(int c) {
+//		return model.getColumnClass(c);
+//	}
+//
+//	public void sort(int c) {
+//		sortColumn = c;
+//		Arrays.sort(rows);
+//		fireTableDataChanged();
+//	}
+//
+//	public void addMouseListener(final JTable table) {
+//		table.getTableHeader().addMouseListener(new MouseAdapter() {
+//			public void mouseClicked(MouseEvent event) {
+//				if (event.getClickCount() < 2) {
+//					return;
+//				}
+//				int tableColumn = table.columnAtPoint(event.getPoint());
+//				int modelColumn = table.convertColumnIndexToModel(tableColumn);
+//
+//				sort(modelColumn);
+//			}
+//		});
+//	}
+//
+//	private class Row implements Comparable {
+//		public int index;
+//
+//		public int compareTo(Object other) {
+//			Row otherRow = (Row) other;
+//			Object a = model.getValueAt(index, sortColumn);
+//			Object b = model.getValueAt(otherRow.index, sortColumn);
+//
+//			if (a instanceof Comparable) {
+//				return ((Comparable) a).compareTo(b);
+//			} else {
+//				return index - otherRow.index;
+//			}
+//		}
+//	}
+//} // class SortFilterModel

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java?rev=330398&r1=330397&r2=330398&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/XMLDefaultMutableTreeNode.java Wed Nov  2 16:54:25 2005
@@ -18,6 +18,9 @@
 package org.apache.jmeter.visualizers;
 
 import javax.swing.tree.DefaultMutableTreeNode;
+
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -34,10 +37,15 @@
  * 
  */
 public class XMLDefaultMutableTreeNode extends DefaultMutableTreeNode {
+    private static final Logger log = LoggingManager.getLoggerForClass();
 	// private static final int LIMIT_STR_SIZE = 100;
 	// private boolean isRoot;
 	private Node xmlNode;
 
+    public XMLDefaultMutableTreeNode(){
+        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+    }
+    
 	public XMLDefaultMutableTreeNode(Node root) throws SAXException {
 		super(root.getNodeName());
 		initAttributeNode(root, this);

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=330398&r1=330397&r2=330398&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Wed Nov  2 16:54:25 2005
@@ -45,14 +45,17 @@
  * @author mstover
  */
 public class SavePropertyDialog extends JDialog implements ActionListener {
-	protected static transient Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	static Map functors = new HashMap();
+	private static Map functors = new HashMap();
 
-	static final long serialVersionUID = 1;
+	private static final long serialVersionUID = 1;
 
-	SampleSaveConfiguration saveConfig;
+	private SampleSaveConfiguration saveConfig;
 
+    public SavePropertyDialog(){
+        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+    }
 	/**
 	 * @param owner
 	 * @param title



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