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 jf...@apache.org on 2003/11/05 03:04:26 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets CustomizeSetAction.java RegistryBrowseAction.java
jford 2003/11/04 18:04:26
Modified: src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java RegistryBrowseAction.java
Log:
Added alphabet navigation to registry browsers and the customizer portlet browser
PR: Bugzilla #19091
Revision Changes Path
1.50 +6 -6 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- CustomizeSetAction.java 3 Nov 2003 05:47:51 -0000 1.49
+++ CustomizeSetAction.java 5 Nov 2003 02:04:26 -0000 1.50
@@ -1063,12 +1063,12 @@
public int compare(Object o1, Object o2)
{
String t1 = (((PortletEntry) o1).getTitle() != null)
- ? ((PortletEntry) o1).getTitle()
- : ((PortletEntry) o1).getName();
+ ? ((PortletEntry) o1).getTitle().toLowerCase()
+ : ((PortletEntry) o1).getName().toLowerCase();
String t2 = (((PortletEntry) o2).getTitle() != null)
- ? ((PortletEntry) o2).getTitle()
- : ((PortletEntry) o2).getName();
-
+ ? ((PortletEntry) o2).getTitle().toLowerCase()
+ : ((PortletEntry) o2).getName().toLowerCase();
+
return t1.compareTo(t2);
}
});
1.6 +19 -1 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/RegistryBrowseAction.java
Index: RegistryBrowseAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/RegistryBrowseAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RegistryBrowseAction.java 3 Nov 2003 05:25:31 -0000 1.5
+++ RegistryBrowseAction.java 5 Nov 2003 02:04:26 -0000 1.6
@@ -55,6 +55,8 @@
package org.apache.jetspeed.modules.actions.portlets;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -116,6 +118,11 @@
int next = start+size+1;
int prev = start-size-1;
+ if(prev < 0)
+ {
+ prev = 0;
+ }
+
String[] filterFields = (String[]) PortletSessionState.getAttribute(portlet, rundata, FILTER_FIELDS);
String[] filterValues = (String[]) PortletSessionState.getAttribute(portlet, rundata, FILTER_VALUES);
@@ -138,6 +145,17 @@
regEntries.add(regEntry);
}
}
+
+ Collections.sort(regEntries,
+ new Comparator() {
+ public int compare(Object o1, Object o2)
+ {
+ String t1 = ((RegistryEntry) o1).getName().toLowerCase();
+ String t2 = ((RegistryEntry) o2).getName().toLowerCase();
+
+ return t1.compareTo(t2);
+ }
+ });
PortletSessionState.setAttribute(portlet, rundata, RESULTS, regEntries);
@@ -164,7 +182,7 @@
List pageEntries = filteredEntries.subList(start, end);
context.put("registry", pageEntries);
- context.put("filtered_entried", filteredEntries);
+ context.put("filtered_entries", filteredEntries);
if (start > 0)
{
context.put("prev",String.valueOf(prev));
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org