khammond    01/10/07 08:36:08

  Modified:    src/org/apache/jmeter/protocol/http/control/gui
                        HttpTestSampleGui.java
  Log:
  New GUI style.
  
  Revision  Changes    Path
  1.11      +188 -195  
jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
  
  Index: HttpTestSampleGui.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HttpTestSampleGui.java    2001/08/31 00:46:44     1.10
  +++ HttpTestSampleGui.java    2001/10/07 15:36:08     1.11
  @@ -1,195 +1,188 @@
  -/*
  - * ====================================================================
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - * notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - * notice, this list of conditions and the following disclaimer in
  - * the documentation and/or other materials provided with the
  - * distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - * if any, must include the following acknowledgment:
  - * "This product includes software developed by the
  - * Apache Software Foundation (http://www.apache.org/)."
  - * Alternately, this acknowledgment may appear in the software itself,
  - * if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "Apache" and "Apache Software Foundation" and
  - * "Apache JMeter" must not be used to endorse or promote products
  - * derived from this software without prior written permission. For
  - * written permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - * "Apache JMeter", nor may "Apache" appear in their name, without
  - * prior written permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -package org.apache.jmeter.protocol.http.control.gui;
  -
  -import java.awt.*;
  -import java.awt.event.*;
  -import javax.swing.*;
  -import java.util.*;
  -
  -import org.apache.jmeter.gui.*;
  -
  -import org.apache.jmeter.protocol.http.control.HttpTestSample;
  -import org.apache.jmeter.protocol.http.config.gui.UrlConfigGui;
  -import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
  -import org.apache.jmeter.protocol.http.config.gui.MultipartUrlConfigGui;
  -
  -/************************************************************
  - *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
  - *
  - *@author     Michael Stover
  - *@created    $Date: 2001/08/31 00:46:44 $
  - *@version    1.0
  - ***********************************************************/
  -
  -public class HttpTestSampleGui extends JPanel implements ModelSupported
  -{
  -
  -     private HttpTestSample model;
  -     private NamePanel namePanel;
  -     private UrlConfigGui defaultUrlGui;
  -     private JCheckBox getImages;
  -     private JCheckBox multipart;
  -     private static ResourceBundle rb = 
ResourceBundle.getBundle("org.apache.jmeter.resources.messages");
  -     private JPanel urlPanel = new JPanel();
  -
  -     /************************************************************
  -      *  !ToDo (Constructor description)
  -      ***********************************************************/
  -     public HttpTestSampleGui()
  -     {
  -     }
  -
  -     /************************************************************
  -      *  !ToDo (Method description)
  -      *
  -      *@param  model  !ToDo (Parameter description)
  -      ***********************************************************/
  -     public void setModel(Object model)
  -     {
  -             this.model = (HttpTestSample)model;
  -             init();
  -             updateGui();
  -     }
  -
  -     /************************************************************
  -      *  !ToDo (Method description)
  -      ***********************************************************/
  -     public void updateGui()
  -     {
  -             namePanel.updateGui();
  -             defaultUrlGui.updateGui();
  -             getImages.setSelected(model.isGetImages());
  -             multipart.setSelected((isMultipart()));
  -             this.validate();
  -             urlPanel.validate();
  -             this.repaint();
  -     }
  -
  -     private void init()
  -     {
  -             this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
  -             namePanel = new NamePanel();
  -             namePanel.setModel(model);
  -             this.add(namePanel);
  -             add(createChoicesPanel());
  -             urlPanel.setLayout(new BoxLayout(urlPanel, BoxLayout.X_AXIS));
  -             
urlPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
 rb.getString("default_parameters")));
  -             if (isMultipart())
  -             {
  -                     defaultUrlGui = new MultipartUrlConfigGui(false);
  -             }
  -             else
  -             {
  -                     defaultUrlGui = new UrlConfigGui(false);
  -             }
  -             defaultUrlGui.setModel(model.getDefaultUrl());
  -             urlPanel.add(defaultUrlGui);
  -             this.add(urlPanel);
  -     }
  -
  -     private JPanel createChoicesPanel()
  -     {
  -             JPanel panel = new JPanel();
  -             getImages = new JCheckBox("Retrieve Images");
  -             getImages.addActionListener(new GetImagesListener());
  -             panel.add(getImages);
  -             multipart = new JCheckBox("Multipart Form");
  -             multipart.addActionListener(new MultipartListener());
  -             panel.add(multipart);
  -             return panel;
  -     }
  -
  -     private boolean isMultipart()
  -     {
  -             return (model.getDefaultUrl() instanceof MultipartUrlConfig);
  -     }
  -
  -     private class GetImagesListener implements ActionListener
  -     {
  -             public void actionPerformed(ActionEvent e)
  -             {
  -                     if(getImages.isSelected())
  -                     {
  -                             model.setGetImages(true);
  -                     }
  -                     else
  -                     {
  -                             model.setGetImages(false);
  -                     }
  -             }
  -     }
  -
  -     private class MultipartListener implements ActionListener
  -     {
  -             public void actionPerformed(ActionEvent e)
  -             {
  -                     urlPanel.removeAll();
  -                     if(multipart.isSelected())
  -                     {
  -                             model.convertUrlToMultipart();
  -                             defaultUrlGui = new MultipartUrlConfigGui(false);
  -                     }
  -                     else
  -                     {
  -                             model.convertUrlToDefault();
  -                             defaultUrlGui = new UrlConfigGui(false);
  -                     }
  -                     defaultUrlGui.setModel(model.getDefaultUrl());
  -                             urlPanel.add(defaultUrlGui);
  -                     updateGui();
  -             }
  -     }
  -}
  +/*
  + * ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + * notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + * notice, this list of conditions and the following disclaimer in
  + * the documentation and/or other materials provided with the
  + * distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + * if any, must include the following acknowledgment:
  + * "This product includes software developed by the
  + * Apache Software Foundation (http://www.apache.org/)."
  + * Alternately, this acknowledgment may appear in the software itself,
  + * if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" and
  + * "Apache JMeter" must not be used to endorse or promote products
  + * derived from this software without prior written permission. For
  + * written permission, please contact [EMAIL PROTECTED]
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + * "Apache JMeter", nor may "Apache" appear in their name, without
  + * prior written permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + */
  +
  +package org.apache.jmeter.protocol.http.control.gui;
  +
  +import java.awt.*;
  +import java.awt.event.*;
  +import javax.swing.*;
  +import javax.swing.border.*;
  +import java.util.*;
  +
  +import org.apache.jmeter.gui.*;
  +import org.apache.jmeter.util.JMeterUtils;
  +import org.apache.jmeter.protocol.http.control.HttpTestSample;
  +import org.apache.jmeter.protocol.http.config.gui.UrlConfigGui;
  +import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
  +import org.apache.jmeter.protocol.http.config.gui.MultipartUrlConfigGui;
  +
  +/************************************************************
  + *  Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
  + *
  + *@author     Michael Stover
  + *@created    $Date: 2001/10/07 15:36:08 $
  + *@version    1.0
  + ***********************************************************/
  +
  +public class HttpTestSampleGui extends JPanel implements ModelSupported
  +{
  +     private HttpTestSample model;
  +     private NamePanel namePanel;
  +     private UrlConfigGui urlConfigGui;
  +     private JCheckBox getImages;
  +
  +     /************************************************************
  +      *  !ToDo (Constructor description)
  +      ***********************************************************/
  +     public HttpTestSampleGui()
  +     {
  +     }
  +
  +     /************************************************************
  +      *  !ToDo (Method description)
  +      *
  +      *@param  model  !ToDo (Parameter description)
  +      ***********************************************************/
  +     public void setModel(Object model)
  +     {
  +             this.model = (HttpTestSample)model;
  +             
  +             init();
  +             updateGui();
  +     }
  +
  +     /************************************************************
  +      *  !ToDo (Method description)
  +      ***********************************************************/
  +     public void updateGui()
  +     {
  +             namePanel.updateGui();
  +             urlConfigGui.updateGui();
  +
  +             getImages.setSelected(model.isGetImages());
  +
  +             this.validate();
  +             this.repaint();
  +     }
  +
  +     private void init()
  +     {
  +             this.setLayout(new VerticalLayout(5, VerticalLayout.LEFT, 
VerticalLayout.TOP));
  +
  +             // MAIN PANEL
  +             JPanel mainPanel = new JPanel();
  +             Border margin = new EmptyBorder(10, 10, 5, 10);
  +             mainPanel.setBorder(margin);
  +             mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.LEFT));
  +
  +             // TITLE
  +             JLabel panelTitleLabel = new 
JLabel(JMeterUtils.getResString("web_testing_title"));
  +             Font curFont = panelTitleLabel.getFont();
  +             int curFontSize = curFont.getSize();
  +             curFontSize += 4;
  +             panelTitleLabel.setFont(new Font(curFont.getFontName(), 
curFont.getStyle(), curFontSize));
  +             mainPanel.add(panelTitleLabel);
  +
  +             // NAME
  +             namePanel = new NamePanel(model);
  +             mainPanel.add(namePanel);
  +
  +             // URL CONFIG
  +             model.convertUrlToMultipart();
  +             urlConfigGui = new MultipartUrlConfigGui(false);
  +             urlConfigGui.setModel(model.getDefaultUrl());
  +             mainPanel.add(urlConfigGui);
  +
  +             // OPTIONAL TASKS
  +             mainPanel.add(createOptionalTasksPanel());
  +
  +             this.add(mainPanel);
  +     }
  +
  +     private JPanel createOptionalTasksPanel()
  +     {
  +             // OPTIONAL TASKS
  +             JPanel optionalTasksPanel = new JPanel();
  +             optionalTasksPanel.setLayout(new VerticalLayout(5, 
VerticalLayout.LEFT, VerticalLayout.TOP));
  +             
optionalTasksPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
 JMeterUtils.getResString("optional_tasks")));
  +
  +             // RETRIEVE IMAGES
  +             JPanel retrieveImagesPanel = new JPanel();
  +             retrieveImagesPanel.setLayout(new BoxLayout(retrieveImagesPanel, 
BoxLayout.X_AXIS));
  +             retrieveImagesPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 
0, 10));
  +             getImages = new 
JCheckBox(JMeterUtils.getResString("web_testing_retrieve_images"));
  +             getImages.addActionListener(new GetImagesListener());
  +             retrieveImagesPanel.add(getImages);
  +
  +             optionalTasksPanel.add(retrieveImagesPanel);
  +
  +             return optionalTasksPanel;
  +     }
  +
  +     private class GetImagesListener implements ActionListener
  +     {
  +             public void actionPerformed(ActionEvent e)
  +             {
  +                     if (getImages.isSelected())
  +                     {
  +                             model.setGetImages(true);
  +                     }
  +                     else
  +                     {
  +                             model.setGetImages(false);
  +                     }
  +             }
  +     }
  +}
  
  
  

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

Reply via email to