Author: rwatler
Date: Mon Mar 17 19:24:56 2014
New Revision: 1578526
URL: http://svn.apache.org/r1578526
Log:
JS2-874: Iterator/foreach conversions for page manager implementation
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerUtils.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageSerializerImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/ojb/ACLFieldConversion.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/om/page/TestPageObjectModel.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestMappings.java
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java Mon Mar 17 19:24:56 2014
@@ -58,7 +58,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Iterator;
import java.util.List;
/**
@@ -485,10 +484,8 @@ public class FolderImpl extends NodeImpl
// populate node caches
synchronized(all)
{
- Iterator nodeIter = accessAll().iterator();
- while (nodeIter.hasNext())
+ for (Node node: accessAll())
{
- Node node = (Node)nodeIter.next();
if (node instanceof PageImpl)
{
pages.add((PageImpl)node);
@@ -1404,10 +1401,8 @@ public class FolderImpl extends NodeImpl
{
// check permissions and constraints, filter nodes as required
NodeSetImpl filteredNodes = null;
- Iterator checkAccessIter = nodes.iterator();
- while (checkAccessIter.hasNext())
+ for (Node node : nodes)
{
- Node node = (Node)checkAccessIter.next();
try
{
// check access
@@ -1428,10 +1423,8 @@ public class FolderImpl extends NodeImpl
// not permitted, copy previously permitted nodes
// to new filteredNodes node set with same comparator
filteredNodes = new NodeSetImpl(nodes);
- Iterator copyIter = nodes.iterator();
- while (copyIter.hasNext())
+ for (Node copyNode : nodes)
{
- Node copyNode = (Node)copyIter.next();
if (copyNode != node)
{
filteredNodes.add(copyNode);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java Mon Mar 17 19:24:56 2014
@@ -54,7 +54,6 @@ import org.slf4j.LoggerFactory;
import java.security.AccessController;
import java.security.Permission;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -670,10 +669,8 @@ public class FolderImpl extends Abstract
// on folders and documents while creating filtered nodes
NodeSet nodes = getAllNodes();
NodeSet filteredNodes = null;
- Iterator checkAccessIter = nodes.iterator();
- while (checkAccessIter.hasNext())
+ for (Node node : nodes)
{
- Node node = (Node)checkAccessIter.next();
try
{
node.checkAccess(JetspeedActions.VIEW);
@@ -687,10 +684,8 @@ public class FolderImpl extends Abstract
if (filteredNodes == null)
{
filteredNodes = new NodeSetImpl(getPath(), ((NodeSetImpl) nodes).getComparator());
- Iterator copyIter = nodes.iterator();
- while (copyIter.hasNext())
+ for (Node copyNode : nodes)
{
- Node copyNode = (Node)copyIter.next();
if (copyNode != node)
{
filteredNodes.add(copyNode);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java Mon Mar 17 19:24:56 2014
@@ -23,7 +23,6 @@ import org.apache.jetspeed.om.page.psml.
import org.apache.jetspeed.om.page.psml.DocumentImpl;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -229,10 +228,9 @@ public class FolderMetaDataImpl extends
// to all menu definitions
if (menuDefinitions != null)
{
- Iterator menuIter = menuDefinitions.iterator();
- while (menuIter.hasNext())
+ for (MenuDefinition menu : menuDefinitions)
{
- ((MenuDefinitionImpl)menuIter.next()).unmarshalled();
+ ((MenuDefinitionImpl)menu).unmarshalled();
}
}
@@ -249,10 +247,9 @@ public class FolderMetaDataImpl extends
// to all menu definitions
if (menuDefinitions != null)
{
- Iterator menuIter = menuDefinitions.iterator();
- while (menuIter.hasNext())
+ for (MenuDefinition menu : menuDefinitions)
{
- ((MenuDefinitionImpl)menuIter.next()).marshalling();
+ ((MenuDefinitionImpl)menu).marshalling();
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java Mon Mar 17 19:24:56 2014
@@ -21,7 +21,6 @@ import org.apache.jetspeed.om.folder.Men
import org.apache.jetspeed.om.folder.MenuDefinitionElement;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -359,11 +358,10 @@ public class MenuDefinitionImpl extends
if (menuElementImpls != null)
{
menuElements = new ArrayList<MenuDefinitionElement>(menuElementImpls.size());
- Iterator menuElementIter = menuElementImpls.iterator();
- while (menuElementIter.hasNext())
+ for (MenuElementImpl menuElementImpl : menuElementImpls)
{
// unwrap menu element
- MenuDefinitionElement menuElement = ((MenuElementImpl)menuElementIter.next()).getElement();
+ MenuDefinitionElement menuElement = menuElementImpl.getElement();
menuElements.add(menuElement);
// propagate unmarshalled notification
@@ -390,17 +388,15 @@ public class MenuDefinitionImpl extends
if (menuElements != null)
{
menuElementImpls = new ArrayList<MenuElementImpl>(menuElements.size());
- Iterator menuElementIter = menuElements.iterator();
- while (menuElementIter.hasNext())
+ for (MenuDefinitionElement menuDefinitionElement : menuElements)
{
// wrap menu element
- MenuDefinitionElement menuElement = (MenuDefinitionElement)menuElementIter.next();
- menuElementImpls.add(new MenuElementImpl(menuElement));
+ menuElementImpls.add(new MenuElementImpl(menuDefinitionElement));
// propagate marshalling notification
- if (menuElement instanceof MenuDefinitionImpl)
+ if (menuDefinitionElement instanceof MenuDefinitionImpl)
{
- ((MenuDefinitionImpl)menuElement).unmarshalled();
+ ((MenuDefinitionImpl)menuDefinitionElement).unmarshalled();
}
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java Mon Mar 17 19:24:56 2014
@@ -58,10 +58,10 @@ public abstract class BaseFragmentProper
Set<Principal> principals = null;
Principal userPrincipal = null;
boolean skipPropertyScopes = false;
- Iterator propertiesIter = properties.iterator();
+ Iterator<FragmentProperty> propertiesIter = properties.iterator();
while ((userValue[0] == null) && propertiesIter.hasNext())
{
- FragmentProperty fragmentProperty = (FragmentProperty)propertiesIter.next();
+ FragmentProperty fragmentProperty = propertiesIter.next();
if (fragmentProperty.getName().equals(propName))
{
String fragmentPropertyScope = fragmentProperty.getScope();
@@ -104,10 +104,10 @@ public abstract class BaseFragmentProper
{
// match property scope and scope value with most specific
// principal without a value
- Iterator principalsIter = principals.iterator();
+ Iterator<Principal> principalsIter = principals.iterator();
while ((userValue[0] == null) && principalsIter.hasNext())
{
- Principal principal = (Principal)principalsIter.next();
+ Principal principal = principalsIter.next();
if (principal.getName().equals(fragmentPropertyScopeValue))
{
if (fragmentPropertyScope.equals(USER_PROPERTY_SCOPE) && (principal instanceof User))
@@ -162,10 +162,8 @@ public abstract class BaseFragmentProper
Set<Principal> principals = null;
Principal userPrincipal = null;
boolean skipPropertyScopes = false;
- Iterator propertiesIter = properties.iterator();
- while (propertiesIter.hasNext())
+ for (FragmentProperty fragmentProperty : properties)
{
- FragmentProperty fragmentProperty = (FragmentProperty)propertiesIter.next();
String fragmentPropertyScope = fragmentProperty.getScope();
if (fragmentPropertyScope != null)
{
@@ -205,10 +203,8 @@ public abstract class BaseFragmentProper
{
// match property scope and scope value with most specific
// principal without a value
- Iterator principalsIter = principals.iterator();
- while (principalsIter.hasNext())
+ for (Principal principal : principals)
{
- Principal principal = (Principal)principalsIter.next();
if (principal.getName().equals(fragmentPropertyScopeValue) &&
((fragmentPropertyScope.equals(USER_PROPERTY_SCOPE) && (principal instanceof User)) ||
(fragmentPropertyScope.equals(GROUP_PROPERTY_SCOPE) && (principal instanceof Group)) ||
@@ -242,10 +238,8 @@ public abstract class BaseFragmentProper
{
// iterate through properties to find specified scoped property
FragmentProperty fragmentProperty = null;
- Iterator propertiesIter = properties.iterator();
- while (propertiesIter.hasNext())
+ for (FragmentProperty findFragmentProperty : properties)
{
- FragmentProperty findFragmentProperty = (FragmentProperty)propertiesIter.next();
if (findFragmentProperty.getName().equals(propName))
{
String findFragmentPropertyScope = findFragmentProperty.getScope();
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java Mon Mar 17 19:24:56 2014
@@ -20,7 +20,6 @@ import org.apache.jetspeed.om.common.Sec
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -385,14 +384,13 @@ public class SecurityConstraintImpl impl
if ((list != null) && !list.isEmpty())
{
StringBuffer csv = new StringBuffer();
- Iterator listIter = list.iterator();
- while (listIter.hasNext())
+ for (String item : list)
{
if (csv.length() > 0)
{
csv.append(",");
}
- csv.append((String)listIter.next());
+ csv.append(item);
}
return csv.toString();
}
@@ -415,10 +413,9 @@ public class SecurityConstraintImpl impl
{
if ((collection0 != null) && (collection1 != null))
{
- Iterator containsIter = collection1.iterator();
- while (containsIter.hasNext())
+ for (String item1 : collection1)
{
- if (collection0.contains(containsIter.next()))
+ if (collection0.contains(item1))
{
return true;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java Mon Mar 17 19:24:56 2014
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.om.page;
-import java.util.Iterator;
import java.util.List;
import java.util.Stack;
@@ -53,10 +52,8 @@ public class SecurityConstraintsRefExpre
{
// evaluate postfix constraints ref tokens
Stack<Boolean> operandsStack = new Stack<Boolean>();
- Iterator constraintsRefTokensIter = constraintsRefTokens.iterator();
- while (constraintsRefTokensIter.hasNext())
+ for (SecurityConstraintsRefToken token : constraintsRefTokens)
{
- SecurityConstraintsRefToken token = (SecurityConstraintsRefToken)constraintsRefTokensIter.next();
String tokenOperation = token.getOperation();
if (tokenOperation != null)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java Mon Mar 17 19:24:56 2014
@@ -20,7 +20,6 @@ import org.apache.jetspeed.om.common.Sec
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Stack;
@@ -75,9 +74,8 @@ public class SecurityConstraintsRefParse
// convert postfix expression tokens into constraints reference tokens
List<SecurityConstraintsRefToken> constraintsRefTokens = new ArrayList<SecurityConstraintsRefToken>();
- Iterator postfixTokensIter = postfixTokens.iterator();
- while (postfixTokensIter.hasNext()) {
- String postfixToken = (String)postfixTokensIter.next();
+ for (String postfixToken : postfixTokens)
+ {
if (postfixToken.equals(AND_OPERATION) || postfixToken.equals(OR_OPERATION) || postfixToken.equals(NOT_OPERATION))
{
// postfix operation
@@ -92,12 +90,10 @@ public class SecurityConstraintsRefParse
// multiple security constraints within an expression are treated as an
// implicit "or": insert these as a postfix "or" sub expression
boolean multipleConstraintsOrExpression = false;
- Iterator securityConstraintIter = securityConstraintsDef.getSecurityConstraints().iterator();
- while (securityConstraintIter.hasNext())
+ for (SecurityConstraint securityConstraint : securityConstraintsDef.getSecurityConstraints())
{
// postfix security constraint
- SecurityConstraintImpl securityConstraint = (SecurityConstraintImpl)securityConstraintIter.next();
- constraintsRefTokens.add(new SecurityConstraintsRefToken(postfixToken, securityConstraint));
+ constraintsRefTokens.add(new SecurityConstraintsRefToken(postfixToken, (SecurityConstraintImpl)securityConstraint));
if (multipleConstraintsOrExpression)
{
// multiple security constraints postfix "or" operation
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Mon Mar 17 19:24:56 2014
@@ -35,7 +35,6 @@ import javax.security.auth.Subject;
import java.security.AccessController;
import java.security.Permission;
import java.security.Principal;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -403,10 +402,8 @@ public abstract class BaseElementImpl im
List<String> userPrincipals = null;
List<String> rolePrincipals = null;
List<String> groupPrincipals = null;
- Iterator principals = subject.getPrincipals().iterator();
- while (principals.hasNext())
+ for (Principal principal : subject.getPrincipals())
{
- Principal principal = (Principal) principals.next();
if (principal instanceof User)
{
if (userPrincipals == null)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java Mon Mar 17 19:24:56 2014
@@ -75,8 +75,7 @@ class FilteredFragmentList extends Abstr
// remove removed object from persistent list
if (o != null)
{
- ListIterator<BaseFragmentElementImpl> iter = fragment.accessFragments().listIterator();
- while (iter.hasNext())
+ for (ListIterator<BaseFragmentElementImpl> iter = fragment.accessFragments().listIterator(); iter.hasNext();)
{
if (iter.next() == o)
{
@@ -98,8 +97,7 @@ class FilteredFragmentList extends Abstr
// replace replaced object in persistent list
if (o != null)
{
- ListIterator<BaseFragmentElementImpl> iter = fragment.accessFragments().listIterator();
- while (iter.hasNext())
+ for (ListIterator<BaseFragmentElementImpl> iter = fragment.accessFragments().listIterator(); iter.hasNext();)
{
if (iter.next() == o)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Mon Mar 17 19:24:56 2014
@@ -67,10 +67,9 @@ public class FragmentImpl extends BaseFr
// propagate to children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- ((BaseFragmentElementImpl)fragmentsIter.next()).setBaseFragmentsElement(baseFragmentsElement);
+ fragmentElement.setBaseFragmentsElement(baseFragmentsElement);
}
}
}
@@ -89,10 +88,9 @@ public class FragmentImpl extends BaseFr
// match children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- BaseFragmentElement matchedFragment = ((BaseFragmentElementImpl)fragmentsIter.next()).getFragmentById(id);
+ BaseFragmentElement matchedFragment = fragmentElement.getFragmentById(id);
if (matchedFragment != null)
{
return matchedFragment;
@@ -110,10 +108,9 @@ public class FragmentImpl extends BaseFr
// remove from deep children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (Iterator<BaseFragmentElementImpl> fragmentsIter = fragments.iterator(); fragmentsIter.hasNext();)
{
- BaseFragmentElementImpl fragment = (BaseFragmentElementImpl)fragmentsIter.next();
+ BaseFragmentElementImpl fragment = fragmentsIter.next();
if (!fragment.getId().equals(id))
{
if (fragment instanceof FragmentImpl)
@@ -155,10 +152,9 @@ public class FragmentImpl extends BaseFr
// match named children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- List<BaseFragmentElement> matchedChildFragments = ((BaseFragmentElementImpl)fragmentsIter.next()).getFragmentsByName(name);
+ List<BaseFragmentElement> matchedChildFragments = fragmentElement.getFragmentsByName(name);
if (matchedChildFragments != null)
{
if (matchedFragments == null)
@@ -185,10 +181,9 @@ public class FragmentImpl extends BaseFr
// match children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- List<BaseFragmentElement> matchedChildFragments = ((BaseFragmentElementImpl)fragmentsIter.next()).getFragmentsByInterface(interfaceFilter);
+ List<BaseFragmentElement> matchedChildFragments = fragmentElement.getFragmentsByInterface(interfaceFilter);
if (matchedChildFragments != null)
{
if (matchedFragments == null)
@@ -214,10 +209,9 @@ public class FragmentImpl extends BaseFr
super.resetCachedSecurityConstraints();
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- ((BaseFragmentElementImpl)fragmentsIter.next()).resetCachedSecurityConstraints();
+ fragmentElement.resetCachedSecurityConstraints();
}
}
}
@@ -291,10 +285,9 @@ public class FragmentImpl extends BaseFr
// validate fragments using validation listener
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (BaseFragmentElementImpl fragmentElement : fragments)
{
- if (!((BaseFragmentElementImpl)fragmentsIter.next()).validateFragments(validationListener))
+ if (!fragmentElement.validateFragments(validationListener))
{
return false;
}
@@ -319,10 +312,8 @@ public class FragmentImpl extends BaseFr
{
// check permissions and constraints, filter fragments as required
List<BaseFragmentElement> filteredFragments = null;
- Iterator checkAccessIter = fragments.iterator();
- while (checkAccessIter.hasNext())
+ for (BaseFragmentElement fragment : fragments)
{
- BaseFragmentElement fragment = (BaseFragmentElement)checkAccessIter.next();
try
{
// check access
@@ -343,10 +334,8 @@ public class FragmentImpl extends BaseFr
// not permitted, copy previously permitted fragments
// to new filteredFragments node set with same comparator
filteredFragments = new ArrayList<BaseFragmentElement>(fragments.size());
- Iterator copyIter = fragments.iterator();
- while (copyIter.hasNext())
+ for (BaseFragmentElement copyFragment : fragments)
{
- BaseFragmentElement copyFragment = (BaseFragmentElement)copyIter.next();
if (copyFragment != fragment)
{
filteredFragments.add(copyFragment);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java Mon Mar 17 19:24:56 2014
@@ -23,7 +23,6 @@ import org.apache.jetspeed.page.Fragment
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
/**
@@ -180,11 +179,9 @@ public class FragmentPropertyListImpl ex
*/
public synchronized FragmentProperty getMatchingProperty(FragmentProperty match)
{
- Iterator matchIter = properties.iterator();
- while (matchIter.hasNext())
+ for (FragmentProperty test : properties)
{
- FragmentPropertyImpl test = (FragmentPropertyImpl)matchIter.next();
- if (test.match(match))
+ if (((FragmentPropertyImpl)test).match(match))
{
return test;
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java Mon Mar 17 19:24:56 2014
@@ -23,7 +23,6 @@ import org.apache.jetspeed.page.document
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -156,10 +155,8 @@ public class PageSecurityImpl extends Do
if ((getSecurityConstraintsDefs() != null) && (securityConstraintsDefsMap == null))
{
securityConstraintsDefsMap = new HashMap<String,SecurityConstraintsDef>((getSecurityConstraintsDefs().size() * 2) + 1);
- Iterator definitionsIter = getSecurityConstraintsDefs().iterator();
- while (definitionsIter.hasNext())
+ for (SecurityConstraintsDef definition : getSecurityConstraintsDefs())
{
- SecurityConstraintsDef definition = (SecurityConstraintsDef)definitionsIter.next();
String definitionName = definition.getName();
if (!securityConstraintsDefsMap.containsKey(definitionName))
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java Mon Mar 17 19:24:56 2014
@@ -27,7 +27,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -135,24 +134,20 @@ public class SecurityConstraintsImpl imp
{
// test each action, constraints check passes only
// if all actions are permitted for principals
- Iterator actionsIter = actions.iterator();
- while (actionsIter.hasNext())
+ for (String action : actions)
{
// check each action:
// - if any actions explicitly permitted, (including owner),
// assume no permissions are permitted by default
// - if all constraints do not specify a permission or an
// expression, assume access is permitted by default
- String action = (String)actionsIter.next();
boolean actionPermitted = false;
boolean actionNotPermitted = false;
boolean anyActionsPermitted = (getOwner() != null);
// check against constraints and constraint ref expressions
- Iterator checkConstraintsIter = checkConstraints.iterator();
- while (checkConstraintsIter.hasNext())
+ for (Object constraintOrExpression : checkConstraints)
{
- Object constraintOrExpression = checkConstraintsIter.next();
if (constraintOrExpression instanceof SecurityConstraintImpl)
{
// check constraint
@@ -307,10 +302,8 @@ public class SecurityConstraintsImpl imp
if (pageSecurity != null)
{
// dereference each security constraints definition
- Iterator constraintsRefsIter = constraintsRefs.iterator();
- while (constraintsRefsIter.hasNext())
+ for (String constraintsRef : constraintsRefs)
{
- String constraintsRef = (String)constraintsRefsIter.next();
// parse constraints ref and return constraints/constraints ref expressions
Object parsedConstraintsOrExpression = SecurityConstraintsRefParser.parse(constraintsRef, pageSecurity);
if (parsedConstraintsOrExpression instanceof List)
@@ -325,12 +318,11 @@ public class SecurityConstraintsImpl imp
}
else if (parsedConstraintsOrExpression instanceof SecurityConstraintsRefExpression)
{
- Object parsedExpression = parsedConstraintsOrExpression;
if (constraints == null)
{
constraints = new ArrayList<Object>();
}
- constraints.add(parsedExpression);
+ constraints.add(parsedConstraintsOrExpression);
}
else if (parsedConstraintsOrExpression != null)
{
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Mon Mar 17 19:24:56 2014
@@ -21,7 +21,6 @@ import java.security.AccessController;
import java.security.Permission;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -290,10 +289,8 @@ public abstract class AbstractBaseElemen
List<String> userPrincipals = null;
List<String> rolePrincipals = null;
List<String> groupPrincipals = null;
- Iterator principals = subject.getPrincipals().iterator();
- while (principals.hasNext())
+ for (Principal principal: subject.getPrincipals())
{
- Principal principal = (Principal) principals.next();
if (principal instanceof User)
{
if (userPrincipals == null)
@@ -631,10 +628,8 @@ public abstract class AbstractBaseElemen
{
// check permissions and constraints, filter nodes as required
NodeSetImpl filteredNodes = null;
- Iterator checkAccessIter = nodes.iterator();
- while (checkAccessIter.hasNext())
+ for (Node node : nodes)
{
- AbstractBaseElement node = (AbstractBaseElement)checkAccessIter.next();
try
{
// check access
@@ -655,10 +650,8 @@ public abstract class AbstractBaseElemen
// not permitted, copy previously permitted nodes
// to new filteredNodes node set with same comparator
filteredNodes = new NodeSetImpl(null, ((NodeSetImpl) nodes).getComparator());
- Iterator copyIter = nodes.iterator();
- while (copyIter.hasNext())
+ for (Node copyNode : nodes)
{
- Node copyNode = (Node)copyIter.next();
if (copyNode != node)
{
filteredNodes.add(copyNode);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java Mon Mar 17 19:24:56 2014
@@ -25,7 +25,6 @@ import org.apache.jetspeed.om.page.Fragm
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Stack;
@@ -143,11 +142,9 @@ public abstract class AbstractBaseFragme
{
if (f instanceof Fragment)
{
- Iterator i = ((Fragment)f).getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : ((Fragment)f).getFragments())
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push(child);
}
}
@@ -181,11 +178,8 @@ public abstract class AbstractBaseFragme
{
if (f instanceof Fragment)
{
- Iterator i = ((Fragment)f).getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : ((Fragment)f).getFragments())
{
- BaseFragmentElement child = (BaseFragmentElement)i.next();
stack.push(child);
parents.put(child, f);
}
@@ -254,11 +248,9 @@ public abstract class AbstractBaseFragme
fragments.add(fragment);
}
- Iterator i = fragment.getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : fragment.getFragments())
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push(child);
}
}
@@ -300,11 +292,9 @@ public abstract class AbstractBaseFragme
if (f instanceof Fragment)
{
Fragment fragment = (Fragment)f;
- Iterator i = fragment.getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : fragment.getFragments())
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push(child);
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java Mon Mar 17 19:24:56 2014
@@ -30,7 +30,6 @@ import org.apache.jetspeed.om.folder.psm
import org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl;
import org.apache.jetspeed.om.page.BasePageElement;
-import java.util.Iterator;
import java.util.List;
/**
@@ -164,10 +163,9 @@ public abstract class AbstractBasePageEl
// to all menu definitions
if (menuDefinitions != null)
{
- Iterator menuIter = menuDefinitions.iterator();
- while (menuIter.hasNext())
+ for (MenuDefinition menuDefinition : menuDefinitions)
{
- ((MenuDefinitionImpl)menuIter.next()).unmarshalled();
+ ((MenuDefinitionImpl)menuDefinition).unmarshalled();
}
}
@@ -184,10 +182,9 @@ public abstract class AbstractBasePageEl
// to all menu definitions
if (menuDefinitions != null)
{
- Iterator menuIter = menuDefinitions.iterator();
- while (menuIter.hasNext())
+ for (MenuDefinition menuDefinition : menuDefinitions)
{
- ((MenuDefinitionImpl)menuIter.next()).marshalling();
+ ((MenuDefinitionImpl)menuDefinition).marshalling();
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java Mon Mar 17 19:24:56 2014
@@ -75,8 +75,7 @@ class FilteredFragmentList extends Abstr
// remove removed object from persistent list
if (o != null)
{
- ListIterator iter = fragment.accessFragments().listIterator();
- while (iter.hasNext())
+ for (ListIterator<AbstractBaseFragmentElement> iter = fragment.accessFragments().listIterator(); iter.hasNext();)
{
if (iter.next() == o)
{
@@ -98,7 +97,7 @@ class FilteredFragmentList extends Abstr
// replace replaced object in persistent list
if (o != null)
{
- ListIterator<AbstractBaseFragmentElement> iter = fragment.accessFragments().listIterator();
+ for (ListIterator<AbstractBaseFragmentElement> iter = fragment.accessFragments().listIterator(); iter.hasNext();)
while (iter.hasNext())
{
if (iter.next() == o)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java Mon Mar 17 19:24:56 2014
@@ -26,7 +26,6 @@ import org.apache.jetspeed.om.page.Fragm
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Stack;
@@ -135,10 +134,9 @@ public class FragmentImpl extends Abstra
// propagate to children
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (AbstractBaseFragmentElement fragmentElement : fragments)
{
- ((AbstractBaseFragmentElement)fragmentsIter.next()).setBaseFragmentsElement(baseFragmentsElement);
+ fragmentElement.setBaseFragmentsElement(baseFragmentsElement);
}
}
}
@@ -149,10 +147,9 @@ public class FragmentImpl extends Abstra
public BaseFragmentElement getFragmentById(String id)
{
Stack<BaseFragmentElement> stack = new Stack<BaseFragmentElement>();
- Iterator i = getFragments().iterator();
- while (i.hasNext())
+ for (AbstractBaseFragmentElement fragmentElement : fragments)
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push((BaseFragmentElement)fragmentElement);
}
BaseFragmentElement f = stack.pop();
@@ -161,11 +158,9 @@ public class FragmentImpl extends Abstra
{
if (f instanceof Fragment)
{
- i = ((Fragment)f).getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : ((Fragment)f).getFragments())
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push(child);
}
}
@@ -190,10 +185,9 @@ public class FragmentImpl extends Abstra
// find fragment by id, tracking fragment parent
Map<BaseFragmentElement,BaseFragmentElement> parents = new HashMap<BaseFragmentElement,BaseFragmentElement>();
Stack<BaseFragmentElement> stack = new Stack<BaseFragmentElement>();
- Iterator i = getFragments().iterator();
- while (i.hasNext())
+ for (BaseFragmentElement fragmentElement : getFragments())
{
- stack.push((BaseFragmentElement)i.next());
+ stack.push(fragmentElement);
}
BaseFragmentElement f = stack.pop();
@@ -201,11 +195,8 @@ public class FragmentImpl extends Abstra
{
if (f instanceof Fragment)
{
- i = ((Fragment)f).getFragments().iterator();
-
- while (i.hasNext())
+ for (BaseFragmentElement child : ((Fragment)f).getFragments())
{
- BaseFragmentElement child = (BaseFragmentElement)i.next();
stack.push(child);
parents.put(child, f);
}
@@ -287,10 +278,9 @@ public class FragmentImpl extends Abstra
// validate fragments using validation listener
if (fragments != null)
{
- Iterator fragmentsIter = fragments.iterator();
- while (fragmentsIter.hasNext())
+ for (AbstractBaseFragmentElement fragmentElement : fragments)
{
- if (!((AbstractBaseFragmentElement)fragmentsIter.next()).validateFragments(validationListener))
+ if (!fragmentElement.validateFragments(validationListener))
{
return false;
}
@@ -313,11 +303,9 @@ public class FragmentImpl extends Abstra
// unwrap fragment elements and propagate
// unmarshalled notification
fragments.clear();
- Iterator fragmentElementIter = fragmentElementImpls.iterator();
- while (fragmentElementIter.hasNext())
+ for (FragmentElementImpl fragmentElement : fragmentElementImpls)
{
// unwrap fragment element
- FragmentElementImpl fragmentElement = (FragmentElementImpl)fragmentElementIter.next();
AbstractBaseFragmentElement fragment = (AbstractBaseFragmentElement)fragmentElement.getElement();
fragments.add(fragment);
@@ -337,11 +325,9 @@ public class FragmentImpl extends Abstra
// wrap menu elements and propagate
// marshalling notification
fragmentElementImpls.clear();
- Iterator fragmentIter = fragments.iterator();
- while (fragmentIter.hasNext())
+ for (AbstractBaseFragmentElement fragment : fragments)
{
// wrap fragment element
- AbstractBaseFragmentElement fragment = (AbstractBaseFragmentElement)fragmentIter.next();
fragmentElementImpls.add(new FragmentElementImpl(fragment));
// propagate marshalling notification
@@ -367,10 +353,8 @@ public class FragmentImpl extends Abstra
{
// check permissions and constraints, filter fragments as required
List<BaseFragmentElement> filteredFragments = null;
- Iterator checkAccessIter = fragments.iterator();
- while (checkAccessIter.hasNext())
+ for (BaseFragmentElement fragment : fragments)
{
- BaseFragmentElement fragment = (BaseFragmentElement) checkAccessIter.next();
try
{
// check access
@@ -391,10 +375,8 @@ public class FragmentImpl extends Abstra
// not permitted, copy previously permitted fragments
// to new filteredFragments node set with same comparator
filteredFragments = new ArrayList<BaseFragmentElement>(fragments.size());
- Iterator copyIter = fragments.iterator();
- while (copyIter.hasNext())
+ for (BaseFragmentElement copyFragment : fragments)
{
- BaseFragmentElement copyFragment = (BaseFragmentElement)copyIter.next();
if (copyFragment != fragment)
{
filteredFragments.add(copyFragment);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java Mon Mar 17 19:24:56 2014
@@ -20,7 +20,6 @@ import org.apache.jetspeed.om.page.PageS
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -110,10 +109,8 @@ public class PageSecurityImpl extends Do
if ((constraintsDefsList != null) && (constraintsDefsMap == null))
{
constraintsDefsMap = new HashMap<String,SecurityConstraintsDef>((constraintsDefsList.size() * 2) + 1);
- Iterator definitionsIter = constraintsDefsList.iterator();
- while (definitionsIter.hasNext())
+ for (SecurityConstraintsDef definition : constraintsDefsList)
{
- SecurityConstraintsDef definition = (SecurityConstraintsDef)definitionsIter.next();
constraintsDefsMap.put(definition.getName(), definition);
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java Mon Mar 17 19:24:56 2014
@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
/**
@@ -181,24 +180,20 @@ public class SecurityConstraintsImpl imp
{
// test each action, constraints check passes only
// if all actions are permitted for principals
- Iterator actionsIter = actions.iterator();
- while (actionsIter.hasNext())
+ for (String action : actions)
{
// check each action:
// - if any actions explicitly permitted, (including owner),
// assume no permissions are permitted by default
// - if all constraints do not specify a permission or an
// expression, assume access is permitted by default
- String action = (String)actionsIter.next();
boolean actionPermitted = false;
boolean actionNotPermitted = false;
boolean anyActionsPermitted = (getOwner() != null);
// check against constraints and constraint ref expressions
- Iterator checkConstraintsIter = checkConstraints.iterator();
- while (checkConstraintsIter.hasNext())
+ for (Object constraintOrExpression : checkConstraints)
{
- Object constraintOrExpression = checkConstraintsIter.next();
if (constraintOrExpression instanceof SecurityConstraintImpl)
{
// check constraint
@@ -342,10 +337,8 @@ public class SecurityConstraintsImpl imp
if (pageSecurity != null)
{
// dereference each security constraints definition
- Iterator constraintsRefsIter = constraintsRefs.iterator();
- while (constraintsRefsIter.hasNext())
+ for (String constraintsRef : constraintsRefs)
{
- String constraintsRef = (String)constraintsRefsIter.next();
// parse constraints ref and return constraints/constraints ref expressions
Object parsedConstraintsOrExpression = SecurityConstraintsRefParser.parse(constraintsRef, pageSecurity);
if (parsedConstraintsOrExpression instanceof List)
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java Mon Mar 17 19:24:56 2014
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
import javax.security.auth.Subject;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -974,10 +973,8 @@ public abstract class AbstractPageManage
listenersList = new ArrayList<PageManagerEventListener>(listeners);
}
// notify listeners
- Iterator listenersIter = listenersList.iterator();
- while (listenersIter.hasNext())
+ for (PageManagerEventListener listener : listenersList)
{
- PageManagerEventListener listener = (PageManagerEventListener)listenersIter.next();
try
{
listener.newNode(node);
@@ -1004,10 +1001,8 @@ public abstract class AbstractPageManage
listenersList = new ArrayList<PageManagerEventListener>(listeners);
}
// notify listeners
- Iterator listenersIter = listenersList.iterator();
- while (listenersIter.hasNext())
+ for (PageManagerEventListener listener : listenersList)
{
- PageManagerEventListener listener = (PageManagerEventListener)listenersIter.next();
try
{
listener.updatedNode(node);
@@ -1034,10 +1029,8 @@ public abstract class AbstractPageManage
listenersList = new ArrayList<PageManagerEventListener>(listeners);
}
// notify listeners
- Iterator listenersIter = listenersList.iterator();
- while (listenersIter.hasNext())
+ for (PageManagerEventListener listener : listenersList)
{
- PageManagerEventListener listener = (PageManagerEventListener)listenersIter.next();
try
{
listener.removedNode(node);
@@ -1062,10 +1055,8 @@ public abstract class AbstractPageManage
listenersList = new ArrayList<PageManagerEventListener>(listeners);
}
// notify listeners
- Iterator listenersIter = listenersList.iterator();
- while (listenersIter.hasNext())
+ for (PageManagerEventListener listener : listenersList)
{
- PageManagerEventListener listener = (PageManagerEventListener)listenersIter.next();
try
{
listener.reapNodes(nodeReapingInterval);
@@ -1106,10 +1097,8 @@ public abstract class AbstractPageManage
// copy document orders
folder.setDocumentOrder(this.<String>createList());
- Iterator documentOrders = source.getDocumentOrder().iterator();
- while (documentOrders.hasNext())
+ for (String name : source.getDocumentOrder())
{
- String name = (String)documentOrders.next();
folder.getDocumentOrder().add(name);
}
@@ -1330,10 +1319,8 @@ public abstract class AbstractPageManage
// copy properties, (only properties for global and
// current user/group/role specific values copied)
- Iterator props = source.getProperties().iterator();
- while (props.hasNext())
+ for (FragmentProperty prop : source.getProperties())
{
- FragmentProperty prop = (FragmentProperty)props.next();
String propName = prop.getName();
String propScope = prop.getScope();
String propScopeValue = prop.getScopeValue();
@@ -1349,18 +1336,14 @@ public abstract class AbstractPageManage
}
// copy preferences
- Iterator prefs = source.getPreferences().iterator();
- while (prefs.hasNext())
+ for (FragmentPreference pref : source.getPreferences())
{
- FragmentPreference pref = (FragmentPreference)prefs.next();
FragmentPreference newPref = this.newFragmentPreference();
newPref.setName(pref.getName());
newPref.setReadOnly(pref.isReadOnly());
newPref.setValueList(this.<String>createList());
- Iterator values = pref.getValueList().iterator();
- while (values.hasNext())
+ for (String value : pref.getValueList())
{
- String value = (String)values.next();
newPref.getValueList().add(value);
}
copy.getPreferences().add(newPref);
@@ -1378,10 +1361,8 @@ public abstract class AbstractPageManage
copyFragment.setType(sourceFragment.getType());
// recursively copy fragments
- Iterator fragments = sourceFragment.getFragments().iterator();
- while (fragments.hasNext())
+ for (BaseFragmentElement fragment : sourceFragment.getFragments())
{
- BaseFragmentElement fragment = (BaseFragmentElement)fragments.next();
BaseFragmentElement copiedFragment = copyFragment(fragment, null, copyIds);
copyFragment.getFragments().add(copiedFragment);
}
@@ -1439,17 +1420,13 @@ public abstract class AbstractPageManage
// copy security constraint defintions
copy.setSecurityConstraintsDefs(this.<SecurityConstraintsDef>createList());
- Iterator defs = source.getSecurityConstraintsDefs().iterator();
- while (defs.hasNext())
+ for (SecurityConstraintsDef def : source.getSecurityConstraintsDefs())
{
- SecurityConstraintsDef def = (SecurityConstraintsDef)defs.next();
- SecurityConstraintsDef defCopy = this.newSecurityConstraintsDef();
+ SecurityConstraintsDef defCopy = this.newSecurityConstraintsDef();
defCopy.setName(def.getName());
List<SecurityConstraint> copiedConstraints = createList();
- Iterator constraints = def.getSecurityConstraints().iterator();
- while (constraints.hasNext())
+ for (SecurityConstraint srcConstraint : def.getSecurityConstraints())
{
- SecurityConstraint srcConstraint = (SecurityConstraint)constraints.next();
SecurityConstraint dstConstraint = newPageSecuritySecurityConstraint();
copyConstraint(srcConstraint, dstConstraint);
copiedConstraints.add(dstConstraint);
@@ -1460,10 +1437,8 @@ public abstract class AbstractPageManage
// copy global security constraint references
copy.setGlobalSecurityConstraintsRefs(this.<String>createList());
- Iterator globals = source.getGlobalSecurityConstraintsRefs().iterator();
- while (globals.hasNext())
+ for (String global : source.getGlobalSecurityConstraintsRefs())
{
- String global = (String)globals.next();
copy.getGlobalSecurityConstraintsRefs().add(global);
}
@@ -1473,10 +1448,8 @@ public abstract class AbstractPageManage
protected List<MenuDefinition> copyMenuDefinitions(String type, List<MenuDefinition> srcMenus)
{
List<MenuDefinition> copiedMenus = createList();
- Iterator menus = srcMenus.iterator();
- while (menus.hasNext())
+ for (MenuDefinition srcMenu : srcMenus)
{
- MenuDefinition srcMenu = (MenuDefinition)menus.next();
MenuDefinition copiedMenu = (MenuDefinition)copyMenuElement(type, srcMenu);
if (copiedMenu != null)
{
@@ -1520,10 +1493,8 @@ public abstract class AbstractPageManage
if (elements != null)
{
List<MenuDefinitionElement> copiedElements = createList();
- Iterator elementsIter = elements.iterator();
- while (elementsIter.hasNext())
+ for (MenuDefinitionElement element : elements)
{
- MenuDefinitionElement element = (MenuDefinitionElement)elementsIter.next();
MenuDefinitionElement copiedElement = copyMenuElement(type, element);
if (copiedElement != null)
{
@@ -1633,10 +1604,8 @@ public abstract class AbstractPageManage
if (source.getSecurityConstraints() != null)
{
List<SecurityConstraint> copiedConstraints = createList();
- Iterator constraints = source.getSecurityConstraints().iterator();
- while (constraints.hasNext())
+ for (SecurityConstraint srcConstraint : source.getSecurityConstraints())
{
- SecurityConstraint srcConstraint = (SecurityConstraint)constraints.next();
SecurityConstraint dstConstraint = null;
if (type.equals(PAGE_NODE_TYPE))
{
@@ -1662,10 +1631,8 @@ public abstract class AbstractPageManage
if (source.getSecurityConstraintsRefs() != null)
{
List<String> copiedRefs = createList();
- Iterator refs = source.getSecurityConstraintsRefs().iterator();
- while (refs.hasNext())
- {
- String constraintsRef = (String)refs.next();
+ for (String constraintsRef : source.getSecurityConstraintsRefs())
+ {
copiedRefs.add(constraintsRef);
}
security.setSecurityConstraintsRefs(copiedRefs);
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java?rev=1578526&r1=1578525&r2=1578526&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java Mon Mar 17 19:24:56 2014
@@ -30,7 +30,6 @@ import javax.security.auth.Subject;
import java.security.AccessController;
import java.security.Principal;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -78,10 +77,8 @@ public class PageManagerSecurityUtils
List<String> userPrincipals = null;
List<String> rolePrincipals = null;
List<String> groupPrincipals = null;
- Iterator principals = subject.getPrincipals().iterator();
- while (principals.hasNext())
+ for (Principal principal : subject.getPrincipals())
{
- Principal principal = (Principal) principals.next();
if (principal instanceof User)
{
if (userPrincipals == null)
@@ -140,25 +137,22 @@ public class PageManagerSecurityUtils
{
// test each action, constraints check passes only
// if all actions are permitted for principals
- Iterator actionsIter = actions.iterator();
- while (actionsIter.hasNext())
+ for (String action : actions)
{
// check each action:
// - if any actions explicitly permitted, (including owner),
// assume no permissions are permitted by default
// - if all constraints do not specify a permission, assume
// access is permitted by default
- String action = (String)actionsIter.next();
boolean actionPermitted = false;
boolean actionNotPermitted = false;
boolean anyActionsPermitted = true; // TODO:(getOwner() != null);
// check against constraints
- Iterator checkConstraintsIter = checkConstraints.iterator();
- while (checkConstraintsIter.hasNext())
+ for (SecurityConstraint checkConstraint : checkConstraints)
{
- SecurityConstraintImpl constraint = (SecurityConstraintImpl)checkConstraintsIter.next();
-
+ SecurityConstraintImpl constraint = (SecurityConstraintImpl)checkConstraint;
+
// if permissions specified, attempt to match constraint
if (constraint.getPermissions() != null)
{
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.