|
Author: doogie
Date: Thu Jan 14 17:50:55 2010 New Revision: 899328 URL: http://svn.apache.org/viewvc?rev=899328&view=rev Log: Replace all tabs with spaces. Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AccessController.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AdminPermission.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermission.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermissions.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsIntersection.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsSet.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsUnion.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericParametersArtifact.java ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ParametersArtifact.java ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/SecurityAwareList.java Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AccessController.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AccessController.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AccessController.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AccessController.java Thu Jan 14 17:50:55 2010 @@ -31,28 +31,28 @@ */ public interface AccessController { - /** Returns silently if the user has been granted <code>permission</code> - * access for the current artifact, throws <code>AccessControlException</code> - * otherwise.<p>Security-aware artifacts call this + /** Returns silently if the user has been granted <code>permission</code> + * access for the current artifact, throws <code>AccessControlException</code> + * otherwise.<p>Security-aware artifacts call this * method with the desired permission. If access is granted the * method returns, otherwise it throws an unchecked exception. * Higher level code can catch the exception and handle it accordingly.</p> - * - * @param permission The permission to check - * @throws AccessControlException - */ + * + * @param permission The permission to check + * @throws AccessControlException + */ public void checkPermission(Permission permission) throws AccessControlException; - /** Returns silently if the user has been granted <code>permission</code> - * access for the specified artifact, throws <code>AccessControlException</code> - * otherwise.<p>Client code can call this method when an artifact other - * than the current one needs to be checked. If access is granted the + /** Returns silently if the user has been granted <code>permission</code> + * access for the specified artifact, throws <code>AccessControlException</code> + * otherwise.<p>Client code can call this method when an artifact other + * than the current one needs to be checked. If access is granted the * method returns, otherwise it throws an unchecked exception. * Higher level code can catch the exception and handle it accordingly.</p> - * - * @param permission The permission to check - * @throws AccessControlException - */ + * + * @param permission The permission to check + * @throws AccessControlException + */ public void checkPermission(Permission permission, ArtifactPath artifactPath) throws AccessControlException; /** Applies permission filters to a <code>List</code>. The @@ -77,6 +77,6 @@ * were specified for the current artifact, or the original * <code>ListIterator</code> otherwise */ - public <E> ListIterator<E> applyFilters(ListIterator<E> list); + public <E> ListIterator<E> applyFilters(ListIterator<E> list); } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AdminPermission.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AdminPermission.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AdminPermission.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AdminPermission.java Thu Jan 14 17:50:55 2010 @@ -26,43 +26,43 @@ @SuppressWarnings("serial") public class AdminPermission extends BasicPermission { - public AdminPermission() { - super("admin=true"); - } - - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - try { - AdminPermission that = (AdminPermission) obj; - return this.permissionString.equals(that.permissionString); - } catch (Exception e) {} - return false; - } - - @Override - public String getActions() { - return null; - } - - @Override - public int hashCode() { - return this.permissionString.hashCode(); - } - - /** Returns <code>true</code> - the admin permission has - * no restrictions. - * - */ - @Override - public boolean implies(Permission permission) { - return true; - } - - @Override - public String toString() { - return this.permissionString; - } + public AdminPermission() { + super("admin=true"); + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + try { + AdminPermission that = (AdminPermission) obj; + return this.permissionString.equals(that.permissionString); + } catch (Exception e) {} + return false; + } + + @Override + public String getActions() { + return null; + } + + @Override + public int hashCode() { + return this.permissionString.hashCode(); + } + + /** Returns <code>true</code> - the admin permission has + * no restrictions. + * + */ + @Override + public boolean implies(Permission permission) { + return true; + } + + @Override + public String toString() { + return this.permissionString; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManager.java Thu Jan 14 17:50:55 2010 @@ -25,7 +25,7 @@ */ public interface AuthorizationManager { - public void assignGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException; + public void assignGroupPermission(String userGroupId, String artifactId, Permission permission) throws AuthorizationManagerException; public void assignGroupToGroup(String childGroupId, String parentGroupId) throws AuthorizationManagerException; Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/AuthorizationManagerException.java Thu Jan 14 17:50:55 2010 @@ -25,11 +25,11 @@ @SuppressWarnings("serial") public class AuthorizationManagerException extends Exception { public AuthorizationManagerException() { - super(); + super(); } public AuthorizationManagerException(String message) { - super(message); + super(message); } public AuthorizationManagerException(String message, Throwable cause) { Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermission.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermission.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermission.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermission.java Thu Jan 14 17:50:55 2010 @@ -26,60 +26,60 @@ @SuppressWarnings("serial") public class BasicPermission extends Permission { - protected final String permissionString; + protected final String permissionString; - public BasicPermission(String permissionString) { - super(permissionString); - this.permissionString = permissionString; - } - - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - try { - BasicPermission that = (BasicPermission) obj; - return this.permissionString.equals(that.permissionString); - } catch (Exception e) {} - return false; - } - - @Override - public String getActions() { - return null; - } - - @Override - public int hashCode() { - return this.permissionString.hashCode(); - } - - @Override - public boolean implies(Permission permission) { - try { - PermissionsUnion permissionsUnion = (PermissionsUnion) permission; - for (Permission perm : permissionsUnion.getPermissionsSet()) { - if (this.implies(perm)) { - return true; - } - } - return false; - } catch (Exception e) {} - try { - PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; - for (Permission perm : permissionsIntersection.getPermissionsSet()) { - if (!this.implies(perm)) { - return false; - } - } - return true; - } catch (Exception e) {} - return this.equals(permission); - } - - @Override - public String toString() { - return this.permissionString; - } + public BasicPermission(String permissionString) { + super(permissionString); + this.permissionString = permissionString; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + try { + BasicPermission that = (BasicPermission) obj; + return this.permissionString.equals(that.permissionString); + } catch (Exception e) {} + return false; + } + + @Override + public String getActions() { + return null; + } + + @Override + public int hashCode() { + return this.permissionString.hashCode(); + } + + @Override + public boolean implies(Permission permission) { + try { + PermissionsUnion permissionsUnion = (PermissionsUnion) permission; + for (Permission perm : permissionsUnion.getPermissionsSet()) { + if (this.implies(perm)) { + return true; + } + } + return false; + } catch (Exception e) {} + try { + PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; + for (Permission perm : permissionsIntersection.getPermissionsSet()) { + if (!this.implies(perm)) { + return false; + } + } + return true; + } catch (Exception e) {} + return this.equals(permission); + } + + @Override + public String toString() { + return this.permissionString; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermissions.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermissions.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermissions.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/BasicPermissions.java Thu Jan 14 17:50:55 2010 @@ -28,13 +28,13 @@ */ public class BasicPermissions { - public static final Permission Access = new BasicPermission("access=true"); - public static final Permission Admin = new AdminPermission(); - public static final Permission Create = new BasicPermission("create=true"); - public static final Permission Delete = new BasicPermission("delete=true"); - public static final Permission Update = new BasicPermission("update=true"); - public static final Permission View = new BasicPermission("view=true"); - public static final Map<String, Permission> ConversionMap = createConversionMap(); + public static final Permission Access = new BasicPermission("access=true"); + public static final Permission Admin = new AdminPermission(); + public static final Permission Create = new BasicPermission("create=true"); + public static final Permission Delete = new BasicPermission("delete=true"); + public static final Permission Update = new BasicPermission("update=true"); + public static final Permission View = new BasicPermission("view=true"); + public static final Map<String, Permission> ConversionMap = createConversionMap(); protected static Map<String, Permission> createConversionMap() { Map<String, Permission> conversionMap = FastMap.newInstance(); Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsIntersection.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsIntersection.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsIntersection.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsIntersection.java Thu Jan 14 17:50:55 2010 @@ -28,46 +28,46 @@ @SuppressWarnings("serial") public class PermissionsIntersection extends PermissionsSet { - public PermissionsIntersection(String listName) { - super(listName); - } + public PermissionsIntersection(String listName) { + super(listName); + } - public PermissionsIntersection(String listName, List<Permission> permissionsList) { - super(listName, permissionsList); - } + public PermissionsIntersection(String listName, List<Permission> permissionsList) { + super(listName, permissionsList); + } public PermissionsIntersection(String listName, Permission... permissions) { super(listName, Arrays.asList(permissions)); } - /** Returns <code>true</code> if all of the contained permissions - * return <code>true</code>. - */ - @Override - public boolean implies(Permission permission) { - try { - PermissionsUnion permissionsUnion = (PermissionsUnion) permission; - for (Permission perm : permissionsUnion.getPermissionsSet()) { - if (this.implies(perm)) { - return true; - } - } - return false; - } catch (Exception e) {} - try { - PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; - for (Permission perm : permissionsIntersection.getPermissionsSet()) { - if (!this.implies(perm)) { - return false; - } - } - return true; - } catch (Exception e) {} - for (Permission perm : this.permissionsSet) { - if (!perm.implies(permission)) { - return false; - } - } - return true; - } + /** Returns <code>true</code> if all of the contained permissions + * return <code>true</code>. + */ + @Override + public boolean implies(Permission permission) { + try { + PermissionsUnion permissionsUnion = (PermissionsUnion) permission; + for (Permission perm : permissionsUnion.getPermissionsSet()) { + if (this.implies(perm)) { + return true; + } + } + return false; + } catch (Exception e) {} + try { + PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; + for (Permission perm : permissionsIntersection.getPermissionsSet()) { + if (!this.implies(perm)) { + return false; + } + } + return true; + } catch (Exception e) {} + for (Permission perm : this.permissionsSet) { + if (!perm.implies(permission)) { + return false; + } + } + return true; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsSet.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsSet.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsSet.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsSet.java Thu Jan 14 17:50:55 2010 @@ -30,50 +30,50 @@ @SuppressWarnings("serial") public abstract class PermissionsSet extends BasicPermission { - protected final Set<Permission> permissionsSet = FastSet.newInstance(); + protected final Set<Permission> permissionsSet = FastSet.newInstance(); - public PermissionsSet(String setName) { - super(setName); - } + public PermissionsSet(String setName) { + super(setName); + } public PermissionsSet(String setName, List<Permission> permissionsList) { super(setName); this.permissionsSet.addAll(permissionsList); } - @Override - public boolean equals(Object obj) { - if (obj == this) { - return true; - } - try { - PermissionsSet that = (PermissionsSet) obj; - return this.permissionsSet.equals(that.permissionsSet); - } catch (Exception e) {} - return false; - } - - @Override - public String getActions() { - return null; - } - - @Override - public int hashCode() { - return permissionsSet.hashCode(); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - for (Permission perm : this.permissionsSet) { - sb.append(perm); - sb.append(" "); - } - return sb.toString().trim(); - } + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + try { + PermissionsSet that = (PermissionsSet) obj; + return this.permissionsSet.equals(that.permissionsSet); + } catch (Exception e) {} + return false; + } + + @Override + public String getActions() { + return null; + } + + @Override + public int hashCode() { + return permissionsSet.hashCode(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (Permission perm : this.permissionsSet) { + sb.append(perm); + sb.append(" "); + } + return sb.toString().trim(); + } - public Set<Permission> getPermissionsSet() { + public Set<Permission> getPermissionsSet() { return this.permissionsSet; } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsUnion.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsUnion.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsUnion.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/authorization/PermissionsUnion.java Thu Jan 14 17:50:55 2010 @@ -28,46 +28,46 @@ @SuppressWarnings("serial") public class PermissionsUnion extends PermissionsSet { - public PermissionsUnion(String listName) { + public PermissionsUnion(String listName) { super(listName); - } + } - public PermissionsUnion(String listName, List<Permission> permissionsList) { + public PermissionsUnion(String listName, List<Permission> permissionsList) { super(listName, permissionsList); - } + } public PermissionsUnion(String listName, Permission... permissions) { super(listName, Arrays.asList(permissions)); } - /** Returns <code>true</code> if any of the contained permissions - * returns <code>true</code>. - */ - @Override - public boolean implies(Permission permission) { - try { - PermissionsUnion permissionsUnion = (PermissionsUnion) permission; - for (Permission perm : permissionsUnion.getPermissionsSet()) { - if (this.implies(perm)) { - return true; - } - } - return false; - } catch (Exception e) {} - try { - PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; - for (Permission perm : permissionsIntersection.getPermissionsSet()) { - if (!this.implies(perm)) { - return false; - } - } - return true; - } catch (Exception e) {} - for (Permission perm : this.permissionsSet) { - if (perm.implies(permission)) { - return true; - } - } - return false; - } + /** Returns <code>true</code> if any of the contained permissions + * returns <code>true</code>. + */ + @Override + public boolean implies(Permission permission) { + try { + PermissionsUnion permissionsUnion = (PermissionsUnion) permission; + for (Permission perm : permissionsUnion.getPermissionsSet()) { + if (this.implies(perm)) { + return true; + } + } + return false; + } catch (Exception e) {} + try { + PermissionsIntersection permissionsIntersection = (PermissionsIntersection) permission; + for (Permission perm : permissionsIntersection.getPermissionsSet()) { + if (!this.implies(perm)) { + return false; + } + } + return true; + } catch (Exception e) {} + for (Permission perm : this.permissionsSet) { + if (perm.implies(permission)) { + return true; + } + } + return false; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/AbstractExecutionContext.java Thu Jan 14 17:50:55 2010 @@ -34,18 +34,18 @@ public static final String module = AbstractExecutionContext.class.getName(); protected final FastList<ExecutionArtifact> artifactStack = FastList.newInstance(); - protected String currencyUom = null; - protected Locale locale = Locale.getDefault(); - protected TimeZone timeZone = TimeZone.getDefault(); - protected final Map<String, Object> properties; - // Temporary - will be removed later - protected boolean verbose = false; - - protected AbstractExecutionContext() { - this.properties = FastMap.newInstance(); - this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "executionContext.verbose")); - } - + protected String currencyUom = null; + protected Locale locale = Locale.getDefault(); + protected TimeZone timeZone = TimeZone.getDefault(); + protected final Map<String, Object> properties; + // Temporary - will be removed later + protected boolean verbose = false; + + protected AbstractExecutionContext() { + this.properties = FastMap.newInstance(); + this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "executionContext.verbose")); + } + protected AbstractExecutionContext(Map<String, Object> properties) { this.properties = properties; this.verbose = "true".equals(UtilProperties.getPropertyValue("api.properties", "executionContext.verbose")); @@ -65,9 +65,9 @@ return this.currencyUom; } - public ArtifactPath getExecutionPath() { - return new ArtifactPath(getExecutionPathAsArray()); - } + public ArtifactPath getExecutionPath() { + return new ArtifactPath(getExecutionPathAsArray()); + } public String[] getExecutionPathAsArray() { FastList<String> elementList = FastList.newInstance(); @@ -100,21 +100,21 @@ return sb.toString(); } - public Locale getLocale() { + public Locale getLocale() { return this.locale; } public Map<String, ? extends Object> getParameters() { - for (int i = this.artifactStack.size() - 1; i >= 0; i--) { - try { - ParametersArtifact artifact = (ParametersArtifact) this.artifactStack.get(i); - return artifact.getParameters(); - } catch (Exception e) {} - } - return null; - } + for (int i = this.artifactStack.size() - 1; i >= 0; i--) { + try { + ParametersArtifact artifact = (ParametersArtifact) this.artifactStack.get(i); + return artifact.getParameters(); + } catch (Exception e) {} + } + return null; + } - public Object getProperty(String key) { + public Object getProperty(String key) { return this.properties.get(key); } @@ -123,27 +123,27 @@ } public void popExecutionArtifact() { - if (this.artifactStack.size() == 0) { - // This check is temporary - it will be removed when implementation is complete - Debug.logError(new Exception("Attempt to pop an empty stack"), module); - return; - } - ExecutionArtifact artifact = this.artifactStack.removeLast(); - if (this.verbose) { - Debug.logInfo("Popping artifact [" + artifact.getClass().getName() + - "] location = " + artifact.getLocation() + - ", name = " + artifact.getName(), module); - } - } + if (this.artifactStack.size() == 0) { + // This check is temporary - it will be removed when implementation is complete + Debug.logError(new Exception("Attempt to pop an empty stack"), module); + return; + } + ExecutionArtifact artifact = this.artifactStack.removeLast(); + if (this.verbose) { + Debug.logInfo("Popping artifact [" + artifact.getClass().getName() + + "] location = " + artifact.getLocation() + + ", name = " + artifact.getName(), module); + } + } public void pushExecutionArtifact(ExecutionArtifact artifact) { - this.artifactStack.addLast(artifact); - if (this.verbose) { - Debug.logInfo("Pushing artifact [" + artifact.getClass().getName() + - "] location = " + artifact.getLocation() + - ", name = " + artifact.getName(), module); - } - } + this.artifactStack.addLast(artifact); + if (this.verbose) { + Debug.logInfo("Pushing artifact [" + artifact.getClass().getName() + + "] location = " + artifact.getLocation() + + ", name = " + artifact.getName(), module); + } + } public void reset() { if (this.verbose) { @@ -195,7 +195,7 @@ } @Override - public String toString() { - return this.getExecutionPathAsString(); - } + public String toString() { + return this.getExecutionPathAsString(); + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionArtifact.java Thu Jan 14 17:50:55 2010 @@ -24,17 +24,17 @@ */ public interface ExecutionArtifact { - /** - * Returns the location of this artifact. - * - * @return Location of this artifact - */ - public String getLocation(); + /** + * Returns the location of this artifact. + * + * @return Location of this artifact + */ + public String getLocation(); - /** - * Returns the name of this artifact. - * - * @return Name of this artifact - */ - public String getName(); + /** + * Returns the name of this artifact. + * + * @return Name of this artifact + */ + public String getName(); } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ExecutionContext.java Thu Jan 14 17:50:55 2010 @@ -92,11 +92,11 @@ public Locale getLocale(); /** - * Returns the parameters associated with this context. - * - * @return The parameters associated with this context - */ - public Map<String, ? extends Object> getParameters(); + * Returns the parameters associated with this context. + * + * @return The parameters associated with this context + */ + public Map<String, ? extends Object> getParameters(); /** Returns the specified property. * Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericExecutionArtifact.java Thu Jan 14 17:50:55 2010 @@ -20,25 +20,25 @@ /** A basic implementation of the <code>ExecutionArtifact</code> interface. */ public class GenericExecutionArtifact implements ExecutionArtifact { - - protected final String location; - protected final String name; + + protected final String location; + protected final String name; - public GenericExecutionArtifact(String location, String name) { - this.location = location; - this.name = name; - } + public GenericExecutionArtifact(String location, String name) { + this.location = location; + this.name = name; + } - public String getLocation() { - return this.location; - } + public String getLocation() { + return this.location; + } - public String getName() { - return this.name; - } + public String getName() { + return this.name; + } - @Override - public String toString() { - return "GenericExecutionArtifact: location = " + this.location + ", name = " + this.name; - } + @Override + public String toString() { + return "GenericExecutionArtifact: location = " + this.location + ", name = " + this.name; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericParametersArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericParametersArtifact.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericParametersArtifact.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/GenericParametersArtifact.java Thu Jan 14 17:50:55 2010 @@ -22,25 +22,25 @@ /** A basic implementation of the ParametersArtifact interface. */ public class GenericParametersArtifact extends GenericExecutionArtifact implements ParametersArtifact { - - protected final Map<String, ? extends Object> parameters; + + protected final Map<String, ? extends Object> parameters; - public GenericParametersArtifact(String location, String name, Map<String, ? extends Object> parameters) { - super(location, name); - this.parameters = parameters; - } + public GenericParametersArtifact(String location, String name, Map<String, ? extends Object> parameters) { + super(location, name); + this.parameters = parameters; + } - public GenericParametersArtifact(ExecutionArtifact artifact, Map<String, ? extends Object> parameters) { - super(artifact.getLocation(), artifact.getName()); - this.parameters = parameters; - } + public GenericParametersArtifact(ExecutionArtifact artifact, Map<String, ? extends Object> parameters) { + super(artifact.getLocation(), artifact.getName()); + this.parameters = parameters; + } - public Map<String, ? extends Object> getParameters() { - return this.parameters; - } + public Map<String, ? extends Object> getParameters() { + return this.parameters; + } - @Override - public String toString() { - return "GenericParametersArtifact: location = " + this.location + ", name = " + this.name; - } + @Override + public String toString() { + return "GenericParametersArtifact: location = " + this.location + ", name = " + this.name; + } } Modified: ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ParametersArtifact.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ParametersArtifact.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ParametersArtifact.java (original) +++ ofbiz/branches/executioncontext20091231/framework/api/src/org/ofbiz/api/context/ParametersArtifact.java Thu Jan 14 17:50:55 2010 @@ -37,12 +37,12 @@ * starting at the top of the stack, and return that instance.</p> */ public interface ParametersArtifact extends ExecutionArtifact { - - /** - * Returns the parameters associated with this artifact. - * - * @return The parameters associated with this artifact - */ - public Map<String, ? extends Object> getParameters(); + + /** + * Returns the parameters associated with this artifact. + * + * @return The parameters associated with this artifact + */ + public Map<String, ? extends Object> getParameters(); } Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/AuthorizationManagerImpl.java Thu Jan 14 17:50:55 2010 @@ -76,8 +76,8 @@ ThreadContext.endRunUnprotected(); } } - return accessController; - } + return accessController; + } public static void logIncident(Permission permission) throws AccessControlException { try { @@ -103,7 +103,7 @@ } } - protected static void processGroupPermissions(String groupId, PathNode node, Delegator delegator) throws AuthorizationManagerException { + protected static void processGroupPermissions(String groupId, PathNode node, Delegator delegator) throws AuthorizationManagerException { try { // Process this group's memberships first List<GenericValue> parentGroups = delegator.findList("UserGroupRelationship", EntityCondition.makeCondition(UtilMisc.toMap("toGroupId", groupId)), null, null, null, false); @@ -218,7 +218,7 @@ public AccessController getAccessController() throws AuthorizationManagerException { String userLoginId = ThreadContext.getUserLogin().getString("userLoginId"); return getAccessController(userLoginId); - } + } @Override public void updateUser(String userLoginId, String password) throws AuthorizationManagerException { Modified: ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/SecurityAwareList.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/SecurityAwareList.java?rev=899328&r1=899327&r2=899328&view=diff ============================================================================== --- ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/SecurityAwareList.java (original) +++ ofbiz/branches/executioncontext20091231/framework/context/src/org/ofbiz/context/SecurityAwareList.java Thu Jan 14 17:50:55 2010 @@ -30,17 +30,17 @@ @SuppressWarnings("serial") public class SecurityAwareList<E> extends ArrayList<E> implements List<E> { - protected final static String module = SecurityAwareList.class.getName(); + protected final static String module = SecurityAwareList.class.getName(); protected final Set<String> serviceNameList; - public SecurityAwareList(List<E> valueList, Set<String> serviceNameList) { - super(valueList.size()); - this.addAll(valueList); - this.trimToSize(); - this.serviceNameList = serviceNameList; - } + public SecurityAwareList(List<E> valueList, Set<String> serviceNameList) { + super(valueList.size()); + this.addAll(valueList); + this.trimToSize(); + this.serviceNameList = serviceNameList; + } - @Override + @Override public Iterator<E> iterator() { return new SecurityAwareIterator<E>(super.iterator(), this.serviceNameList); } |
| Free forum by Nabble | Edit this page |
