[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...

[Gavin King]

  User: gavin   
  Date: 07/06/19 15:21:17

  Modified:    src/main/org/jboss/seam    Component.java
                        InterceptionType.java Model.java
  Log:
  repackaged built-in components
  sorry for breakage, but it had to happen eventually :-(
  
  Revision  Changes    Path
  1.257     +4 -4      jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.256
  retrieving revision 1.257
  diff -u -b -r1.256 -r1.257
  --- Component.java	18 Jun 2007 21:32:03 -0000	1.256
  +++ Component.java	19 Jun 2007 19:21:17 -0000	1.257
  @@ -116,11 +116,11 @@
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.util.Conversions;
   import org.jboss.seam.util.Naming;
  -import org.jboss.seam.util.Parameters;
   import org.jboss.seam.util.Reflections;
   import org.jboss.seam.util.SortItem;
   import org.jboss.seam.util.Sorter;
   import org.jboss.seam.util.Conversions.PropertyValue;
  +import org.jboss.seam.web.Parameters;
   
   /**
    * Metamodel class for component classes.
  @@ -1347,11 +1347,11 @@
   
      private void injectParameters(Object bean)
      {
  -      Map<String, String[]> requestParameters = Parameters.getRequestParameters();
  -
  +      Parameters params = Parameters.instance();
  +      Map<String, String[]> requestParameters = params.getRequestParameters();
         for (BijectedAttribute setter: parameterSetters)
         {
  -         Object convertedValue = Parameters.convertMultiValueRequestParameter(requestParameters, setter.getName(), setter.getType());
  +         Object convertedValue = params.convertMultiValueRequestParameter(requestParameters, setter.getName(), setter.getType());
            setter.set(bean, convertedValue);
         }
      }
  
  
  
  1.6       +6 -7      jboss-seam/src/main/org/jboss/seam/InterceptionType.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptionType.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/InterceptionType.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- InterceptionType.java	11 Oct 2006 01:22:15 -0000	1.5
  +++ InterceptionType.java	19 Jun 2007 19:21:17 -0000	1.6
  @@ -1,9 +1,8 @@
  -//$Id: InterceptionType.java,v 1.5 2006/10/11 01:22:15 gavin Exp $
  +//$Id: InterceptionType.java,v 1.6 2007/06/19 19:21:17 gavin Exp $
   package org.jboss.seam;
   
  -import javax.faces.event.PhaseId;
  -
   import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.util.JSF;
   
   /**
    * Rules for when Seam will intercept invocations upon a
  @@ -48,17 +47,17 @@
      public boolean isActive()
      {
         //if ( Lifecycle.isDestroying() ) return false;
  -      final PhaseId phaseId = Lifecycle.getPhaseId();
  +      final Object phaseId = Lifecycle.getPhaseId();
         switch(this)
         {
            case NEVER:
               return false;
            case AFTER_RESTORE_VIEW:
  -            return phaseId!=PhaseId.RESTORE_VIEW;
  +            return phaseId!=JSF.RESTORE_VIEW;
            case AFTER_UPDATE_MODEL_VALUES:
  -            return phaseId!=PhaseId.RESTORE_VIEW && phaseId!=PhaseId.UPDATE_MODEL_VALUES;
  +            return phaseId!=JSF.RESTORE_VIEW && phaseId!=JSF.UPDATE_MODEL_VALUES;
            case INVOKE_APPLICATION:
  -            return phaseId==PhaseId.INVOKE_APPLICATION || phaseId==null;
  +            return phaseId==JSF.INVOKE_APPLICATION || phaseId==null;
            case ALWAYS:
               return true;
            default:
  
  
  
  1.4       +1 -1      jboss-seam/src/main/org/jboss/seam/Model.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Model.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Model.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Model.java	27 Feb 2007 15:03:07 -0000	1.3
  +++ Model.java	19 Jun 2007 19:21:17 -0000	1.4
  @@ -5,7 +5,7 @@
   
   import org.hibernate.validator.ClassValidator;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.core.ResourceBundle;
  +import org.jboss.seam.international.ResourceBundle;
   
   /**
    * Base class of metamodels. For a class which