mstover1    02/02/22 17:21:07

  Modified:    src/org/apache/jmeter/config Arguments.java
               src/org/apache/jmeter/control TestPlan.java
               src/org/apache/jmeter/gui ModelSupported.java
               src/org/apache/jmeter/gui/action Remove.java
               src/org/apache/jmeter/gui/popup EditCommand.java
               src/org/apache/jmeter/gui/tree JMeterTreeListener.java
               src/org/apache/jmeter/protocol/ftp/config FtpConfig.java
               src/org/apache/jmeter/protocol/ftp/control
                        FtpTestSampler.java
               src/org/apache/jmeter/protocol/http/config UrlConfig.java
                        UrlConfigFull.java
               src/org/apache/jmeter/protocol/http/control AuthManager.java
                        CookieManager.java HeaderManager.java
                        HttpTestSample.java
               src/org/apache/jmeter/protocol/http/modifier
                        AnchorModifier.java
               src/org/apache/jmeter/protocol/http/proxy ProxyControl.java
               src/org/apache/jmeter/protocol/jdbc/config DbConfig.java
                        PoolConfig.java SqlConfig.java
               src/org/apache/jmeter/protocol/jdbc/control
                        JdbcTestSample.java
               src/org/apache/jmeter/resources messages.properties
                        messages_ja.properties
               src/org/apache/jmeter/visualizers GraphVisualizer.java
                        SplineVisualizer.java
  Log:
  adding internationalization improvements
  
  Revision  Changes    Path
  1.16      +6 -2      jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java
  
  Index: Arguments.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/config/Arguments.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Arguments.java    20 Feb 2002 23:04:26 -0000      1.15
  +++ Arguments.java    23 Feb 2002 01:21:06 -0000      1.16
  @@ -59,19 +59,23 @@
   
   import org.apache.jmeter.gui.JMeterComponentModel;
   import org.apache.jmeter.save.Saveable;
  +import org.apache.jmeter.util.JMeterUtils;
   
   /************************************************************
    *  Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
    *  Apache Foundation
    *
    *@author     Michael Stover
  - *@created    $Date: 2002/02/20 23:04:26 $
  + *@created    $Date: 2002/02/23 01:21:06 $
    *@version    1.0
    ***********************************************************/
   
   public class Arguments implements JMeterComponentModel, 
Saveable,Serializable,Cloneable
   {
  -     public static String[] COLUMN_NAMES = {"Name", "Value"};
  +     public static String[] COLUMN_NAMES = {
  +       JMeterUtils.getResString("name"), 
  +       JMeterUtils.getResString("value")
  +     };
   
        private List args;
        private String name;
  
  
  
  1.10      +1 -0      jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java
  
  Index: TestPlan.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/control/TestPlan.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestPlan.java     9 Nov 2001 19:18:52 -0000       1.9
  +++ TestPlan.java     23 Feb 2002 01:21:06 -0000      1.10
  @@ -63,6 +63,7 @@
   import org.apache.jmeter.save.Saveable;
   import org.apache.jmeter.save.handlers.TestPlanHandler;
   import org.apache.jmeter.threads.ThreadGroup;
  +import org.apache.jmeter.util.JMeterUtils;
   /************************************************************
    *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
    *
  
  
  
  1.5       +4 -2      jakarta-jmeter/src/org/apache/jmeter/gui/ModelSupported.java
  
  Index: ModelSupported.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/ModelSupported.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ModelSupported.java       26 Jul 2001 00:34:44 -0000      1.4
  +++ ModelSupported.java       23 Feb 2002 01:21:06 -0000      1.5
  @@ -54,6 +54,8 @@
    */
    package org.apache.jmeter.gui;
   
  +import org.apache.jmeter.util.JMeterUtils;
  +
   /**
    * Title:        JMeter
    * Description:
  @@ -66,9 +68,9 @@
   public interface ModelSupported
   {
   
  -     public static final String NAME_FIELD = "Name";
  +     public static final String NAME_FIELD = JMeterUtils.getResString("name");
   
        void setModel(Object model);
   
        public void updateGui();
  -}
  \ No newline at end of file
  +}
  
  
  
  1.6       +4 -2      jakarta-jmeter/src/org/apache/jmeter/gui/action/Remove.java
  
  Index: Remove.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/action/Remove.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Remove.java       5 Oct 2001 22:32:44 -0000       1.5
  +++ Remove.java       23 Feb 2002 01:21:06 -0000      1.6
  @@ -61,6 +61,8 @@
   import org.apache.jmeter.gui.*;
   import org.apache.jmeter.control.WorkBench;
   import org.apache.jmeter.control.TestPlan;
  +import org.apache.jmeter.util.JMeterUtils;
  +
   /**
    *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
    *
  @@ -106,11 +108,11 @@
                }
                guiPackage.getTreeListener().removedSelectedNode();
                ActionRouter.getInstance().actionPerformed(new 
ActionEvent(e.getSource(),
  -                             e.getID(), "Edit"));
  +                             e.getID(), JMeterUtils.getResString("edit")));
   
        }
        static
        {
  -             commands.add("Remove");
  +             commands.add(JMeterUtils.getResString("remove"));
        }
   }
  
  
  
  1.5       +2 -1      jakarta-jmeter/src/org/apache/jmeter/gui/popup/EditCommand.java
  
  Index: EditCommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/popup/EditCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- EditCommand.java  26 Jul 2001 00:34:45 -0000      1.4
  +++ EditCommand.java  23 Feb 2002 01:21:06 -0000      1.5
  @@ -59,6 +59,7 @@
   import org.apache.jmeter.gui.action.Command;
   import java.awt.event.ActionEvent;
   import org.apache.jmeter.gui.*;
  +import org.apache.jmeter.util.JMeterUtils;
   
   /**
    * Title:        JMeter
  @@ -75,7 +76,7 @@
        private static Set commands = new HashSet();
        static
        {
  -             commands.add("Edit");
  +             commands.add(JMeterUtils.getResString("edit"));
        }
   
        public EditCommand()
  
  
  
  1.13      +1 -1      
jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java
  
  Index: JMeterTreeListener.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/gui/tree/JMeterTreeListener.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JMeterTreeListener.java   5 Oct 2001 22:32:45 -0000       1.12
  +++ JMeterTreeListener.java   23 Feb 2002 01:21:06 -0000      1.13
  @@ -246,7 +246,7 @@
                        else
                        {
                                updateMainMenu(createAddMenu((JMeterComponentModel) 
(getCurrentNode().getUserObject())));
  -                             actionHandler.actionPerformed(new ActionEvent(this, 
e.getID(), "Edit"));
  +                             actionHandler.actionPerformed(new ActionEvent(this, 
e.getID(), JMeterUtils.getResString("edit")));
                        }
                }
        }
  
  
  
  1.10      +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/ftp/config/FtpConfig.java
  
  Index: FtpConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/ftp/config/FtpConfig.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FtpConfig.java    12 Dec 2001 22:01:50 -0000      1.9
  +++ FtpConfig.java    23 Feb 2002 01:21:06 -0000      1.10
  @@ -55,6 +55,7 @@
    package org.apache.jmeter.protocol.ftp.config;
   
   import org.apache.jmeter.config.*;
  +import org.apache.jmeter.util.JMeterUtils;
   import java.util.Collection;
   import java.io.*;
   
  @@ -95,7 +96,7 @@
   
        public String getClassLabel()
        {
  -             return "FTP Request Defaults";
  +             return JMeterUtils.getResString("ftp_sample_title");
        }
   
        public boolean isComplete()
  
  
  
  1.11      +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/ftp/control/FtpTestSampler.java
  
  Index: FtpTestSampler.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/ftp/control/FtpTestSampler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- FtpTestSampler.java       18 Nov 2001 13:44:10 -0000      1.10
  +++ FtpTestSampler.java       23 Feb 2002 01:21:06 -0000      1.11
  @@ -64,6 +64,7 @@
   import org.apache.jmeter.protocol.ftp.control.gui.*;
   import org.apache.jmeter.samplers.*;
   import org.apache.jmeter.protocol.ftp.sampler.FTPSampler;
  +import org.apache.jmeter.util.JMeterUtils;
   
   /**
    * Title:        Apache JMeter
  @@ -129,7 +130,7 @@
         *@return    The ClassLabel value
         */
        public String getClassLabel() {
  -             return "FTP Request";
  +             return JMeterUtils.getResString("ftp_testing_title");
        }
   
        /**
  
  
  
  1.27      +3 -3      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java
  
  Index: UrlConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfig.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- UrlConfig.java    16 Feb 2002 03:21:40 -0000      1.26
  +++ UrlConfig.java    23 Feb 2002 01:21:06 -0000      1.27
  @@ -70,8 +70,8 @@
    *  the value you specify here.
    *
    *@author     Michael Stover
  - *@created    $Date: 2002/02/16 03:21:40 $
  - *@version    $Revision: 1.26 $
  + *@created    $Date: 2002/02/23 01:21:06 $
  + *@version    $Revision: 1.27 $
    */
   
   public class UrlConfig extends AbstractConfigElement implements Serializable
  @@ -353,7 +353,7 @@
         */
        public String getClassLabel()
        {
  -             return "HTTP Request Defaults";
  +             return JMeterUtils.getResString("url_config_title");
        }
   
        /**
  
  
  
  1.7       +3 -3      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfigFull.java
  
  Index: UrlConfigFull.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/config/UrlConfigFull.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UrlConfigFull.java        13 Nov 2001 13:15:41 -0000      1.6
  +++ UrlConfigFull.java        23 Feb 2002 01:21:06 -0000      1.7
  @@ -71,8 +71,8 @@
    *  Apache Foundation
    *
    *@author     Michael Stover
  - *@created    $Date: 2001/11/13 13:15:41 $
  - *@version    $Revision: 1.6 $
  + *@created    $Date: 2002/02/23 01:21:06 $
  + *@version    $Revision: 1.7 $
    */
   
   public class UrlConfigFull extends UrlConfig implements Serializable
  @@ -95,7 +95,7 @@
                        */
                  public String getClassLabel()
                  {
  -                      return "UrlFull Sample";
  +                      return JMeterUtils.getResString("url_full_config_title");
                  }
   
        /**
  
  
  
  1.15      +9 -3      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/AuthManager.java
  
  Index: AuthManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/AuthManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- AuthManager.java  8 Oct 2001 05:20:30 -0000       1.14
  +++ AuthManager.java  23 Feb 2002 01:21:06 -0000      1.15
  @@ -62,6 +62,8 @@
   import org.apache.jmeter.config.ConfigElement;
   import org.apache.jmeter.save.Saveable;
   import org.apache.jmeter.protocol.http.util.Base64Encoder;
  +import org.apache.jmeter.util.JMeterUtils;
  +
   /************************************************************
    *  This class provides a way to provide Authorization in jmeter requests. The
    *  format of the authorization file is: URL user pass where URL is an HTTP URL,
  @@ -69,7 +71,7 @@
    *
    *@author     <a href="mailto:[EMAIL PROTECTED]";>Raphaël Luta
    *      </a>
  - *@created    $Date: 2001/10/08 05:20:30 $
  + *@created    $Date: 2002/02/23 01:21:06 $
    *@version    0.9
    ***********************************************************/
   public class AuthManager implements ConfigElement, JMeterComponentModel, Saveable,
  @@ -85,7 +87,11 @@
        private String name;
   
        private final static int columnCount = 3;
  -     private final static String[] columnNames = {"Base URL", "Username", 
"Password"};
  +     private final static String[] columnNames = {
  +             JMeterUtils.getResString("auth_base_url"),
  +             JMeterUtils.getResString("username"),
  +             JMeterUtils.getResString("password")
  +     };
   
        /************************************************************
         *  Default Constructor
  @@ -210,7 +216,7 @@
         ***********************************************************/
        public String getClassLabel()
        {
  -             return "HTTP Authorization Manager";
  +             return JMeterUtils.getResString("auth_manager_title");
        }
   
        /************************************************************
  
  
  
  1.17      +11 -3     
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/CookieManager.java
  
  Index: CookieManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/CookieManager.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CookieManager.java        13 Nov 2001 16:54:19 -0000      1.16
  +++ CookieManager.java        23 Feb 2002 01:21:06 -0000      1.17
  @@ -67,13 +67,14 @@
   import org.apache.jmeter.gui.JMeterComponentModel;
   import org.apache.jmeter.protocol.http.save.*;
   import org.apache.jmeter.save.Saveable;
  +import org.apache.jmeter.util.JMeterUtils;
   
   /**
    * This class provides an interface to the netscape cookies file to
    * pass cookies along with a request.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Sean Dowd</a>
  - * @version $Revision: 1.16 $ $Date: 2001/11/13 16:54:19 $
  + * @version $Revision: 1.17 $ $Date: 2002/02/23 01:21:06 $
    */
   public class CookieManager implements ConfigElement,JMeterComponentModel,Saveable,
           Serializable
  @@ -89,7 +90,14 @@
        private static SimpleDateFormat dateFormat = new SimpleDateFormat("EEEE, 
dd-MMM-yyyy HH:mm:ss zzz");
   
        private final static int columnCount = 6;
  -     private final static String[] columnNames = 
{"Name","Value","Domain","Path","Secure","Expiration"};
  +     private final static String[] columnNames = {
  +       JMeterUtils.getResString("name"),
  +       JMeterUtils.getResString("value"),
  +       JMeterUtils.getResString("domain"),
  +       JMeterUtils.getResString("path"),
  +       JMeterUtils.getResString("secure"),
  +       JMeterUtils.getResString("expiration"),
  +     };
   
        private static List addableList = new LinkedList();
   
  @@ -457,6 +465,6 @@
   
        public String getClassLabel()
        {
  -        return "HTTP Cookie Manager";
  +     return JMeterUtils.getResString("cookie_manager_title");
        }
   }
  
  
  
  1.9       +7 -3      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HeaderManager.java
  
  Index: HeaderManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HeaderManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HeaderManager.java        9 Nov 2001 18:26:35 -0000       1.8
  +++ HeaderManager.java        23 Feb 2002 01:21:06 -0000      1.9
  @@ -70,13 +70,14 @@
   import org.apache.jmeter.gui.JMeterComponentModel;
   import org.apache.jmeter.protocol.http.save.*;
   import org.apache.jmeter.save.Saveable;
  +import org.apache.jmeter.util.JMeterUtils;
   
   /**
    * This class provides an interface to headers file to
    * pass HTTP headers along with a request.
    *
    * @author  <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
  - * @version $Revision: 1.8 $ $Date: 2001/11/09 18:26:35 $
  + * @version $Revision: 1.9 $ $Date: 2002/02/23 01:21:06 $
    */
   public class HeaderManager implements ConfigElement,JMeterComponentModel,Saveable,
                Serializable
  @@ -91,7 +92,10 @@
         private String name;
   
         private final static int columnCount = 2;
  -      private final static String[] columnNames = {"Name","Value"};
  +      private final static String[] columnNames = {
  +        JMeterUtils.getResString("name"),
  +        JMeterUtils.getResString("value")
  +      };
   
         private static List addableList = new LinkedList();
   
  @@ -372,6 +376,6 @@
         }
   
         public String getClassLabel() {
  -               return "HTTP Header Manager";
  +             return JMeterUtils.getResString("header_manager_title");
         }
   }
  
  
  
  1.30      +3 -2      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java
  
  Index: HttpTestSample.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/HttpTestSample.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- HttpTestSample.java       16 Feb 2002 03:21:41 -0000      1.29
  +++ HttpTestSample.java       23 Feb 2002 01:21:06 -0000      1.30
  @@ -70,6 +70,7 @@
   import org.apache.jmeter.gui.JMeterComponentModel;
   import org.apache.jmeter.gui.MenuFactory;
   import org.apache.jmeter.control.AbstractGenerativeController;
  +import org.apache.jmeter.util.JMeterUtils;
   
   import org.apache.log4j.*;
   
  @@ -78,7 +79,7 @@
    *  Apache Foundation
    *
    *@author     Michael Stover
  - *@created    $Date: 2002/02/16 03:21:41 $
  + *@created    $Date: 2002/02/23 01:21:06 $
    *@version    1.0
    ***********************************************************/
   public class HttpTestSample extends AbstractGenerativeController implements 
JMeterComponentModel,
  @@ -160,7 +161,7 @@
         ***********************************************************/
        public String getClassLabel()
        {
  -             return "HTTP Request";
  +             return JMeterUtils.getResString("web_testing_title");
        }
   
        /************************************************************
  
  
  
  1.13      +3 -2      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
  
  Index: AnchorModifier.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AnchorModifier.java       20 Feb 2002 23:04:26 -0000      1.12
  +++ AnchorModifier.java       23 Feb 2002 01:21:07 -0000      1.13
  @@ -66,6 +66,7 @@
   import org.apache.jmeter.config.Argument;
   import org.apache.jmeter.config.Arguments;
   import org.apache.jmeter.gui.NamePanel;
  +import org.apache.jmeter.util.JMeterUtils;
   
   import java.util.*;
   import java.io.*;
  @@ -79,7 +80,7 @@
    *  Apache
    *
    *@author     Michael Stover
  - *@created    $Date: 2002/02/20 23:04:26 $
  + *@created    $Date: 2002/02/23 01:21:07 $
    *@version    1.0
    ***********************************************************/
   
  @@ -130,7 +131,7 @@
         ***********************************************************/
        public String getClassLabel()
        {
  -             return "HTTP HTML Link parser";
  +             return JMeterUtils.getResString("anchor_modifier_title");
        }
   
        /************************************************************
  
  
  
  1.11      +2 -2      
jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
  
  Index: ProxyControl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ProxyControl.java 20 Feb 2002 01:35:32 -0000      1.10
  +++ ProxyControl.java 23 Feb 2002 01:21:07 -0000      1.11
  @@ -78,7 +78,7 @@
    *  Apache Foundation
    *
    *@author     Michael Stover
  - *@created    $Date: 2002/02/20 01:35:32 $
  + *@created    $Date: 2002/02/23 01:21:07 $
    *@version    1.0
    ***********************************************************/
   
  @@ -125,7 +125,7 @@
         ***********************************************************/
        public String getClassLabel()
        {
  -             return "HTTP Proxy Server";
  +             return JMeterUtils.getResString("proxy_title");
        }
   
        /************************************************************
  
  
  
  1.10      +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/DbConfig.java
  
  Index: DbConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/DbConfig.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DbConfig.java     9 Nov 2001 18:28:54 -0000       1.9
  +++ DbConfig.java     23 Feb 2002 01:21:07 -0000      1.10
  @@ -55,6 +55,7 @@
    package org.apache.jmeter.protocol.jdbc.config;
   
   import org.apache.jmeter.config.LoginConfig;
  +import org.apache.jmeter.util.JMeterUtils;
   import java.io.*;
   
   /**
  @@ -114,6 +115,6 @@
   
        public String getClassLabel()
        {
  -             return "JDBC Database Login Defaults";
  +             return JMeterUtils.getResString("database_login_title");
        }
   }
  
  
  
  1.10      +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java
  
  Index: PoolConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/PoolConfig.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PoolConfig.java   9 Nov 2001 18:28:54 -0000       1.9
  +++ PoolConfig.java   23 Feb 2002 01:21:07 -0000      1.10
  @@ -55,6 +55,7 @@
    package org.apache.jmeter.protocol.jdbc.config;
   
   import org.apache.jmeter.config.*;
  +import org.apache.jmeter.util.JMeterUtils;
   import java.io.*;
   
   
  @@ -105,7 +106,7 @@
   
        public String getClassLabel()
        {
  -             return "JDBC Database Connection Pool Defaults";
  +             return JMeterUtils.getResString("database_conn_pool_title");
        }
   
        public void addConfigElement(ConfigElement config)
  
  
  
  1.8       +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java
  
  Index: SqlConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/config/SqlConfig.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- SqlConfig.java    9 Nov 2001 18:28:54 -0000       1.7
  +++ SqlConfig.java    23 Feb 2002 01:21:07 -0000      1.8
  @@ -55,6 +55,7 @@
    package org.apache.jmeter.protocol.jdbc.config;
   
   import org.apache.jmeter.config.*;
  +import org.apache.jmeter.util.JMeterUtils;
   import java.io.*;
   
   
  @@ -83,7 +84,7 @@
   
        public String getClassLabel()
        {
  -             return "JDBC SQL Query Defaults";
  +             return JMeterUtils.getResString("database_sql_query_title");
        }
   
        public Object clone()
  
  
  
  1.10      +2 -1      
jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/control/JdbcTestSample.java
  
  Index: JdbcTestSample.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/jdbc/control/JdbcTestSample.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JdbcTestSample.java       18 Nov 2001 13:45:13 -0000      1.9
  +++ JdbcTestSample.java       23 Feb 2002 01:21:07 -0000      1.10
  @@ -63,6 +63,7 @@
   import org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler;
   import org.apache.jmeter.gui.MenuFactory;
   import org.apache.jmeter.control.AbstractGenerativeController;
  +import org.apache.jmeter.util.JMeterUtils;
   import java.util.*;
   import java.io.*;
   
  @@ -132,7 +133,7 @@
   
        public String getClassLabel()
        {
  -             return "JDBC Request";
  +             return JMeterUtils.getResString("database_testing_title");
        }
   
        public Class getGuiClass()
  
  
  
  1.43      +13 -5     
jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages.properties,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- messages.properties       21 Feb 2002 14:07:14 -0000      1.42
  +++ messages.properties       23 Feb 2002 01:21:07 -0000      1.43
  @@ -43,6 +43,7 @@
   default_parameters=Default Parameters
   name=Name:
   value=Value
  +secure=Secure
   expiration=Expiration
   username=Username
   password=Password
  @@ -80,12 +81,18 @@
   menu_edit=Edit
   graph_full_results_title=GraphFull Results
   graph_results_title=Graph Results
  +graph_results_data=Data
  +graph_results_average=Average
  +graph_results_deviation=Deviation
   spline_visualizer_title=Spline Visualizer
  +spline_visualizer_maximum=Maximum
  +spline_visualizer_minimum=Minimum
  +spline_visualizer_average=Average
  +spline_visualizer_incoming=Incoming
  +spline_visualizer_waitingmessage=Waiting for samples
   ftp_testing_title=FTP Request
   server=Server Name or IP:
   file_to_retrieve=File to Retrieve From Server:
  -username=Username:
  -password=Password:
   ftp_sample_title=FTP Request Defaults
   assertion_title=Assertion
   assertion_visualizer_title=Assertion Results
  @@ -115,7 +122,7 @@
   file_visualizer_browse=Browse...
   file_visualizer_append=Append to Existing Data File
   file_visualizer_verbose=Verbose Output
  -file_visualizer_auto_flush=Automatically Flush After Each Data Sample 
  +file_visualizer_auto_flush=Automatically Flush After Each Data Sample
   file_visualizer_submit_data=Include Submitted Data
   file_visualizer_open=Open
   file_visualizer_flush=Flush
  @@ -128,13 +135,13 @@
   url_config_http=HTTP
   url_config_https=HTTPS
   url_config_title=HTTP Request Defaults
  -url_full_config_title=HTTP Request Defaults
  +url_full_config_title=UrlFull Sample
   web_server=Web Server
   web_server_domain=Server Name or IP:
   web_server_port=Port Number:
   web_request=HTTP Request
   web_testing_title=HTTP Request
  -web_testing_retrieve_images=Retrieve  All Images and Java Applets (HTML files only) 
  +web_testing_retrieve_images=Retrieve  All Images and Java Applets (HTML files only)
   send_file=Send a File With the Request:
   send_file_filename_label=Filename:
   send_file_browse=Browse...
  @@ -149,6 +156,7 @@
   header_manager_title=HTTP Header Manager
   headers_stored=Headers Stored in the Header Manager
   auth_manager_title=HTTP Authorization Manager
  +auth_base_url=Base URL
   auths_stored=Authorizations Stored in the Authorization Manager
   anchor_modifier_title=HTTP HTML Link Parser
   jndi_config_title=JNDI Configuration
  
  
  
  1.4       +134 -14   
jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties
  
  Index: messages_ja.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/resources/messages_ja.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- messages_ja.properties    24 Sep 2001 13:17:01 -0000      1.3
  +++ messages_ja.properties    23 Feb 2002 01:21:07 -0000      1.4
  @@ -9,17 +9,26 @@
   start=\u958b\u59cb
   stop=\u505c\u6b62
   clear=\u6d88\u53bb
  +clear_all=\u5168\u3066\u6d88\u53bb
   report=\u30ec\u30dd\u30fc\u30c8
  -analyze=\u30c7\u30fc\u30bf\u5206\u6790
  +analyze=\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u5206\u6790
   option=\u30aa\u30d7\u30b7\u30e7\u30f3
  -appearance=\u5916\u89b3
  +appearance=\u30eb\u30c3\u30af&\u30d5\u30a3\u30fc\u30eb
  +sslManager=SSL \u30de\u30cd\u30fc\u30b8\u30e3
  +pkcs12_desc=PKCS 12 Key (*.p12)
  +ssl_error_title=Key Store Problem
  
+ssl_pass_prompt=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002
  +ssl_pass_title=KeyStore Password
  
+ssl_alias_prompt=\u3042\u306a\u305f\u306e\u5b9a\u7fa9\u6e08\u307f\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u5165\u529b\u3057\u3066\u4e0b\u3055\u3044\u3002
  
+ssl_alias_select=\u30c6\u30b9\u30c8\u306e\u305f\u3081\u306e\u3042\u306a\u305f\u306e\u30a8\u30a4\u30ea\u30a2\u30b9\u3092\u9078\u629e\u3057\u3066\u4e0b\u3055\u3044\u3002
  +ssl_alias_title=Client Alias
   help=\u30d8\u30eb\u30d7
  -about=\u3053\u306e\u30bd\u30d5\u30c8\u306b\u3064\u3044\u3066
  +about=Apache JMeter \u306b\u3064\u3044\u3066
   remote_start=\u958b\u59cb(\u30ea\u30e2\u30fc\u30c8)
   remote_start=\u505c\u6b62(\u30ea\u30e2\u30fc\u30c8)
  -#root=\u30eb\u30fc\u30c8
  -#test_plan=\u30c6\u30b9\u30c8\u30d7\u30e9\u30f3
  -#workbench=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
  +root=\u30eb\u30fc\u30c8
  +test_plan=\u30c6\u30b9\u30c8\u30d7\u30e9\u30f3
  +workbench=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
   add=\u8ffd\u52a0
   remove=\u524a\u9664
   delete=\u524a\u9664
  @@ -34,22 +43,133 @@
   default_parameters=\u30c7\u30d5\u30a9\u30eb\u30c8\u30d1\u30e9\u30e1\u30fc\u30bf
   name=\u540d\u524d
   value=\u5024
  -domain=\u30c9\u30e1\u30a4\u30f3
  -path=\u30d1\u30b9
  +secure=\u30bb\u30ad\u30e5\u30a2
   expiration=\u671f\u9650
   username=\u30e6\u30fc\u30b6\u540d
   password=\u30d1\u30b9\u30ef\u30fc\u30c9
   number_of_threads=\u30b9\u30ec\u30c3\u30c9\u6570
   infinite=\u7121\u9650\u30eb\u30fc\u30d7
  -iterator_num=\u30a4\u30c6\u30ec\u30fc\u30bf\u6570
  +iterator_num=\u30eb\u30fc\u30d7\u56de\u6570
   add_value=\u5024\u306e\u8ffd\u52a0
  -paramtable=\u30d1\u30e9\u30e1\u30fc\u30bf\u540d
  
+paramtable=\u30ea\u30af\u30a8\u30b9\u30c8\u3067\u9001\u308b\u30d1\u30e9\u30e1\u30fc\u30bf
   upload=\u30d5\u30a1\u30a4\u30eb\u30a2\u30c3\u30d7\u30ed\u30fc\u30c9
   field_name=\u30d5\u30a3\u30fc\u30eb\u30c9\u540d
   looping_control=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30eb
  -browse=\u8868\u793a
  +browse=\u53c2\u7167
   mimetype=Mime\u30bf\u30a4\u30d7
  -patterns_to_include=\u633f\u5165\u30d1\u30bf\u30fc\u30f3
  -patterns_to_exclude=\u9664\u5916\u30d1\u30bf\u30fc\u30f3
  +patterns_to_include=\u633f\u5165\u3059\u308b\u30d1\u30bf\u30fc\u30f3
  +patterns_to_exclude=\u9664\u5916\u3059\u308b\u30d1\u30bf\u30fc\u30f3
   add_pattern=\u30d1\u30bf\u30fc\u30f3\u8ffd\u52a0
  -ramp_up=Ramp-Up Period (sec)
  +ramp_up=Ramp-Up \u671f\u9593 (\u79d2): 
  +constant_timer_title=Constant Timer
  +constant_timer_delay=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593 
(\u30df\u30ea\u79d2):
  +gaussian_timer_title=Gaussian Random Timer
  
+gaussian_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8
 (\u30df\u30ea\u79d2):
  +gaussian_timer_range=\u504f\u5dee (\u30df\u30ea\u79d2):
  +uniform_timer_title=Uniform Random Timer
  
+uniform_timer_delay=\u9045\u5ef6\u6642\u9593\u306e\u5b9a\u6570\u30aa\u30d5\u30bb\u30c3\u30c8
 (\u30df\u30ea\u79d2):
  +uniform_timer_range=\u6700\u5927\u9045\u5ef6\u6642\u9593 (\u30df\u30ea\u79d2):
  
+thread_delay_properties=\u30b9\u30ec\u30c3\u30c9\u9045\u5ef6\u6642\u9593\u30d7\u30ed\u30d1\u30c6\u30a3
  +thread_group_title=\u30b9\u30ec\u30c3\u30c9\u30b0\u30eb\u30fc\u30d7
  +loop_controller_title=\u30eb\u30fc\u30d7\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9
  +modification_manager_title=\u4fee\u6b63\u30de\u30cd\u30fc\u30b8\u30e3
  +interleave_control_title=Interleave Controller
  +logic_controller_title=Simple Controller
  +once_only_controller_title=Once Only Controller
  +workbench_title=\u30ef\u30fc\u30af\u30d9\u30f3\u30c1
  +root_title=\u30eb\u30fc\u30c8
  +menu_edit=\u7de8\u96c6
  +graph_full_results_title=GraphFull Results
  +graph_results_title=\u30b0\u30e9\u30d5\u8868\u793a
  +graph_results_data=\u30c7\u30fc\u30bf
  +graph_results_average=\u5e73\u5747
  +graph_results_deviation=\u504f\u5dee
  
+spline_visualizer_title=\u30b9\u30d7\u30e9\u30a4\u30f3\u30d3\u30b8\u30e5\u30a2\u30e9\u30a4\u30b6
  +spline_visualizer_maximum=\u6700\u5927
  +spline_visualizer_minimum=\u6700\u5c0f
  +spline_visualizer_average=\u5e73\u5747
  +spline_visualizer_incoming=\u5230\u7740
  
+spline_visualizer_waitingmessage=\u30b5\u30f3\u30d7\u30ea\u30f3\u30b0\u958b\u59cb\u307e\u3067\u304a\u5f85\u3061\u4e0b\u3055\u3044\u3002
  +ftp_testing_title=FTP \u30ea\u30af\u30a8\u30b9\u30c8
  +server=\u30b5\u30fc\u30d0\u540d\u307e\u305f\u306f IP:
  
+file_to_retrieve=\u30b5\u30fc\u30d0\u304b\u3089\u7e70\u308a\u8fd4\u3057\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b\u30d5\u30a1\u30a4\u30eb:
  +ftp_sample_title=FTP \u30ea\u30af\u30a8\u30b9\u30c8\u8a2d\u5b9a
  +assertion_title=\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3
  +assertion_visualizer_title=\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3 \u7d50\u679c
  
+assertion_resp_field=\u30c6\u30b9\u30c8\u3059\u308b\u30ec\u30b9\u30dd\u30f3\u30b9\u30d5\u30a3\u30fc\u30eb\u30c9
  +assertion_text_resp=\u30c6\u30ad\u30b9\u30c8\u306e\u30ec\u30b9\u30dd\u30f3\u30b9
  +assertion_url_samp=\u30b5\u30f3\u30d7\u30ea\u30f3\u30b0\u3055\u308c\u305f URL
  
+assertion_pattern_match_rules=\u30d1\u30bf\u30fc\u30f3\u30de\u30c3\u30c1\u30f3\u30b0\u30eb\u30fc\u30eb
  +assertion_contains=\u542b\u3080
  +assertion_matches=\u30de\u30c3\u30c1\u3059\u308b
  +assertion_not=\u5426\u5b9a
  +assertion_patterns_to_test=\u30c6\u30b9\u30c8\u30d1\u30bf\u30fc\u30f3
  +assertion_textarea_label=\u30a2\u30b5\u30fc\u30b7\u30e7\u30f3:
  +login_config=\u30ed\u30b0\u30a4\u30f3\u8a2d\u5b9a
  +database_testing_title=JDBC \u30ea\u30af\u30a8\u30b9\u30c8
  +database_driver_class=\u30c9\u30e9\u30a4\u30d0\u30af\u30e9\u30b9:
  +database_url=JDBC URL:
  +database_url_jdbc_props=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 URL \u3068 JDBC 
\u30c9\u30e9\u30a4\u30d0
  +database_login_title=JDBC 
\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30ed\u30b0\u30a4\u30f3\u8a2d\u5b9a
  
+database_conn_pool_props=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u30d7\u30fc\u30eb
  +database_conn_pool_title=JDBC 
\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u30d7\u30fc\u30eb\u8a2d\u5b9a
  
+database_conn_pool_size=\u30d7\u30fc\u30eb\u4e2d\u306e\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u6570:
  
+database_conn_pool_max_usage=\u5404\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u306e\u6700\u5927\u4f7f\u7528\u6570:
  +database_sql_query_title=JDBC SQL \u30af\u30a8\u30ea\u30fc\u8a2d\u5b9a
  +database_sql_query_string=SQL \u30af\u30a8\u30ea\u30fc\u6587\u5b57\u5217:
  +file_visualizer_title=\u30d5\u30a1\u30a4\u30eb\u30ec\u30dd\u30fc\u30bf
  
+file_visualizer_output_file=\u5168\u3066\u306e\u30c7\u30fc\u30bf\u3092\u30d5\u30a1\u30a4\u30eb\u306b\u51fa\u529b
  +file_visualizer_browse=\u53c2\u7167...
  
+file_visualizer_append=\u65e2\u306b\u5b58\u5728\u3059\u308b\u30c7\u30fc\u30bf\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0
  
+file_visualizer_verbose=\u8a73\u7d30\u306a\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u51fa\u529b
  
+file_visualizer_auto_flush=\u5404\u30c7\u30fc\u30bf\u3092\u30b5\u30f3\u30d7\u30ea\u30f3\u30b0\u3057\u305f\u3042\u3068\u306b\u81ea\u52d5\u7684\u306b\u30d5\u30e9\u30c3\u30b7\u30e5
  
+file_visualizer_submit_data=\u9001\u4fe1\u30c7\u30fc\u30bf\u3092\u542b\u307e\u305b\u308b
  +file_visualizer_open=\u958b\u304f
  +file_visualizer_flush=\u30d5\u30e9\u30c3\u30b7\u30e5
  +file_visualizer_close=\u9589\u3058\u308b
  
+file_visualizer_filename=\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u5165\u529b\u3059\u308b\u304b\u3001\u65e2\u306b\u5b58\u5728\u3059\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u6307\u5b9a\u3057\u3066\u4e0b\u3055\u3044\u3002
  +file_visualizer_file_options=\u30d5\u30a1\u30a4\u30eb\u30aa\u30d7\u30b7\u30e7\u30f3
  
+file_visualizer_missing_filename=\u51fa\u529b\u30d5\u30a1\u30a4\u30eb\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
  +url_config_post=POST
  +url_config_get=GET
  +url_config_http=HTTP
  +url_config_https=HTTPS
  +url_config_title=HTTP \u30ea\u30af\u30a8\u30b9\u30c8\u8a2d\u5b9a
  +url_full_config_title=HTTP \u30ea\u30af\u30a8\u30b9\u30c8\u8a2d\u5b9a
  +web_server=Web \u30b5\u30fc\u30d0
  +web_server_domain=\u30b5\u30fc\u30d0\u540d\u307e\u305f\u306f IP:
  +web_server_port=\u30dd\u30fc\u30c8\u756a\u53f7:
  +web_request=HTTP \u30ea\u30af\u30a8\u30b9\u30c8
  +web_testing_title=HTTP \u30ea\u30af\u30a8\u30b9\u30c8
  
+web_testing_retrieve_images=\u5168\u3066\u306e\u30a4\u30e1\u30fc\u30b8\u3068\u30a2\u30d7\u30ec\u30c3\u30c8\u3092\u7e70\u308a\u8fd4\u3057\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3059\u308b(HTML
 \u30d5\u30a1\u30a4\u30eb\u306e\u307f) 
  
+send_file=\u30ea\u30af\u30a8\u30b9\u30c8\u3068\u4e00\u7dd2\u306b\u9001\u4fe1\u3055\u308c\u308b\u30d5\u30a1\u30a4\u30eb:
  +send_file_filename_label=\u30d5\u30a1\u30a4\u30eb\u540d:
  +send_file_browse=\u53c2\u7167...
  +send_file_param_name_label=\u30d1\u30e9\u30e1\u30fc\u30bf\u540d:
  +send_file_mime_label=MIME \u30bf\u30a4\u30d7:
  +optional_tasks=\u30aa\u30d7\u30b7\u30e7\u30f3\u30bf\u30b9\u30af
  +proxy_title=HTTP \u30d7\u30ed\u30ad\u30b7\u30b5\u30fc\u30d0
  +view_results_title=\u7d50\u679c\u8868\u793a
  +view_results_tree_title=\u30c4\u30ea\u30fc\u3067\u7d50\u679c\u8868\u793a
  +cookie_manager_title=HTTP \u30af\u30c3\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3
  
+cookies_stored=\u30af\u30c3\u30ad\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u306b\u4fdd\u5b58\u3055\u308c\u3066\u3044\u308b\u30af\u30c3\u30ad\u30fc
  +header_manager_title=HTTP \u30d8\u30c3\u30c0\u30de\u30cd\u30fc\u30b8\u30e3
  
+headers_stored=\u30d8\u30c3\u30c0\u30fc\u30de\u30cd\u30fc\u30b8\u30e3\u306b\u4fdd\u5b58\u3055\u308c\u3066\u3044\u308b\u30d8\u30c3\u30c0
  +auth_manager_title=HTTP \u8a8d\u8a3c\u30de\u30cd\u30fc\u30b8\u30e3
  +auth_base_url=\u30d9\u30fc\u30b9URL
  
+auths_stored=\u8a8d\u8a3c\u30de\u30cd\u30fc\u30b8\u30e3\u306b\u4fdd\u5b58\u3055\u308c\u3066\u3044\u308b\u8a8d\u8a3c
  +anchor_modifier_title=HTTP HTML \u30ea\u30f3\u30af\u30d1\u30fc\u30b5
  +jndi_config_title=JNDI \u8a2d\u5b9a
  +jndi_url_jndi_props=JNDI \u30d7\u30ed\u30d1\u30c6\u30a3
  +jndi_lookup_title=JNDI \u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u8a2d\u5b9a
  +jndi_lookup_name=\u30ea\u30e2\u30fc\u30c8\u30a4\u30f3\u30bf\u30d5\u30a7\u30fc\u30b9
  +jndi_method_title=\u30ea\u30e2\u30fc\u30c8\u30e1\u30bd\u30c3\u30c9\u8a2d\u5b9a
  +jndi_testing_title=JNDI \u30ea\u30af\u30a8\u30b9\u30c8
  +jndi_method_name=\u30e1\u30bd\u30c3\u30c9\u540d
  +jndi_method_parms=\u30e1\u30bd\u30c3\u30c9\u306e\u5f15\u6570
  +jndi_method_button_reflect=\u30ea\u30d5\u30ec\u30af\u30b7\u30e7\u30f3
  +jndi_method_button_invoke=\u547c\u3073\u51fa\u3057
  +
  +
  +
  +
  
  
  
  1.17      +4 -4      
jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphVisualizer.java
  
  Index: GraphVisualizer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/visualizers/GraphVisualizer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- GraphVisualizer.java      1 Oct 2001 14:21:00 -0000       1.16
  +++ GraphVisualizer.java      23 Feb 2002 01:21:07 -0000      1.17
  @@ -72,7 +72,7 @@
    *
    *@author     <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
    *@created    February 8, 2001
  - *@version    $Revision: 1.16 $ $Date: 2001/10/01 14:21:00 $
  + *@version    $Revision: 1.17 $ $Date: 2002/02/23 01:21:07 $
    */
   public class GraphVisualizer extends JPanel
                 implements ImageVisualizer, ItemListener,ModelSupported,GraphListener,
  @@ -143,15 +143,15 @@
                namePanel = new NamePanel(model);
                mainPanel.add(namePanel);
   
  -             data = new JCheckBox("data");
  +             data = new JCheckBox(JMeterUtils.getResString("graph_results_data"));
                data.setSelected(true);
                data.addItemListener(this);
                data.setForeground(Color.black);
  -             average = new JCheckBox("average");
  +             average = new 
JCheckBox(JMeterUtils.getResString("graph_results_average"));
                average.setSelected(true);
                average.addItemListener(this);
                average.setForeground(Color.blue);
  -             deviation = new JCheckBox("deviation");
  +             deviation = new 
JCheckBox(JMeterUtils.getResString("graph_results_deviation"));
                deviation.setSelected(true);
                deviation.addItemListener(this);
                deviation.setForeground(Color.red);
  
  
  
  1.14      +5 -5      
jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineVisualizer.java
  
  Index: SplineVisualizer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/visualizers/SplineVisualizer.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SplineVisualizer.java     1 Oct 2001 14:21:16 -0000       1.13
  +++ SplineVisualizer.java     23 Feb 2002 01:21:07 -0000      1.14
  @@ -133,16 +133,16 @@
   
                  graph = new SplineGraph();
   
  -               maximumLabel = new JLabel("Maximum");
  +               maximumLabel = new 
JLabel(JMeterUtils.getResString("spline_visualizer_maximum"));
                  maximumLabel.setForeground(MAXIMUM_COLOR);
                  maximumLabel.setBackground(backColor);
  -               averageLabel = new JLabel("Average");
  +               averageLabel = new 
JLabel(JMeterUtils.getResString("spline_visualizer_average"));
                  averageLabel.setForeground(AVERAGE_COLOR);
                  averageLabel.setBackground(backColor);
  -               incomingLabel = new JLabel("Incoming");
  +               incomingLabel = new 
JLabel(JMeterUtils.getResString("spline_visualizer_incoming"));
                  incomingLabel.setForeground(INCOMING_COLOR);
                  incomingLabel.setBackground(backColor);
  -               minimumLabel = new JLabel("Minimum");
  +               minimumLabel = new 
JLabel(JMeterUtils.getResString("spline_visualizer_minimum"));
                  minimumLabel.setForeground(MINIMUM_COLOR);
                  minimumLabel.setBackground(backColor);
   
  @@ -283,7 +283,7 @@
                                         g.setColor(this.getBackground());
                                         g.fillRect(0, 0, width, height);
                                         g.setColor(WAITING_COLOR);
  -                                      g.drawString( "Waiting for samples",
  +                                      
g.drawString(JMeterUtils.getResString("spline_visualizer_waitingmessage"),
                                                                                (width 
- 120) / 2, height - (height - 12) / 2);
                                         return;
                                }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to