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 2013/01/29 22:52:03 UTC
svn commit: r1440163 - in /jmeter/trunk:
src/core/org/apache/jmeter/gui/action/Copy.java
src/core/org/apache/jmeter/resources/messages.properties
src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml
Author: pmouawad
Date: Tue Jan 29 21:52:03 2013
New Revision: 1440163
URL: http://svn.apache.org/viewvc?rev=1440163&view=rev
Log:
Bug 54504 - Resource string not found: [clipboard_node_read_error]
Bugzilla Id: 54504
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1440163&r1=1440162&r2=1440163&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Tue Jan 29 21:52:03 2013
@@ -32,12 +32,15 @@ import org.apache.jmeter.gui.tree.JMeter
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterTreeNodeTransferable;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* Implements the Copy menu command
*/
public class Copy extends AbstractAction {
-
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
private static final HashSet<String> commands = new HashSet<String>();
static {
@@ -66,6 +69,7 @@ public class Copy extends AbstractAction
try {
return (JMeterTreeNode[]) clipboard.getData(JMeterTreeNodeTransferable.JMETER_TREE_NODE_ARRAY_DATA_FLAVOR);
} catch (Exception ex) {
+ log.error("Clipboard node read error:" + ex.getMessage(), ex);
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
@@ -88,6 +92,7 @@ public class Copy extends AbstractAction
transferable.setTransferData(nodes);
clipboard.setContents(transferable, null);
} catch (Exception ex) {
+ log.error("Clipboard node read error:" + ex.getMessage(), ex);
JOptionPane.showMessageDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils.getResString("clipboard_node_read_error")+":\n" + ex.getLocalizedMessage(), //$NON-NLS-1$ //$NON-NLS-2$
JMeterUtils.getResString("error_title"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$
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=1440163&r1=1440162&r2=1440163&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Jan 29 21:52:03 2013
@@ -161,6 +161,7 @@ clear=Clear
clear_all=Clear All
clear_cache_per_iter=Clear cache each iteration?
clear_cookies_per_iter=Clear cookies each iteration?
+clipboard_node_read_error=An error occurred while copying node
close=Close
closeconnection=Close connection
column_delete_disallowed=Deleting this column is not permitted
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=1440163&r1=1440162&r2=1440163&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 Tue Jan 29 21:52:03 2013
@@ -155,6 +155,7 @@ clear=Nettoyer
clear_all=Nettoyer tout
clear_cache_per_iter=Nettoyer le cache \u00E0 chaque it\u00E9ration ?
clear_cookies_per_iter=Nettoyer les cookies \u00E0 chaque it\u00E9ration ?
+clipboard_node_read_error=Une erreur est survenue lors de la copie du noeud
close=Fermer
closeconnection=Fermer la connexion
column_delete_disallowed=Supprimer cette colonne n'est pas possible
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1440163&r1=1440162&r2=1440163&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Jan 29 21:52:03 2013
@@ -118,6 +118,7 @@ This does not affect JMeter operation.
<h3>General</h3>
<ul>
+<li><bugzilla>54504</bugzilla> - Resource string not found: [clipboard_node_read_error]</li>
</ul>
<!-- =================== Improvements =================== -->