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 2018/01/20 14:49:12 UTC
svn commit: r1821746 - in /jmeter/trunk/src/core/org/apache/jmeter:
gui/action/ActionNames.java gui/action/OpenLinkAction.java
gui/util/JMeterMenuBar.java resources/messages.properties
resources/messages_fr.properties
Author: pmouawad
Date: Sat Jan 20 14:49:12 2018
New Revision: 1821746
URL: http://svn.apache.org/viewvc?rev=1821746&view=rev
Log:
BUG 61785 Add Menu Item in Help > Useful links for functions reference
Bugzilla Id: 61785
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1821746&r1=1821745&r2=1821746&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Sat Jan 20 14:49:12 2018
@@ -62,6 +62,7 @@ public final class ActionNames {
public static final String LAF_PREFIX = "laf:"; // Look and Feel prefix
public static final String LINK_BUG_TRACKER = "link_bug_tracker:"; // URI of bug tracker
public static final String LINK_COMP_REF = "link_component_reference:"; // URI of component reference
+ public static final String LINK_FUNC_REF = "link_function_reference:"; // URI of functions reference
public static final String LINK_NIGHTLY_BUILD = "link_nightly_build:"; // URI of nightly build
public static final String LINK_RELEASE_NOTES = "link_release_notes"; // URI of the release note
public static final String LOGGER_PANEL_ENABLE_DISABLE = "logger_panel_enable_disable"; // $NON-NLS-1$
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=1821746&r1=1821745&r2=1821746&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 Sat Jan 20 14:49:12 2018
@@ -40,14 +40,16 @@ public class OpenLinkAction extends Abst
static {
commands.add(ActionNames.LINK_BUG_TRACKER);
commands.add(ActionNames.LINK_COMP_REF);
+ commands.add(ActionNames.LINK_FUNC_REF);
commands.add(ActionNames.LINK_NIGHTLY_BUILD);
commands.add(ActionNames.LINK_RELEASE_NOTES);
}
private static final Map<String, String> initLinkMap() {
- Map<String, String> map = new HashMap<>(4);
+ Map<String, String> map = new HashMap<>(5);
map.put(ActionNames.LINK_BUG_TRACKER, "https://jmeter.apache.org/issues.html");
map.put(ActionNames.LINK_COMP_REF, "https://jmeter.apache.org/usermanual/component_reference.html");
+ map.put(ActionNames.LINK_FUNC_REF, "https://jmeter.apache.org/usermanual/functions.html");
map.put(ActionNames.LINK_NIGHTLY_BUILD, "https://jmeter.apache.org/nightly.html");
map.put(ActionNames.LINK_RELEASE_NOTES, "https://jmeter.apache.org/changes.html");
return map;
@@ -63,6 +65,9 @@ public class OpenLinkAction extends Abst
return;
}
try {
+ if(e.getSource() instanceof String) {
+ url += "#"+((String)e.getSource());
+ }
java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
} catch (IOException err) {
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 {}", err);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1821746&r1=1821745&r2=1821746&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat Jan 20 14:49:12 2018
@@ -249,6 +249,7 @@ public class JMeterMenuBar extends JMenu
usefulLinks.add(makeMenuItemRes("link_release_notes", ActionNames.LINK_RELEASE_NOTES));
usefulLinks.add(makeMenuItemRes("link_bug_tracker", ActionNames.LINK_BUG_TRACKER));
usefulLinks.add(makeMenuItemRes("link_comp_ref", ActionNames.LINK_COMP_REF));
+ usefulLinks.add(makeMenuItemRes("link_func_ref", ActionNames.LINK_FUNC_REF));
usefulLinks.add(makeMenuItemRes("link_nightly_build", ActionNames.LINK_NIGHTLY_BUILD));
JMenuItem helpAbout = makeMenuItemRes("about", 'A', ActionNames.ABOUT);
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1821746&r1=1821745&r2=1821746&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat Jan 20 14:49:12 2018
@@ -621,6 +621,7 @@ ldapext_testing_title=LDAP Extended Requ
library=Library
link_bug_tracker=Create an issue
link_comp_ref=Component Reference Documentation
+link_func_ref=Functions Reference Documentation
link_nightly_build=Nightly builds
link_release_notes=Release notes
load=Load
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1821746&r1=1821745&r2=1821746&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sat Jan 20 14:49:12 2018
@@ -614,7 +614,8 @@ ldapext_sample_title=Requ\u00EAte LDAP \
ldapext_testing_title=Requ\u00EAte LDAP \u00E9tendue
library=Librairie
link_bug_tracker=Cr\u00E9er un ticket
-link_comp_ref=R\u00e9f\u00e9rence des composants
+link_comp_ref=R\u00e9f\u00e9rence des composants
+link_func_ref=R\u00e9f\u00e9rence des fonctions
link_nightly_build=Versions de d\u00E9veloppement
link_release_notes=Notes de version
load=Charger