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 d6f9f50c39
commit dead3c3825
265 changed files with 44099 additions and 44099 deletions

View File

@@ -1,71 +1,71 @@
package org.alfresco.web.config;
/**
* Represents the result of a navigation config result.
*
* This object holds the string result which can either represent an outcome
* or a view id.
*
* @author gavinc
*/
public class NavigationResult
{
private String result;
private boolean isOutcome = true;
/**
* Default constructor
*
* @param viewId The to-view-id value
* @param outcome The to-outcome value
*/
public NavigationResult(String viewId, String outcome)
{
if (viewId != null && outcome != null)
{
throw new IllegalStateException("You can not have both a to-view-id and to-outcome");
}
if (outcome != null)
{
this.result = outcome;
}
else if (viewId != null)
{
this.result = viewId;
this.isOutcome = false;
}
}
/**
* Returns the result
*
* @return The result
*/
public String getResult()
{
return this.result;
}
/**
* Determines whether the result is an outcome
*
* @return true if the result represents an outcome,
* false if it represents a view id
*/
public boolean isOutcome()
{
return this.isOutcome;
}
/**
* @see java.lang.Object#toString()
*/
public String toString()
{
StringBuilder buffer = new StringBuilder(super.toString());
buffer.append(" (result=").append(this.result);
buffer.append(" isOutcome=").append(this.isOutcome).append(")");
return buffer.toString();
}
}
package org.alfresco.web.config;
/**
* Represents the result of a navigation config result.
*
* This object holds the string result which can either represent an outcome
* or a view id.
*
* @author gavinc
*/
public class NavigationResult
{
private String result;
private boolean isOutcome = true;
/**
* Default constructor
*
* @param viewId The to-view-id value
* @param outcome The to-outcome value
*/
public NavigationResult(String viewId, String outcome)
{
if (viewId != null && outcome != null)
{
throw new IllegalStateException("You can not have both a to-view-id and to-outcome");
}
if (outcome != null)
{
this.result = outcome;
}
else if (viewId != null)
{
this.result = viewId;
this.isOutcome = false;
}
}
/**
* Returns the result
*
* @return The result
*/
public String getResult()
{
return this.result;
}
/**
* Determines whether the result is an outcome
*
* @return true if the result represents an outcome,
* false if it represents a view id
*/
public boolean isOutcome()
{
return this.isOutcome;
}
/**
* @see java.lang.Object#toString()
*/
public String toString()
{
StringBuilder buffer = new StringBuilder(super.toString());
buffer.append(" (result=").append(this.result);
buffer.append(" isOutcome=").append(this.isOutcome).append(")");
return buffer.toString();
}
}