jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1527125 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui: MultipartUrlConfigGui.java UrlConfigGui.java
Date Fri, 27 Sep 2013 23:24:01 GMT
Author: pmouawad
Date: Fri Sep 27 23:24:01 2013
New Revision: 1527125

URL: http://svn.apache.org/r1527125
Log:
Bug 55606 - Use JSyntaxtTextArea for Http Request, JMS Test Elements
Reverting crappy code
Bugzilla Id: 55606

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java?rev=1527125&r1=1527124&r2=1527125&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
Fri Sep 27 23:24:01 2013
@@ -19,7 +19,6 @@
 package org.apache.jmeter.protocol.http.config.gui;
 
 import java.awt.BorderLayout;
-import java.awt.HeadlessException;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -28,15 +27,11 @@ import javax.swing.JPanel;
 import org.apache.jmeter.protocol.http.gui.HTTPFileArgsPanel;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
 
 public class MultipartUrlConfigGui extends UrlConfigGui {
 
     private static final long serialVersionUID = 240L;
 
-    private static final Logger log = LoggingManager.getLoggerForClass();
-
     /**
      * Files panel that holds file informations to be uploaded by
      * http request.
@@ -73,32 +68,26 @@ public class MultipartUrlConfigGui exten
     }
 
     private void init() {// called from ctor, so must not be overridable
-    	try {
-	        this.setLayout(new BorderLayout());
-	
-	        // WEB REQUEST PANEL
-	        JPanel webRequestPanel = new JPanel();
-	        webRequestPanel.setLayout(new BorderLayout());
-	        webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-	                JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
-	
-	        JPanel northPanel = new JPanel();
-	        northPanel.setLayout(new BoxLayout(northPanel, BoxLayout.Y_AXIS));
-	        northPanel.add(getProtocolAndMethodPanel());
-	        northPanel.add(getPathPanel());
-	
-	        webRequestPanel.add(northPanel, BorderLayout.NORTH);
-	        webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
-	        webRequestPanel.add(getHTTPFileArgsPanel(), BorderLayout.SOUTH);
-	
-	        this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
-	        this.add(webRequestPanel, BorderLayout.CENTER);
-	        this.add(getProxyServerPanel(), BorderLayout.SOUTH);
-    	}
-        catch (HeadlessException e){
-        	// When running in Headless mode, avoid unit tests failures
-            log.warn(e.toString());
-        }
+        this.setLayout(new BorderLayout());
+
+        // WEB REQUEST PANEL
+        JPanel webRequestPanel = new JPanel();
+        webRequestPanel.setLayout(new BorderLayout());
+        webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
+
+        JPanel northPanel = new JPanel();
+        northPanel.setLayout(new BoxLayout(northPanel, BoxLayout.Y_AXIS));
+        northPanel.add(getProtocolAndMethodPanel());
+        northPanel.add(getPathPanel());
+
+        webRequestPanel.add(northPanel, BorderLayout.NORTH);
+        webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
+        webRequestPanel.add(getHTTPFileArgsPanel(), BorderLayout.SOUTH);
+
+        this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
+        this.add(webRequestPanel, BorderLayout.CENTER);
+        this.add(getProxyServerPanel(), BorderLayout.SOUTH);
     }
 
     private JPanel getHTTPFileArgsPanel() {

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=1527125&r1=1527124&r2=1527125&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
Fri Sep 27 23:24:01 2013
@@ -22,7 +22,6 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Font;
-import java.awt.HeadlessException;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -54,8 +53,6 @@ import org.apache.jmeter.testelement.pro
 import org.apache.jmeter.testelement.property.TestElementProperty;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.JLabeledChoice;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
 
 /**
  * Basic URL / HTTP Request configuration:
@@ -68,8 +65,6 @@ public class UrlConfigGui extends JPanel
 
     private static final long serialVersionUID = 240L;
 
-    private static final Logger log = LoggingManager.getLoggerForClass();
-
     private static final int TAB_PARAMETERS = 0;
     
     private static final int TAB_RAW_BODY = 1;
@@ -326,31 +321,25 @@ public class UrlConfigGui extends JPanel
     }
 
     private void init() {// called from ctor, so must not be overridable
-    	try {
-	        this.setLayout(new BorderLayout());
-	
-	        // WEB REQUEST PANEL
-	        JPanel webRequestPanel = new JPanel();
-	        webRequestPanel.setLayout(new BorderLayout());
-	        webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
-	                JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
-	
-	        JPanel northPanel = new JPanel();
-	        northPanel.setLayout(new BoxLayout(northPanel, BoxLayout.Y_AXIS));
-	        northPanel.add(getProtocolAndMethodPanel());
-	        northPanel.add(getPathPanel());
-	
-	        webRequestPanel.add(northPanel, BorderLayout.NORTH);
-	        webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
-	
-	        this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
-	        this.add(webRequestPanel, BorderLayout.CENTER);
-	        this.add(getProxyServerPanel(), BorderLayout.SOUTH);
-    	}
-        catch (HeadlessException e){
-        	// When running in Headless mode, avoid unit tests failures
-            log.warn(e.toString());
-        } 
+        this.setLayout(new BorderLayout());
+
+        // WEB REQUEST PANEL
+        JPanel webRequestPanel = new JPanel();
+        webRequestPanel.setLayout(new BorderLayout());
+        webRequestPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
+                JMeterUtils.getResString("web_request"))); // $NON-NLS-1$
+
+        JPanel northPanel = new JPanel();
+        northPanel.setLayout(new BoxLayout(northPanel, BoxLayout.Y_AXIS));
+        northPanel.add(getProtocolAndMethodPanel());
+        northPanel.add(getPathPanel());
+
+        webRequestPanel.add(northPanel, BorderLayout.NORTH);
+        webRequestPanel.add(getParameterPanel(), BorderLayout.CENTER);
+
+        this.add(getWebServerTimeoutPanel(), BorderLayout.NORTH);
+        this.add(webRequestPanel, BorderLayout.CENTER);
+        this.add(getProxyServerPanel(), BorderLayout.SOUTH); 
     }
 
     /**



Mime
View raw message