You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/06/09 20:38:58 UTC

cvs commit: jakarta-tapestry/examples/Workbench build.xml

hlship      2005/06/09 11:38:58

  Modified:    examples/Workbench/src/java/org/apache/tapestry/workbench/palette
                        Palette.java
               examples/Workbench build.xml
  Log:
  Remove dependency on commons-lang.
  
  Revision  Changes    Path
  1.7       +4 -11     jakarta-tapestry/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java
  
  Index: Palette.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/src/java/org/apache/tapestry/workbench/palette/Palette.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Palette.java	11 Apr 2005 16:08:22 -0000	1.6
  +++ Palette.java	9 Jun 2005 18:38:58 -0000	1.7
  @@ -15,12 +15,9 @@
   package org.apache.tapestry.workbench.palette;
   
   import java.util.List;
  -import java.util.ResourceBundle;
   
  -import org.apache.commons.lang.enum.Enum;
   import org.apache.tapestry.IRequestCycle;
   import org.apache.tapestry.contrib.palette.SortMode;
  -import org.apache.tapestry.form.EnumPropertySelectionModel;
   import org.apache.tapestry.form.IPropertySelectionModel;
   import org.apache.tapestry.form.StringPropertySelectionModel;
   import org.apache.tapestry.html.BasePage;
  @@ -33,12 +30,12 @@
   {
       public abstract List getSelectedColors();
   
  -    public abstract SortMode getSort();
  +    public abstract String getSort();
   
       private IPropertySelectionModel _sortModel;
   
       /**
  -     * Invoked before {@link #formSubmit(IRequestCycle)}if the user clicks the "advance" button.
  +     * Invoked before {@link #formSubmit(IRequestCycle)} if the user clicks the "advance" button.
        */
   
       public void advance(IRequestCycle cycle)
  @@ -71,14 +68,10 @@
       {
           if (_sortModel == null)
           {
  -            ResourceBundle bundle = ResourceBundle.getBundle(
  -                    "org.apache.tapestry.workbench.palette.SortModeStrings",
  -                    getLocale());
  -
  -            Enum[] options = new Enum[]
  +            String[] options = new String[]
               { SortMode.NONE, SortMode.LABEL, SortMode.VALUE, SortMode.USER };
   
  -            _sortModel = new EnumPropertySelectionModel(options, bundle);
  +            _sortModel = new StringPropertySelectionModel(options);
           }
   
           return _sortModel;
  
  
  
  1.18      +0 -1      jakarta-tapestry/examples/Workbench/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tapestry/examples/Workbench/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	7 May 2005 21:57:31 -0000	1.17
  +++ build.xml	9 Jun 2005 18:38:58 -0000	1.18
  @@ -34,7 +34,6 @@
       <ibiblio-dependency artifact="bsf"                version="${bsf.version}"      group="bsf"               use="run"/>
       <ibiblio-dependency artifact="commons-codec"      version="${codec.version}"    group="commons-codec"     use="run"/>
       <ibiblio-dependency artifact="commons-fileupload" version="${fileupload.version}" group="commons-fileupload" use="run"/>        
  -    <ibiblio-dependency artifact="commons-lang"       version="${lang.version}"     group="commons-lang"      use="run"/>
       <ibiblio-dependency artifact="commons-logging"    version="${logging.version}"  group="commons-logging"   use="run"/>
       
       <ibiblio-dependency artifact="hivemind"           version="${hivemind.version}" group="hivemind"          use="run"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org