You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2018/01/31 20:40:01 UTC
svn commit: r1822831 -
/jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
Author: fschumacher
Date: Wed Jan 31 20:40:01 2018
New Revision: 1822831
URL: http://svn.apache.org/viewvc?rev=1822831&view=rev
Log:
Test function reference when showing the tip about help.local.
Use %n in String#format and remove unused parameter targetObject.
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java?rev=1822831&r1=1822830&r2=1822831&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java Wed Jan 31 20:40:01 2018
@@ -75,7 +75,7 @@ public class OpenLinkAction extends Abst
log.error("OpenLinkAction: User default browser is not found, or it fails to be launched, or the default handler application failed to be launched on {}", url, err);
} catch (UnsupportedOperationException err) {
log.error("OpenLinkAction: Current platform does not support the Desktop.Action.BROWSE action on {}", url, err);
- showBrowserWarning(e.getSource(), url);
+ showBrowserWarning(url);
} catch (SecurityException err) {
log.error("OpenLinkAction: Security problem on {}", url, err);
} catch (Exception err) {
@@ -88,15 +88,16 @@ public class OpenLinkAction extends Abst
return commands;
}
- private void showBrowserWarning(Object targetObject, String url) {
+ private void showBrowserWarning(String url) {
String problemSolver;
- if (url.startsWith(LINK_MAP.get(ActionNames.LINK_COMP_REF))) {
+ if (url.startsWith(LINK_MAP.get(ActionNames.LINK_COMP_REF))
+ || url.startsWith(LINK_MAP.get(ActionNames.LINK_FUNC_REF))) {
problemSolver = "\n\nTry to set the system property help.local to true.";
} else {
problemSolver = "";
}
JOptionPane.showMessageDialog(null, String.format(
- "Problem opening a browser to show the content of the URL\n%s%s",
+ "Problem opening a browser to show the content of the URL%n%s%s",
url, problemSolver), "Problem opening browser",
JOptionPane.WARNING_MESSAGE);
}