svn commit: r1771634 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java

[pm...@apache.org]

Author: pmouawad
Date: Sun Nov 27 20:07:54 2016
New Revision: 1771634

URL: http://svn.apache.org/viewvc?rev=1771634&view=rev
Log:
Drop deprecated code

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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java?rev=1771634&r1=1771633&r2=1771634&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java Sun Nov 27 20:07:54 2016
@@ -20,7 +20,6 @@ package org.apache.jmeter.protocol.http.
 
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -30,7 +29,6 @@ import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JFileChooser;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -60,10 +58,6 @@ public class HTTPFileArgsPanel extends J
 
     private static final long serialVersionUID = 240L;
 
-    /** The title label for this component. */
-    @Deprecated
-    private JLabel tableLabel;
-
     /** The table containing the list of files. */
     private transient JTable table;
 
@@ -103,19 +97,6 @@ public class HTTPFileArgsPanel extends J
     public HTTPFileArgsPanel() {
         init();
     }
-    
-    /**
-     * Create a new HTTPFileArgsPanel as an embedded component, using the
-     * specified title.
-     *
-     * @param label the title for the component.
-     * @deprecated will be removed in the next version
-     */
-    @Deprecated
-    public HTTPFileArgsPanel(String label) {
-        tableLabel = new JLabel(label);
-        init();
-    }
 
     /**
      * Initialize the table model used for the http files table.
@@ -335,17 +316,6 @@ public class HTTPFileArgsPanel extends J
     }
 
     /**
-     * Create a panel containing the title label for the table.
-     * @return a panel containing the title label
-     */
-    @Deprecated
-    private Component makeLabelPanel() {
-        JPanel labelPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        labelPanel.add(tableLabel);
-        return labelPanel;
-    }
-
-    /**
      * Create a panel containing the add and delete buttons.
      *
      * @return a GUI panel containing the buttons
@@ -382,10 +352,6 @@ public class HTTPFileArgsPanel extends J
 
         p.setLayout(new BorderLayout());
 
-        // retro compatibility, will be removed in the next version
-        if(tableLabel != null) {
-            p.add(makeLabelPanel(), BorderLayout.NORTH);
-        }
         p.add(makeMainPanel(), BorderLayout.CENTER);
         // Force a minimum table height of 70 pixels
         p.add(Box.createVerticalStrut(70), BorderLayout.WEST);