paulsp 2002/08/25 14:49:45
Modified: src/java/org/apache/jetspeed/portal/controls
VelocityPortletSetControl.java
Log:
o Housekeeping directed by checkStyle.
No functional changes
Revision Changes Path
1.11 +25 -22
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java
Index: VelocityPortletSetControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VelocityPortletSetControl.java 25 Aug 2002 19:52:08 -0000 1.10
+++ VelocityPortletSetControl.java 25 Aug 2002 21:49:45 -0000 1.11
@@ -57,7 +57,6 @@
// Turbine stuff
import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.DynamicURI;
// Jetspeed stuff
import org.apache.jetspeed.om.security.JetspeedUser;
@@ -74,7 +73,7 @@
// Velocity Stuff
import org.apache.velocity.context.Context;
-import java.util.ArrayList;
+// Java stuff
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@@ -99,11 +98,11 @@
* @param rundata the RunData object for this request
* @param context the Context used by the template
*/
- public void buildContext( RunData rundata, Context context )
+ public void buildContext(RunData rundata, Context context)
{
if (getPortlet() instanceof PortletSet)
{
- context.put("tabs", getTabs((PortletSet)getPortlet(), rundata, context)
);
+ context.put("tabs", getTabs((PortletSet) getPortlet(), rundata,
context));
}
}
@@ -117,22 +116,22 @@
* @param portlet the base portlet to explore for children
* @
*/
- private Collection getTabs( PortletSet portlets, RunData rundata, Context
context )
+ private Collection getTabs(PortletSet portlets, RunData rundata, Context
context)
{
TreeSet tabs = new TreeSet(new PortletTabComparator());
PanedPortletController controller = null;
// if portlet is a PortletSet, try to retrieve the Controller
// we need a PanedPortletController to work properly.
- if ( portlets.getController() instanceof PanedPortletController )
+ if (portlets.getController() instanceof PanedPortletController)
{
controller = (PanedPortletController) portlets.getController();
}
int count = 0;
- for ( Enumeration en = portlets.getPortlets(); en.hasMoreElements();
count++ )
+ for (Enumeration en = portlets.getPortlets(); en.hasMoreElements(); count++)
{
- Portlet p = (Portlet)en.nextElement();
+ Portlet p = (Portlet) en.nextElement();
PortalResource portalResource = new PortalResource(p);
// Secure the tabs
@@ -147,36 +146,40 @@
Log.warn(e.toString());
portalResource.setOwner(null);
}
- JetspeedRunData jdata = (JetspeedRunData)rundata;
- boolean hasView = JetspeedSecurity.checkPermission((JetspeedUser)
jdata.getUser(), portalResource, JetspeedSecurity.PERMISSION_VIEW);
- if(!hasView)
+ JetspeedRunData jdata = (JetspeedRunData) rundata;
+ boolean hasView = JetspeedSecurity.checkPermission((JetspeedUser)
jdata.getUser(),
+ portalResource,
+
JetspeedSecurity.PERMISSION_VIEW);
+ if (!hasView)
{
continue;
}
// skip any closed portlet
- if ((p instanceof PortletState) &&
(((PortletState)p).isClosed(rundata)))
+ if ((p instanceof PortletState) && (((PortletState)
p).isClosed(rundata)))
{
continue;
}
- String mstate = p.getAttribute( "_menustate", "open", rundata );
+ String mstate = p.getAttribute("_menustate", "open", rundata);
if (mstate.equals("closed"))
+ {
continue;
+ }
PortletTab tab = new PortletTab();
- tab.setTitle( (p.getTitle()!=null)?p.getTitle():p.getName() );
+ tab.setTitle((p.getTitle() != null) ? p.getTitle() : p.getName());
tab.setPosition(p.getPortletConfig().getPosition());
- if(tabs.contains(tab))
+ if (tabs.contains(tab))
{
PortletTab lastTab = (PortletTab) tabs.last();
int nextPos = lastTab.getPosition() + 1;
tab.setPosition(nextPos);
}
- if ( controller != null )
+ if (controller != null)
{
tab.setSelected(controller.isSelected(p, rundata));
- tab.setLink(controller.getPortletURI( p, rundata ).toString());
+ tab.setLink(controller.getPortletURI(p, rundata).toString());
}
tab.setActions(buildActionList(rundata, p));
@@ -228,7 +231,7 @@
public List getActions()
{
- return (this.actions==null)?new Vector():this.actions;
+ return (this.actions == null) ? new Vector() : this.actions;
}
public void setActions(List actions)
@@ -266,11 +269,11 @@
int pos1 = pt1.getPosition();
int pos2 = pt2.getPosition();
- if(pos1 < pos2)
+ if (pos1 < pos2)
{
return -1;
}
- else if(pos1 > pos2)
+ else if (pos1 > pos2)
{
return 1;
}
@@ -279,7 +282,7 @@
return 0;
}
}
- catch(ClassCastException e)
+ catch (ClassCastException e)
{
return 0;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
