Attachment #32026 for bug #42248

View | Details | Raw Unified | Return to bug 42248
Collapse All | Expand All

Lines 137-143 Link Here

(-)src/core/org/apache/jmeter/gui/GuiPackage.java (-2 / +6 lines)
137	*/	137	*/
138	private GuiPackage(JMeterTreeModel treeModel, JMeterTreeListener treeListener) {	138	private GuiPackage(JMeterTreeModel treeModel, JMeterTreeListener treeListener) {
139	this.treeModel = treeModel;	139	this.treeModel = treeModel;
140	this.treeModel.addTreeModelListener(undoHistory);	140	if(undoHistory.isEnabled()) {
		141	this.treeModel.addTreeModelListener(undoHistory);
		142	}
141	this.treeListener = treeListener;	143	this.treeListener = treeListener;
142	}	144	}
143		145
Lines 156-162 Link Here
156	* - Locale Changes	158	* - Locale Changes
157	*/	159	*/
158	public void registerAsListener() {	160	public void registerAsListener() {
159	this.undoHistory.registerHistoryListener(this);	161	if(undoHistory.isEnabled()) {
		162	this.undoHistory.registerHistoryListener(this);
		163	}
160	JMeterUtils.addLocaleChangeListener(this);	164	JMeterUtils.addLocaleChangeListener(this);
161	}	165	}
162		166

Lines 133-138 Link Here

(-)src/core/org/apache/jmeter/gui/UndoHistory.java (+13 lines)
133	* @param comment String	133	* @param comment String
134	*/	134	*/
135	public void add(JMeterTreeModel treeModel, String comment) {	135	public void add(JMeterTreeModel treeModel, String comment) {
		136	if(!isEnabled()) {
		137	log.debug("undo.history.size is set to 0, undo/redo feature is disabled");
		138	return;
		139	}
		140
136	// don't add element if we are in the middle of undo/redo or a big loading	141	// don't add element if we are in the middle of undo/redo or a big loading
137	if (working) {	142	if (working) {
138	log.debug("Not adding history because of noop");	143	log.debug("Not adding history because of noop");
Lines 338-343 Link Here
338	}	343	}
339		344
340	/**	345	/**
		346	*
		347	* @return true if history is enabled
		348	*/
		349	boolean isEnabled() {
		350	return HISTORY_SIZE > 0;
		351	}
		352
		353	/**
341	* Register HistoryListener	354	* Register HistoryListener
342	* @param listener	355	* @param listener
343	*/	356	*/

Return to bug 42248