paulsp 2002/08/13 20:04:09 Modified: src/java/org/apache/jetspeed/modules/actions/portlets CustomizeSetAction.java Log: Housekeeping - shortened lines as directed by checkStyle Revision Changes Path 1.28 +13 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java Index: CustomizeSetAction.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- CustomizeSetAction.java 12 Aug 2002 01:29:00 -0000 1.27 +++ CustomizeSetAction.java 14 Aug 2002 03:04:09 -0000 1.28 @@ -714,7 +714,9 @@ } else { - Log.warn("Unable to update skin for portlet set " + set.getID() + " because skin " + skin + " does not exist."); + Log.warn("Unable to update skin for portlet set " + + set.getID() + " because skin " + skin + + " does not exist."); return; } } @@ -802,7 +804,9 @@ //Make a master portlet list, we will eventually us this to build a category list allPortlets.add(entry); // MODIFIED: Selection now takes care of the specified mediatype! - if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry), JetspeedSecurity.PERMISSION_VIEW) + if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), + new PortalResource(entry), + JetspeedSecurity.PERMISSION_VIEW) && ((!entry.isHidden()) && (!entry.getType().equals(PortletEntry.TYPE_ABSTRACT)) && entry.hasMediaType(mediaType))) @@ -875,7 +879,9 @@ (String) i.next()); // MODIFIED: Selection now takes care of the specified mediatype! - if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry), JetspeedSecurity.PERMISSION_CUSTOMIZE) + if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), + new PortalResource(entry), + JetspeedSecurity.PERMISSION_CUSTOMIZE) && ((!entry.isHidden()) && entry.hasMediaType(mediaType))) { @@ -910,7 +916,9 @@ { RegistryEntry entry = Registry.getEntry(regName, (String) i.next()); - if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry), JetspeedSecurity.PERMISSION_CUSTOMIZE) + if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), + new PortalResource(entry), + JetspeedSecurity.PERMISSION_CUSTOMIZE) && (!entry.isHidden())) { list.add(entry);
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>