You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-dev@portals.apache.org by cz...@apache.org on 2004/05/27 13:53:44 UTC
cvs commit: jakarta-pluto/container/src/java/org/apache/pluto/util/impl NamespaceMapperFactoryImpl.java
cziegeler 2004/05/27 04:53:44
Modified: container/src/java/org/apache/pluto/services/factory
FactoryManagerService.java
container/src/java/org/apache/pluto/factory/impl
PortletConfigFactoryImpl.java
PortletContextFactoryImpl.java
RenderRequestFactoryImpl.java
RenderResponseFactoryImpl.java
PortletURLFactoryImpl.java
ActionRequestFactoryImpl.java
PortalContextFactoryImpl.java
PortletPreferencesFactoryImpl.java
ActionResponseFactoryImpl.java
PortletSessionFactoryImpl.java
container/src/java/org/apache/pluto/om/portlet
PortletDefinitionCtrl.java
portal/src/java/org/apache/pluto/portalImpl Deploy.java
container/src/java/org/apache/pluto/services/title
DynamicTitle.java
container/src/java/org/apache/pluto
PortletContainerImpl.java PortletContainer.java
container/src/java/org/apache/pluto/om/servlet
ServletDefinitionCtrl.java
container/src/java/org/apache/pluto/services/property
PropertyManagerService.java
container/src/java/org/apache/pluto/om/common
PreferenceCtrl.java ParameterCtrl.java
SecurityRoleRefSetCtrl.java
container/src/java/org/apache/pluto/core/impl
ActionRequestImpl.java PortletURLImpl.java
PortletConfigImpl.java PortletPreferencesImpl.java
container/src/java/org/apache/pluto/services/information
DynamicInformationProvider.java
testsuite/src/java/org/apache/pluto/portalImpl/portlet
TestPortlet.java
container/src/java/org/apache/pluto/tags
DefineObjectsTag.java BasicURLTag.java
container/src/java/org/apache/pluto/util/impl
NamespaceMapperFactoryImpl.java
Log:
Cleaning up code
Revision Changes Path
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/services/factory/FactoryManagerService.java
Index: FactoryManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/services/factory/FactoryManagerService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FactoryManagerService.java 2 Mar 2004 14:49:01 -0000 1.2
+++ FactoryManagerService.java 27 May 2004 11:53:43 -0000 1.3
@@ -36,7 +36,7 @@
* Returns the factory implementation for the given interface class, or
* <CODE>null</CODE> if no such interface is registered.
*
- * @param aClass
+ * @param theClass
* the interface class
*
* @return the factory implementation
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletConfigFactoryImpl.java
Index: PortletConfigFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletConfigFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletConfigFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortletConfigFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class PortletConfigFactoryImpl implements PortletConfigFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortletConfigFactory implementation -------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletContextFactoryImpl.java
Index: PortletContextFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletContextFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletContextFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortletContextFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class PortletContextFactoryImpl implements PortletContextFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortletContextFactory implementation ------------------------------
1.3 +0 -2 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/RenderRequestFactoryImpl.java
Index: RenderRequestFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/RenderRequestFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderRequestFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ RenderRequestFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -26,11 +26,9 @@
import org.apache.pluto.om.window.PortletWindow;
public class RenderRequestFactoryImpl implements RenderRequestFactory {
- private javax.servlet.ServletConfig servletConfig;
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.RenderRequestFactory implementation -------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/RenderResponseFactoryImpl.java
Index: RenderResponseFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/RenderResponseFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RenderResponseFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ RenderResponseFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class RenderResponseFactoryImpl implements RenderResponseFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.RenderRequestFactory implementation -------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletURLFactoryImpl.java
Index: PortletURLFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletURLFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletURLFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortletURLFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class PortletURLFactoryImpl implements PortletURLFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortletURLFactory implementation ----------------------------------
1.3 +0 -2 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/ActionRequestFactoryImpl.java
Index: ActionRequestFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/ActionRequestFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionRequestFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ ActionRequestFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -37,13 +37,11 @@
* Window>Preferences>Java>Code Generation.
*/
public class ActionRequestFactoryImpl implements ActionRequestFactory {
- private javax.servlet.ServletConfig servletConfig;
/**
* @see org.apache.pluto.factory.Factory#init(ServletConfig, Map)
*/
public void init(ServletConfig config, Map properties) throws Exception {
- servletConfig = config;
}
// org.apache.pluto.factory.ActionRequestFactory implementation -------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortalContextFactoryImpl.java
Index: PortalContextFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortalContextFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortalContextFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortalContextFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class PortalContextFactoryImpl implements PortalContextFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortalContextFactory implementation -------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletPreferencesFactoryImpl.java
Index: PortletPreferencesFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletPreferencesFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletPreferencesFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortletPreferencesFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -29,11 +29,8 @@
public class PortletPreferencesFactoryImpl implements PortletPreferencesFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortletPreferencesFactory -----------------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/ActionResponseFactoryImpl.java
Index: ActionResponseFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/ActionResponseFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActionResponseFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ ActionResponseFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class ActionResponseFactoryImpl implements ActionResponseFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.ActionResponseFactory implementation ------------------------------
1.3 +0 -3 jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletSessionFactoryImpl.java
Index: PortletSessionFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/factory/impl/PortletSessionFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletSessionFactoryImpl.java 2 Mar 2004 14:48:54 -0000 1.2
+++ PortletSessionFactoryImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -27,11 +27,8 @@
public class PortletSessionFactoryImpl implements PortletSessionFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
}
// org.apache.pluto.factory.PortletSessionFactory ---------------------------------------------
1.3 +3 -3 jakarta-pluto/container/src/java/org/apache/pluto/om/portlet/PortletDefinitionCtrl.java
Index: PortletDefinitionCtrl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/om/portlet/PortletDefinitionCtrl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletDefinitionCtrl.java 2 Mar 2004 14:48:57 -0000 1.2
+++ PortletDefinitionCtrl.java 27 May 2004 11:53:43 -0000 1.3
@@ -61,14 +61,14 @@
/**
* Sets the descriptions
*
- * @param name the new description
+ * @param descriptions the new description
*/
public void setDescriptions(DescriptionSet descriptions);
/**
* Sets the display names
*
- * @param name the new display names
+ * @param displayNames the new display names
*/
public void setDisplayNames(DisplayNameSet displayNames);
@@ -76,7 +76,7 @@
/**
* Sets the class loader of the portlet
*
- * @param ClassLoader
+ * @param loader
*/
public void setPortletClassLoader(ClassLoader loader);
1.7 +4 -6 jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/Deploy.java
Index: Deploy.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/portal/src/java/org/apache/pluto/portalImpl/Deploy.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Deploy.java 26 Apr 2004 12:02:01 -0000 1.6
+++ Deploy.java 27 May 2004 11:53:43 -0000 1.7
@@ -32,8 +32,6 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.pluto.om.common.DescriptionSet;
-import org.apache.pluto.om.common.DisplayNameSet;
import org.apache.pluto.om.common.Parameter;
import org.apache.pluto.om.common.ParameterCtrl;
import org.apache.pluto.om.common.ParameterSet;
@@ -201,13 +199,13 @@
dispName.setLocale(Locale.ENGLISH);
DisplayNameSetImpl dispSet = new DisplayNameSetImpl();
dispSet.add(dispName);
- webApp.setDisplayNames((DisplayNameSet) dispSet);
+ webApp.setDisplayNames(dispSet);
DescriptionImpl desc = new DescriptionImpl();
desc.setDescription("Automated generated Application Wrapper");
desc.setLocale(Locale.ENGLISH);
DescriptionSetImpl descSet = new DescriptionSetImpl();
descSet.add(desc);
- webApp.setDescriptions((DescriptionSet) descSet);
+ webApp.setDescriptions(descSet);
}
org.apache.pluto.om.ControllerFactory controllerFactory =
@@ -255,7 +253,7 @@
dispName.setLocale(Locale.ENGLISH);
DisplayNameSetImpl dispSet = new DisplayNameSetImpl();
dispSet.add(dispName);
- servletCtrl.setDisplayNames((DisplayNameSet) dispSet);
+ servletCtrl.setDisplayNames(dispSet);
DescriptionImpl desc = new DescriptionImpl();
desc.setDescription("Automated generated Portlet Wrapper");
desc.setLocale(Locale.ENGLISH);
@@ -324,6 +322,7 @@
SecurityRoleRefSet portletSecurityRoleRefs =
portlet.getInitSecurityRoleRefSet();
+ // TODO - Do we need this call? The variable is never read
SecurityRoleRefSetCtrl portletSecurityRoleRefSetCtrl =
(SecurityRoleRefSetCtrl) controllerFactory.get(
portletSecurityRoleRefs);
@@ -493,7 +492,6 @@
}
static private void addToEntityReg(String[] args) {
- String pluto = args[1];
File portletAppFile = new File(args[2]);
String portletAppFileName = portletAppFile.getName();
String portletApp =
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/services/title/DynamicTitle.java
Index: DynamicTitle.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/services/title/DynamicTitle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DynamicTitle.java 2 Mar 2004 14:49:01 -0000 1.2
+++ DynamicTitle.java 27 May 2004 11:53:43 -0000 1.3
@@ -25,7 +25,7 @@
/**
* The static accessor for the <CODE>DynamicTitleService</CODE>.
*
- * @see PropertyManagerService
+ * @see DynamicTitleService
**/
public class DynamicTitle
{
1.7 +1 -5 jakarta-pluto/container/src/java/org/apache/pluto/PortletContainerImpl.java
Index: PortletContainerImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/PortletContainerImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletContainerImpl.java 1 Apr 2004 13:33:36 -0000 1.6
+++ PortletContainerImpl.java 27 May 2004 11:53:43 -0000 1.7
@@ -48,9 +48,7 @@
public class PortletContainerImpl implements PortletContainer
{
- private ServletConfig servletConfig;
private String uniqueContainerName;
- private Properties properties;
private boolean initialized;
private Logger log = null;
@@ -61,10 +59,8 @@
Properties properties)
throws PortletContainerException
{
- this.servletConfig = servletConfig;
this.uniqueContainerName = uniqueContainerName;
PortletContainerServices.createReference(uniqueContainerName, environment);
- this.properties = properties;
initialized = true;
// Initialize the Logger that we will use
1.4 +3 -3 jakarta-pluto/container/src/java/org/apache/pluto/PortletContainer.java
Index: PortletContainer.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/PortletContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortletContainer.java 2 Mar 2004 14:49:00 -0000 1.3
+++ PortletContainer.java 27 May 2004 11:53:43 -0000 1.4
@@ -123,8 +123,8 @@
*
* @param portletWindow
* the portlet Window
- * @param request the servlet request
- * @param response the servlet response
+ * @param servletRequest the servlet request
+ * @param servletResponse the servlet response
* @exception PortletException
* if one portlet has trouble fulfilling the request
* @exception PortletContainerException
1.3 +3 -3 jakarta-pluto/container/src/java/org/apache/pluto/om/servlet/ServletDefinitionCtrl.java
Index: ServletDefinitionCtrl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/om/servlet/ServletDefinitionCtrl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletDefinitionCtrl.java 2 Mar 2004 14:48:57 -0000 1.2
+++ ServletDefinitionCtrl.java 27 May 2004 11:53:43 -0000 1.3
@@ -52,21 +52,21 @@
/**
* Sets the descriptions
*
- * @param name the new description
+ * @param descriptions the new description
*/
public void setDescriptions(DescriptionSet descriptions);
/**
* Sets the display names
*
- * @param name the new display names
+ * @param displayNames the new display names
*/
public void setDisplayNames(DisplayNameSet displayNames);
/**
* Sets the class name of this servlet
*
- * @param name the new class name
+ * @param servletClass the new class name
*/
public void setServletClass(String servletClass);
1.4 +0 -1 jakarta-pluto/container/src/java/org/apache/pluto/services/property/PropertyManagerService.java
Index: PropertyManagerService.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/services/property/PropertyManagerService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PropertyManagerService.java 2 Mar 2004 14:49:04 -0000 1.3
+++ PropertyManagerService.java 27 May 2004 11:53:43 -0000 1.4
@@ -72,7 +72,6 @@
*
* @param window the portlet window of this property
* @param request the servlet request
- * @param response the servlet response
*
* @return a <code>Map</code> containing
* all properties. If there are no properties of
1.4 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/om/common/PreferenceCtrl.java
Index: PreferenceCtrl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/om/common/PreferenceCtrl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PreferenceCtrl.java 7 Apr 2004 12:13:45 -0000 1.3
+++ PreferenceCtrl.java 27 May 2004 11:53:43 -0000 1.4
@@ -51,7 +51,7 @@
/**
* Defines whether this preference is modifiable
*
- * @param modifiable true, if this preference is modifiable
+ * @param readOnly true, if this preference is modifiable
*/
public void setReadOnly(String readOnly);
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/om/common/ParameterCtrl.java
Index: ParameterCtrl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/om/common/ParameterCtrl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParameterCtrl.java 2 Mar 2004 14:48:53 -0000 1.2
+++ ParameterCtrl.java 27 May 2004 11:53:43 -0000 1.3
@@ -51,7 +51,7 @@
/**
* Sets the description
*
- * @param description the new description
+ * @param descriptions the new description
*/
public void setDescriptionSet(DescriptionSet descriptions);
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/om/common/SecurityRoleRefSetCtrl.java
Index: SecurityRoleRefSetCtrl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/om/common/SecurityRoleRefSetCtrl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SecurityRoleRefSetCtrl.java 2 Mar 2004 14:48:53 -0000 1.2
+++ SecurityRoleRefSetCtrl.java 27 May 2004 11:53:43 -0000 1.3
@@ -55,7 +55,7 @@
/**
* Removes the given SecurityRoleRef from the set
*
- * @param SecurityRoleRef the SecurityRoleRef to be removed
+ * @param securityRoleRef the SecurityRoleRef to be removed
*/
public void remove(SecurityRoleRef securityRoleRef);
1.4 +3 -5 jakarta-pluto/container/src/java/org/apache/pluto/core/impl/ActionRequestImpl.java
Index: ActionRequestImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/core/impl/ActionRequestImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ActionRequestImpl.java 7 Apr 2004 12:26:27 -0000 1.3
+++ ActionRequestImpl.java 27 May 2004 11:53:43 -0000 1.4
@@ -19,8 +19,6 @@
package org.apache.pluto.core.impl;
-import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStream;
import javax.portlet.ActionRequest;
@@ -75,11 +73,11 @@
// PortletRequestImpl implementation ----------------------------------------------------------
public PortletPreferences getPreferences()
{
- if (portletPreferences == null)
+ if (this.portletPreferences == null)
{
- portletPreferences = PortletObjectAccess.getPortletPreferences(org.apache.pluto.Constants.METHOD_ACTION, super.getInternalPortletWindow().getPortletEntity());
+ this.portletPreferences = PortletObjectAccess.getPortletPreferences(org.apache.pluto.Constants.METHOD_ACTION, super.getInternalPortletWindow().getPortletEntity());
}
- return portletPreferences;
+ return this.portletPreferences;
}
// --------------------------------------------------------------------------------------------
}
1.6 +0 -4 jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletURLImpl.java
Index: PortletURLImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletURLImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletURLImpl.java 12 May 2004 07:28:49 -0000 1.5
+++ PortletURLImpl.java 27 May 2004 11:53:43 -0000 1.6
@@ -19,12 +19,10 @@
package org.apache.pluto.core.impl;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.portlet.PortalContext;
import javax.portlet.PortletMode;
import javax.portlet.PortletModeException;
import javax.portlet.PortletSecurityException;
@@ -32,8 +30,6 @@
import javax.portlet.WindowState;
import javax.portlet.WindowStateException;
-import org.apache.pluto.factory.PortletObjectAccess;
-import org.apache.pluto.om.portlet.ContentType;
import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletConfigImpl.java
Index: PortletConfigImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletConfigImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PortletConfigImpl.java 2 Mar 2004 14:48:56 -0000 1.2
+++ PortletConfigImpl.java 27 May 2004 11:53:43 -0000 1.3
@@ -80,7 +80,7 @@
throw new IllegalArgumentException("Parameter name == null");
}
parm = portletDefinition.getInitParameterSet().get(name);
- return(String)(parm == null ? null : parm.getValue());
+ return (parm == null ? null : parm.getValue());
}
public java.util.Enumeration getInitParameterNames()
1.5 +2 -2 jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
Index: PortletPreferencesImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletPreferencesImpl.java 2 Mar 2004 14:48:56 -0000 1.4
+++ PortletPreferencesImpl.java 27 May 2004 11:53:43 -0000 1.5
@@ -214,7 +214,7 @@
// iterate through all modified preferences of first layer
while (changedIter.hasNext())
{
- keyset.add((String)changedIter.next());
+ keyset.add(changedIter.next());
}
// iterate through all existing preferences of first layer
@@ -228,7 +228,7 @@
// iterate through all removed preferences of first layer
while (removedIter.hasNext())
{
- keyset.remove((String)removedIter.next());
+ keyset.remove(removedIter.next());
}
1.4 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/services/information/DynamicInformationProvider.java
Index: DynamicInformationProvider.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/services/information/DynamicInformationProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicInformationProvider.java 2 Mar 2004 14:49:00 -0000 1.3
+++ DynamicInformationProvider.java 27 May 2004 11:53:43 -0000 1.4
@@ -90,7 +90,7 @@
/**
* Returns the <CODE>WindowState</CODE> of the given portlet window.
*
- * @param portletEntity the portlet Entity
+ * @param portletWindow the portlet window
* @return the portlet window state
*/
public WindowState getWindowState(PortletWindow portletWindow);
1.5 +4 -4 jakarta-pluto/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java
Index: TestPortlet.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestPortlet.java 24 Mar 2004 12:21:51 -0000 1.4
+++ TestPortlet.java 27 May 2004 11:53:43 -0000 1.5
@@ -45,21 +45,21 @@
portletSession = request.getPortletSession();
//corresponding action to test4.jsp part1:'checkAction'
- checkAction = (String)request.getParameter("checkAction");
+ checkAction = request.getParameter("checkAction");
if ( checkAction != null ) {
portletSession.setAttribute("checkAction", checkAction);
actionResponse.setRenderParameter("jspName", "test4.jsp");
}
//corresponding action to test4.jsp part2:'checkActionRender'
- checkActionRender = (String)request.getParameter("checkActionRender");
+ checkActionRender = request.getParameter("checkActionRender");
if(checkActionRender != null && "step1".equals(checkActionRender))
{
actionResponse.setRenderParameter("checkActionRender2","step2");
}
//corresponding action to test6.jsp:'testPreferenceStore' (called from test5.jsp)
- checkPreferences = (String)request.getParameter("checkPreferences");
+ checkPreferences = request.getParameter("checkPreferences");
if (checkPreferences != null)
{
PortletPreferences preferences = request.getPreferences();
@@ -103,7 +103,7 @@
}
// transfer jsp name
- jspNameTransfer = (String)request.getParameter("jspNameTransfer");
+ jspNameTransfer = request.getParameter("jspNameTransfer");
if (jspNameTransfer!=null)
{
actionResponse.setRenderParameter("jspName",jspNameTransfer);
1.3 +3 -3 jakarta-pluto/container/src/java/org/apache/pluto/tags/DefineObjectsTag.java
Index: DefineObjectsTag.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/tags/DefineObjectsTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefineObjectsTag.java 2 Mar 2004 14:48:57 -0000 1.2
+++ DefineObjectsTag.java 27 May 2004 11:53:43 -0000 1.3
@@ -35,9 +35,9 @@
* <LI><CODE>renderResponse</CODE>
* <LI><CODE>portletConfig</CODE>
* </UL>
- * @see org.apache.pluto.portlet.PortletRequest
- * @see org.apache.pluto.portlet.RenderResponse
- * @see org.apache.pluto.portlet.PortletConfig
+ * @see javax.portlet.PortletRequest
+ * @see javax.portlet.RenderResponse
+ * @see javax.portlet.PortletConfig
*
*/
public class DefineObjectsTag extends TagSupport
1.3 +1 -1 jakarta-pluto/container/src/java/org/apache/pluto/tags/BasicURLTag.java
Index: BasicURLTag.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/tags/BasicURLTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicURLTag.java 2 Mar 2004 14:48:57 -0000 1.2
+++ BasicURLTag.java 27 May 2004 11:53:43 -0000 1.3
@@ -214,7 +214,7 @@
/**
* Sets secure to boolean value of the string
- * @param String
+ * @param secure
*/
public void setSecure(String secure)
{
1.3 +0 -2 jakarta-pluto/container/src/java/org/apache/pluto/util/impl/NamespaceMapperFactoryImpl.java
Index: NamespaceMapperFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-pluto/container/src/java/org/apache/pluto/util/impl/NamespaceMapperFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NamespaceMapperFactoryImpl.java 2 Mar 2004 14:49:03 -0000 1.2
+++ NamespaceMapperFactoryImpl.java 27 May 2004 11:53:44 -0000 1.3
@@ -25,12 +25,10 @@
public class NamespaceMapperFactoryImpl implements NamespaceMapperFactory
{
- private javax.servlet.ServletConfig servletConfig;
private NamespaceMapperImpl namespaceMapper;
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
namespaceMapper = new NamespaceMapperImpl();
}