You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2006/03/24 09:28:50 UTC
svn commit: r388454 -
/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
Author: rwatler
Date: Fri Mar 24 00:28:48 2006
New Revision: 388454
URL: http://svn.apache.org/viewcvs?rev=388454&view=rev
Log:
correct titled folder selection to differentiate between imported and specified titles/short titles
Modified:
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java?rev=388454&r1=388453&r2=388454&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java Fri Mar 24 00:28:48 2006
@@ -611,15 +611,19 @@
private Folder selectTitledFromAggregateFolders(Folder defaultFolder)
{
// select most specific folder along search paths
- // with a specified short title or metadata
+ // with a specified title, short title, or metadata
try
{
Iterator foldersIter = getSearchFolders().iterator();
while (foldersIter.hasNext())
{
Folder folder = ((SearchFolder)foldersIter.next()).folder;
+ String name = folder.getName();
+ String title = folder.getTitle();
+ String shortTitle = folder.getShortTitle();
GenericMetadata folderMetadata = folder.getMetadata();
- if ((folder.getTitle() != folder.getShortTitle()) ||
+ if (((title != null) && !title.equalsIgnoreCase(name)) ||
+ ((shortTitle != null) && !shortTitle.equalsIgnoreCase(name)) ||
((folderMetadata != null) && (folderMetadata.getFields() != null) && !folderMetadata.getFields().isEmpty()))
{
return folder;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org