From portal-commits at lists.jboss.org Wed Nov 14 06:58:53 2007
Content-Type: multipart/mixed; boundary="===============7318094773354687078=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r8922 - in
 branches/JBoss_Portal_Branch_2_6/core-admin/src:
 resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
Date: Wed, 14 Nov 2007 06:58:53 -0500
Message-ID: <E1IsGtR-0006cj-Ft@committer01.frg.pub.inap.atl.jboss.com>

--===============7318094773354687078==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: thomas.heute(a)jboss.com
Date: 2007-11-14 06:58:53 -0500 (Wed, 14 Nov 2007)
New Revision: 8922

Modified:
   branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/co=
re/admin/ui/AdminPropertyResolver.java
   branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-w=
ar/WEB-INF/jsf/instances.xhtml
Log:
Use display name for Portlet Instances tab (with tooltip on the portlet ins=
tance Id)


Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/po=
rtal/core/admin/ui/AdminPropertyResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/c=
ore/admin/ui/AdminPropertyResolver.java	2007-11-14 11:03:32 UTC (rev 8921)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/c=
ore/admin/ui/AdminPropertyResolver.java	2007-11-14 11:58:53 UTC (rev 8922)
@@ -213,7 +213,9 @@
             }
          }
       });
+      instanceDecorator.setProperty("displayName", new InstanceDisplayName=
PropertyDecorator());
       registerDecorator(Instance.class, instanceDecorator);
+      =

 =

       //
       SimpleBeanDecorator portalObjectDecorator =3D new SimpleBeanDecorato=
r()
@@ -471,4 +473,24 @@
          return DEFAULT_PORTLET_ICON;
       }
    }
+
+   private class InstanceDisplayNamePropertyDecorator extends AbstractProp=
ertyDecorator
+   {
+      public InstanceDisplayNamePropertyDecorator()
+      {
+         super(String.class);
+      }
+
+      public Object getValue(Object bean) throws IllegalArgumentException
+      {
+         Instance instance =3D (Instance)bean;
+         String displayName =3D getValueForRequestLocale(instance.getDispl=
ayName());
+         if (displayName =3D=3D null)
+         {
+            displayName =3D instance.getId();
+         }
+         return displayName;
+      }
+   }
+
 }

Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-=
admin-war/WEB-INF/jsf/instances.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-=
war/WEB-INF/jsf/instances.xhtml	2007-11-14 11:03:32 UTC (rev 8921)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-=
war/WEB-INF/jsf/instances.xhtml	2007-11-14 11:58:53 UTC (rev 8922)
@@ -15,7 +15,7 @@
       <table id=3D"instancesTable2" width=3D"100%">
          <thead class=3D"portlet-section-header">
             <tr>
-               <th>Id</th>
+               <th>Name</th>
                <th>Actions</th>
             </tr>
          </thead>
@@ -25,7 +25,7 @@
                   class=3D"#{instance.id =3D=3D instancemgr.selectedId ? '=
portlet-section-selected' : (status.index % 2 =3D=3D 0 ? 'portlet-section-b=
ody' : 'portlet-section-alternate')}">
                   <td>
                      <h:commandLink action=3D"#{instancemgr.selectInstance=
}">
-                        <h:outputText value=3D"#{instance.id}"/>
+                        <h:outputText value=3D"#{instance.displayName}" ti=
tle=3D"#{instance.id}"/>
                         <f:param name=3D"id" value=3D"#{instance.id}"/>
                         <f:param name=3D"plugin" value=3D"info"/>
                      </h:commandLink>


--===============7318094773354687078==--