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 we...@apache.org on 2005/07/27 22:29:17 UTC
svn commit: r225611 - in
/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core:
PortalContextImpl.java PortalContextProviderImpl.java
Author: weaver
Date: Wed Jul 27 13:29:16 2005
New Revision: 225611
URL: http://svn.apache.org/viewcvs?rev=225611&view=rev
Log:
Now dependency injected.
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextImpl.java?rev=225611&r1=225610&r2=225611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextImpl.java Wed Jul 27 13:29:16 2005
@@ -27,6 +27,7 @@
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
+ * @deprecated Can't any references as it appears we always use JetpseedPortletContext
*/
public class PortalContextImpl implements PortalContext
{
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java?rev=225611&r1=225610&r2=225611&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java Wed Jul 27 13:29:16 2005
@@ -15,16 +15,16 @@
*/
package org.apache.jetspeed.engine.core;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
-import java.util.HashMap;
+import java.util.Iterator;
import java.util.Vector;
+
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
-import javax.portlet.PortalContext;
-
-import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.PortalContext;
import org.apache.pluto.services.information.PortalContextProvider;
/**
@@ -36,26 +36,22 @@
public class PortalContextProviderImpl
implements PortalContextProvider
{
- PortalContextImpl portalContext = null;
+ private final PortalContext portalContext;
/** Portal information */
- private String info = null;
- private String portalName = null;
- private String portalVersion = null;
+ private String info;
+ private final String portalName;
+ private final String portalVersion;
/** supported portlet modes by this portal */
private Vector modes;
/** supported window states by this portal */
private Vector states;
-
- /** portal properties */
- private HashMap properties = new HashMap();
-
-
- public PortalContextProviderImpl()
+
+ public PortalContextProviderImpl(PortalContext portalContext)
{
- portalContext = new PortalContextImpl(this);
+ this.portalContext = portalContext;
modes = getDefaultModes();
@@ -64,8 +60,8 @@
states = getDefaultStates();
// set info
- portalName = Jetspeed.getContext().getConfiguration().getString("portal.name");
- portalVersion = Jetspeed.getContext().getConfiguration().getString("portal.version");
+ portalName = this.portalContext.getConfiguration().getString("portal.name");
+ portalVersion = this.portalContext.getConfiguration().getString("portal.version");
info = portalName + "/" + portalVersion;
}
@@ -102,11 +98,7 @@
*/
public String getProperty(String name)
{
- if (name == null)
- {
- throw new IllegalArgumentException("Property name == null");
- }
- return(String) properties.get(name);
+ return portalContext.getProperty(name);
}
/**
@@ -119,7 +111,13 @@
*/
public Collection getPropertyNames()
{
- return properties.keySet();
+ Iterator itr = portalContext.getConfiguration().getKeys();
+ ArrayList names = new ArrayList();
+ while(itr.hasNext())
+ {
+ names.add(itr.next());
+ }
+ return names;
}
/**
@@ -149,13 +147,12 @@
}
private Vector getDefaultModes()
- {
+ {
Vector m = new Vector();
- String[] supportedModes = Jetspeed.getContext().getConfiguration().getStringArray("supported.portletmode");
-
- for (int i=0; i<supportedModes.length; i++)
+ Enumeration supportedPortletModes = portalContext.getSupportedPortletModes();
+ while(supportedPortletModes.hasMoreElements())
{
- m.add(new PortletMode(supportedModes[i].toString().toLowerCase()));
+ m.add((PortletMode) supportedPortletModes.nextElement());
}
return m;
@@ -164,11 +161,10 @@
private Vector getDefaultStates()
{
Vector s = new Vector();
- String[] supportedStates = Jetspeed.getContext().getConfiguration().getStringArray("supported.windowstate");
-
- for (int i=0; i<supportedStates.length; i++)
+ Enumeration supportedWindowStates = portalContext.getSupportedWindowStates();
+ while(supportedWindowStates.hasMoreElements())
{
- s.add(new WindowState(supportedStates[i].toString().toLowerCase()));
+ s.add((WindowState) supportedWindowStates.nextElement());
}
return s;
@@ -180,7 +176,7 @@
{
throw new IllegalArgumentException("Property name == null");
}
- properties.put(name, value);
+ portalContext.getConfiguration().setProperty(name, value);
}
// expects enumeration of PortletMode objects
@@ -234,7 +230,7 @@
// these are the minimum states that the portal needs to support
states = getDefaultStates();
- properties.clear();
+ //properties.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org