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 2007/10/12 19:31:41 UTC

svn commit: r584209 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java

Author: sebb
Date: Fri Oct 12 10:31:41 2007
New Revision: 584209

URL: http://svn.apache.org/viewvc?rev=584209&view=rev
Log:
Restore autoexpand, but don't expand when merging

Modified:
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=584209&r1=584208&r2=584209&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Fri Oct 12 10:31:41 2007
@@ -177,13 +177,12 @@
 		}
 
 		ActionRouter.getInstance().actionPerformed(actionEvent);
-// Disabled for now, as it is disconcerting
-//	    if (expandTree) {
-//			JTree jTree = guiInstance.getMainFrame().getTree();
-//			   for(int i = 0; i < jTree.getRowCount(); i++) {
-//			     jTree.expandRow(i);
-//			   }
-//	    }
+	    if (expandTree && !merging) { // don't automatically expand when merging
+			JTree jTree = guiInstance.getMainFrame().getTree();
+			   for(int i = 0; i < jTree.getRowCount(); i++) {
+			     jTree.expandRow(i);
+			   }
+	    }
 
 		return isTestPlan;
 	}



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