[jboss-svn-commits] JBoss Portal SVN: r5407 - in trunk: core/src/bin/portal-core-war/themes/renaissance theme/src/main/org/jboss/portal/theme/impl/render/dynamic

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-10-10 15:09:24 -0400 (Tue, 10 Oct 2006)
New Revision: 5407

Modified:
   trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
Log:
- changing handle behaviour

Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css	2006-10-10 18:51:03 UTC (rev 5406)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css	2006-10-10 19:09:24 UTC (rev 5407)
@@ -765,14 +765,14 @@
 .portlet-font {
    color: #000000;
    font-family: Verdana, Arial, Helvetica, sans-serif;
-   font-size: 12px;
+   font-size: 11px;
 }
 
 /* Font attributes similar to the portlet.font but the color is lighter */
 .portlet-font-dim {
    color: #777777;
    font-family: Verdana, Arial, Helvetica, sans-serif;
-   font-size: 12px;
+   font-size: 11px;
 }
 
 /********

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java	2006-10-10 18:51:03 UTC (rev 5406)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java	2006-10-10 19:09:24 UTC (rev 5407)
@@ -84,7 +84,7 @@
       if (DynaRegionRenderer.isEnabled())
       {
          // we don't need a title bar on empty renderers, but we want titlebar handles on others.
-         if(!(delegate instanceof EmptyDecorationRenderer))
+         if (!(delegate instanceof EmptyDecorationRenderer))
          {
             StringBuffer markup = renderContext.getMarkupFragment();
             markup.append("<tr><td class=\"portlet-titlebar-left\"></td>");
@@ -107,8 +107,6 @@
    private static void renderRemoveLink(RenderContext renderContext, WindowContext windowContext)
    {
       renderContext.getMarkupFragment().append("<div class=\"portlet-mode-").append("remove");
-      //renderContext.getMarkupFragment().append("\" onClick=\"location.href='").append("#").append("';\" title=\"");
-      // onclick="removeWindow('UserPortletWindow');"
       renderContext.getMarkupFragment().append("\" onclick=\"removeWindow('").append(windowContext.getId()).append("');\" title=\"");
       renderContext.getMarkupFragment().append("Remove").append("\"></div>");
    }
@@ -125,22 +123,22 @@
    {
       log.debug("render " + selector + "s");
       Collection modesOrStates = result.getTriggerableActions(selector);
-      if(modesOrStates == null)
+      if (modesOrStates == null)
       {
          return;
       }
 
-      if(modesOrStates instanceof List)
+      if (modesOrStates instanceof List)
       {
-         List list = (List) modesOrStates;
+         List list = (List)modesOrStates;
          Collections.sort(list, COMPARATOR);
          modesOrStates = list;
       }
 
-      for(Iterator i = modesOrStates.iterator(); i.hasNext();)
+      for (Iterator i = modesOrStates.iterator(); i.hasNext();)
       {
-         WindowResult.Action action = (WindowResult.Action) i.next();
-         if(action.isEnabled())
+         WindowResult.Action action = (WindowResult.Action)i.next();
+         if (action.isEnabled())
          {
             log.debug("action is enabled: " + action.getName());
             ctx.getMarkupFragment().append("<div class=\"portlet-mode-").append(action.getName());
@@ -171,13 +169,13 @@
 
       public int compare(Object o1, Object o2)
       {
-         WindowResult.Action action1 = (WindowResult.Action) o1;
-         WindowResult.Action action2 = (WindowResult.Action) o2;
+         WindowResult.Action action1 = (WindowResult.Action)o1;
+         WindowResult.Action action2 = (WindowResult.Action)o2;
 
          Object origin1 = action1.getOrigin();
          Object origin2 = action2.getOrigin();
 
-         if(origin1.equals(origin2))
+         if (origin1.equals(origin2))
          {
             return 0;
          }
@@ -190,8 +188,8 @@
 
       private int getIndexFor(Object origin)
       {
-         Integer index = (Integer) modeOrState2Index.get(origin);
-         if(index == null)
+         Integer index = (Integer)modeOrState2Index.get(origin);
+         if (index == null)
          {
             index = (origin instanceof Mode) ? new Integer(lastModeIndex++) : new Integer(lastStateIndex++);
             modeOrState2Index.put(origin, index);