jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1530458 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Date Tue, 08 Oct 2013 23:22:52 GMT
Author: sebb
Date: Tue Oct  8 23:22:52 2013
New Revision: 1530458

URL: http://svn.apache.org/r1530458
Log:
Tweak pop-up message

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1530458&r1=1530457&r2=1530458&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Tue Oct  8 23:22:52 2013
@@ -82,6 +82,8 @@ public class ProxyControlGui extends Log
 
     private static final long serialVersionUID = 232L;
 
+    private static final String NEW_LINE = "\n";  // $NON-NLS-1$
+
     /**
      * This choice means don't explicitly set Implementation and rely on default, see Bug
54154
      */
@@ -441,7 +443,7 @@ public class ProxyControlGui extends Log
         try {
             String clipboardContent = GuiUtils.getPastedText();
             if (clipboardContent != null) {
-                String[] clipboardLines = clipboardContent.split("\n");
+                String[] clipboardLines = clipboardContent.split(NEW_LINE);
                 for (String clipboardLine : clipboardLines) {
                     model = (PowerTableModel) table.getModel();
                     model.addRow(new Object[] {clipboardLine});
@@ -481,12 +483,14 @@ public class ProxyControlGui extends Log
             if (ProxyControl.isDynamicMode()) {
                 String details[] = model.getCertificateDetails();
                 StringBuilder sb = new StringBuilder();
+                sb.append("Please check the details below when installing the certificate
in the browser")
+                    .append(NEW_LINE).append(NEW_LINE);
                 for(String detail : details) {
-                    sb.append(detail).append("\n"); // $NON-NLS-1$
+                    sb.append(detail).append(NEW_LINE);
                 }
                 JOptionPane.showMessageDialog(this,
                     sb.toString(),
-                    "Please check the certificate matches the details below before installing
" + KeyToolUtils.ROOT_CACERT_CRT_PFX,
+                    "Root CA certificate: " + KeyToolUtils.ROOT_CACERT_CRT_PFX + " created
in JMeter bin directory",
                     JOptionPane.INFORMATION_MESSAGE);
             }
         } catch (InvalidVariableException e) {



Mime
View raw message