Author: pmouawad
Date: Wed Oct 26 21:14:33 2011
New Revision: 1189464
URL: http://svn.apache.org/viewvc?rev=1189464&view=rev
Log:
Bug 52093 - Toolbar ToolTips don't switch language
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1189464&r1=1189463&r2=1189464&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
Wed Oct 26 21:14:33 2011
@@ -31,6 +31,8 @@ import javax.swing.JToolBar;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.util.LocaleChangeEvent;
+import org.apache.jmeter.util.LocaleChangeListener;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -38,8 +40,13 @@ import org.apache.log.Logger;
* The JMeter main toolbar class
*
*/
-public class JMeterToolBar {
+public class JMeterToolBar extends JToolBar implements LocaleChangeListener {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4591210341986068907L;
+
private static final Logger log = LoggingManager.getLoggerForClass();
private static final String TOOLBAR_ENTRY_SEP = ","; //$NON-NLS-1$
@@ -58,10 +65,21 @@ public class JMeterToolBar {
* @return the JMeter toolbar
*/
public static JToolBar createToolbar(boolean visible) {
- JToolBar toolBar = new JToolBar();
+ JMeterToolBar toolBar = new JMeterToolBar();
toolBar.setFloatable(false);
toolBar.setVisible(visible);
+ setupToolbarContent(toolBar);
+ JMeterUtils.addLocaleChangeListener(toolBar);
+ // implicit return empty toolbar if icons == null
+ return toolBar;
+ }
+
+ /**
+ * Setup toolbar content
+ * @param toolBar {@link JMeterToolBar}
+ */
+ private static void setupToolbarContent(JMeterToolBar toolBar) {
List<IconToolbarBean> icons = getIconMappings();
if (icons != null) {
for (IconToolbarBean iconToolbarBean : icons) {
@@ -72,8 +90,6 @@ public class JMeterToolBar {
}
}
}
- // implicit return empty toolbar if icons == null
- return toolBar;
}
/**
@@ -150,4 +166,11 @@ public class JMeterToolBar {
return listIcons;
}
-}
+ /**
+ * {@inheritDoc}
+ */
+ public void localeChanged(LocaleChangeEvent event) {
+ this.removeAll();
+ setupToolbarContent(this);
+ }
+}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1189464&r1=1189463&r2=1189464&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Oct 26 21:14:33 2011
@@ -132,6 +132,7 @@ Mirror server now uses default port 8081
<li>Bug 52003 - View Results Tree "Scroll automatically" does not scroll
properly in case nodes are expanded</li>
<li>Bug 27112 - User Parameters should use scrollbars</li>
<li>Bug 52029 - Command-line shutdown only gets sent to last engine that was
started</li>
+<li>Bug 52093 - Toolbar ToolTips don't switch language</li>
</ul>
<!-- =================== Improvements =================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
