Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-10-15 15:02:20 +00:00 · 2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions
--- a/source/java/org/alfresco/service/cmr/action/CompositeActionCondition.java
+++ b/source/java/org/alfresco/service/cmr/action/CompositeActionCondition.java
@@ -1,87 +1,87 @@
-package org.alfresco.service.cmr.action;
-
-import java.util.List;
-
-import org.alfresco.api.AlfrescoPublicApi;
-
-/**
- * Composite action condition
- * 
- * @author Jean Barmash
- */
-@AlfrescoPublicApi
-public interface CompositeActionCondition extends ActionCondition
-{
-
-    public static String COMPOSITE_CONDITION = "composite-condition";
-
-    /**
-     * Indicates whether there are any Conditions
-     * 
-     * @return  true if there are ActionConditions, false otherwise
-     */
-    boolean hasActionConditions();
-
-    /**
-     * Add an ActionCondition to the end of the list
-     * 
-     * @param ActionCondition  the ActionCondition
-     */
-    void addActionCondition(ActionCondition ActionCondition);
-
-    /**
-     * Add an ActionCondition to the list at the index specified
-     * 
-     * @param index        the index
-     * @param ActionCondition    the ActionCondition
-     */
-    void addActionCondition(int index, ActionCondition ActionCondition);
-
-    /**
-     * Replace the ActionCondition at the specified index with the passed ActionCondition.
-     * 
-     * @param index        the index
-     * @param ActionCondition    the ActionCondition
-     */
-    void setActionCondition(int index, ActionCondition ActionCondition);
-
-    /**
-     * Gets the index of an ActionCondition
-     * 
-     * @param ActionCondition    the ActionCondition
-     * @return            the index
-     */
-    int indexOfActionCondition(ActionCondition ActionCondition);
-
-    /**
-     * Get list containing the ActionConditions in their current order
-     * 
-     * @return  the list of ActionConditions
-     */
-    List<ActionCondition> getActionConditions();
-
-    /**
-     * Get an ActionCondition at a given index
-     * 
-     * @param index        the index
-     * @return            the ActionCondition
-     */
-    ActionCondition getActionCondition(int index);
-
-    /**
-     * Remove an ActionCondition from the list
-     * 
-     * @param ActionCondition  the ActionCondition
-     */
-    void removeActionCondition(ActionCondition ActionCondition);
-
-    /**
-     * Remove all ActionConditions from the list
-     */
-    void removeAllActionConditions();
-
-    public boolean isORCondition();
-
-    public void setORCondition(boolean andOr);    
-
-}
+package org.alfresco.service.cmr.action;
+
+import java.util.List;
+
+import org.alfresco.api.AlfrescoPublicApi;
+
+/**
+ * Composite action condition
+ * 
+ * @author Jean Barmash
+ */
+@AlfrescoPublicApi
+public interface CompositeActionCondition extends ActionCondition
+{
+
+    public static String COMPOSITE_CONDITION = "composite-condition";
+
+    /**
+     * Indicates whether there are any Conditions
+     * 
+     * @return  true if there are ActionConditions, false otherwise
+     */
+    boolean hasActionConditions();
+
+    /**
+     * Add an ActionCondition to the end of the list
+     * 
+     * @param ActionCondition  the ActionCondition
+     */
+    void addActionCondition(ActionCondition ActionCondition);
+
+    /**
+     * Add an ActionCondition to the list at the index specified
+     * 
+     * @param index        the index
+     * @param ActionCondition    the ActionCondition
+     */
+    void addActionCondition(int index, ActionCondition ActionCondition);
+
+    /**
+     * Replace the ActionCondition at the specified index with the passed ActionCondition.
+     * 
+     * @param index        the index
+     * @param ActionCondition    the ActionCondition
+     */
+    void setActionCondition(int index, ActionCondition ActionCondition);
+
+    /**
+     * Gets the index of an ActionCondition
+     * 
+     * @param ActionCondition    the ActionCondition
+     * @return            the index
+     */
+    int indexOfActionCondition(ActionCondition ActionCondition);
+
+    /**
+     * Get list containing the ActionConditions in their current order
+     * 
+     * @return  the list of ActionConditions
+     */
+    List<ActionCondition> getActionConditions();
+
+    /**
+     * Get an ActionCondition at a given index
+     * 
+     * @param index        the index
+     * @return            the ActionCondition
+     */
+    ActionCondition getActionCondition(int index);
+
+    /**
+     * Remove an ActionCondition from the list
+     * 
+     * @param ActionCondition  the ActionCondition
+     */
+    void removeActionCondition(ActionCondition ActionCondition);
+
+    /**
+     * Remove all ActionConditions from the list
+     */
+    void removeAllActionConditions();
+
+    public boolean isORCondition();
+
+    public void setORCondition(boolean andOr);    
+
+}