You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ma...@apache.org on 2001/11/08 04:34:39 UTC

cvs commit: jakarta-struts/web/exercise-taglib html-select.jsp

martinc     01/11/07 19:34:39

  Modified:    web/example subscription.jsp
               web/exercise-taglib html-select.jsp
  Added:       src/share/org/apache/struts/util LabelValueBean.java
  Removed:     src/example/org/apache/struts/webapp/example
                        LabelValueBean.java
               src/exercise-taglib/org/apache/struts/webapp/exercise
                        OptionBean.java
  Log:
  Combined two bean classes, that did almost the same thing, into one class
  which is now part of the Struts core. This new class - LabelValueBean -
  can be used to build a collection of name/value pairs suitable for the
  <html:options> tag, amongst other uses.
  
  Revision  Changes    Path
  1.1                  jakarta-struts/src/share/org/apache/struts/util/LabelValueBean.java
  
  Index: LabelValueBean.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/LabelValueBean.java,v 1.1 2001/11/08 03:34:39 martinc Exp $
   * $Revision: 1.1 $
   * $Date: 2001/11/08 03:34:39 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-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 acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Struts", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * 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.struts.util;
  
  
  /**
   * A simple JavaBean to represent label-value pairs. This is most commonly used
   * when constructing user interface elements which have a label to be displayed
   * to the user, and a corresponding value to be returned to the server. One
   * example is the <code>&lt;html:options&gt;</code> tag.
   *
   * @author  Craig R. McClanahan
   * @author  Martin F N Cooper
   * @version $Revision: 1.1 $ $Date: 2001/11/08 03:34:39 $
   */
  
  public class LabelValueBean {
  
  
      // ----------------------------------------------------------- Constructors
  
  
      /**
       * Construct an instance with the supplied property values.
       *
       * @param label The label to be displayed to the user.
       * @param value The value to be returned to the server.
       */
      public LabelValueBean(String label, String value) {
          this.label = label;
          this.value = value;
      }
  
  
      // ------------------------------------------------------------- Properties
  
  
      /**
       * The property which supplies the option label visible to the end user.
       */
      private String label;
  
      public String getLabel() {
          return this.label;
      }
  
      public void setLabel(String label) {
          this.label = label;
      }
  
  
      /**
       * The property which supplies the value returned to the server.
       */
      private String value;
  
      public String getValue() {
          return this.value;
      }
  
      public void setValue(String value) {
          this.value = value;
      }
  
  
      // --------------------------------------------------------- Public Methods
  
  
      /**
       * Return a string representation of this object.
       */
      public String toString() {
          StringBuffer sb = new StringBuffer("LabelValueBean[");
          sb.append(this.label);
          sb.append(", ");
          sb.append(this.value);
          sb.append("]");
          return (sb.toString());
      }
  
  
  }
  
  
  
  1.25      +2 -2      jakarta-struts/web/example/subscription.jsp
  
  Index: subscription.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/subscription.jsp,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- subscription.jsp	2001/04/11 02:08:50	1.24
  +++ subscription.jsp	2001/11/08 03:34:39	1.25
  @@ -8,8 +8,8 @@
   <%-- In real life, these would be loaded from a database --%>
   <%
     java.util.ArrayList list = new java.util.ArrayList();
  -  list.add(new org.apache.struts.webapp.example.LabelValueBean("IMAP Protocol", "imap"));
  -  list.add(new org.apache.struts.webapp.example.LabelValueBean("POP3 Protocol", "pop3"));
  +  list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
  +  list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
     pageContext.setAttribute("serverTypes", list);
   %>
   
  
  
  
  1.3       +11 -11    jakarta-struts/web/exercise-taglib/html-select.jsp
  
  Index: html-select.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/exercise-taglib/html-select.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- html-select.jsp	2001/10/15 05:50:11	1.2
  +++ html-select.jsp	2001/11/08 03:34:39	1.3
  @@ -1,4 +1,4 @@
  -<%@ page language="java" import="java.util.*, org.apache.struts.webapp.exercise.*;"%>
  +<%@ page language="java" import="java.util.*, org.apache.struts.util.*;"%>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -12,16 +12,16 @@
     pageContext.setAttribute("multipleValues", multipleValues);
   
     Vector options = new Vector();
  -  options.add(new OptionBean("Label 0", "Value 0"));
  -  options.add(new OptionBean("Label 1", "Value 1"));
  -  options.add(new OptionBean("Label 2", "Value 2"));
  -  options.add(new OptionBean("Label 3", "Value 3"));
  -  options.add(new OptionBean("Label 4", "Value 4"));
  -  options.add(new OptionBean("Label 5", "Value 5"));
  -  options.add(new OptionBean("Label 6", "Value 6"));
  -  options.add(new OptionBean("Label 7", "Value 7"));
  -  options.add(new OptionBean("Label 8", "Value 8"));
  -  options.add(new OptionBean("Label 9", "Value 9"));
  +  options.add(new LabelValueBean("Label 0", "Value 0"));
  +  options.add(new LabelValueBean("Label 1", "Value 1"));
  +  options.add(new LabelValueBean("Label 2", "Value 2"));
  +  options.add(new LabelValueBean("Label 3", "Value 3"));
  +  options.add(new LabelValueBean("Label 4", "Value 4"));
  +  options.add(new LabelValueBean("Label 5", "Value 5"));
  +  options.add(new LabelValueBean("Label 6", "Value 6"));
  +  options.add(new LabelValueBean("Label 7", "Value 7"));
  +  options.add(new LabelValueBean("Label 8", "Value 8"));
  +  options.add(new LabelValueBean("Label 9", "Value 9"));
     pageContext.setAttribute("options", options);
   %>
   </head>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>