/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * 
 */

package org.apache.jmeter.protocol.ftp.control.gui;

import java.awt.BorderLayout;

import javax.swing.BorderFactory;

import org.apache.jmeter.config.gui.LoginConfigGui;
import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui;
import org.apache.jmeter.protocol.ftp.sampler.FTPSampler;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;

public class FtpTestSamplerGui extends AbstractSamplerGui {
	private LoginConfigGui loginPanel;

	private FtpConfigGui ftpDefaultPanel;

	public FtpTestSamplerGui() {
		init();
	}

	public void configure(TestElement element) {
		super.configure(element);
		loginPanel.configure(element);
		ftpDefaultPanel.configure(element);
	}

	public TestElement createTestElement() {
		FTPSampler sampler = new FTPSampler();
		modifyTestElement(sampler);
		return sampler;
	}

	/**
	 * Modifies a given TestElement to mirror the data in the gui components.
	 * 
	 * @see org.apache.jmeter.gui.JMeterGUIComponent#modifyTestElement(TestElement)
	 */
	public void modifyTestElement(TestElement sampler) {
		sampler.clear();
		((FTPSampler) sampler).addTestElement(ftpDefaultPanel.createTestElement());
		((FTPSampler) sampler).addTestElement(loginPanel.createTestElement());
		this.configureTestElement(sampler);
	}

    /**
     * Implements JMeterGUIComponent.clearGui
     */
    public void clearGui() {
        super.clearGui();

        ftpDefaultPanel.clearGui();
        loginPanel.clearGui();
    }    
    
	public String getLabelResource() {
		return "ftp_testing_title"; // $NON-NLS-1$
	}

	private void init() {
		setLayout(new BorderLayout(0, 5));
		setBorder(makeBorder());

		add(makeTitlePanel(), BorderLayout.NORTH);

		VerticalPanel mainPanel = new VerticalPanel();

		ftpDefaultPanel = new FtpConfigGui(false);
		mainPanel.add(ftpDefaultPanel);

		loginPanel = new LoginConfigGui(false);
		loginPanel.setBorder(BorderFactory.createTitledBorder(JMeterUtils.getResString("login_config"))); // $NON-NLS-1$
		mainPanel.add(loginPanel);

		add(mainPanel, BorderLayout.CENTER);
	}
}

@@ -2006,46 +2006,8 @@
 ;%0A%09%09
-((FTPSampler) sampler).addTestElement(
 ftpD
@@ -2014,30 +2014,30 @@
 efaultPanel.
-create
+modify
 TestElement(
@@ -2040,52 +2040,20 @@
 ent(
-));%0A%09%09((FTPSampler) sampler).addTestElement(
+sampler);%0A%09%09
 logi
@@ -2059,22 +2059,22 @@
 inPanel.
-create
+modify
 TestElem
@@ -2077,17 +2077,23 @@
 Element(
-)
+sampler
 );%0A%09%09thi

Change processing to be more like other GUIs