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
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions

View File

@@ -1,21 +1,21 @@
package org.alfresco.filesys.repo.rules;
import java.util.List;
/**
* A dependent instance takes account of some other instance.
*/
public interface DependentInstance
{
/**
* Notifies the scenario that there are conflicting loosing scenarios.
* <p>
* The winning scenario may modify its behavior to take account of the loosers.
* <p>
* @param results
* @param command
* @return the new command
*/
Command win(List<ScenarioResult> results, Command command);
}
package org.alfresco.filesys.repo.rules;
import java.util.List;
/**
* A dependent instance takes account of some other instance.
*/
public interface DependentInstance
{
/**
* Notifies the scenario that there are conflicting loosing scenarios.
* <p>
* The winning scenario may modify its behavior to take account of the loosers.
* <p>
* @param results
* @param command
* @return the new command
*/
Command win(List<ScenarioResult> results, Command command);
}