portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r225221 - /portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
Date Tue, 26 Jul 2005 02:26:39 GMT
Author: rwatler
Date: Mon Jul 25 19:26:36 2005
New Revision: 225221

URL: http://svn.apache.org/viewcvs?rev=225221&view=rev
Log:
refine defaulting of getShortTitle(Locale)

Modified:
    portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java?rev=225221&r1=225220&r2=225221&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/impl/StandardMenuDefinitionImpl.java
Mon Jul 25 19:26:36 2005
@@ -206,6 +206,7 @@
      */
     public String getTitle()
     {
+        // fallback to getName()
         return getName();
     }
 
@@ -226,6 +227,7 @@
      */
     public String getShortTitle()
     {
+        // fallback to getTitle()
         return getTitle();
     }
 
@@ -247,6 +249,7 @@
      */
     public String getTitle(Locale locale)
     {
+        // fallback to getTitle()
         return getTitle();
     }
 
@@ -258,8 +261,11 @@
      */
     public String getShortTitle(Locale locale)
     {
+        // fallback to getTitle(Locale)
         String title = getTitle(locale);
-        if (title == null)
+
+        // fallback to getShortTitle() over getTitle()
+        if ((title == null) || (title == getTitle()))
         {
             title = getShortTitle();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message