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 ta...@apache.org on 2002/04/27 23:14:06 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser ActionParameter.java DatabaseBrowserAction.java
taylor 02/04/27 14:14:06
Modified: src/java/org/apache/jetspeed/modules/actions/portlets/browser
ActionParameter.java DatabaseBrowserAction.java
Log:
Added new parameter for page in ActionParameter.
Added new attributes that will read the link types.
Revision Changes Path
1.2 +27 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/ActionParameter.java
Index: ActionParameter.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/ActionParameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionParameter.java 26 Apr 2002 18:31:12 -0000 1.1
+++ ActionParameter.java 27 Apr 2002 21:14:05 -0000 1.2
@@ -58,29 +58,49 @@
* Action Parameter
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: ActionParameter.java,v 1.1 2002/04/26 18:31:12 taylor Exp $
+ * @version $Id: ActionParameter.java,v 1.2 2002/04/27 21:14:05 taylor Exp $
*
*/
public class ActionParameter
{
String name;
String action;
+ String type;
+ String page;
- public ActionParameter(String name, String action)
+ public ActionParameter(String name, String action, String type)
{
this.name = name;
- this.action= action;
+ if(type.equalsIgnoreCase("psml"))
+ {
+ int index = action.indexOf("/");
+ this.page= action.substring(0, index);
+ this.action= action.substring(index+1);
+ }
+ else
+ {
+ this.action= action;
+ }
+ this.type = type;
}
public String getName()
{
return this.name;
}
+ public String getPage()
+ {
+ return this.page;
+ }
public String getAction()
{
return this.action;
}
+ public String getType()
+ {
+ return this.type;
+ }
public void setName(String name)
{
this.name = name;
@@ -89,6 +109,10 @@
public void setAction(String action)
{
this.action = action;
+ }
+ public void setType(String type)
+ {
+ this.type = type;
}
}
1.15 +31 -26 jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java
Index: DatabaseBrowserAction.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/browser/DatabaseBrowserAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DatabaseBrowserAction.java 26 Apr 2002 18:31:12 -0000 1.14
+++ DatabaseBrowserAction.java 27 Apr 2002 21:14:05 -0000 1.15
@@ -112,7 +112,7 @@
* according to the quey speciified by the user.
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: DatabaseBrowserAction.java,v 1.14 2002/04/26 18:31:12 taylor Exp $
+ * @version $Id: DatabaseBrowserAction.java,v 1.15 2002/04/27 21:14:05 taylor Exp $
*/
public class DatabaseBrowserAction extends VelocityPortletAction implements BrowserQuery
{
@@ -121,12 +121,14 @@
private static final String CUSTOMIZE_TEMPLATE = "customizeTemplate";
private static final String WINDOW_SIZE = "windowSize";
private static final String PRIMARY_KEY = "primaryKey";
- private static final String ROW_ACTION = "rowActions";
- private static final String TABLE_ACTION = "tableActions";
- private static final String ROW_ACTION_IDS = "row-action-ids";
- private static final String ROW_ACTION_CLASSES = "row-action-classes";
- private static final String TABLE_ACTION_IDS = "table-action-ids";
- private static final String TABLE_ACTION_CLASSES = "table-action-classes";
+ private static final String ROW_LINK = "rowLinks";
+ private static final String TABLE_LINK = "tableLinks";
+ private static final String ROW_LINK_IDS = "row-link-ids";
+ private static final String ROW_LINK_TYPES = "row-link-types";
+ private static final String ROW_LINK_TARGETS = "row-link-targets";
+ private static final String TABLE_LINK_IDS = "table-link-ids";
+ private static final String TABLE_LINK_TYPES = "table-link-types";
+ private static final String TABLE_LINK_TARGETS = "table-link-targets";
private static final String BROWSER_TABLE_SIZE = "tableSize";
private static final String DATABASE_BROWSER_ACTION_KEY = "database_browser_action_key";
private static final String BROWSER_ITERATOR = "table";
@@ -189,42 +191,45 @@
int resultSetSize, next, prev, windowSize;
List rowList, tableList;
- context.put("$l10n", new LocalizationTool());
-
String pk = getParameterFromRegistry(portlet,PRIMARY_KEY,null);
context.put(PRIMARY_KEY, pk);
- System.out.println("primary key="+pk);
- String rowActionIds= getParameterFromRegistry(portlet,ROW_ACTION_IDS,null);
- String rowActionClasses= getParameterFromRegistry(portlet,ROW_ACTION_CLASSES,null);
- if( rowActionIds != null && rowActionIds.length() > 0 )
+ String rowLinkIds= getParameterFromRegistry(portlet,ROW_LINK_IDS,null);
+ String rowLinkClasses= getParameterFromRegistry(portlet,ROW_LINK_TARGETS,null);
+ String rowLinkTypes= getParameterFromRegistry(portlet,ROW_LINK_TYPES,null);
+ if( rowLinkIds != null && rowLinkIds.length() > 0 )
{
rowList = new ArrayList();
int rowIndex = 0;
- StringTokenizer tokenizer1 = new StringTokenizer(rowActionIds, ",");
- StringTokenizer tokenizer2 = new StringTokenizer(rowActionClasses, ",");
- while(tokenizer1.hasMoreTokens() && tokenizer2.hasMoreTokens())
+ StringTokenizer tokenizer1 = new StringTokenizer(rowLinkIds, ",");
+ StringTokenizer tokenizer2 = new StringTokenizer(rowLinkClasses, ",");
+ StringTokenizer tokenizer3 = new StringTokenizer(rowLinkTypes, ",");
+ while(tokenizer1.hasMoreTokens() && tokenizer2.hasMoreTokens() && tokenizer3.hasMoreTokens())
{
- rowList.add(rowIndex, new ActionParameter(tokenizer1.nextToken(), tokenizer2.nextToken()));
+ rowList.add(rowIndex,
+ new ActionParameter(tokenizer1.nextToken(), tokenizer2.nextToken(), tokenizer3.nextToken()));
rowIndex++;
}
- context.put(ROW_ACTION, rowList);
+ context.put(ROW_LINK, rowList);
}
- String tableActionIds= getParameterFromRegistry(portlet,TABLE_ACTION_IDS,null);
- String tableActionClasses= getParameterFromRegistry(portlet,TABLE_ACTION_CLASSES,null);
- if( tableActionIds != null && tableActionIds.length() > 0 )
+ String tableLinkIds= getParameterFromRegistry(portlet,TABLE_LINK_IDS,null);
+ String tableLinkClasses= getParameterFromRegistry(portlet,TABLE_LINK_TARGETS,null);
+ String tableLinkTypes= getParameterFromRegistry(portlet,TABLE_LINK_TYPES,null);
+ if( tableLinkIds != null && tableLinkIds.length() > 0 )
{
tableList = new ArrayList();
int tableIndex = 0;
- StringTokenizer tokenizer1 = new StringTokenizer(tableActionIds, ",");
- StringTokenizer tokenizer2 = new StringTokenizer(tableActionClasses, ",");
- while(tokenizer1.hasMoreTokens() && tokenizer2.hasMoreTokens())
+ StringTokenizer tokenizer1 = new StringTokenizer(tableLinkIds, ",");
+ StringTokenizer tokenizer2 = new StringTokenizer(tableLinkClasses, ",");
+ StringTokenizer tokenizer3 = new StringTokenizer(tableLinkTypes, ",");
+ while(tokenizer1.hasMoreTokens() && tokenizer2.hasMoreTokens() && tokenizer3.hasMoreTokens())
{
- tableList.add(tableIndex, new ActionParameter(tokenizer1.nextToken(), tokenizer2.nextToken()));
+ tableList.add(tableIndex,
+ new ActionParameter(tokenizer1.nextToken(), tokenizer2.nextToken(), tokenizer3.nextToken()));
tableIndex++;
}
- context.put(TABLE_ACTION, tableList);
+ context.put(TABLE_LINK, tableList);
}
BrowserIterator iterator = getDatabaseBrowserIterator(portlet, rundata);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>