You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/01/23 13:34:31 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl PortletPortalManager.java
joerg 2004/01/23 04:34:31
Modified: src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common
PreferenceImpl.java LanguageSetImpl.java
ObjectIDImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl
PortletAdapter.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto
Deploy.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet
ServletRequestImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/om
PortletWindowListImpl.java
WebApplicationDefinitionImpl.java
PortletWindowImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory
FactoryManagerServiceImpl.java
src/blocks/portal/java/org/apache/cocoon/portal/impl
PortletPortalManager.java
Log:
cleanup
Please review the changes, Carsten.
Revision Changes Path
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java
Index: PreferenceImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreferenceImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ PreferenceImpl.java 23 Jan 2004 12:34:30 -0000 1.2
@@ -92,7 +92,7 @@
// replace all NULL_ARRAYENTRY Strings by NULL
for (int i = 0; i < returnValue.size(); i++) {
- if (NULL_ARRAYENTRY.equals((String)returnValue.get(i))) {
+ if (NULL_ARRAYENTRY.equals(returnValue.get(i))) {
returnValue.set(i, null);
}
}
1.2 +4 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageSetImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ LanguageSetImpl.java 23 Jan 2004 12:34:30 -0000 1.2
@@ -50,7 +50,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.StringTokenizer;
import java.util.Vector;
import org.apache.pluto.om.common.Language;
@@ -95,6 +94,7 @@
return(Language)lang;
}
+ /* never used
// creates a locale object from a string representation
private Locale createLocale(String locale)
{
@@ -115,6 +115,7 @@
return new java.util.Locale(localeDef[0], localeDef[1], localeDef[2]+localeDef[3]+localeDef[4]);
}
+ */
// AbstractSupportSet implementation.
@@ -221,7 +222,7 @@
{
title="";
}
- boolean added = add(createLanguage(getDefaultLocale(), null));
+ add(createLanguage(getDefaultLocale(), null));
}
// create and add all resource bundle information as Language objects to this set
1.2 +1 -8 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java
Index: ObjectIDImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ObjectIDImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ ObjectIDImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -62,13 +62,6 @@
private String stringOID;
private int intOID;
- private ObjectIDImpl (int oid)
- {
- stringOID = String.valueOf (oid);
- intOID = oid;
- }
-
-
private ObjectIDImpl (int oid, String stringOID)
{
this.stringOID = stringOID;
1.2 +1 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java
Index: PortletAdapter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/PortletAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletAdapter.java 22 Jan 2004 14:01:22 -0000 1.1
+++ PortletAdapter.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -128,9 +128,6 @@
PortletDefinitionRegistry registry = (PortletDefinitionRegistry) environment.getContainerService(PortletDefinitionRegistry.class);
final String portletEntityId = (String) getConfiguration(coplet, "portlet");
- final int pos = portletEntityId.indexOf('.');
- final String applicationId = portletEntityId.substring(0, pos);
- final String portletId = portletEntityId.substring(pos+1);
PortletApplicationEntity pae = registry.getPortletApplicationEntityList().get(ObjectIDImpl.createFromString("cocoon"));
PortletEntity portletEntity = ((PortletEntityListImpl)pae.getPortletEntityList()).add(pae, portletEntityId, coplet, registry);
1.2 +6 -6 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/Deploy.java
Index: Deploy.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/Deploy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Deploy.java 22 Jan 2004 15:05:19 -0000 1.1
+++ Deploy.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -69,8 +69,6 @@
import org.apache.cocoon.portal.pluto.om.common.DisplayNameImpl;
import org.apache.cocoon.portal.pluto.om.common.DisplayNameSetImpl;
import org.apache.pluto.om.ControllerFactory;
-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;
@@ -236,13 +234,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);
}
ControllerFactory controllerFactory = new ControllerFactoryImpl();
@@ -289,7 +287,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);
@@ -358,9 +356,11 @@
SecurityRoleRefSet portletSecurityRoleRefs =
portlet.getInitSecurityRoleRefSet();
+/* never read
SecurityRoleRefSetCtrl portletSecurityRoleRefSetCtrl =
(SecurityRoleRefSetCtrl) controllerFactory.get(
portletSecurityRoleRefs);
+*/
Iterator p = portletSecurityRoleRefs.iterator();
1.2 +1 -1 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
Index: ServletRequestImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletRequestImpl.java 22 Jan 2004 14:01:22 -0000 1.1
+++ ServletRequestImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -566,7 +566,7 @@
while (parameters.hasMoreElements()) {
String paramName = (String) parameters.nextElement();
String[] paramValues =
- (String[]) this.request.getParameterValues(paramName);
+ this.request.getParameterValues(paramName);
String[] values =
(String[]) this.portletParameterMap.get(paramName);
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java
Index: PortletWindowListImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletWindowListImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ PortletWindowListImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -81,7 +81,7 @@
/**
* Returns the portlet window object of the given id
*
- * @param
+ * @param id id of the portlet window object
*
* @return the portlet window object or null if the list does not
* contain a portlet window with the given id
1.2 +1 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java
Index: WebApplicationDefinitionImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WebApplicationDefinitionImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ WebApplicationDefinitionImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -160,7 +160,6 @@
{
Vector structure = (Vector)parameter;
PortletApplicationDefinition portletApplication = (PortletApplicationDefinition)structure.get(0);
- String contextString = (String)structure.get(1);
((Support)portletApplication).postLoad(this);
@@ -203,7 +202,6 @@
{
Vector structure = (Vector)parameter;
PortletApplicationDefinition portletApplication = (PortletApplicationDefinition)structure.get(0);
- String contextString = (String)structure.get(1);
((Support)portletApplication).preStore(null);
1.2 +1 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
Index: PortletWindowImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletWindowImpl.java 22 Jan 2004 14:01:20 -0000 1.1
+++ PortletWindowImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -63,9 +63,6 @@
private String id;
private PortletEntity portletEntity;
- //counter used to generate unique id's
- private static int counter;
-
public PortletWindowImpl(String id) {
this.id = id;
}
1.2 +2 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java
Index: FactoryManagerServiceImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FactoryManagerServiceImpl.java 22 Jan 2004 14:01:22 -0000 1.1
+++ FactoryManagerServiceImpl.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -188,8 +188,7 @@
** Returns the service implementation for the given service class, or
** <CODE>null</CODE> if no such service is registered.
**
- ** @param aClass
- ** the service class
+ ** @param theClass the service class
**
** @return the service implementation
**/
1.2 +1 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java
Index: PortletPortalManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletPortalManager.java 22 Jan 2004 14:01:22 -0000 1.1
+++ PortletPortalManager.java 23 Jan 2004 12:34:31 -0000 1.2
@@ -51,7 +51,6 @@
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -175,8 +174,6 @@
* Initialize the container
*/
public void initContainer() throws Exception {
- final ServletContext servletContext = this.servletConfig.getServletContext();
-
this.portletContainer = new PortletContainerImpl();
if (!portletContainer.isInitialized()) {