You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2020/12/19 15:32:32 UTC
[jmeter] branch master updated: Bug 64543 - On MacOSX,
Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 37d7b5e Bug 64543 - On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip
37d7b5e is described below
commit 37d7b5ee10065e718bf6e46c56e5aa5b14ce6ecf
Author: pmouawad <p....@ubik-ingenierie.com>
AuthorDate: Sat Dec 19 16:31:10 2020 +0100
Bug 64543 - On MacOSX, Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
---
src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java | 8 +++++++-
xdocs/changes.xml | 1 +
xdocs/changes_history.xml | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 9e998eb..da3e027 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -83,6 +83,7 @@ import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.KeyStrokes;
import org.apache.jmeter.gui.action.LoadDraggedFile;
+import org.apache.jmeter.gui.action.LookAndFeelCommand;
import org.apache.jmeter.gui.logging.GuiLogEventListener;
import org.apache.jmeter.gui.logging.LogEventObject;
import org.apache.jmeter.gui.tree.JMeterCellRenderer;
@@ -674,7 +675,12 @@ public class MainFrame extends JFrame implements TestStateListener, Remoteable,
}
}
}
- return null;
+ if (LookAndFeelCommand.isDarklafTheme()) {
+ // See https://github.com/weisJ/darklaf/issues/226#issuecomment-748478418
+ return "";
+ } else {
+ return null;
+ }
}
};
treevar.setToolTipText("");
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6d619de..feda12c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -139,6 +139,7 @@ Summary
<li><bug>64955</bug>Keystore password not reset on reload</li>
<li><bug>65002</bug>HTTP(S) Test Script recorder creates an invalid Basic authentication URL. Contributed by Ubik Load Pack (https://ubikloadpack.com)</li>
<li><bug>65004</bug>HTTP(S) Test Script recorder computes wrong HTTP Request breaking the application. Contributed by Ubik Load Pack (https://ubikloadpack.com)</li>
+ <li><bug>64543</bug>On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip</li>
</ul>
<h3>Other Samplers</h3>
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index ad0c768..5913567 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -225,7 +225,6 @@ applications when JMeter is starting up.</p>
<li><bug>64448</bug>User Defined Variable Duplication in Right Click Context Menu</li>
<li><bug>64499</bug>Exiting JMeter when <code>jmeterengine.stopfail.system.exit=true</code> takes too much time if threads are not stopped</li>
<li><bug>64510</bug>Darklaf- IntelliJ Theme throws NPE in DarkTreeUI on MacOS</li>
- <li><bug>64543</bug>On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip</li>
<li><bug>64594</bug>Unable to enter variable values instead of numeric values in components using PowerTableModel (Impacts 3rd party plugins like Throughput Shaping Timer)</li>
<li><bug>64475</bug>Menu Generate HTML Report: When report generation fails due to timeout, error message is not explicit. Contributed by Ubik Load Pack (https://ubikloadpack.com)</li>
<li><bug>64627</bug>Programmatic manipulation of the control flow via API methods of JMeterContext is not working as it used to before 5.0. Contributed by Till Neunast</li>