Author: sebb
Date: Fri Aug 31 09:45:46 2007
New Revision: 571519
URL: http://svn.apache.org/viewvc?rev=571519&view=rev
Log:
Allow for guiPackage to be null (see bug 38687)
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java?rev=571519&r1=571518&r2=571519&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Fri Aug 31 09:45:46 2007
@@ -105,12 +105,17 @@
}
component.setProperty(TestElement.GUI_CLASS,
NameUpdater.getCurrentName(component
.getPropertyAsString(TestElement.GUI_CLASS)));
- GuiPackage.getInstance().updateCurrentNode();
- JMeterGUIComponent guicomp =
GuiPackage.getInstance().getGui(component);
- guicomp.configure(component);
- guicomp.modifyTestElement(component);
- GuiPackage.getInstance().getCurrentGui(); // put the gui object
back
-
// to the way it was.
+
+ GuiPackage guiPackage = GuiPackage.getInstance();
+ if (guiPackage != null) {
+ // The node can be added in non GUI mode at startup
+ guiPackage.updateCurrentNode();
+ JMeterGUIComponent guicomp =
guiPackage.getGui(component);
+ guicomp.configure(component);
+ guicomp.modifyTestElement(component);
+ guiPackage.getCurrentGui(); // put the gui object back
+
// to the way it was.
+ }
JMeterTreeNode newNode = new JMeterTreeNode(component, this);
// This check the state of the TestElement and if returns false
it
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
