cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui MultipartUrlConfigGui.java UrlConfigGui.java

sebb        2005/06/04 03:28:04

  Modified:    src/protocol/http/org/apache/jmeter/protocol/http/config/gui
                        MultipartUrlConfigGui.java UrlConfigGui.java
  Log:
  Reorganise layout to give more room for Path field
 
  Revision  Changes    Path
  1.14      +12 -9     jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java
 
  Index: MultipartUrlConfigGui.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/MultipartUrlConfigGui.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MultipartUrlConfigGui.java 3 Jul 2004 02:39:21 -0000 1.13
  +++ MultipartUrlConfigGui.java 4 Jun 2005 10:28:04 -0000 1.14
  @@ -1,6 +1,6 @@
   // $Header$
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -132,19 +132,22 @@
           webServerPanel.add(getDomainPanel());
           webServerPanel.add(getPortPanel());
   
  +        JPanel northPanel = new JPanel();
  +        northPanel.setLayout(new BoxLayout(northPanel, BoxLayout.Y_AXIS));
  +        northPanel.add(getProtocolAndMethodPanel());
  +        northPanel.add(getPathPanel());
  +
           // WEB REQUEST PANEL
           JPanel webRequestPanel = new JPanel();
  -        webRequestPanel.setLayout(
  -            new BoxLayout(webRequestPanel, BoxLayout.Y_AXIS));
  +        webRequestPanel.setLayout(new BorderLayout());
           webRequestPanel.setBorder(
               BorderFactory.createTitledBorder(
                   BorderFactory.createEtchedBorder(),
                   JMeterUtils.getResString("web_request")));
           
  -        webRequestPanel.add(getProtocolAndMethodPanel());
  -        webRequestPanel.add(getPathPanel());
  -        webRequestPanel.add(getParameterPanel());
  -        webRequestPanel.add(getFilePanel());
  +        webRequestPanel.add(northPanel,BorderLayout.NORTH);
  +        webRequestPanel.add(getParameterPanel(),BorderLayout.CENTER);
  +        webRequestPanel.add(getFilePanel(),BorderLayout.SOUTH );
           
           this.add(webServerPanel, BorderLayout.NORTH);
           this.add(webRequestPanel, BorderLayout.CENTER);
 
 
 
  1.21      +17 -11    jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
 
  Index: UrlConfigGui.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- UrlConfigGui.java 2 Apr 2005 23:21:49 -0000 1.20
  +++ UrlConfigGui.java 4 Jun 2005 10:28:04 -0000 1.21
  @@ -1,5 +1,5 @@
   /*
  - * Copyright 2001-2004 The Apache Software Foundation.
  + * Copyright 2001-2005 The Apache Software Foundation.
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -23,6 +23,7 @@
   
   import javax.swing.BorderFactory;
   import javax.swing.Box;
  +import javax.swing.BoxLayout;
   import javax.swing.ButtonGroup;
   import javax.swing.JCheckBox;
   import javax.swing.JLabel;
  @@ -274,16 +275,21 @@
           useKeepAlive.setName(USE_KEEPALIVE);
           useKeepAlive.setSelected(true);
   
  -        JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT));
  -        panel.add(label);
  -        panel.add(Box.createHorizontalStrut(5));
  -        panel.add(path);
  -        panel.add(Box.createHorizontalStrut(10));
  -        panel.add(autoRedirects);
  -        panel.add(followRedirects);
  -        panel.add(Box.createHorizontalStrut(5));
  -        panel.add(useKeepAlive);
  -        panel.setMinimumSize(panel.getPreferredSize());
  +        JPanel pathPanel = new JPanel(new BorderLayout(5, 0));
  +        pathPanel.add(label, BorderLayout.WEST);
  +        pathPanel.add(path, BorderLayout.CENTER);
  +        pathPanel.setMinimumSize(pathPanel.getPreferredSize());
  +        
  +        JPanel optionPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
  +        optionPanel.add(autoRedirects);
  +        optionPanel.add(followRedirects);
  +        optionPanel.add(useKeepAlive);
  +        optionPanel.setMinimumSize(optionPanel.getPreferredSize());
  +        
  +        JPanel panel = new JPanel();
  +        panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
  +        panel.add(pathPanel);
  +        panel.add(optionPanel);
           return panel;
       }
   
 
 
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]