portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets CustomizeSetAction.java
Date Thu, 08 Aug 2002 04:05:16 GMT
paulsp      2002/08/07 21:05:16

  Modified:    src/java/org/apache/jetspeed/modules/actions/portlets
                        CustomizeSetAction.java
  Log:
  Housekeeping, as directed by checkStyle.  This involved adding space and
  removing imports.  No functional changes where made.
  
  Revision  Changes    Path
  1.25      +148 -138  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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CustomizeSetAction.java	8 Aug 2002 03:05:41 -0000	1.24
  +++ CustomizeSetAction.java	8 Aug 2002 04:05:16 -0000	1.25
  @@ -72,9 +72,7 @@
   import org.apache.jetspeed.om.registry.RegistryEntry;
   import org.apache.jetspeed.om.registry.PortletEntry;
   import org.apache.jetspeed.om.registry.PortletInfoEntry;
  -import org.apache.jetspeed.om.registry.MediaTypeEntry;
   import org.apache.jetspeed.om.registry.base.BaseCategory;
  -import org.apache.jetspeed.om.profile.Layout;
   import org.apache.jetspeed.om.profile.Portlets;
   import org.apache.jetspeed.om.profile.psml.PsmlPortlets;
   import org.apache.jetspeed.om.profile.Entry;
  @@ -98,7 +96,6 @@
   // Turbine stuff
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.RunData;
  -import org.apache.turbine.services.template.TurbineTemplate;
   
   // Velocity Stuff
   import org.apache.velocity.context.Context;
  @@ -106,12 +103,10 @@
   // Java imports
   import java.util.ArrayList;
   import java.util.TreeMap;
  -import java.util.Vector;
   import java.util.List;
   import java.util.Iterator;
   import java.util.Collections;
   import java.util.Comparator;
  -import java.util.Enumeration;
   
   
   /**
  @@ -121,6 +116,7 @@
    * associated through the registry PortletName
    * 
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  + * @version $Id$
    */
   public class CustomizeSetAction extends VelocityPortletAction
   {
  @@ -130,9 +126,9 @@
        * Subclasses must override this method to provide default behavior 
        * for the portlet action
        */
  -    protected void buildNormalContext( VelocityPortlet portlet, 
  -                                       Context context,
  -                                       RunData rundata ) throws Exception
  +    protected void buildNormalContext(VelocityPortlet portlet, 
  +                                      Context context,
  +                                      RunData rundata) throws Exception
       {
       
          /**
  @@ -144,7 +140,7 @@
           */
           AutoProfile.doIt (rundata, true);
           
  -        JetspeedRunData jdata = (JetspeedRunData)rundata;
  +        JetspeedRunData jdata = (JetspeedRunData) rundata;
           Profile profile = jdata.getProfile();
           String mediaType = jdata.getProfile().getMediaType ();
   
  @@ -157,43 +153,50 @@
           
           
           // we should first retrieve the portlet to customize
  -        PortletSet set = (PortletSet)(jdata).getCustomized();
  +        PortletSet set = (PortletSet) (jdata).getCustomized();
   
           //identify the portlet submode and build the appropriate subt-template path
           String mode = rundata.getParameters().getString("mode");
           if (mode == null)
           {
  -          mode = (String)rundata.getUser().getTemp("mode");
  -          if ((mode==null) || (mode.equalsIgnoreCase("addset")) || (mode.equalsIgnoreCase("general")))
  +          mode = (String) rundata.getUser().getTemp("mode");
  +          if ((mode == null) || (mode.equalsIgnoreCase("addset")) || (mode.equalsIgnoreCase("general")))
  +          {
               mode = "layout";
  +          }
             
           }
           else
           {
             if ((mediaType.equalsIgnoreCase("wml")) && (!mode.equalsIgnoreCase("add")))
  +          {
               mode = "layout";
  +          }
   
  -          rundata.getUser().setTemp("mode",mode);
  +          rundata.getUser().setTemp("mode", mode);
           }
   
  -        String template = (String)context.get("template");
  +        String template = (String) context.get("template");
   
  -        if (template!=null)
  +        if (template != null)
           {
  -            int idx=template.lastIndexOf(".");
  +            int idx = template.lastIndexOf(".");
               StringBuffer buffer = new StringBuffer(template);
  -            if (idx>0)
  +            if (idx > 0)
               {
  -                template = template.substring(0,idx);
  +                template = template.substring(0, idx);
               }
               buffer.append("-").append(mode).append(".vm");
               
               template = TemplateLocator.locatePortletTemplate(rundata, buffer.toString());
  -            context.put("feature",template);
  +            context.put("feature", template);
   
           }
       
  -        if (set==null) return;
  +        if (set == null)
  +        {
  +            return;
  +        }
   
   
          
  @@ -201,13 +204,13 @@
           context.put("panename", (String) jdata.getSession().getAttribute ("customizedPaneName"));
           context.put("skin", set.getPortletConfig().getPortletSkin());
           context.put("set", set);
  -        context.put("action","portlets.CustomizeSetAction");        
  +        context.put("action", "portlets.CustomizeSetAction");        
           context.put("controllers", buildInfoList(rundata, Registry.PORTLET_CONTROLLER,
mediaType));
           context.put("skins", buildList(rundata, Registry.SKIN));
           context.put("securitys", buildList(rundata, Registry.SECURITY));
       
  -        String CtrlName = set.getController().getConfig().getName();
  -        context.put("currentController", CtrlName);
  +        String controllerName = set.getController().getConfig().getName();
  +        context.put("currentController", controllerName);
   
           context.put("currentSecurityRef", set.getPortletConfig().getSecurityRef());
   
  @@ -222,27 +225,35 @@
   
           if (mediaType.equalsIgnoreCase("wml"))
           {
  -          context.put("currentSkin","Not for wml!");
  +          context.put("currentSkin", "Not for wml!");
             context.put("allowproperties", "false");
           }
           else
           {
             if (set.getPortletConfig().getSkin() != null)
  +          {
               context.put("currentSkin", set.getPortletConfig().getPortletSkin().getName());
  +          }
             if (((String) jdata.getSession().getAttribute ("customizedPaneName")).equalsIgnoreCase("*"))
  +          {
               context.put("allowproperties", "false");
  -          else  
  +          }
  +          else
  +          {
               context.put("allowproperties", "true");
  +          }
           }
   
   
  -        context.put("allowpane","false");
  +        context.put("allowpane", "false");
           
           // do not allow panes for wml profiles
           if ((!mediaType.equalsIgnoreCase("wml")) && (set.getController() instanceof
PortletSetController))
           {
             if (((String) jdata.getSession().getAttribute ("customizedPaneName")).equalsIgnoreCase("*"))
  -            context.put("allowpane","true");
  +          {
  +            context.put("allowpane", "true");
  +          }
           }
           else
           {
  @@ -255,12 +266,12 @@
           if ("add".equals(mode)) // build context for add mode
           {
               ArrayList allPortlets = new ArrayList();
  -            List portlets  = buildPortletList(rundata,set,mediaType, allPortlets);
  +            List portlets  = buildPortletList(rundata, set, mediaType, allPortlets);
               // Build a list of categories from the available portlets
               List categories = buildCategoryList(rundata, allPortlets);
               context.put("categories", categories);
               
  -            int start = rundata.getParameters().getInt("start",0);                
  +            int start = rundata.getParameters().getInt("start", 0);                
               int size = 15;
                   
               try
  @@ -273,25 +284,25 @@
                   // ignore
               }
                   
  -            int end = Math.min(start+size, portlets.size());
  +            int end = Math.min(start + size, portlets.size());
                   
               if (start > 0)
               {
  -                context.put("prev",String.valueOf(Math.max(start - size,0)));
  +                context.put("prev", String.valueOf(Math.max(start - size, 0)));
               }
                   
  -            if (start + size < portlets.size() )
  +            if (start + size < portlets.size())
               {
  -                context.put("next",String.valueOf(start + size));
  +                context.put("next", String.valueOf(start + size));
               }
                   
  -            context.put("browser", portlets.subList(start,end));
  +            context.put("browser", portlets.subList(start, end));
           }
           else if ("addref".equals(mode))
           {
               Iterator psmlIterator = null;
               psmlIterator = Profiler.query(new QueryLocator(QueryLocator.QUERY_ALL));
  -            int start = rundata.getParameters().getInt("start",0);                
  +            int start = rundata.getParameters().getInt("start", 0);                
               int size = 15;
                   
               try
  @@ -305,17 +316,17 @@
               }
                   
   //            int end = Math.min(start+size, portlets.size());
  -            int end = Math.min(start+size, 100);
  +            int end = Math.min(start + size, 100);
                   
               if (start > 0)
               {
  -                context.put("prev",String.valueOf(Math.max(start - size,0)));
  +                context.put("prev", String.valueOf(Math.max(start - size, 0)));
               }
                   
   //            if (start + size < portlets.size() )
  -            if (start + size < 100 )
  +            if (start + size < 100)
               {
  -                context.put("next",String.valueOf(start + size));
  +                context.put("next", String.valueOf(start + size));
               }
                   
               //context.put("browser", portlets.subList(start,end));
  @@ -339,12 +350,12 @@
       /** Save the general informations for this set */
       public void doSave(RunData rundata, Context context)
       {
  -        doMetainfo(rundata,context);
  -        doSkin(rundata,context);
  -        doLayout(rundata,context);
  -        doSecurity(rundata,context);
  +        doMetainfo(rundata, context);
  +        doSkin(rundata, context);
  +        doLayout(rundata, context);
  +        doSecurity(rundata, context);
           
  -        Profile profile = ((JetspeedRunData)rundata).getProfile();
  +        Profile profile = ((JetspeedRunData) rundata).getProfile();
           try
           {
               String mtype = rundata.getParameters().getString("mtype");
  @@ -357,7 +368,7 @@
           }
           catch (Exception e)
           {
  -            Log.error("Exception occured while saving PSML",e);
  +            Log.error("Exception occured while saving PSML", e);
           }
   
       }
  @@ -371,14 +382,14 @@
       /** Add a new portlets element in the customized set */
       public void doAddset(RunData rundata, Context context)
       {
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  -        String title = rundata.getParameters().getString("title","My Pane");
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
  +        String title = rundata.getParameters().getString("title", "My Pane");
           
  -        if (set!=null)
  +        if (set != null)
           {
  -            Portlets portlets = ((JetspeedRunData)rundata).getProfile()
  -                                            .getDocument()
  -                                            .getPortletsById(set.getID());
  +            Portlets portlets = ((JetspeedRunData) rundata).getProfile()
  +                                                           .getDocument()
  +                                                           .getPortletsById(set.getID());
               
               if (portlets != null)
               {
  @@ -390,7 +401,7 @@
               }
           }
   
  -        rundata.getUser().setTemp("mode","layout");
  +        rundata.getUser().setTemp("mode", "layout");
       }
       
       /** Add new portlets in the customized set */
  @@ -407,7 +418,7 @@
           //boolean isWML = AutoProfile.doIt (rundata, true).getMediaType().equalsIgnoreCase("wml");
           AutoProfile.doIt (rundata, true);
   
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           String[] pnames = rundata.getParameters().getStrings("pname");
   
           // Create a ClearPortletControl
  @@ -415,23 +426,23 @@
           ctrl.setName ("ClearPortletControl");
   
           
  -        if ( (pnames!=null) && (set!=null) )
  +        if ((pnames != null) && (set != null))
           {
  -            Portlets portlets = ((JetspeedRunData)rundata).getProfile()
  -                                            .getDocument()
  -                                            .getPortletsById(set.getID());
  +            Portlets portlets = ((JetspeedRunData) rundata).getProfile()
  +                                                           .getDocument()
  +                                                           .getPortletsById(set.getID());
   
               List usedPortlets = AutoProfile.getPortletList(rundata);
               boolean addIt;
               int cc;
               Entry usedEntry;
                                             
  -            for(int i=0;i < pnames.length; i++)
  +            for (int i = 0; i < pnames.length; i++)
               {
  -                PortletEntry entry = (PortletEntry)Registry.getEntry(Registry.PORTLET,
pnames[i]);
  +                PortletEntry entry = (PortletEntry) Registry.getEntry(Registry.PORTLET,
pnames[i]);
   
                   // add only new portlets!
  -                if ((entry!=null) && (portlets != null))
  +                if ((entry != null) && (portlets != null))
                   {
                   
                       addIt = true;
  @@ -464,7 +475,7 @@
           // --------------------------------------------------------------------------
   
   
  -        rundata.getUser().setTemp("mode","layout");
  +        rundata.getUser().setTemp("mode", "layout");
   
           /** 
            * Save changed wml profile
  @@ -486,7 +497,7 @@
       {
           AutoProfile.doIt (rundata, true);
   
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           String[] refNames = rundata.getParameters().getStrings("refname");
           
           // Create a ClearPortletControl
  @@ -494,44 +505,44 @@
           ctrl.setName ("ClearPortletControl");
   
           
  -        if ( (refNames != null) && (set != null) )
  +        if ((refNames != null) && (set != null))
           {
  -            Portlets portlets = ((JetspeedRunData)rundata).getProfile()
  -                                            .getDocument()
  -                                            .getPortletsById(set.getID());
  +            Portlets portlets = ((JetspeedRunData) rundata).getProfile()
  +                                                           .getDocument()
  +                                                           .getPortletsById(set.getID());
   
               for (int i = 0; i < refNames.length; i++)
               {
                 Reference ref = new PsmlReference();
  -              ref.setPath( refNames[i]);
  +              ref.setPath(refNames[i]);
                 portlets.addReference(ref);
               }
           }
  -        rundata.getUser().setTemp("mode","layout");
  +        rundata.getUser().setTemp("mode", "layout");
       }
       
       /** Sets the metainfo for this entry */
       public void doMetainfo(RunData rundata, Context context)
       {
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           String title = rundata.getParameters().getString("title");
   
  -        if ( set!=null )
  +        if (set != null)
           {
  -            Portlets portlets = ((JetspeedRunData)rundata).getProfile()
  -                                            .getDocument()
  -                                            .getPortletsById(set.getID());
  +            Portlets portlets = ((JetspeedRunData) rundata).getProfile()
  +                                                           .getDocument()
  +                                                           .getPortletsById(set.getID());
               
  -            if (portlets!=null)
  +            if (portlets != null)
               {
                   MetaInfo meta = portlets.getMetaInfo();
  -                if (meta==null)
  +                if (meta == null)
                   {
                       meta = new PsmlMetaInfo();
                       portlets.setMetaInfo(meta);
                   }
               
  -                if (title!=null)
  +                if (title != null)
                   {
                       meta.setTitle(title);
                       set.setTitle(title);
  @@ -545,18 +556,18 @@
       {
           // we should first retrieve the portlet to customize and its parameters
           // definition
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           
           try
           {            
               String controller = rundata.getParameters().getString("controller");
               
  -            if (controller!=null)
  +            if (controller != null)
               {
  -                Profile profile = ((JetspeedRunData)rundata).getProfile();
  +                Profile profile = ((JetspeedRunData) rundata).getProfile();
                   PortletController pc = PortalToolkit.getController(controller);
   
  -                if (pc!=null)
  +                if (pc != null)
                   {
                       set.setController(pc);
   
  @@ -572,7 +583,7 @@
                       
                       String linkedControl = pc.getConfig().getInitParameter("control");
   
  -                    if (linkedControl!=null)
  +                    if (linkedControl != null)
                       {
                           Control ctl = new PsmlControl();
                           ctl.setName(linkedControl);
  @@ -602,18 +613,18 @@
       {
           // we should first retrieve the portlet to customize and its parameters
           // definition
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           
           try
           {            
               String skin = rundata.getParameters().getString("skin");
  -            Profile profile = ((JetspeedRunData)rundata).getProfile();
  +            Profile profile = ((JetspeedRunData) rundata).getProfile();
               Portlets portlets = profile.getDocument().getPortletsById(set.getID());
  -            if ((skin!=null) && (skin.trim().length() > 0))
  +            if ((skin != null) && (skin.trim().length() > 0))
               {
                   PortletSkin s = PortalToolkit.getSkin(skin);
   
  -                if (s!=null)
  +                if (s != null)
                   {
                       set.getPortletConfig().setPortletSkin(s);
   
  @@ -626,17 +637,16 @@
                   }
                   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;
                   }
               }
               else
               {
                   // By setting the skin to null, the parent's skin will be used.
  -                set.getPortletConfig().setPortletSkin( (PortletSkin) null);
  -                portlets.setSkin( null);
  +                set.getPortletConfig().setPortletSkin((PortletSkin) null);
  +                portlets.setSkin(null);
               }
  -
           }
           catch (Exception e)
           {
  @@ -654,19 +664,19 @@
       {
           // we should first retrieve the portlet to customize and its parameters
           // definition
  -        PortletSet set = (PortletSet)((JetspeedRunData)rundata).getCustomized();
  +        PortletSet set = (PortletSet) ((JetspeedRunData) rundata).getCustomized();
           
           try
           {            
               String securityRefName = rundata.getParameters().getString("securityRef");
               SecurityReference securityRef = null;
  -            Profile profile = ((JetspeedRunData)rundata).getProfile();
  +            Profile profile = ((JetspeedRunData) rundata).getProfile();
               Portlets portlets = profile.getDocument().getPortletsById(set.getID());
   
  -            if ((securityRefName !=null) && (securityRefName.trim().length() >
0))
  +            if ((securityRefName != null) && (securityRefName.trim().length() >
0))
               {
                   securityRef = new BaseSecurityReference();
  -                securityRef.setParent( securityRefName);
  +                securityRef.setParent(securityRefName);
               }
               set.getPortletConfig().setSecurityRef(securityRef);
               portlets.setSecurityRef(securityRef);
  @@ -683,9 +693,9 @@
       {
           List list = new ArrayList();
           
  -        String mime = ((JetspeedRunData)data).getCapability()
  -                                             .getPreferredType()
  -                                             .toString();
  +        String mime = ((JetspeedRunData) data).getCapability()
  +                                              .getPreferredType()
  +                                              .toString();
                                                
           Iterator m = Registry.get(Registry.MEDIA_TYPE).listEntryNames();
   //        
  @@ -706,17 +716,17 @@
                       
           Iterator i = Registry.get(Registry.PORTLET).listEntryNames();
           
  -        while(i.hasNext())
  +        while (i.hasNext())
           {
  -            PortletEntry entry = (PortletEntry)Registry.getEntry(Registry.PORTLET,
  -                                                                 (String)i.next());
  +            PortletEntry entry = (PortletEntry) Registry.getEntry(Registry.PORTLET,
  +                                                                 (String) i.next());
               
               Iterator medias;
               //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) &&
  -               ((!entry.isHidden()) 
  +            if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry),
JetspeedSecurity.PERMISSION_VIEW)
  +              && ((!entry.isHidden()) 
                   && (!entry.getType().equals(PortletEntry.TYPE_ABSTRACT))
                   && entry.hasMediaType(mediaType)))
               {
  @@ -728,8 +738,8 @@
   //                }
   //  
                   // Filter by category
  -				String filterCat = (String)  data.getUser().getTemp("filter_category");
  -                if(filterCat == null || (filterCat.equals("All Portlets") || entry.hasCategory(filterCat)))
  +                String filterCat = (String)  data.getUser().getTemp("filter_category");
  +                if (filterCat == null || (filterCat.equals("All Portlets") || entry.hasCategory(filterCat)))
                   {                
                       list.add(entry);
                   }
  @@ -740,12 +750,12 @@
                   new Comparator() {
                       public int compare(Object o1, Object o2)
                       {
  -                        String t1 = (((PortletEntry)o1).getTitle() != null)
  -                            ?((PortletEntry)o1).getTitle()
  -                            :((PortletEntry)o1).getName();
  -                        String t2 = (((PortletEntry)o2).getTitle() != null)
  -                            ?((PortletEntry)o2).getTitle()
  -                            :((PortletEntry)o2).getName();
  +                        String t1 = (((PortletEntry) o1).getTitle() != null)
  +                            ? ((PortletEntry) o1).getTitle()
  +                            : ((PortletEntry) o1).getName();
  +                        String t2 = (((PortletEntry) o2).getTitle() != null)
  +                            ? ((PortletEntry) o2).getTitle()
  +                            : ((PortletEntry) o2).getName();
                           
                           return t1.compareTo(t2);
                       }
  @@ -758,9 +768,9 @@
       {
           List list = new ArrayList();
           
  -        String mime = ((JetspeedRunData)data).getCapability()
  -                                             .getPreferredType()
  -                                             .toString();
  +        String mime = ((JetspeedRunData) data).getCapability()
  +                                              .getPreferredType()
  +                                              .toString();
                                                
           Iterator m = Registry.get(Registry.MEDIA_TYPE).listEntryNames();
   //        String mediaName = "html";
  @@ -782,15 +792,15 @@
                       
           Iterator i = Registry.get(regName).listEntryNames();
           
  -        while(i.hasNext())
  +        while (i.hasNext())
           {
  -            PortletInfoEntry entry = (PortletInfoEntry)Registry.getEntry(regName,
  -                                                                 (String)i.next());
  +            PortletInfoEntry entry = (PortletInfoEntry) Registry.getEntry(regName,
  +                                                                 (String) i.next());
               
               // MODIFIED: Selection now takes care of the specified mediatype!
  -            if (JetspeedSecurity.checkPermission((JetspeedUser)data.getUser(), new PortalResource(entry),
JetspeedSecurity.PERMISSION_CUSTOMIZE) &&
  -               ((!entry.isHidden())
  -                && entry.hasMediaType(mediaType)))
  +            if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry),
JetspeedSecurity.PERMISSION_CUSTOMIZE)
  +               && ((!entry.isHidden())
  +                 && entry.hasMediaType(mediaType)))
               {
                   list.add(entry);
               }
  @@ -800,12 +810,12 @@
                   new Comparator() {
                       public int compare(Object o1, Object o2)
                       {
  -                        String t1 = (((RegistryEntry)o1).getTitle() != null)
  -                            ?((RegistryEntry)o1).getTitle()
  -                            :((RegistryEntry)o1).getName();
  -                        String t2 = (((RegistryEntry)o2).getTitle() != null)
  -                            ?((RegistryEntry)o2).getTitle()
  -                            :((RegistryEntry)o2).getName();
  +                        String t1 = (((RegistryEntry) o1).getTitle() != null)
  +                            ? ((RegistryEntry) o1).getTitle()
  +                            : ((RegistryEntry) o1).getName();
  +                        String t2 = (((RegistryEntry) o2).getTitle() != null)
  +                            ? ((RegistryEntry) o2).getTitle()
  +                            : ((RegistryEntry) o2).getName();
                           
                           return t1.compareTo(t2);
                       }
  @@ -819,12 +829,12 @@
           List list = new ArrayList();
           
           Iterator i = Registry.get(regName).listEntryNames();        
  -        while(i.hasNext())
  +        while (i.hasNext())
           {
  -            RegistryEntry entry = Registry.getEntry(regName,(String)i.next());
  +            RegistryEntry entry = Registry.getEntry(regName, (String) i.next());
               
  -            if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry),JetspeedSecurity.PERMISSION_CUSTOMIZE)
&&
  -               (!entry.isHidden()))
  +            if (JetspeedSecurity.checkPermission((JetspeedUser) data.getUser(), new PortalResource(entry),
JetspeedSecurity.PERMISSION_CUSTOMIZE)
  +               && (!entry.isHidden()))
               {
                   list.add(entry);
               }
  @@ -834,12 +844,12 @@
                   new Comparator() {
                       public int compare(Object o1, Object o2)
                       {
  -                        String t1 = (((RegistryEntry)o1).getTitle() != null)
  -                            ?((RegistryEntry)o1).getTitle()
  -                            :((RegistryEntry)o1).getName();
  -                        String t2 = (((RegistryEntry)o2).getTitle() != null)
  -                            ?((RegistryEntry)o2).getTitle()
  -                            :((RegistryEntry)o2).getName();
  +                        String t1 = (((RegistryEntry) o1).getTitle() != null)
  +                            ? ((RegistryEntry) o1).getTitle()
  +                            : ((RegistryEntry) o1).getName();
  +                        String t2 = (((RegistryEntry) o2).getTitle() != null)
  +                            ? ((RegistryEntry) o2).getTitle()
  +                            : ((RegistryEntry) o2).getName();
                           
                           return t1.compareTo(t2);
                       }
  @@ -857,11 +867,11 @@
       {
           TreeMap catMap = new TreeMap();
           Iterator pItr = portlets.iterator();
  -        while(pItr.hasNext())
  +        while (pItr.hasNext())
           {
               PortletEntry entry =  (PortletEntry) pItr.next();
               Iterator cItr = entry.listCategories();
  -            while(cItr.hasNext())
  +            while (cItr.hasNext())
               {
                   BaseCategory cat = (BaseCategory) cItr.next();
                   catMap.put(cat.getName(), cat);
  @@ -880,8 +890,8 @@
        */
       public void doFiltercategory(RunData rundata, Context context)
       {
  -        String filterCat = rundata.getParameters().getString("filter_category","All Portlets");
  -        rundata.getUser().setTemp("filter_category",filterCat);
  +        String filterCat = rundata.getParameters().getString("filter_category", "All Portlets");
  +        rundata.getUser().setTemp("filter_category", filterCat);
           
       }
           
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message