Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory
james.mmbase.org:/tmp/cvs-serv25254/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
Modified Files:
SiteManagementServiceMMBaseImpl.java SiteModelManager.java
SiteCacheLoader.java
Log Message:
CMSC-852 Cleanup java files
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
See also: http://www.mmbase.org/jira/browse/CMSC-852
Index: SiteManagementServiceMMBaseImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteManagementServiceMMBaseImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SiteManagementServiceMMBaseImpl.java 28 Mar 2008 15:48:43 -0000
1.15
+++ SiteManagementServiceMMBaseImpl.java 12 Apr 2008 14:26:07 -0000
1.16
@@ -240,8 +240,7 @@
public <E extends NavigationItem> List<E> getListFromPath(String path,
Class<E> clazz) {
List<E> itemsForPath = siteModelManager.getItemsForPath(path, clazz);
if (ServerUtil.isStaging()) {
- for (Iterator<E> iterator = itemsForPath.iterator();
iterator.hasNext();) {
- E child = iterator.next();
+ for (E child : itemsForPath) {
if (!showNavigation(child)) {
itemsForPath.clear();
break;
Index: SiteModelManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- SiteModelManager.java 28 Jan 2008 21:15:43 -0000 1.10
+++ SiteModelManager.java 12 Apr 2008 14:26:07 -0000 1.11
@@ -365,8 +365,7 @@
if (v != null) {
List<String> vTypes = v.getContenttypes();
if (!vTypes.isEmpty()) {
- for (Iterator<String> iter = vTypes.iterator(); iter.hasNext();) {
- String type = iter.next();
+ for (String type : vTypes) {
if (dTypes.isEmpty() || dTypes.contains(type)) {
types.add(type);
}
Index: SiteCacheLoader.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteCacheLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SiteCacheLoader.java 28 Jan 2008 21:15:43 -0000 1.1
+++ SiteCacheLoader.java 12 Apr 2008 14:26:07 -0000 1.2
@@ -144,8 +144,7 @@
}
}
- for (Iterator<Node> iter = unfinishedNodes.iterator(); iter.hasNext();)
{
- Node navrelNode = iter.next();
+ for (Node navrelNode : unfinishedNodes) {
log.warn("Page treenode not found for navrel: " + navrelNode);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
