[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/component ...

Peter Muir peter at bleepbleep.org.uk
Wed Jun 20 08:25:31 EDT 2007


  User: pmuir   
  Date: 07/06/20 08:25:31

  Modified:    ui/src/main/java/org/jboss/seam/ui/component              
                        UIConversationId.java UIEnumItem.java UILink.java
                        UITaskId.java UIButton.java
                        UIConversationPropagation.java UISelectItems.java
                        UISeamCommandBase.java UIFileUpload.java
                        UICache.java UIValidateAll.java UISelection.java
  Removed:     ui/src/main/java/org/jboss/seam/ui/component              
                        UISpan.java UIDiv.java
  Log:
  Tidy up seam ui
  
  Revision  Changes    Path
  1.3       +2 -5      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIConversationId.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIConversationId.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UIConversationId.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -38,9 +38,6 @@
   	
   	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationId";
   	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ConversationId";
  -   
  -   
      @Override
      public String getName()
      {
  @@ -79,7 +76,7 @@
         }
      }
   
  -   public abstract String getViewId();;
  +   public abstract String getViewId();
   
      public abstract void setViewId(String viewId);
      
  
  
  
  1.2       +0 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIEnumItem.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIEnumItem.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UIEnumItem.java	15 Jun 2007 17:06:57 -0000	1.1
  +++ UIEnumItem.java	20 Jun 2007 12:25:31 -0000	1.2
  @@ -11,10 +11,6 @@
   public abstract class UIEnumItem extends UISelectItem
   {
   
  -   private static final String COMPONENT_TYPE = "org.jboss.seam.ui.EnumItem";
  -
  -   private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.EnumItem";
  -
      public abstract String getEnumValue();
   
      public abstract void setEnumValue(String enumValue);
  
  
  
  1.3       +0 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UILink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UILink.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UILink.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -28,10 +28,6 @@
    */
   public abstract class UILink extends UISeamCommandBase {
   	
  -	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Link";
  -	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Link";
  -   
      public abstract String getStyleClass();
      
      public abstract void setStyleClass(String styleClass);
  
  
  
  1.2       +0 -2      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UITaskId.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UITaskId.java	15 Jun 2007 17:06:57 -0000	1.1
  +++ UITaskId.java	20 Jun 2007 12:25:31 -0000	1.2
  @@ -35,8 +35,6 @@
   	
   	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.TaskId";
   	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.TaskId";
  -	
      @Override
      public String getName()
      {
  
  
  
  1.3       +0 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIButton.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIButton.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIButton.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIButton.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UIButton.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -28,10 +28,6 @@
    */
   public abstract class UIButton extends UISeamCommandBase  {
   	
  -	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Button";
  -	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Button";
  -   
   	public abstract String getStyleClass();
      
      public abstract void setStyleClass(String styleClass);
  
  
  
  1.2       +0 -2      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIConversationPropagation.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UIConversationPropagation.java	15 Jun 2007 17:06:57 -0000	1.1
  +++ UIConversationPropagation.java	20 Jun 2007 12:25:31 -0000	1.2
  @@ -32,8 +32,6 @@
   	
   	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationPropagation";
   	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ConversationPropagation";
  -   
      @Override
      public String getName()
      {
  
  
  
  1.3       +0 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISelectItems.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UISelectItems.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UISelectItems.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -44,10 +44,6 @@
    */
   public abstract class UISelectItems extends javax.faces.component.UISelectItems {
   	
  -	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.SelectItems";
  -	
  -	private static final String COMPONENT_FAMILY = "javax.faces.SelectItems";
  -   
      private Object value;
      
      private class NullableSelectItem extends javax.faces.model.SelectItem
  
  
  
  1.5       +6 -10     jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISeamCommandBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- UISeamCommandBase.java	20 Jun 2007 09:54:37 -0000	1.4
  +++ UISeamCommandBase.java	20 Jun 2007 12:25:31 -0000	1.5
  @@ -12,7 +12,6 @@
   import javax.faces.component.UIOutput;
   import javax.faces.component.UIParameter;
   import javax.faces.context.FacesContext;
  -import javax.faces.el.MethodBinding;
   import javax.faces.event.ActionListener;
   import javax.faces.model.DataModel;
   
  @@ -59,12 +58,11 @@
            }
         }
   
  -      MethodBinding action = getAction();
  -      if (action != null)
  +      if (getAction() != null)
         {
   
            UIAction uiAction = new UIAction();
  -         uiAction.setAction(action.getExpressionString());
  +         uiAction.setAction(getAction().getExpressionString());
            url.addParameter(uiAction);
         }
   
  @@ -163,19 +161,17 @@
   
      public void removeActionListener(ActionListener listener)
      {
  -      // TODO Auto-generated method stub
  -
  +      throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button");
      }
   
      public ActionListener[] getActionListeners()
      {
  -      // TODO Auto-generated method stub
  -      return null;
  +      throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button");
      }
   
      public void addActionListener(ActionListener listener)
      {
  -      // TODO Auto-generated method stub
  +      throw new UnsupportedOperationException("Action listeners not supported by s:link/s:button");
   
      }
   
  
  
  
  1.3       +0 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIFileUpload.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIFileUpload.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UIFileUpload.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -24,10 +24,6 @@
   
      private InputStream localInputStream;
   
  -   private static final String COMPONENT_TYPE = "org.jboss.seam.ui.FileUpload";
  -
  -   private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.FileUpload";
  -
      @Override
      public void processUpdates(FacesContext context)
      {
  
  
  
  1.2       +0 -10     jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UICache.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UICache.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UICache.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UICache.java	15 Jun 2007 17:06:57 -0000	1.1
  +++ UICache.java	20 Jun 2007 12:25:31 -0000	1.2
  @@ -31,16 +31,6 @@
   public abstract class UICache extends UIComponentBase
   {
   
  -   private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Cache";
  -
  -   private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Cache";
  -   
  -   @Override
  -   public String getFamily()
  -   {
  -      return COMPONENT_FAMILY;
  -   }
  -   
      public abstract boolean isEnabled();
      
      public abstract void setEnabled(boolean enabled);
  
  
  
  1.3       +1 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIValidateAll.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIValidateAll.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UIValidateAll.java	20 Jun 2007 12:25:31 -0000	1.3
  @@ -9,10 +9,7 @@
   public abstract class UIValidateAll extends UIComponentBase
   {
   
  -   private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ValidateAll";
  -
  -   private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ValidateAll";
  -
  +   // TODO Make this a hidden=true, el=false property in validateAll.xml
      private boolean validatorsAdded = false;
   
      public boolean isValidatorsAdded()
  
  
  
  1.2       +0 -2      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelection.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISelection.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UISelection.java	15 Jun 2007 17:06:57 -0000	1.1
  +++ UISelection.java	20 Jun 2007 12:25:31 -0000	1.2
  @@ -35,8 +35,6 @@
   	
   	private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Selection";
   	
  -	private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Selection";
  -   
      @Override
      public String getName()
      {
  
  
  



More information about the jboss-cvs-commits mailing list