Reversed incorrect checkin

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7438 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/ui/common/ConstantMethodBinding.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.ui.common;
+
+import javax.faces.component.StateHolder;
+import javax.faces.context.FacesContext;
+import javax.faces.el.MethodBinding;
+
+public class ConstantMethodBinding extends MethodBinding implements StateHolder
+{
+   private String outcome = null;
+   private boolean transientFlag = false;
+
+   public ConstantMethodBinding()
+   {
+   }
+
+   public ConstantMethodBinding(String yourOutcome)
+   {
+      outcome = yourOutcome;
+   }
+
+   public Object invoke(FacesContext context, Object params[])
+   {
+      return outcome;
+   }
+
+   public Class getType(FacesContext context)
+   {
+      return String.class;
+   }
+
+   public Object saveState(FacesContext context)
+   {
+      return outcome;
+   }
+
+   public void restoreState(FacesContext context, Object state)
+   {
+      outcome = (String) state;
+   }
+
+   public boolean isTransient()
+   {
+      return (this.transientFlag);
+   }
+
+   public void setTransient(boolean transientFlag)
+   {
+      this.transientFlag = transientFlag;
+   }
+}

source/java/org/alfresco/web/ui/common/component/SelfRenderingComponent.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.ui.common.component;
+
+import java.io.IOException;
+
+import javax.faces.component.UIComponentBase;
+import javax.faces.context.ResponseWriter;
+
+
+/**
+ * @author kevinr
+ */
+public abstract class SelfRenderingComponent extends UIComponentBase
+{
+   /**
+    * Default Constructor
+    */
+   public SelfRenderingComponent()
+   {
+      // specifically set the renderer type to null to indicate to the framework
+      // that this component renders itself - there is no abstract renderer class
+      setRendererType(null);
+   }
+   
+   /**
+    * Helper to output an attribute to the output stream
+    * 
+    * @param out        ResponseWriter
+    * @param attr       attribute value object (cannot be null)
+    * @param mapping    mapping to output as e.g. style="..."
+    * 
+    * @throws IOException
+    */
+   protected static void outputAttribute(ResponseWriter out, Object attr, String mapping)
+      throws IOException
+   {
+      if (attr != null)
+      {
+         out.write(' ');
+         out.write(mapping);
+         out.write("=\"");
+         out.write(attr.toString());
+         out.write('"');
+      }
+   }
+}

source/java/org/alfresco/web/ui/common/tag/BaseComponentTag.java

@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of 
+ * the GPL, you may redistribute this Program in connection with Free/Libre 
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's 
+ * FLOSS exception.  You should have recieved a copy of the text describing 
+ * the FLOSS exception, and it is also available here: 
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.ui.common.tag;
+
+import javax.faces.FacesException;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.webapp.UIComponentTag;
+
+import org.alfresco.web.ui.common.ConstantMethodBinding;
+
+/**
+ * @author Kevin Roast
+ */
+public abstract class BaseComponentTag extends UIComponentTag
+{
+   /**
+    * Helper to set an action property into a command component
+    * 
+    * @param command    Command component
+    * @param action     The action method binding or outcome to set
+    */
+   protected void setActionProperty(UICommand command, String action)
+   {
+      if (action != null)
+      {
+         if (isValueReference(action))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(action, null);
+            command.setAction(vb);
+         }
+         else
+         {
+            MethodBinding vb = new ConstantMethodBinding(action);
+            command.setAction(vb);
+         }
+      }
+   }
+   
+   /**
+    * Helper to set an action listener property into a command component
+    * 
+    * @param command          Command component
+    * @param actionListener   Action listener method binding
+    */
+   protected void setActionListenerProperty(UICommand command, String actionListener)
+   {
+      if (actionListener != null)
+      {
+         if (isValueReference(actionListener))
+         {
+            MethodBinding vb = getFacesContext().getApplication().createMethodBinding(actionListener, ACTION_CLASS_ARGS);
+            command.setActionListener(vb);
+         }
+         else
+         {
+            throw new FacesException("Action listener method binding incorrectly specified: " + actionListener);
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String property value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value
+    */
+   protected void setStringProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            component.getAttributes().put(name, value);
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String value property into the component.
+    * Assumes the that the property value can only be a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value binding
+    */
+   protected void setStringBindingProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            throw new IllegalArgumentException("Property: '" + name + "' must be a value binding expression.");
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a static String property into the component.
+    * Assumes the that the property value can only be a static string value.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string static value
+    */
+   protected void setStringStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         component.getAttributes().put(name, value);
+      }
+   }
+   
+   /**
+    * Helper method to set a String property as an Integer value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value (an Integer will be created)
+    */
+   protected void setIntProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            try
+            {
+               component.getAttributes().put(name, Integer.valueOf(value));
+            }
+            catch (NumberFormatException ne)
+            {
+               throw new RuntimeException("Was expecting Int value for property '" + name + "' but passed value: " + value); 
+            }
+         }
+      }
+   }
+   
+   protected void setIntStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         try
+         {
+            component.getAttributes().put(name, Integer.valueOf(value));
+         }
+         catch (NumberFormatException ne)
+         {
+            throw new RuntimeException("Was expecting Int value for property '" + name + "' but passed value: " + value); 
+         }
+      }
+   }
+   
+   /**
+    * Helper method to set a String property as an Boolean value into the component.
+    * Respects the possibility that the property value is a Value Binding.
+    * 
+    * @param component  UIComponent
+    * @param name       property string name
+    * @param value      property string value (a Boolean will be created)
+    */
+   protected void setBooleanProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         if (isValueReference(value))
+         {
+            ValueBinding vb = getFacesContext().getApplication().createValueBinding(value);
+            component.setValueBinding(name, vb);
+         }
+         else
+         {
+            component.getAttributes().put(name, Boolean.valueOf(value));
+         }
+      }
+   }
+   
+   protected void setBooleanStaticProperty(UIComponent component, String name, String value)
+   {
+      if (value != null)
+      {
+         component.getAttributes().put(name, Boolean.valueOf(value));
+      }
+   }
+   
+   protected final static Class ACTION_CLASS_ARGS[] = {javax.faces.event.ActionEvent.class};
+}

source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java

@@ -36,10 +36,10 @@ import javax.faces.context.ResponseWriter;
 import org.alfresco.config.Config;
 import org.alfresco.config.ConfigService;
 import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.repo.web.scripts.bean.SearchProxy;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.config.OpenSearchConfigElement;
 import org.alfresco.web.config.OpenSearchConfigElement.EngineConfig;
+import org.alfresco.web.scripts.bean.SearchProxy;
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.SelfRenderingComponent;
 import org.springframework.web.jsf.FacesContextUtils;