Author: sebb
Date: Mon Oct 24 19:15:27 2011
New Revision: 1188309
URL: http://svn.apache.org/viewvc?rev=1188309&view=rev
Log:
Use "," as icon property field separator
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java?rev=1188309&r1=1188308&r2=1188309&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/IconToolbarBean.java
Mon Oct 24 19:15:27 2011
@@ -28,7 +28,7 @@ public final class IconToolbarBean {
private static final Logger log = LoggingManager.getLoggerForClass();
- private static final String ICON_FIELD_SEP = ";"; //$NON-NLS-1$
+ private static final String ICON_FIELD_SEP = ","; //$NON-NLS-1$
private final String i18nKey;
@@ -43,7 +43,7 @@ public final class IconToolbarBean {
* @param strToSplit - the line value (i18n key, ActionNames ID, icon
path, optional icon pressed path)
* @throws JMeterException if error in parsing.
*/
- public IconToolbarBean(final String strToSplit) throws JMeterException {
+ IconToolbarBean(final String strToSplit) throws JMeterException {
if (strToSplit == null) {
throw new NullPointerException("Icon definition must not be
null"); //$NON-NLS-1$
}
@@ -51,9 +51,8 @@ public final class IconToolbarBean {
if (tmp.length > 2) {
this.i18nKey = tmp[0];
this.actionName = tmp[1];
- final String icons[] = tmp[2].split(" "); //$NON-NLS-1$
- this.iconPath = icons[0];
- this.iconPathPressed = (icons.length > 1) ? icons[1] : icons[0];
+ this.iconPath = tmp[2];
+ this.iconPathPressed = (tmp.length > 3) ? tmp[3] : tmp[2];
} else {
throw new IllegalArgumentException("Incorrect argument format -
expected at least 2 fields separated by " + ICON_FIELD_SEP);
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties?rev=1188309&r1=1188308&r2=1188309&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/images/toolbar/icons-toolbar.properties
Mon Oct 24 19:15:27 2011
@@ -18,27 +18,27 @@ toolbar=new,open,close,save,save_as_test
# Icon / action definition file.
# Key: button names
-# Value: I18N key in messages.properties; ActionNames key field; icon
path, optionally followed by space and then the pressed icon name
-new=new;CLOSE;org/apache/jmeter/images/toolbar/new.png
-open=menu_open;OPEN;org/apache/jmeter/images/toolbar/open.png
-close=menu_close;CLOSE;org/apache/jmeter/images/toolbar/close.png
-save=save;SAVE;org/apache/jmeter/images/toolbar/save.png
-save_as_testplan=save_as;SAVE_AS;org/apache/jmeter/images/toolbar/saveastp.png
-cut=cut;CUT;org/apache/jmeter/images/toolbar/cut.png
-copy=copy;COPY;org/apache/jmeter/images/toolbar/copy.png
-paste=paste;PASTE;org/apache/jmeter/images/toolbar/paste.png
-test_start=start;ACTION_START;org/apache/jmeter/images/toolbar/start.png
-test_stop=stop;ACTION_STOP;org/apache/jmeter/images/toolbar/stop.png
-test_shutdown=shutdown;ACTION_SHUTDOWN;org/apache/jmeter/images/toolbar/shutdown.png
-test_start_remote_all=remote_start_all;REMOTE_START_ALL;org/apache/jmeter/images/toolbar/startremoteall.png
-test_stop_remote_all=remote_stop_all;REMOTE_STOP_ALL;org/apache/jmeter/images/toolbar/stopremoteall.png
-test_shutdown_remote_all=remote_shut_all;REMOTE_SHUT_ALL;org/apache/jmeter/images/toolbar/shutdownremoteall.png
-test_clear=clear;CLEAR;org/apache/jmeter/images/toolbar/clear.png
-test_clear_all=clear_all;CLEAR_ALL;org/apache/jmeter/images/toolbar/clearall.png
-toggle=toggle;TOGGLE;org/apache/jmeter/images/toolbar/toggle.png
-expand=menu_expand_all;EXPAND_ALL;org/apache/jmeter/images/toolbar/expand.png
-collapse=menu_collapse_all;COLLAPSE_ALL;org/apache/jmeter/images/toolbar/collapse.png
-search=menu_search;SEARCH_TREE;org/apache/jmeter/images/toolbar/search.png
-search_reset=menu_search_reset;SEARCH_RESET;org/apache/jmeter/images/toolbar/searchreset.png
-function_helper=function_dialog_menu_item;FUNCTIONS;org/apache/jmeter/images/toolbar/function.png
-help=help;HELP;org/apache/jmeter/images/toolbar/help.png
\ No newline at end of file
+# Value: I18N key in messages.properties, ActionNames key field, icon
path, optionally followed by comma and then the pressed icon name
+new=new,CLOSE,org/apache/jmeter/images/toolbar/new.png
+open=menu_open,OPEN,org/apache/jmeter/images/toolbar/open.png
+close=menu_close,CLOSE,org/apache/jmeter/images/toolbar/close.png
+save=save,SAVE,org/apache/jmeter/images/toolbar/save.png
+save_as_testplan=save_as,SAVE_AS,org/apache/jmeter/images/toolbar/saveastp.png
+cut=cut,CUT,org/apache/jmeter/images/toolbar/cut.png
+copy=copy,COPY,org/apache/jmeter/images/toolbar/copy.png
+paste=paste,PASTE,org/apache/jmeter/images/toolbar/paste.png
+test_start=start,ACTION_START,org/apache/jmeter/images/toolbar/start.png
+test_stop=stop,ACTION_STOP,org/apache/jmeter/images/toolbar/stop.png
+test_shutdown=shutdown,ACTION_SHUTDOWN,org/apache/jmeter/images/toolbar/shutdown.png
+test_start_remote_all=remote_start_all,REMOTE_START_ALL,org/apache/jmeter/images/toolbar/startremoteall.png
+test_stop_remote_all=remote_stop_all,REMOTE_STOP_ALL,org/apache/jmeter/images/toolbar/stopremoteall.png
+test_shutdown_remote_all=remote_shut_all,REMOTE_SHUT_ALL,org/apache/jmeter/images/toolbar/shutdownremoteall.png
+test_clear=clear,CLEAR,org/apache/jmeter/images/toolbar/clear.png
+test_clear_all=clear_all,CLEAR_ALL,org/apache/jmeter/images/toolbar/clearall.png
+toggle=toggle,TOGGLE,org/apache/jmeter/images/toolbar/toggle.png
+expand=menu_expand_all,EXPAND_ALL,org/apache/jmeter/images/toolbar/expand.png
+collapse=menu_collapse_all,COLLAPSE_ALL,org/apache/jmeter/images/toolbar/collapse.png
+search=menu_search,SEARCH_TREE,org/apache/jmeter/images/toolbar/search.png
+search_reset=menu_search_reset,SEARCH_RESET,org/apache/jmeter/images/toolbar/searchreset.png
+function_helper=function_dialog_menu_item,FUNCTIONS,org/apache/jmeter/images/toolbar/function.png
+help=help,HELP,org/apache/jmeter/images/toolbar/help.png
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
