You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/05/06 01:43:58 UTC

svn commit: r535575 [3/3] - in /jakarta/jmeter/branches/rel-2-2/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/assertions/gui/ components/org/apache/jmeter/control/ components/org/apache/jmeter/control/gui/ components/org/ap...

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java Sat May  5 16:43:53 2007
@@ -39,7 +39,6 @@
 
 /**
  * @author Michael Stover
- * @version $Revision$
  */
 public class MultipartUrlConfigGui extends UrlConfigGui implements ActionListener {
 
@@ -49,9 +48,10 @@
 
 	private JTextField mimetypeField;
 
+	// TODO these are used as names for the GUI elements - are they needed? are they NLS?
 	private static String FILENAME = "filename";
 
-	private static String BROWSE = "browse";
+	private static String BROWSE = "browse";  // $NON-NLS-1$ used as an ActionName locally
 
 	private static String PARAMNAME = "paramname";
 
@@ -88,7 +88,7 @@
 	}
 
 	public String getLabelResource() {
-		return "url_multipart_config_title";
+		return "url_multipart_config_title"; // $NON-NLS-1$
 	}
 
 	public void updateGui() {
@@ -116,8 +116,8 @@
 
 		// WEB SERVER PANEL
 		VerticalPanel webServerPanel = new VerticalPanel();
-		webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("web_server")));
+		webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("web_server"))); // $NON-NLS-1$
 		webServerPanel.add(getDomainPanel());
 		webServerPanel.add(getPortPanel());
 
@@ -129,8 +129,8 @@
 		// WEB REQUEST PANEL
 		JPanel webRequestPanel = new JPanel();
 		webRequestPanel.setLayout(new BorderLayout());
-		webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("web_request")));
+		webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
 
 		webRequestPanel.add(northPanel, BorderLayout.NORTH);
 		webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
@@ -142,8 +142,8 @@
 
 	protected JPanel getFilePanel() {
 		JPanel filePanel = new VerticalPanel();
-		filePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("send_file")));
+		filePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("send_file"))); // $NON-NLS-1$
 
 		filePanel.add(createFilenamePanel());
 		filePanel.add(createFileParamNamePanel());
@@ -156,7 +156,7 @@
 		mimetypeField = new JTextField(15);
 		mimetypeField.setName(MIMETYPE);
 
-		JLabel mimetypeLabel = new JLabel(JMeterUtils.getResString("send_file_mime_label"));
+		JLabel mimetypeLabel = new JLabel(JMeterUtils.getResString("send_file_mime_label")); // $NON-NLS-1$
 		mimetypeLabel.setLabelFor(mimetypeField);
 		JPanel mimePanel = new JPanel(new BorderLayout(5, 0));
 		mimePanel.add(mimetypeLabel, BorderLayout.WEST);
@@ -168,7 +168,7 @@
 		paramNameField = new JTextField(15);
 		paramNameField.setName(PARAMNAME);
 
-		JLabel paramNameLabel = new JLabel(JMeterUtils.getResString("send_file_param_name_label"));
+		JLabel paramNameLabel = new JLabel(JMeterUtils.getResString("send_file_param_name_label")); // $NON-NLS-1$
 		paramNameLabel.setLabelFor(paramNameField);
 
 		JPanel paramNamePanel = new JPanel(new BorderLayout(5, 0));
@@ -181,10 +181,10 @@
 		filenameField = new JTextField(15);
 		filenameField.setName(FILENAME);
 
-		JLabel filenameLabel = new JLabel(JMeterUtils.getResString("send_file_filename_label"));
+		JLabel filenameLabel = new JLabel(JMeterUtils.getResString("send_file_filename_label")); // $NON-NLS-1$
 		filenameLabel.setLabelFor(filenameField);
 
-		JButton browseFileButton = new JButton(JMeterUtils.getResString("send_file_browse"));
+		JButton browseFileButton = new JButton(JMeterUtils.getResString("send_file_browse")); // $NON-NLS-1$
 		browseFileButton.setActionCommand(BROWSE);
 		browseFileButton.addActionListener(this);
 
@@ -203,8 +203,8 @@
 	public void clear() {
 		// TODO Auto-generated method stub
 		super.clear();
-		filenameField.setText("");
-		mimetypeField.setText("");
-		paramNameField.setText("");
+		filenameField.setText(""); // $NON-NLS-1$
+		mimetypeField.setText(""); // $NON-NLS-1$
+		paramNameField.setText(""); // $NON-NLS-1$
 	}
 }

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Sat May  5 16:43:53 2007
@@ -167,16 +167,16 @@
 		JPanel webServerPanel = new JPanel();
 
 		webServerPanel.setLayout(new BorderLayout());
-		webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("web_server"))); // $NON-NLS-1$
+		webServerPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("web_server"))); // $NON-NLS-1$
 		webServerPanel.add(getDomainPanel(), BorderLayout.NORTH);
 		webServerPanel.add(getPortPanel(), BorderLayout.WEST);
 
 		JPanel webRequestPanel = new JPanel();
 
 		webRequestPanel.setLayout(new BorderLayout());
-		webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("web_request"))); // $NON-NLS-1$
+		webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
 		JPanel northPanel = new JPanel(new BorderLayout());
 
 		northPanel.add(getProtocolAndMethodPanel(), BorderLayout.NORTH);
@@ -226,10 +226,10 @@
 		path = new JTextField(15);
 		path.setName(PATH);
 
-		JLabel label = new JLabel(JMeterUtils.getResString("path"));
+		JLabel label = new JLabel(JMeterUtils.getResString("path")); //$NON-NLS-1$
 		label.setLabelFor(path);
 
-		autoRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto"));
+		autoRedirects = new JCheckBox(JMeterUtils.getResString("follow_redirects_auto")); //$NON-NLS-1$
 		autoRedirects.setName(AUTO_REDIRECTS);
 		autoRedirects.setSelected(false);// will be reset by
 											// configure(TestElement)

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java Sat May  5 16:43:53 2007
@@ -53,14 +53,14 @@
 public class AuthManager extends ConfigTestElement implements ConfigElement, Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private final static String AUTH_LIST = "AuthManager.auth_list";
+	private final static String AUTH_LIST = "AuthManager.auth_list"; //$NON-NLS-1$
 
 	private final static String[] columnNames = {
-		JMeterUtils.getResString("auth_base_url"),
-		JMeterUtils.getResString("username"), 
-		JMeterUtils.getResString("password"), 
-		JMeterUtils.getResString("domain"), 
-		JMeterUtils.getResString("realm"), 
+		JMeterUtils.getResString("auth_base_url"), //$NON-NLS-1$
+		JMeterUtils.getResString("username"),  //$NON-NLS-1$
+		JMeterUtils.getResString("password"),  //$NON-NLS-1$
+		JMeterUtils.getResString("domain"),  //$NON-NLS-1$
+		JMeterUtils.getResString("realm"),  //$NON-NLS-1$
 		};
 
 	// Column numbers - must agree with order above
@@ -125,7 +125,7 @@
 	}
 
 	public String getClassLabel() {
-		return JMeterUtils.getResString("auth_manager_title");
+		return JMeterUtils.getResString("auth_manager_title"); //$NON-NLS-1$
 	}
 
 	public Class getGuiClass() {
@@ -256,10 +256,10 @@
 		String line;
 		while ((line = reader.readLine()) != null) {
 			try {
-				if (line.startsWith("#") || line.trim().length() == 0) {
+				if (line.startsWith("#") || line.trim().length() == 0) { //$NON-NLS-1$
 					continue;
 				}
-				StringTokenizer st = new StringTokenizer(line, "\t");
+				StringTokenizer st = new StringTokenizer(line, "\t"); //$NON-NLS-1$
 				String url = st.nextToken();
 				String user = st.nextToken();
 				String pass = st.nextToken();
@@ -296,6 +296,6 @@
     // Needs to be package protected for Unit test
 	static boolean isSupportedProtocol(URL url) {
 		String protocol = url.getProtocol().toUpperCase();
-		return protocol.equals("HTTP") || protocol.equals("HTTPS");
+		return protocol.equals("HTTP") || protocol.equals("HTTPS"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 }

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java Sat May  5 16:43:53 2007
@@ -30,15 +30,18 @@
  * author <a href="mailto:luta.raphael@networks.vivendi.net">Raphael Luta</a>
  */
 public class Authorization extends AbstractTestElement implements Serializable {
-	private static String URL = "Authorization.url";
 
-	private static String USERNAME = "Authorization.username";
+	private static String URL = "Authorization.url"; // $NON-NLS-1$
 
-	private static String PASSWORD = "Authorization.password";
+	private static String USERNAME = "Authorization.username"; // $NON-NLS-1$
 
-	private static String DOMAIN = "Authorization.domain";
+	private static String PASSWORD = "Authorization.password"; // $NON-NLS-1$
 
-	private static String REALM = "Authorization.realm";
+	private static String DOMAIN = "Authorization.domain"; // $NON-NLS-1$
+
+	private static String REALM = "Authorization.realm"; // $NON-NLS-1$
+
+	private static final String TAB = "\t"; // $NON-NLS-1$
 
 	/**
 	 * create the authorization
@@ -56,15 +59,7 @@
 	}
 
 	public Authorization() {
-		setURL("");
-		setUser("");
-		setPass("");
-		setDomain("");
-		setRealm("");
-	}
-
-	public String getClassLabel() {// TODO Is this used?
-		return "Authorization";
+		this("","","","","");
 	}
 
 	public void addConfigElement(ConfigElement config) {
@@ -112,7 +107,7 @@
 
 	// Used for saving entries to a file
 	public String toString() {
-		return getURL() + "\t" + getUser() + "\t" + getPass() + "\t" + getDomain() + "\t" + getRealm();
+		return getURL() + TAB + getUser() + TAB + getPass() + TAB + getDomain() + TAB + getRealm();
 	}
     
     public String toBasicHeader(){

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java Sat May  5 16:43:53 2007
@@ -26,14 +26,13 @@
 /**
  * This class is an HTTP Header encapsulator.
  * 
- * @author <a href="mailto:giacomo@apache.org">Giacomo Pati</a>
- * @version $Revision$ last updated $Date$
  */
 public class Header extends AbstractTestElement implements Serializable {
-	private static final String HNAME = "Header.name"; // See
-														// TestElementPropertyConverter
+	
+	private static final String HNAME = "Header.name";  //$NON-NLS-1$
+	// See TestElementPropertyConverter
 
-	private static final String VALUE = "Header.value";
+	private static final String VALUE = "Header.value"; //$NON-NLS-1$
 
 	/**
 	 * Create the header.
@@ -58,10 +57,6 @@
 		return false;
 	}
 
-	public String getClassLabel() {
-		return "Header";
-	}
-
 	/**
 	 * Get the name for this object.
 	 */
@@ -94,6 +89,6 @@
 	 * Creates a string representation of this header.
 	 */
 	public String toString() {
-		return getName() + "\t" + getValue();
+		return getName() + "\t" + getValue(); //$NON-NLS-1$
 	}
 }

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/HttpMirrorControl.java Sat May  5 16:43:53 2007
@@ -58,7 +58,7 @@
 	}
 	
 	public String getClassLabel() {
-		return JMeterUtils.getResString("httpmirror_title");
+		return JMeterUtils.getResString("httpmirror_title"); //$NON-NLS-1$
 	}
 
 

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.java Sat May  5 16:43:53 2007
@@ -49,9 +49,9 @@
 
 	private JButton stop, start;
 
-	private static final String STOP = "stop";
+	private static final String ACTION_STOP = "stop"; // $NON-NLS-1$
 
-	private static final String START = "start";
+	private static final String ACTION_START = "start"; // $NON-NLS-1$
 
 	private HttpMirrorControl mirrorController;
 
@@ -82,7 +82,7 @@
 	}
 
 	public String getLabelResource() {
-		return "httpmirror_title";
+		return "httpmirror_title"; // $NON-NLS-1$
 	}
 
 	public Collection getMenuCategories() {
@@ -101,11 +101,11 @@
 	public void actionPerformed(ActionEvent action) {
 		String command = action.getActionCommand();
 
-		if (command.equals(STOP)) {
+		if (command.equals(ACTION_STOP)) {
 			mirrorController.stopHttpMirror();
 			stop.setEnabled(false);
 			start.setEnabled(true);
-		} else if (command.equals(START)) {
+		} else if (command.equals(ACTION_START)) {
 			modifyTestElement(mirrorController);
 			mirrorController.startHttpMirror();
 			start.setEnabled(false);
@@ -131,14 +131,14 @@
 	}
 
 	private JPanel createControls() {
-		start = new JButton(JMeterUtils.getResString("start"));
+		start = new JButton(JMeterUtils.getResString("start")); // $NON-NLS-1$
 		start.addActionListener(this);
-		start.setActionCommand(START);
+		start.setActionCommand(ACTION_START);
 		start.setEnabled(true);
 
-		stop = new JButton(JMeterUtils.getResString("stop"));
+		stop = new JButton(JMeterUtils.getResString("stop")); // $NON-NLS-1$
 		stop.addActionListener(this);
-		stop.setActionCommand(STOP);
+		stop.setActionCommand(ACTION_STOP);
 		stop.setEnabled(false);
 
 		JPanel panel = new JPanel();
@@ -151,7 +151,7 @@
 		portField = new JTextField(HttpMirrorControl.DEFAULT_PORT_S, 8);
 		portField.setName(HttpMirrorControl.PORT);
 
-		JLabel label = new JLabel(JMeterUtils.getResString("port"));
+		JLabel label = new JLabel(JMeterUtils.getResString("port")); // $NON-NLS-1$
 		label.setLabelFor(portField);
 
 		

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java Sat May  5 16:43:53 2007
@@ -39,7 +39,7 @@
 	}
 
 	public String getStaticLabel() {
-		return JMeterUtils.getResString("web_testing2_title");
+		return JMeterUtils.getResString("web_testing2_title"); //$NON-NLS-1$
 	}
 
     // Documentation is shared with our parent

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/RecordController.java Sat May  5 16:43:53 2007
@@ -22,12 +22,9 @@
 import org.apache.jmeter.protocol.http.control.RecordingController;
 import org.apache.jmeter.testelement.TestElement;
 
-/**
- * @version $Revision$
- */
 public class RecordController extends LogicControllerGui {
 	public String getLabelResource() {
-		return "record_controller_title";
+		return "record_controller_title"; // $NON-NLS-1$
 	}
 
 	public TestElement createTestElement() {

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/AuthPanel.java Sat May  5 16:43:53 2007
@@ -56,15 +56,15 @@
  * user selects.
  */
 public class AuthPanel extends AbstractConfigGui implements ActionListener {
-	transient private static Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private static final String ADD_COMMAND = "Add";
+	private static final String ADD_COMMAND = "Add"; //$NON-NLS-1$
 
-	private static final String DELETE_COMMAND = "Delete";
+	private static final String DELETE_COMMAND = "Delete"; //$NON-NLS-1$
 
-	private static final String LOAD_COMMAND = "Load";
+	private static final String LOAD_COMMAND = "Load"; //$NON-NLS-1$
 
-	private static final String SAVE_COMMAND = "Save";
+	private static final String SAVE_COMMAND = "Save"; //$NON-NLS-1$
 
 	private InnerTableModel tableModel;
 
@@ -127,7 +127,7 @@
 	}
 
 	public String getLabelResource() {
-		return "auth_manager_title";
+		return "auth_manager_title"; //$NON-NLS-1$
 	}
 
 	/**
@@ -245,7 +245,7 @@
 
 		JPanel panel = new JPanel(new BorderLayout(0, 5));
 		panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-				JMeterUtils.getResString("auths_stored")));
+				JMeterUtils.getResString("auths_stored"))); //$NON-NLS-1$
 		panel.add(new JScrollPane(authTable));
 		panel.add(createButtonPanel(), BorderLayout.SOUTH);
 		return panel;
@@ -263,10 +263,10 @@
 	private JPanel createButtonPanel() {
 		boolean tableEmpty = (tableModel.getRowCount() == 0);
 
-		addButton = createButton("add", 'A', ADD_COMMAND, true);
-		deleteButton = createButton("delete", 'D', DELETE_COMMAND, !tableEmpty);
-		loadButton = createButton("load", 'L', LOAD_COMMAND, true);
-		saveButton = createButton("save", 'S', SAVE_COMMAND, !tableEmpty);
+		addButton = createButton("add", 'A', ADD_COMMAND, true); //$NON-NLS-1$
+		deleteButton = createButton("delete", 'D', DELETE_COMMAND, !tableEmpty); //$NON-NLS-1$
+		loadButton = createButton("load", 'L', LOAD_COMMAND, true); //$NON-NLS-1$
+		saveButton = createButton("save", 'S', SAVE_COMMAND, !tableEmpty); //$NON-NLS-1$
 
 		// Button Panel
 		JPanel buttonPanel = new JPanel();
@@ -277,9 +277,6 @@
 		return buttonPanel;
 	}
 
-	/**
-	 * @version $Revision$
-	 */
 	private static class InnerTableModel extends AbstractTableModel {
 		AuthManager manager;
 
@@ -381,9 +378,6 @@
 		}
 	}
 
-	/**
-	 * @version $Revision$
-	 */
 	private static class PasswordCellRenderer extends JPasswordField implements TableCellRenderer {
 		private Border myBorder;
 

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java Sat May  5 16:43:53 2007
@@ -33,28 +33,25 @@
 import org.apache.jorphan.reflect.Functor;
 
 public class HTTPArgumentsPanel extends ArgumentsPanel {
-	/*
-	 * NOTUSED private static final String ENCODED_VALUE =
-	 * JMeterUtils.getResString("encoded_value");
-	 */
-	private static final String ENCODE_OR_NOT = JMeterUtils.getResString("encode?");
 
-	private static final String INCLUDE_EQUALS = JMeterUtils.getResString("include_equals");
+	private static final String ENCODE_OR_NOT = JMeterUtils.getResString("encode?"); //$NON-NLS-1$
+
+	private static final String INCLUDE_EQUALS = JMeterUtils.getResString("include_equals"); //$NON-NLS-1$
 
 	protected void initializeTableModel() {
 		tableModel = new ObjectTableModel(new String[] {
 				ArgumentsPanel.COLUMN_NAMES_0, ArgumentsPanel.COLUMN_NAMES_1, ENCODE_OR_NOT, INCLUDE_EQUALS },
 				HTTPArgument.class,
 				new Functor[] {
-				new Functor("getName"),
-				new Functor("getValue"),
-				new Functor("isAlwaysEncoded"),
-				new Functor("isUseEquals") },
+				new Functor("getName"), //$NON-NLS-1$
+				new Functor("getValue"), //$NON-NLS-1$
+				new Functor("isAlwaysEncoded"), //$NON-NLS-1$
+				new Functor("isUseEquals") }, //$NON-NLS-1$
 				new Functor[] { 
-				new Functor("setName"),
-				new Functor("setValue"),
-				new Functor("setAlwaysEncoded"),
-				new Functor("setUseEquals") },
+				new Functor("setName"), //$NON-NLS-1$
+				new Functor("setValue"), //$NON-NLS-1$
+				new Functor("setAlwaysEncoded"), //$NON-NLS-1$
+				new Functor("setUseEquals") }, //$NON-NLS-1$
 				new Class[] {String.class, String.class, Boolean.class, Boolean.class });
 	}
 
@@ -88,7 +85,7 @@
 	}
 
 	public HTTPArgumentsPanel() {
-		super(JMeterUtils.getResString("paramtable"));
+		super(JMeterUtils.getResString("paramtable")); //$NON-NLS-1$
 	}
 
 	public TestElement createTestElement() {

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/AnchorModifierGui.java Sat May  5 16:43:53 2007
@@ -24,16 +24,13 @@
 import org.apache.jmeter.protocol.http.modifier.AnchorModifier;
 import org.apache.jmeter.testelement.TestElement;
 
-/**
- * @version $Revision$ on $Date$
- */
 public class AnchorModifierGui extends AbstractPreProcessorGui {
 	public AnchorModifierGui() {
 		init();
 	}
 
 	public String getLabelResource() {
-		return "anchor_modifier_title";
+		return "anchor_modifier_title"; //$NON-NLS-1$
 	}
 
 	public TestElement createTestElement() {

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.java Sat May  5 16:43:53 2007
@@ -41,9 +41,14 @@
  * 
  * Created Jan 18, 2002
  * 
- * @version $Revision$ Last updated: $Date$
  */
 public class ParamModifierGui extends AbstractPreProcessorGui implements FocusListener {
+	
+	/*
+	 * These are used as GUI item names;
+	 * LOWERBOUND, UPPERBOUND and INCREMENT are used in the focusLost() method 
+	 */
+	
 	private static final String NAME = "name";
 
 	private static final String PREFIX = "prefix";
@@ -56,6 +61,8 @@
 
 	private static final String SUFFIX = "suffix";
 
+	private static final String ZERO = "0"; //$NON-NLS-1$
+
 	private JTextField _fieldName;
 
 	private JTextField _prefix;
@@ -73,7 +80,7 @@
 	}
 
 	public String getLabelResource() {
-		return "html_parameter_mask";
+		return "html_parameter_mask"; //$NON-NLS-1$
 	}
 
 	public void configure(TestElement el) {
@@ -115,7 +122,7 @@
         
         _fieldName.setText(""); //$NON-NLS-1$
         _prefix.setText(""); //$NON-NLS-1$
-        _lowerBound.setText("0"); //$NON-NLS-1$
+        _lowerBound.setText(ZERO);
         _upperBound.setText("10"); //$NON-NLS-1$
         _increment.setText("1"); //$NON-NLS-1$
         _suffix.setText(""); //$NON-NLS-1$        
@@ -129,11 +136,11 @@
 		if (evt.isTemporary()) {
 			return;
 		} else if (name.equals(LOWERBOUND)) {
-			checkTextField(evt, "0");
+			checkTextField(evt, ZERO);
 		} else if (name.equals(UPPERBOUND)) {
-			checkTextField(evt, "0");
+			checkTextField(evt, ZERO);
 		} else if (name.equals(INCREMENT)) {
-			checkTextField(evt, "0");
+			checkTextField(evt, ZERO);
 		}
 	}
 
@@ -167,35 +174,35 @@
 
 	private JPanel getParameterMaskPanel() {
 		HorizontalPanel panel = new HorizontalPanel(10, HorizontalPanel.TOP_ALIGNMENT);
-		panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("HTML Parameter Mask")));
+		panel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("html_parameter_mask"))); //$NON-NLS-1$
 
 		_fieldName = new JTextField(10);
 		_fieldName.setName(NAME);
-		panel.add(createLabeledField("Name", _fieldName));
+		panel.add(createLabeledField("name", _fieldName)); //$NON-NLS-1$ resource name
 
 		_prefix = new JTextField(5);
 		_prefix.setName(PREFIX);
-		panel.add(createLabeledField("ID Prefix", _prefix));
+		panel.add(createLabeledField("id_prefix", _prefix)); //$NON-NLS-1$ resource name
 
-		_lowerBound = new JTextField("0", 5);
+		_lowerBound = new JTextField(ZERO, 5);
 		_lowerBound.addFocusListener(this);
 		_lowerBound.setName(LOWERBOUND);
-		panel.add(createLabeledField("Lower Bound", _lowerBound));
+		panel.add(createLabeledField("lower_bound", _lowerBound)); //$NON-NLS-1$ resource name
 
 		_upperBound = new JTextField("10", 5);
 		_upperBound.addFocusListener(this);
 		_upperBound.setName(UPPERBOUND);
-		panel.add(createLabeledField("Upper Bound", _upperBound));
+		panel.add(createLabeledField("upper_bound", _upperBound)); //$NON-NLS-1$ resource name
 
 		_increment = new JTextField("1", 3);
 		_increment.addFocusListener(this);
 		_increment.setName(INCREMENT);
-		panel.add(createLabeledField("Increment", _increment));
+		panel.add(createLabeledField("increment", _increment)); //$NON-NLS-1$ resource name
 
 		_suffix = new JTextField(5);
 		_suffix.setName(SUFFIX);
-		panel.add(createLabeledField("ID Suffix", _suffix));
+		panel.add(createLabeledField("id_suffix", _suffix)); //$NON-NLS-1$ resource name
 
 		JPanel mainPanel = new JPanel(new BorderLayout());
 		mainPanel.add(panel, BorderLayout.NORTH);

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/URLRewritingModifierGui.java Sat May  5 16:43:53 2007
@@ -29,9 +29,6 @@
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JLabeledTextField;
 
-/**
- * @version $Revision$ last updated $Date$
- */
 public class URLRewritingModifierGui extends AbstractPreProcessorGui {
 	private JLabeledTextField argumentName;
 
@@ -44,7 +41,7 @@
     private JCheckBox shouldCache;
 
 	public String getLabelResource() {
-		return "http_url_rewriting_modifier_title";
+		return "http_url_rewriting_modifier_title"; // $NON-NLS-1$
 	}
 
 	public URLRewritingModifierGui() {

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/modifier/gui/UserParameterModifierGui.java Sat May  5 16:43:53 2007
@@ -36,7 +36,6 @@
 /**
  * A swing panel to allow UI with the UserParameterModifier class.
  * 
- * @version $Revision$ on $Date$
  */
 public class UserParameterModifierGui extends AbstractPreProcessorGui {
 	// -------------------------------------------
@@ -81,7 +80,7 @@
 	}
 
 	public String getLabelResource() {
-		return "http_user_parameter_modifier";
+		return "http_user_parameter_modifier"; // $NON-NLS-1$
 	}
 
 	public void configure(TestElement el) {
@@ -101,7 +100,7 @@
 		mainPanel.add(getFileLocator(), BorderLayout.NORTH);
 
 		// We want the help text to look like a label, but wrap like a text area
-		JTextArea helpText = new JTextArea(JMeterUtils.getResString("user_param_mod_help_note"));
+		JTextArea helpText = new JTextArea(JMeterUtils.getResString("user_param_mod_help_note")); // $NON-NLS-1$
 		helpText.setLineWrap(true);
 		helpText.setWrapStyleWord(true);
 		helpText.setBackground(getBackground());
@@ -118,7 +117,7 @@
 
 	private JPanel getFileLocator() {
 		fileNameField = new JTextField("users.xml", 15);
-		JLabel label = new JLabel(JMeterUtils.getResString("filename"));
+		JLabel label = new JLabel(JMeterUtils.getResString("filename")); // $NON-NLS-1$
 		label.setLabelFor(fileNameField);
 
 		JPanel fileLocator = new JPanel(new BorderLayout());

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java Sat May  5 16:43:53 2007
@@ -64,27 +64,27 @@
 public class WebServiceSampler extends HTTPSamplerBase {
 	private static Logger log = LoggingManager.getLoggerForClass();
 
-	public static final String XML_DATA = "HTTPSamper.xml_data";
+	public static final String XML_DATA = "HTTPSamper.xml_data"; //$NON-NLS-1$
 
-	public static final String SOAP_ACTION = "Soap.Action";
+	public static final String SOAP_ACTION = "Soap.Action"; //$NON-NLS-1$
 
-	public static final String XML_DATA_FILE = "WebServiceSampler.xml_data_file";
+	public static final String XML_DATA_FILE = "WebServiceSampler.xml_data_file"; //$NON-NLS-1$
 
-	public static final String XML_PATH_LOC = "WebServiceSampler.xml_path_loc";
+	public static final String XML_PATH_LOC = "WebServiceSampler.xml_path_loc"; //$NON-NLS-1$
 
-	public static final String MEMORY_CACHE = "WebServiceSampler.memory_cache";
+	public static final String MEMORY_CACHE = "WebServiceSampler.memory_cache"; //$NON-NLS-1$
 
-	public static final String READ_RESPONSE = "WebServiceSampler.read_response";
+	public static final String READ_RESPONSE = "WebServiceSampler.read_response"; //$NON-NLS-1$
 
-	public static final String USE_PROXY = "WebServiceSampler.use_proxy";
+	public static final String USE_PROXY = "WebServiceSampler.use_proxy"; //$NON-NLS-1$
 
-	public static final String PROXY_HOST = "WebServiceSampler.proxy_host";
+	public static final String PROXY_HOST = "WebServiceSampler.proxy_host"; //$NON-NLS-1$
 
-	public static final String PROXY_PORT = "WebServiceSampler.proxy_port";
+	public static final String PROXY_PORT = "WebServiceSampler.proxy_port"; //$NON-NLS-1$
 
-	public static final String WSDL_URL = "WebserviceSampler.wsdl_url";
+	public static final String WSDL_URL = "WebserviceSampler.wsdl_url"; //$NON-NLS-1$
 
-    public static final String TIMEOUT = "WebserviceSampler.timeout";
+    public static final String TIMEOUT = "WebserviceSampler.timeout"; //$NON-NLS-1$
 
     private static final String PROXY_USER = 
         JMeterUtils.getPropDefault(JMeter.HTTP_PROXY_USER,""); // $NON-NLS-1$
@@ -516,7 +516,7 @@
 					// performance on slow clients
 					br.read();
 					result.sampleEnd();
-					result.setResponseData(JMeterUtils.getResString("read_response_message").getBytes());
+					result.setResponseData(JMeterUtils.getResString("read_response_message").getBytes()); //$NON-NLS-1$
 				}
 				result.setSuccessful(true);
 				result.setResponseCodeOK();
@@ -593,7 +593,7 @@
 		StringBuffer buf = new StringBuffer();
 		while (en.hasMoreElements()) {
 			Object key = en.nextElement();
-			buf.append((String) key + "=" + (String) ht.get(key) + "\n");
+			buf.append((String) key).append("=").append((String) ht.get(key)).append("\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		return buf.toString();
 	}

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java Sat May  5 16:43:53 2007
@@ -47,11 +47,10 @@
  * The <code>JavaConfigGui</code> class provides the user interface for the
  * {@link JavaConfig} object.
  * 
- * @version $Revision$ on $Date$
  */
 public class JavaConfigGui extends AbstractConfigGui implements ActionListener {
 	/** Logging */
-	private static transient Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
 	/** The name of the classnameCombo JComboBox */
 	private static final String CLASSNAMECOMBO = "classnamecombo";
@@ -91,7 +90,7 @@
 	}
 
 	public String getLabelResource() {
-		return "java_request_defaults";
+		return "java_request_defaults"; // $NON-NLS-1$
 	}
 
 	/**
@@ -135,7 +134,7 @@
 			log.debug("Exception getting interfaces.", e);
 		}
 
-		JLabel label = new JLabel(JMeterUtils.getResString("protocol_java_classname"));
+		JLabel label = new JLabel(JMeterUtils.getResString("protocol_java_classname")); // $NON-NLS-1$
 
 		classnameCombo = new JComboBox(possibleClasses.toArray());
 		classnameCombo.addActionListener(this);
@@ -213,7 +212,7 @@
 	 * @return a panel containing the relevant components
 	 */
 	private JPanel createParameterPanel() {
-		argsPanel = new ArgumentsPanel(JMeterUtils.getResString("paramtable"));
+		argsPanel = new ArgumentsPanel(JMeterUtils.getResString("paramtable")); // $NON-NLS-1$
 		return argsPanel;
 	}
 

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BSFSamplerGui.java Sat May  5 16:43:53 2007
@@ -32,20 +32,14 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
-/**
- * 
- * @version $Revision$ $Date$
- */
 public class BSFSamplerGui extends AbstractSamplerGui {
 	private JTextArea scriptField;
 
-	private JTextField langField;// Language TODO should this be a drop-down
-									// list?
+	private JTextField langField;// Language TODO should this be a drop-down list?
 
 	private JTextField filename;// script file name (if present)
 
-	private JTextField parameters;// parameters to pass to script file (or
-									// script)
+	private JTextField parameters;// parameters to pass to script file (or script)
 
 	public BSFSamplerGui() {
 		init();
@@ -92,7 +86,7 @@
     }    
 
 	public String getLabelResource() {
-		return "bsf_sampler_title";
+		return "bsf_sampler_title"; // $NON-NLS-1$
 	}
 
 	private void init() {
@@ -113,7 +107,7 @@
 	}
 
 	private JPanel createParameterPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_parameters"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_parameters")); // $NON-NLS-1$
 
 		parameters = new JTextField(10);
 		parameters.setName(BSFSampler.PARAMETERS);
@@ -127,7 +121,7 @@
 
 	private JPanel createFilenamePanel()// TODO ought to be a FileChooser ...
 	{
-		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_file"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_file")); // $NON-NLS-1$
 
 		filename = new JTextField(10);
 		filename.setName(BSFSampler.FILENAME);
@@ -140,7 +134,7 @@
 	}
 
 	private JPanel createLanguagePanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_language"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script_language")); // $NON-NLS-1$
 
 		langField = new JTextField(10);
 		langField.setName(BSFSampler.LANGUAGE);
@@ -158,7 +152,7 @@
 		scriptField.setLineWrap(true);
 		scriptField.setWrapStyleWord(true);
 
-		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsf_script")); // $NON-NLS-1$
 		label.setLabelFor(scriptField);
 
 		JPanel panel = new JPanel(new BorderLayout());

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java Sat May  5 16:43:53 2007
@@ -32,15 +32,11 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
-/**
- * @version $Revision$ $Date$
- */
 public class BeanShellSamplerGui extends AbstractSamplerGui {
 
 	private JTextField filename;// script file name (if present)
 
-	private JTextField parameters;// parameters to pass to script file (or
-									// script)
+	private JTextField parameters;// parameters to pass to script file (or script)
 
 	private JTextArea scriptField;// script area
 
@@ -86,12 +82,12 @@
     }    
 
 	public String getLabelResource() {
-		return "bsh_sampler_title";
+		return "bsh_sampler_title"; // $NON-NLS-1$
 	}
 
 	private JPanel createFilenamePanel()// TODO ought to be a FileChooser ...
 	{
-		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_file"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_file")); // $NON-NLS-1$
 
 		filename = new JTextField(10);
 		filename.setName(BeanShellSampler.FILENAME);
@@ -104,7 +100,7 @@
 	}
 
 	private JPanel createParameterPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_parameters"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script_parameters")); // $NON-NLS-1$
 
 		parameters = new JTextField(10);
 		parameters.setName(BeanShellSampler.PARAMETERS);
@@ -138,7 +134,7 @@
 		scriptField.setLineWrap(true);
 		scriptField.setWrapStyleWord(true);
 
-		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script"));
+		JLabel label = new JLabel(JMeterUtils.getResString("bsh_script")); // $NON-NLS-1$
 		label.setLabelFor(scriptField);
 
 		JPanel panel = new JPanel(new BorderLayout());

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/JavaTestSamplerGui.java Sat May  5 16:43:53 2007
@@ -30,7 +30,6 @@
  * The <code>JavaTestSamplerGui</code> class provides the user interface for
  * the {@link JavaSampler}.
  * 
- * @version $Revision$ on $Date$
  */
 public class JavaTestSamplerGui extends AbstractSamplerGui {
 	/** Panel containing the configuration options. */
@@ -45,7 +44,7 @@
 	}
 
 	public String getLabelResource() {
-		return "java_request";
+		return "java_request"; // $NON-NLS-1$
 	}
 
 	/**

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java Sat May  5 16:43:53 2007
@@ -42,30 +42,29 @@
  * Created on: October 28, 2004
  * 
  * @author Martijn Blankestijn
- * @version $Id$
  */
 public class JMSConfigGui extends AbstractSamplerGui {
 
-	private JLabeledTextField queueuConnectionFactory = new JLabeledTextField(JMeterUtils
-			.getResString("jms_queue_connection_factory"));
+	private JLabeledTextField queueuConnectionFactory = new JLabeledTextField(
+			JMeterUtils.getResString("jms_queue_connection_factory")); //$NON-NLS-1$
 
-	private JLabeledTextField sendQueue = new JLabeledTextField(JMeterUtils.getResString("jms_send_queue"));
+	private JLabeledTextField sendQueue = new JLabeledTextField(JMeterUtils.getResString("jms_send_queue")); //$NON-NLS-1$
 
-	private JLabeledTextField receiveQueue = new JLabeledTextField(JMeterUtils.getResString("jms_receive_queue"));
+	private JLabeledTextField receiveQueue = new JLabeledTextField(JMeterUtils.getResString("jms_receive_queue")); //$NON-NLS-1$
 
-	private JLabeledTextField timeout = new JLabeledTextField(JMeterUtils.getResString("jms_timeout"));
+	private JLabeledTextField timeout = new JLabeledTextField(JMeterUtils.getResString("jms_timeout")); //$NON-NLS-1$
 
-	private JLabeledTextArea soapXml = new JLabeledTextArea(JMeterUtils.getResString("jms_msg_content"), null);
+	private JLabeledTextArea soapXml = new JLabeledTextArea(JMeterUtils.getResString("jms_msg_content"), null); //$NON-NLS-1$
 
-	private JLabeledTextField initialContextFactory = new JLabeledTextField(JMeterUtils
-			.getResString("jms_initial_context_factory"));
+	private JLabeledTextField initialContextFactory = new JLabeledTextField(
+			JMeterUtils.getResString("jms_initial_context_factory")); //$NON-NLS-1$
 
-	private JLabeledTextField providerUrl = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url"));
+	private JLabeledTextField providerUrl = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url")); //$NON-NLS-1$
 
-	private String[] labels = new String[] { JMeterUtils.getResString("jms_request"),
-			JMeterUtils.getResString("jms_requestreply") };
+	private String[] labels = new String[] { JMeterUtils.getResString("jms_request"), //$NON-NLS-1$
+			JMeterUtils.getResString("jms_requestreply") }; //$NON-NLS-1$
 
-	private JLabeledChoice oneWay = new JLabeledChoice(JMeterUtils.getResString("jms_communication_style"), labels);
+	private JLabeledChoice oneWay = new JLabeledChoice(JMeterUtils.getResString("jms_communication_style"), labels); //$NON-NLS-1$
 
 	private ArgumentsPanel jmsPropertiesPanel;
 
@@ -82,7 +81,7 @@
 		queueuConnectionFactory.setText("");
 		sendQueue.setText("");
 		receiveQueue.setText("");
-		((JComboBox) oneWay.getComponentList().get(1)).setSelectedItem(JMeterUtils.getResString("jms_request"));
+		((JComboBox) oneWay.getComponentList().get(1)).setSelectedItem(JMeterUtils.getResString("jms_request")); //$NON-NLS-1$
 		timeout.setText("");
 		soapXml.setText("");
 		initialContextFactory.setText("");
@@ -105,7 +104,7 @@
 		element.setProperty(JMSSampler.SEND_QUEUE, sendQueue.getText());
 		element.setProperty(JMSSampler.RECEIVE_QUEUE, receiveQueue.getText());
 
-		boolean isOneway = oneWay.getText().equals(JMeterUtils.getResString("jms_request"));
+		boolean isOneway = oneWay.getText().equals(JMeterUtils.getResString("jms_request")); //$NON-NLS-1$
 		element.setProperty(new BooleanProperty(JMSSampler.IS_ONE_WAY, isOneway));
 
 		element.setProperty(JMSSampler.TIMEOUT, timeout.getText());
@@ -170,9 +169,9 @@
 		JComboBox box = (JComboBox) oneWay.getComponentList().get(1);
 		String selected = null;
 		if (sampler.isOneway()) {
-			selected = JMeterUtils.getResString("jms_request");
+			selected = JMeterUtils.getResString("jms_request"); //$NON-NLS-1$
 		} else {
-			selected = JMeterUtils.getResString("jms_requestreply");
+			selected = JMeterUtils.getResString("jms_requestreply"); //$NON-NLS-1$
 		}
 		box.setSelectedItem(selected);
 
@@ -202,8 +201,8 @@
 		Box mainPanel = Box.createVerticalBox();
 
 		JPanel jmsQueueingPanel = new JPanel(new BorderLayout());
-		jmsQueueingPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("jms_queueing")));
+		jmsQueueingPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("jms_queueing"))); //$NON-NLS-1$
 
 		JPanel qcfPanel = new JPanel(new BorderLayout(5, 0));
 		qcfPanel.add(queueuConnectionFactory, BorderLayout.CENTER);
@@ -220,8 +219,8 @@
 		JPanel jndiPanel = createJNDIPanel();
 
 		JPanel messagePanel = new JPanel(new BorderLayout());
-		messagePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("jms_message_title")));
+		messagePanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("jms_message_title"))); //$NON-NLS-1$
 
 		JPanel messageNorthPanel = new JPanel(new BorderLayout());
 		JPanel onewayPanel = new JPanel(new BorderLayout());
@@ -238,7 +237,7 @@
 		soapXmlPanel.add(soapXml);
 		messagePanel.add(soapXmlPanel, BorderLayout.CENTER);
 
-		jmsPropertiesPanel = new ArgumentsPanel(JMeterUtils.getResString("jms_props"));
+		jmsPropertiesPanel = new ArgumentsPanel(JMeterUtils.getResString("jms_props")); //$NON-NLS-1$
 		messagePanel.add(jmsPropertiesPanel, BorderLayout.SOUTH);
 
 		mainPanel.add(jmsQueueingPanel, BorderLayout.NORTH);
@@ -255,8 +254,8 @@
 	 */
 	private JPanel createJNDIPanel() {
 		JPanel jndiPanel = new JPanel(new BorderLayout());
-		jndiPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), JMeterUtils
-				.getResString("jms_jndi_props")));
+		jndiPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), 
+				JMeterUtils.getResString("jms_jndi_props"))); //$NON-NLS-1$
 
 		JPanel contextPanel = new JPanel(new BorderLayout(10, 0));
 		contextPanel.add(initialContextFactory);
@@ -266,13 +265,13 @@
 		providerPanel.add(providerUrl);
 		jndiPanel.add(providerPanel, BorderLayout.SOUTH);
 
-		jndiPropertiesPanel = new ArgumentsPanel(JMeterUtils.getResString("jms_jndi_props"));
+		jndiPropertiesPanel = new ArgumentsPanel(JMeterUtils.getResString("jms_jndi_props")); //$NON-NLS-1$
 		jndiPanel.add(jndiPropertiesPanel);
 		return jndiPanel;
 	}
 
 	public String getLabelResource() {
-		return "jms_point_to_point";// TODO - probably wrong
+		return "jms_point_to_point"; //$NON-NLS-1$ // TODO - probably wrong
 	}
 
 }

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Sat May  5 16:43:53 2007
@@ -46,62 +46,60 @@
  * This is the GUI for JMS Publisher <br>
  * Created on: October 13, 2003
  * 
- * @author Peter Lin
- * @version $Id$
  */
 public class JMSPublisherGui extends AbstractSamplerGui implements java.awt.event.ActionListener, ChangeListener {
-	public static final String use_file = JMeterUtils.getResString("jms_use_file");
+	public static final String use_file = JMeterUtils.getResString("jms_use_file"); //$NON-NLS-1$
 
-	public static final String use_random = JMeterUtils.getResString("jms_use_random_file");
+	public static final String use_random = JMeterUtils.getResString("jms_use_random_file"); //$NON-NLS-1$
 
-	public static final String use_text = JMeterUtils.getResString("jms_use_text");
+	public static final String use_text = JMeterUtils.getResString("jms_use_text"); //$NON-NLS-1$
 
 	private String[] items = { use_file, use_random, use_text };
 
-	private String text_msg = JMeterUtils.getResString("jms_text_message");
+	private String text_msg = JMeterUtils.getResString("jms_text_message"); //$NON-NLS-1$
 
-	private String object_msg = JMeterUtils.getResString("jms_object_message");
+	private String object_msg = JMeterUtils.getResString("jms_object_message"); //$NON-NLS-1$
 
 	private String[] msgTypes = { text_msg, object_msg };
 
-	private String required = JMeterUtils.getResString("jms_auth_required");
+	private String required = JMeterUtils.getResString("jms_auth_required"); //$NON-NLS-1$
 
-	private String not_req = JMeterUtils.getResString("jms_auth_not_required");
+	private String not_req = JMeterUtils.getResString("jms_auth_not_required"); //$NON-NLS-1$
 
 	private String[] auth_items = { required, not_req };
 
-	JCheckBox useProperties = new JCheckBox(JMeterUtils.getResString("jms_use_properties_file"), false);
+	JCheckBox useProperties = new JCheckBox(JMeterUtils.getResString("jms_use_properties_file"), false); //$NON-NLS-1$
 
-	JLabeledRadio configChoice = new JLabeledRadio(JMeterUtils.getResString("jms_config"), items, use_text);
+	JLabeledRadio configChoice = new JLabeledRadio(JMeterUtils.getResString("jms_config"), items, use_text); //$NON-NLS-1$
 
-	JLabeledTextField jndiICF = new JLabeledTextField(JMeterUtils.getResString("jms_initial_context_factory"));
+	JLabeledTextField jndiICF = new JLabeledTextField(JMeterUtils.getResString("jms_initial_context_factory")); //$NON-NLS-1$
 
-	JLabeledTextField urlField = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url"));
+	JLabeledTextField urlField = new JLabeledTextField(JMeterUtils.getResString("jms_provider_url")); //$NON-NLS-1$
 
-	JLabeledTextField jndiConnFac = new JLabeledTextField(JMeterUtils.getResString("jms_connection_factory"));
+	JLabeledTextField jndiConnFac = new JLabeledTextField(JMeterUtils.getResString("jms_connection_factory")); //$NON-NLS-1$
 
-	JLabeledTextField jmsTopic = new JLabeledTextField(JMeterUtils.getResString("jms_topic"));
+	JLabeledTextField jmsTopic = new JLabeledTextField(JMeterUtils.getResString("jms_topic")); //$NON-NLS-1$
 
-	JLabeledRadio reqAuth = new JLabeledRadio(JMeterUtils.getResString("jms_authentication"), auth_items, not_req);
+	JLabeledRadio reqAuth = new JLabeledRadio(JMeterUtils.getResString("jms_authentication"), auth_items, not_req); //$NON-NLS-1$
 
-	JLabeledTextField jmsUser = new JLabeledTextField(JMeterUtils.getResString("jms_user"));
+	JLabeledTextField jmsUser = new JLabeledTextField(JMeterUtils.getResString("jms_user")); //$NON-NLS-1$
 
-	JLabeledTextField jmsPwd = new JLabeledTextField(JMeterUtils.getResString("jms_pwd"));
+	JLabeledTextField jmsPwd = new JLabeledTextField(JMeterUtils.getResString("jms_pwd")); //$NON-NLS-1$
 
-	JLabeledTextField iterations = new JLabeledTextField(JMeterUtils.getResString("jms_itertions"));
+	JLabeledTextField iterations = new JLabeledTextField(JMeterUtils.getResString("jms_itertions")); //$NON-NLS-1$
 
-	FilePanel messageFile = new FilePanel(JMeterUtils.getResString("jms_file"), "*.*");
+	FilePanel messageFile = new FilePanel(JMeterUtils.getResString("jms_file"), "*.*"); //$NON-NLS-1$
 
-	FilePanel randomFile = new FilePanel(JMeterUtils.getResString("jms_random_file"), "*.*");
+	FilePanel randomFile = new FilePanel(JMeterUtils.getResString("jms_random_file"), "*.*"); //$NON-NLS-1$
 
 	JLabeledTextArea textMessage = new JLabeledTextArea(text_msg, null);
 
-	JLabeledRadio msgChoice = new JLabeledRadio(JMeterUtils.getResString("jms_message_type"), msgTypes, text_msg);
+	JLabeledRadio msgChoice = new JLabeledRadio(JMeterUtils.getResString("jms_message_type"), msgTypes, text_msg); //$NON-NLS-1$
 
 	/**
 	 * This is the font for the note.
 	 */
-	Font plainText = new Font("plain", Font.PLAIN, 10);
+	Font plainText = new Font("plain", Font.PLAIN, 10); //$NON-NLS-1$
 
 	private JPanel lookup = null;
 
@@ -115,7 +113,7 @@
 	 * the name of the property for the JMSPublisherGui is jms_publisher.
 	 */
 	public String getLabelResource() {
-		return "jms_publisher";
+		return "jms_publisher"; //$NON-NLS-1$
 	}
 
 	/**
@@ -308,7 +306,9 @@
 	public void updateMessageType(String msgType) {
 		if (msgType.equals(object_msg)) {
 			if (configChoice.getText().equals(use_text)) {
-				JOptionPane.showConfirmDialog(this, JMeterUtils.getResString("jms_error_msg"), "Warning",
+				JOptionPane.showConfirmDialog(this, 
+						JMeterUtils.getResString("jms_error_msg"),  //$NON-NLS-1$
+						"Warning",
 						JOptionPane.OK_CANCEL_OPTION, JOptionPane.ERROR_MESSAGE);
 			}
 		}

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java Sat May  5 16:43:53 2007
@@ -46,6 +46,7 @@
  * @author Thad Smith
  */
 public class MailReaderSamplerGui extends AbstractSamplerGui {
+
 	// Gui Components
 	private JComboBox serverTypeBox;
 
@@ -68,27 +69,29 @@
 	private JCheckBox deleteBox;
 
 	// Labels
-	private final static String POP3Label = JMeterUtils.getResString("mail_reader_pop3");
+	private final static String POP3Label = JMeterUtils.getResString("mail_reader_pop3");// $NON-NLS-1$
+
+	private final static String IMAPLabel = JMeterUtils.getResString("mail_reader_imap");// $NON-NLS-1$
 
-	private final static String IMAPLabel = JMeterUtils.getResString("mail_reader_imap");
+	private final static String ServerTypeLabel = JMeterUtils.getResString("mail_reader_server_type");// $NON-NLS-1$
 
-	private final static String ServerTypeLabel = JMeterUtils.getResString("mail_reader_server_type");
+	private final static String ServerLabel = JMeterUtils.getResString("mail_reader_server");// $NON-NLS-1$
 
-	private final static String ServerLabel = JMeterUtils.getResString("mail_reader_server");
+	private final static String AccountLabel = JMeterUtils.getResString("mail_reader_account");// $NON-NLS-1$
 
-	private final static String AccountLabel = JMeterUtils.getResString("mail_reader_account");
+	private final static String PasswordLabel = JMeterUtils.getResString("mail_reader_password");// $NON-NLS-1$
 
-	private final static String PasswordLabel = JMeterUtils.getResString("mail_reader_password");
+	private final static String NumMessagesLabel = JMeterUtils.getResString("mail_reader_num_messages");// $NON-NLS-1$
 
-	private final static String NumMessagesLabel = JMeterUtils.getResString("mail_reader_num_messages");
+	private final static String AllMessagesLabel = JMeterUtils.getResString("mail_reader_all_messages");// $NON-NLS-1$
 
-	private final static String AllMessagesLabel = JMeterUtils.getResString("mail_reader_all_messages");
+	private final static String DeleteLabel = JMeterUtils.getResString("mail_reader_delete");// $NON-NLS-1$
 
-	private final static String DeleteLabel = JMeterUtils.getResString("mail_reader_delete");
+	private final static String FolderLabel = JMeterUtils.getResString("mail_reader_folder");// $NON-NLS-1$
 
-	private final static String FolderLabel = JMeterUtils.getResString("mail_reader_folder");
+	private static final String INBOX = "INBOX"; // $NON-NLS-1$
 
-	// NOTREAD private String type;
+// NOTREAD private String type;
 	private boolean delete;
 
 	private int num_messages;
@@ -100,7 +103,7 @@
 	}
 
 	public String getLabelResource() {
-		return "mail_reader_title";
+		return "mail_reader_title"; // $NON-NLS-1$
 	}
 
 	/*
@@ -112,7 +115,7 @@
 		MailReaderSampler mrs = (MailReaderSampler) element;
 		if (mrs.getServerType().equals(MailReaderSampler.TYPE_POP3)) {
 			serverTypeBox.setSelectedItem(POP3Label);
-			folderBox.setText("INBOX");
+			folderBox.setText(INBOX);
 		} else {
 			serverTypeBox.setSelectedItem(IMAPLabel);
 			folderBox.setText(mrs.getFolder());
@@ -191,7 +194,7 @@
 				if (((String) serverTypeBox.getSelectedItem()).equals(POP3Label)) {
 					// NOTREAD type = MailReaderSampler.TYPE_POP3;
 					folderLabel.setEnabled(false);
-					folderBox.setText("INBOX");
+					folderBox.setText(INBOX);
 					folderBox.setEnabled(false);
 				} else {
 					// NOTREAD type = MailReaderSampler.TYPE_IMAP;
@@ -223,7 +226,7 @@
 
 		JPanel folderPanel = new JPanel();
 		folderLabel = new JLabel(FolderLabel);
-		folderBox = new JTextField("INBOX", 10);
+		folderBox = new JTextField(INBOX, 10);
 		folderPanel.add(folderLabel);
 		folderPanel.add(folderBox);
 		add(folderPanel);

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/config/gui/TCPConfigGui.java Sat May  5 16:43:53 2007
@@ -33,8 +33,6 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
-/**
- */
 public class TCPConfigGui extends AbstractConfigGui {
 	private final static String SERVER = "server"; //$NON-NLS-1$
 
@@ -75,7 +73,7 @@
 	}
 
 	public String getLabelResource() {
-		return "tcp_config_title";
+		return "tcp_config_title"; // $NON-NLS-1$
 	}
 
 	public void configure(TestElement element) {
@@ -127,7 +125,7 @@
     }    
 
 	private JPanel createTimeoutPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("tcp_timeout"));
+		JLabel label = new JLabel(JMeterUtils.getResString("tcp_timeout")); // $NON-NLS-1$
 
 		timeout = new JTextField(10);
 		timeout.setName(TIMEOUT);
@@ -140,7 +138,7 @@
 	}
 
 	private JPanel createNoDelayPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("tcp_nodelay"));
+		JLabel label = new JLabel(JMeterUtils.getResString("tcp_nodelay")); // $NON-NLS-1$
 
 		setNoDelay = new JCheckBox();
 		setNoDelay.setName(NODELAY);
@@ -153,7 +151,7 @@
 	}
 
 	private JPanel createServerPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("server"));
+		JLabel label = new JLabel(JMeterUtils.getResString("server")); // $NON-NLS-1$
 
 		server = new JTextField(10);
 		server.setName(SERVER);
@@ -166,7 +164,7 @@
 	}
 
 	private JPanel createClosePortPanel() {
-        JLabel label = new JLabel(JMeterUtils.getResString("reUseConnection"));
+        JLabel label = new JLabel(JMeterUtils.getResString("reuseconnection")); //$NON-NLS-1$
 
         reUseConnection = new JCheckBox("", true);
 		reUseConnection.setName(RE_USE_CONNECTION);
@@ -179,7 +177,7 @@
 	}
 
 	private JPanel createPortPanel() {
-		JLabel label = new JLabel(JMeterUtils.getResString("tcp_port"));
+		JLabel label = new JLabel(JMeterUtils.getResString("tcp_port")); //$NON-NLS-1$
 
 		port = new JTextField(10);
 		port.setName(PORT);
@@ -192,7 +190,7 @@
 	}
 
 	private JPanel createRequestPanel() {
-		JLabel reqLabel = new JLabel(JMeterUtils.getResString("tcp_request_data"));
+		JLabel reqLabel = new JLabel(JMeterUtils.getResString("tcp_request_data")); // $NON-NLS-1$
 		requestData = new JTextArea(3, 0);
 		requestData.setLineWrap(true);
 		requestData.setName(REQUEST);
@@ -208,7 +206,7 @@
 	// private JPanel createFilenamePanel()//Not used yet
 	// {
 	//		
-	// JLabel label = new JLabel(JMeterUtils.getResString("file_to_retrieve"));
+	// JLabel label = new JLabel(JMeterUtils.getResString("file_to_retrieve")); // $NON-NLS-1$
 	//
 	// filename = new JTextField(10);
 	// filename.setName(FILENAME);

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java?view=diff&rev=535575&r1=535574&r2=535575
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/tcp/org/apache/jmeter/protocol/tcp/control/gui/TCPSamplerGui.java Sat May  5 16:43:53 2007
@@ -29,9 +29,6 @@
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
 
-/**
- * @version $Revision$ $Date$
- */
 public class TCPSamplerGui extends AbstractSamplerGui {
 
 	private LoginConfigGui loginPanel;
@@ -77,7 +74,7 @@
     }    
     
 	public String getLabelResource() {
-		return "tcp_sample_title";
+		return "tcp_sample_title"; // $NON-NLS-1$
 	}
 
 	private void init() {
@@ -92,7 +89,7 @@
 		mainPanel.add(TcpDefaultPanel);
 
 		loginPanel = new LoginConfigGui(false);
-		loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config")));
+		loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config"))); // $NON-NLS-1$
 		mainPanel.add(loginPanel);
 
 		add(mainPanel, BorderLayout.CENTER);



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org