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 sg...@apache.org on 2001/03/09 13:41:07 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util URILookup.java
sgala 01/03/09 04:41:07
Modified: src/java/org/apache/jetspeed/util URILookup.java
Log:
Solved problem (use URIEncoder instead of java.net.URLEncoder) and cleaned indentation
Revision Changes Path
1.10 +88 -30 jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java
Index: URILookup.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/URILookup.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- URILookup.java 2001/03/07 06:50:09 1.9
+++ URILookup.java 2001/03/09 12:41:07 1.10
@@ -1,3 +1,5 @@
+package org.apache.jetspeed.util;
+
/* ====================================================================
* The Apache Software License, Version 1.1
*
@@ -52,8 +54,6 @@
* <http://www.apache.org/>.
*/
-package org.apache.jetspeed.util;
-
//jetspeed support
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.portal.PortletControl;
@@ -68,6 +68,8 @@
//java imports
import java.util.Enumeration;
import java.util.Hashtable;
+import java.net.URLEncoder;
+import java.net.URLDecoder;
/**
@@ -118,7 +120,8 @@
* </UL>
*
* @author <A HREF="shesmer@raleigh.ibm.com">Stephan Hesmer</A>
- * @version URILookup.java,v 1.1
+ * @author <A HREF="sgala@apache.org">Santiago Gala</A>
+ * @version $Id: URILookup.java,v 1.10 2001/03/09 12:41:07 sgala Exp $
*/
public class URILookup {
@@ -229,10 +232,16 @@
* @return the URI
* @exception JetspeedException
*/
- public static String getURI(int aType, int aSubType, RunData rundata)
+ public static String getURI(int aType,
+ int aSubType,
+ RunData rundata)
throws JetspeedException
{
- return getURI(aType, aSubType, null, (String)null, rundata);
+ return getURI(aType,
+ aSubType,
+ null,
+ (String)null,
+ rundata);
}
/**
@@ -244,10 +253,17 @@
* @param rundata the RunData object
* @return the URI
*/
- public static String getURI(int aType, int aSubType, Portlet aPortlet, RunData rundata)
+ public static String getURI(int aType,
+ int aSubType,
+ Portlet aPortlet,
+ RunData rundata)
throws JetspeedException
{
- return getURI(aType, aSubType, null, aPortlet, rundata);
+ return getURI(aType,
+ aSubType,
+ null,
+ aPortlet,
+ rundata);
}
/**
@@ -259,10 +275,17 @@
* @param rundata the RunData object
* @return the URI
*/
- public static String getURI(int aType, int aSubType, String aPortletName, RunData rundata)
+ public static String getURI(int aType,
+ int aSubType,
+ String aPortletName,
+ RunData rundata)
throws JetspeedException
{
- return getURI(aType, aSubType, null, aPortletName, rundata);
+ return getURI(aType,
+ aSubType,
+ null,
+ aPortletName,
+ rundata);
}
/**
@@ -276,15 +299,27 @@
* @param rundata the RunData object
* @return the URI
*/
- public static String getURI(int aType, int aSubType, String userData, Portlet aPortlet, RunData rundata)
+ public static String getURI(int aType,
+ int aSubType,
+ String userData,
+ Portlet aPortlet,
+ RunData rundata)
throws JetspeedException
{
if (aPortlet!=null) {
aPortlet = getRealPortlet(aPortlet);
- return getURI(aType, aSubType, userData, aPortlet.getName(), rundata);
+ return getURI(aType,
+ aSubType,
+ userData,
+ aPortlet.getName(),
+ rundata);
}
else {
- return getURI(aType, aSubType, userData, (String)null, rundata);
+ return getURI(aType,
+ aSubType,
+ userData,
+ (String)null,
+ rundata);
}
}
@@ -299,7 +334,11 @@
* @param rundata the RunData object
* @return the URI
*/
- public static String getURI(int aType, int aSubType, String userData, String aPortletName, RunData rundata)
+ public static String getURI(int aType,
+ int aSubType,
+ String userData,
+ String aPortletName,
+ RunData rundata)
throws JetspeedException
{
String newURI = null;
@@ -318,7 +357,8 @@
newURI = getMarkedPage( rundata );
if (newURI==null) {
- DynamicURI uri = new DynamicURI( rundata, SCREEN_HOME );
+ DynamicURI uri = new DynamicURI( rundata,
+ SCREEN_HOME );
newURI = uri.toString();
}
}
@@ -328,19 +368,24 @@
if (aPortletName==null) throw new JetspeedException( "A portlet is required to return an URI." );
DynamicURI uri = new DynamicURI( rundata );
uri.setAction( ACTION_MARKPAGE );
- uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
newURI = uri.toString();
}
else if (aSubType==SUBTYPE_LOGOUT) {
propertiesParameter += "logout.";
- DynamicURI uri = new DynamicURI( rundata, SCREEN_HOME, ACTION_LOGOUT );
+ DynamicURI uri = new DynamicURI( rundata,
+ SCREEN_HOME,
+ ACTION_LOGOUT );
newURI = uri.toString();
}
else if (aSubType==SUBTYPE_ACCEPT_LOGIN) {
propertiesParameter += "acceptlogin.";
- DynamicURI uri = new DynamicURI( rundata, SCREEN_HOME, ACTION_ACCEPT_LOGIN );
+ DynamicURI uri = new DynamicURI( rundata,
+ SCREEN_HOME,
+ ACTION_ACCEPT_LOGIN );
newURI = uri.toString();
}
else {
@@ -352,16 +397,21 @@
if (aSubType==SUBTYPE_NONE) {
if (aPortletName==null) throw new JetspeedException( "A portlet is required to return an URI." );
- DynamicURI uri = new DynamicURI( rundata, SCREEN_INFO );
- uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ DynamicURI uri = new DynamicURI( rundata,
+ SCREEN_INFO );
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
newURI = uri.toString();
}
else if (aSubType==SUBTYPE_MARK) {
propertiesParameter += "mark.";
if (aPortletName==null) throw new JetspeedException( "A portlet is required to return an URI." );
- DynamicURI uri = new DynamicURI( rundata, SCREEN_INFO, ACTION_MARKPAGE );
- uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ DynamicURI uri = new DynamicURI( rundata,
+ SCREEN_INFO,
+ ACTION_MARKPAGE );
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
newURI = uri.toString();
}
else {
@@ -384,7 +434,8 @@
// FIX ME: how can we add a prepare action and a mark action at the same time?
// But I think this branch is never used anyway. (?)
DynamicURI uri = new DynamicURI( rundata, SCREEN_EDIT_ACCOUNT, ACTION_MARKPAGE );
- uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
newURI = uri.toString();
}
else {
@@ -396,14 +447,20 @@
if (aSubType==SUBTYPE_NONE) {
DynamicURI uri = new DynamicURI( rundata, SCREEN_CUSTOMIZE );
- if( aPortletName != null ) uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ if( aPortletName != null ) {
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
+ }
newURI = uri.toString();
}
else if (aSubType==SUBTYPE_SAVE) {
propertiesParameter += "save.";
DynamicURI uri = new DynamicURI( rundata, SCREEN_CUSTOMIZE );
- if( aPortletName != null ) uri.addPathInfo( "portlet", URIEncoder.encode( aPortletName ) );
+ if( aPortletName != null ) {
+ uri.addPathInfo( "portlet",
+ URLEncoder.encode( aPortletName ) );
+ }
uri.setAction( ACTION_CUSTOMIZER_SAVE );
newURI = uri.toString();
}
@@ -496,7 +553,7 @@
if (aPortlet!=null) {
aPortlet = getRealPortlet(aPortlet);
- if (URIEncoder.encode(aPortlet.getName())
+ if (URLEncoder.encode(aPortlet.getName())
.equals(rundata.getParameters().getString("portlet"))) {
if (rundata.getScreen()!=null) {
if (rundata.getScreen().equals(SCREEN_INFO)) return TYPE_INFO;
@@ -544,7 +601,7 @@
aPortlet = getRealPortlet(aPortlet);
- if (URIEncoder.encode(aPortlet.getName())
+ if (URLEncoder.encode(aPortlet.getName())
.equals(rundata.getParameters().getString("portlet"))) {
if ((rundata.getScreen()==null) || // no screen
@@ -686,7 +743,7 @@
*/
public static final PortletEntry getEntry( ParameterParser params ) {
- String name = URIEncoder.decode( params.getString( "portlet" ) );
+ String name = URLDecoder.decode( params.getString( "portlet" ) );
return (PortletEntry)RegistryManager.getEntry(RegistryManager.PORTLET_REGISTRY, name );
@@ -759,8 +816,8 @@
*/
private static String addURIParameter( String uri, String parameter, String value)
{
- parameter = URIEncoder.encode( parameter );
- value = URIEncoder.encode( value );
+ parameter = URLEncoder.encode( parameter );
+ value = URLEncoder.encode( value );
if (uri.indexOf("?")!=-1) {
int idx = uri.indexOf( parameter + "=", uri.indexOf("?"));
if (idx!=-1) { // parameter already in URI. remove it
@@ -780,7 +837,8 @@
* @param data the data to be added (has to be the correct format - paramater=value)
* @return the modified URI
*/
- private static String addURIParameter( String uri, String data)
+ private static String addURIParameter( String uri,
+ String data)
{
if (uri.indexOf("?")!=-1) uri += "&";
else uri += "?";
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org