-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reduce memory consumption by the logging panel (disable undo events f…
…or it) There are two fixes: 1) undoManager.setLimit(0) -> setLimit(1) since (0) means "unlimited undo" See bobbylight/RSyntaxTextArea#99 2) By default, JMeter adds undoManager to ALL text fields via Swing updateUI method, so we need to explicitly uninstall it for the case when undo is not needed
- Loading branch information
Showing
5 changed files
with
143 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...rc/main/java/org/apache/jorphan/gui/ui/AddUndoableEditListenerPropertyChangeListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to you under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.jorphan.gui.ui; | ||
|
|
||
| import java.beans.PropertyChangeEvent; | ||
| import java.beans.PropertyChangeListener; | ||
|
|
||
| import javax.swing.text.Document; | ||
| import javax.swing.undo.UndoManager; | ||
|
|
||
| class AddUndoableEditListenerPropertyChangeListener implements PropertyChangeListener { | ||
| private final UndoManager manager; | ||
|
|
||
| public AddUndoableEditListenerPropertyChangeListener(UndoManager manager) { | ||
| this.manager = manager; | ||
| } | ||
|
|
||
| public final UndoManager getUndoManager() { | ||
| return manager; | ||
| } | ||
|
|
||
| @Override | ||
| public void propertyChange(PropertyChangeEvent evt) { | ||
| manager.discardAllEdits(); | ||
| if (evt.getOldValue() != null) { | ||
| ((Document) evt.getOldValue()).removeUndoableEditListener(manager); | ||
| } | ||
| if (evt.getNewValue() != null) { | ||
| ((Document) evt.getNewValue()).addUndoableEditListener(manager); | ||
| } | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
src/jorphan/src/main/java/org/apache/jorphan/gui/ui/DefaultUndoManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to you under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.jorphan.gui.ui; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| import javax.swing.event.UndoableEditEvent; | ||
| import javax.swing.undo.UndoManager; | ||
|
|
||
| class DefaultUndoManager extends UndoManager { | ||
| private final AtomicInteger undoEpoch; | ||
| private int ourUndoEpoch; | ||
|
|
||
| DefaultUndoManager(AtomicInteger undoEpoch) { | ||
| this.undoEpoch = undoEpoch; | ||
| this.ourUndoEpoch = undoEpoch.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized void discardAllEdits() { | ||
| super.discardAllEdits(); | ||
| ourUndoEpoch = undoEpoch.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public void undoableEditHappened(UndoableEditEvent e) { | ||
| int epoch = undoEpoch.get(); | ||
| if (ourUndoEpoch != epoch) { | ||
| discardAllEdits(); | ||
| } | ||
| super.undoableEditHappened(e); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized boolean canUndo() { | ||
| return ourUndoEpoch == undoEpoch.get() && super.canUndo(); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized boolean canRedo() { | ||
| return ourUndoEpoch == undoEpoch.get() && super.canRedo(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters