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 ra...@apache.org on 2001/05/27 13:07:33 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory LayoutFactory.java SkinFactory.java
raphael 01/05/27 04:07:33
Modified: src/java/org/apache/jetspeed/portal BasePortletConfig.java
BasePortletSet.java PortletConfig.java
PortletSet.java
src/java/org/apache/jetspeed/portal/controls
AbstractPortletControl.java
src/java/org/apache/jetspeed/portal/factory
LayoutFactory.java SkinFactory.java
Log:
change Dictionary to Map in PortletConfig and PortletSet
Revision Changes Path
1.2 +9 -9 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletConfig.java
Index: BasePortletConfig.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasePortletConfig.java 2001/05/07 20:48:18 1.1
+++ BasePortletConfig.java 2001/05/27 11:07:31 1.2
@@ -72,16 +72,16 @@
* about the running environment of a given Portlet.
*
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: BasePortletConfig.java,v 1.1 2001/05/07 20:48:18 raphael Exp $
+ * @version $Id: BasePortletConfig.java,v 1.2 2001/05/27 11:07:31 raphael Exp $
*/
public class BasePortletConfig extends BaseConfig implements PortletConfig
{
private String url;
private MetaData metainfo;
- private Dictionary layoutConstraints = null;
+ private Map layoutConstraints = null;
private int layoutPosition = -1;
- private Dictionary skin;
+ private Map skin;
private transient PortletSet currentSet;
private CapabilityMap cm = null;
@@ -121,7 +121,7 @@
/**
Returns the portlet current PortletSet
*/
- public Dictionary getLayout()
+ public Map getLayout()
{
return this.layoutConstraints;
}
@@ -129,7 +129,7 @@
/**
Set the context (PortletSet) for this portlet
*/
- public void setLayout(Dictionary constraints)
+ public void setLayout(Map constraints)
{
this.layoutConstraints=constraints;
}
@@ -137,16 +137,16 @@
/**
Returns the portlet current PortletSet
*/
- public Dictionary getSkin()
+ public Map getSkin()
{
Hashtable normalSkin = new Hashtable();
if (getPortletSet()!=null)
{
- normalSkin.putAll((Map)getPortletSet().getPortletConfig().getSkin());
+ normalSkin.putAll(getPortletSet().getPortletConfig().getSkin());
}
- if (this.skin!=null) normalSkin.putAll((Map)this.skin);
+ if (this.skin!=null) normalSkin.putAll(this.skin);
return normalSkin;
}
@@ -154,7 +154,7 @@
/**
Set the context (PortletSet) for this portlet
*/
- public void setSkin(Dictionary skin)
+ public void setSkin(Map skin)
{
this.skin=skin;
}
1.2 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java
Index: BasePortletSet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/BasePortletSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasePortletSet.java 2001/05/07 20:48:20 1.1
+++ BasePortletSet.java 2001/05/27 11:07:31 1.2
@@ -55,7 +55,7 @@
package org.apache.jetspeed.portal;
//standard java stuff
-import java.util.Dictionary;
+import java.util.Map;
import java.util.Vector;
import java.util.Enumeration;
@@ -82,7 +82,7 @@
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: BasePortletSet.java,v 1.1 2001/05/07 20:48:20 raphael Exp $
+ * @version $Id: BasePortletSet.java,v 1.2 2001/05/27 11:07:31 raphael Exp $
*/
public class BasePortletSet implements PortletSet, Portlet
{
@@ -219,7 +219,7 @@
/**
Add a portlet to this set.It updates its config to modify the current set
*/
- public void addPortlet(Portlet portlet, Dictionary constraints)
+ public void addPortlet(Portlet portlet, Map constraints)
{
addPortlet(portlet,constraints,-1);
}
@@ -227,7 +227,7 @@
/**
Add a portlet to this set.It updates its config to modify the current set
*/
- public void addPortlet(Portlet portlet, Dictionary constraint, int position)
+ public void addPortlet(Portlet portlet, Map constraint, int position)
{
synchronized (portlets)
{
1.43 +9 -14 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletConfig.java
Index: PortletConfig.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletConfig.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- PortletConfig.java 2001/05/07 20:48:22 1.42
+++ PortletConfig.java 2001/05/27 11:07:31 1.43
@@ -55,24 +55,19 @@
package org.apache.jetspeed.portal;
//standard java stuff
-import java.net.*;
-import java.util.*;
+import java.util.Map;
-//turbine support
-import org.apache.turbine.util.*;
-import org.apache.turbine.services.servlet.TurbineServlet;
-
//jetspeed support
-import org.apache.jetspeed.util.*;
-import org.apache.jetspeed.profiler.*;
-import org.apache.jetspeed.capability.*;
+import org.apache.jetspeed.util.Config;
+import org.apache.jetspeed.util.MetaData;
+import org.apache.jetspeed.capability.CapabilityMap;
/**
Defines a configuration for Portlets. A PortletConfig provides information
about the running environment of a given Portlet.
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
-@version $Id: PortletConfig.java,v 1.42 2001/05/07 20:48:22 raphael Exp $
+@version $Id: PortletConfig.java,v 1.43 2001/05/27 11:07:31 raphael Exp $
*/
public interface PortletConfig extends Config
@@ -96,22 +91,22 @@
/**
Returns the portlet current PortletSet
*/
- public Dictionary getLayout();
+ public Map getLayout();
/**
Set the context (PortletSet) for this portlet
*/
- public void setLayout(Dictionary constraints);
+ public void setLayout(Map constraints);
/**
Returns the portlet current PortletSet
*/
- public Dictionary getSkin();
+ public Map getSkin();
/**
Set the context (PortletSet) for this portlet
*/
- public void setSkin(Dictionary skin);
+ public void setSkin(Map skin);
/**
Returns the portlet current PortletSet
1.22 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletSet.java
Index: PortletSet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletSet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PortletSet.java 2001/05/07 20:48:32 1.21
+++ PortletSet.java 2001/05/27 11:07:31 1.22
@@ -55,7 +55,7 @@
package org.apache.jetspeed.portal;
//standard java stuff
-import java.util.Dictionary;
+import java.util.Map;
import java.util.Enumeration;
/**
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
- * @version $Id: PortletSet.java,v 1.21 2001/05/07 20:48:32 raphael Exp $
+ * @version $Id: PortletSet.java,v 1.22 2001/05/27 11:07:31 raphael Exp $
*/
public interface PortletSet extends Portlet
{
@@ -102,12 +102,12 @@
/**
* Add a portlet to this set.It updates its config to modify the current set
*/
- public void addPortlet(Portlet portlet, Dictionary constraints);
+ public void addPortlet(Portlet portlet, Map constraints);
/**
* Add a portlet to this set.It updates its config to modify the current set
*/
- public void addPortlet(Portlet portlet, Dictionary constraint, int position);
+ public void addPortlet(Portlet portlet, Map constraint, int position);
/**
* Return the current controller for this set
1.2 +4 -4 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java
Index: AbstractPortletControl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/AbstractPortletControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPortletControl.java 2001/05/07 20:48:47 1.1
+++ AbstractPortletControl.java 2001/05/27 11:07:32 1.2
@@ -54,7 +54,7 @@
package org.apache.jetspeed.portal.controls;
-import java.util.Dictionary;
+import java.util.Map;
import java.util.Enumeration;
import java.util.Vector;
@@ -82,7 +82,7 @@
* a simple portlet wherever in a PSML object tree.
*
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
- * @version $Id: AbstractPortletControl.java,v 1.1 2001/05/07 20:48:47 raphael Exp $
+ * @version $Id: AbstractPortletControl.java,v 1.2 2001/05/27 11:07:32 raphael Exp $
*/
public abstract class AbstractPortletControl extends AbstractPortlet
implements PortletControl
@@ -458,7 +458,7 @@
* @param portlet the portlet to add
* @param constraints the portlet layout constraints
*/
- public synchronized void addPortlet(Portlet portlet, Dictionary constraints)
+ public synchronized void addPortlet(Portlet portlet, Map constraints)
{
if (getPortlet() instanceof PortletSet)
((PortletSet)getPortlet()).addPortlet(portlet,constraints);
@@ -472,7 +472,7 @@
* @param constraint the portlet layout constraints
* @param position the portlet required position
*/
- public synchronized void addPortlet(Portlet portlet, Dictionary constraint, int position)
+ public synchronized void addPortlet(Portlet portlet, Map constraint, int position)
{
if (getPortlet() instanceof PortletSet)
((PortletSet)getPortlet()).addPortlet(portlet,constraint,position);
1.6 +15 -15 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/LayoutFactory.java
Index: LayoutFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/LayoutFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LayoutFactory.java 2001/03/07 06:46:30 1.5
+++ LayoutFactory.java 2001/05/27 11:07:32 1.6
@@ -55,7 +55,7 @@
package org.apache.jetspeed.portal.factory;
import org.apache.jetspeed.xml.api.portletmarkup.*;
-import java.util.Dictionary;
+import java.util.Map;
import java.util.Hashtable;
/**
@@ -63,7 +63,7 @@
PSML markup
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
-@version $Id: LayoutFactory.java,v 1.5 2001/03/07 06:46:30 taylor Exp $
+@version $Id: LayoutFactory.java,v 1.6 2001/05/27 11:07:32 raphael Exp $
*/
public class LayoutFactory {
@@ -72,10 +72,10 @@
@param layout the Layout object to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- static Dictionary getLayout(Layout layout)
+ static Map getLayout(Layout layout)
{
if (layout==null) return new Hashtable();
return getProperties(layout.getProperty());
@@ -86,10 +86,10 @@
@param entry the Entry object to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- static Dictionary getLayout(Entry entry)
+ static Map getLayout(Entry entry)
{
if (entry.getLayout()==null) return new Hashtable();
return getProperties(entry.getLayout().getProperty());
@@ -100,10 +100,10 @@
@param entry the Portlets object to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- static Dictionary getLayout(Portlets entry)
+ static Map getLayout(Portlets entry)
{
if (entry.getLayout()==null) return new Hashtable();
return getProperties(entry.getLayout().getProperty());
@@ -131,14 +131,14 @@
}
/**
- Transforms an array of PSML Property array in a string name/value Dictionary
+ Transforms an array of PSML Property array in a string name/value Map
@param props the Property array to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- private static Dictionary getProperties(Property[] props)
+ private static Map getProperties(Property[] props)
{
Hashtable hash = new Hashtable();
if (props!=null) {
@@ -151,15 +151,15 @@
}
/**
- Fills a given Dictionary with an array of PSML Property values
+ Fills a given Map with an array of PSML Property values
@param props the Property array to use
- @param hash the Dictionary to use, if null use a new one.
+ @param hash the Map to use, if null use a new one.
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- private static Dictionary getProperties(Property[] props, Dictionary hash)
+ private static Map getProperties(Property[] props, Map hash)
{
if (hash!=null) {
for(int i = 0; i < props.length; ++i) {
1.8 +13 -13 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/SkinFactory.java
Index: SkinFactory.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/factory/SkinFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SkinFactory.java 2001/03/07 06:46:40 1.7
+++ SkinFactory.java 2001/05/27 11:07:33 1.8
@@ -58,7 +58,7 @@
import org.apache.jetspeed.xml.api.portletmarkup.*;
//java stuff
-import java.util.Dictionary;
+import java.util.Map;
import java.util.Hashtable;
/**
@@ -66,7 +66,7 @@
markup
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
-@version $Id: SkinFactory.java,v 1.7 2001/03/07 06:46:40 taylor Exp $
+@version $Id: SkinFactory.java,v 1.8 2001/05/27 11:07:33 raphael Exp $
*/
public class SkinFactory {
@@ -75,10 +75,10 @@
@param entry the Entry object to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- static Dictionary getSkin( Entry entry )
+ static Map getSkin( Entry entry )
{
if ( entry.getSkin() == null )
return new Hashtable();
@@ -91,24 +91,24 @@
@param entry the Portlets object to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- static Dictionary getSkin( Portlets entry )
+ static Map getSkin( Portlets entry )
{
if (entry.getSkin()==null) return new Hashtable();
return getProperties(entry.getSkin().getProperty());
}
/**
- Transforms an array of PSML Property array in a string name/value Dictionary
+ Transforms an array of PSML Property array in a string name/value Map
@param props the Property array to use
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- private static Dictionary getProperties( Property[] props )
+ private static Map getProperties( Property[] props )
{
Hashtable hash = new Hashtable();
if (props!=null) {
@@ -120,15 +120,15 @@
}
/**
- Fills a given Dictionary with an array of PSML Property values
+ Fills a given Map with an array of PSML Property values
@param props the Property array to use
- @param hash the Dictionary to use, if null use a new one.
+ @param hash the Map to use, if null use a new one.
- @returns a Dictionary containing the names/values, an empty Dictonary
+ @returns a Map containing the names/values, an empty Dictonary
is returned if there are no properties
*/
- private static Dictionary getProperties( Property[] props, Dictionary hash )
+ private static Map getProperties( Property[] props, Map hash )
{
if (hash!=null) {
for(int i = 0; i < props.length; ++i) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org