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 2003/10/17 21:50:40 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/portlet/impl PortletDefinitionImpl.java
weaver 2003/10/17 12:50:40
Modified: portal/src/java/org/apache/jetspeed/om/portlet/impl
PortletDefinitionImpl.java
Log:
- Added additional convenience methods
Revision Changes Path
1.2 +63 -50 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Index: PortletDefinitionImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletDefinitionImpl.java 10 Oct 2003 05:12:10 -0000 1.1
+++ PortletDefinitionImpl.java 17 Oct 2003 19:50:40 -0000 1.2
@@ -55,9 +55,10 @@
import java.io.IOException;
import java.io.Serializable;
-import java.util.Collection;
import java.util.Locale;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.util.HashCodeBuilder;
import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.jetspeed.om.common.MutableDescription;
@@ -78,7 +79,7 @@
import org.apache.jetspeed.om.impl.ParameterSetImpl;
import org.apache.jetspeed.om.impl.PortletParameterSetImpl;
import org.apache.jetspeed.om.impl.SecurityRoleRefSetImpl;
-import org.apache.jetspeed.om.preference.impl.PreferenceImpl;
+import org.apache.jetspeed.om.preference.impl.DefaultPreferenceImpl;
import org.apache.jetspeed.om.preference.impl.PreferenceSetImpl;
import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.common.DescriptionSet;
@@ -87,8 +88,11 @@
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.common.LanguageSet;
import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.common.Parameter;
import org.apache.pluto.om.common.ParameterSet;
+import org.apache.pluto.om.common.Preference;
import org.apache.pluto.om.common.PreferenceSet;
+import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.common.SecurityRoleRefSet;
import org.apache.pluto.om.portlet.ContentType;
import org.apache.pluto.om.portlet.ContentTypeSet;
@@ -105,6 +109,8 @@
*/
public class PortletDefinitionImpl implements PortletDefinitionComposite, Serializable
{
+
+ private static final Log log = LogFactory.getLog(PortletDefinitionImpl.class);
private int id;
private String className;
private String name;
@@ -202,6 +208,7 @@
*/
public PreferenceSet getPreferenceSet()
{
+ log.debug("Portlet "+name+" has "+prefSet.size()+" preferences.");
return prefSet;
}
@@ -356,6 +363,11 @@
return param;
}
+ public void addInitParameter(Parameter parameter)
+ {
+ parameterSet.add(parameter);
+ }
+
/**
* @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setInitParameter(java.lang.String, java.lang.String)
*/
@@ -383,18 +395,17 @@
/**
* @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addPreference(java.lang.String, java.util.Collection)
*/
- public PreferenceComposite addPreference(String name, Collection values)
+ public PreferenceComposite addPreference(String name, String[] values)
{
// PreferenceComposite pref = JetspeedPortletRegistry.newPreference();
- PreferenceComposite pref = new PreferenceImpl();
+ PreferenceComposite pref = new DefaultPreferenceImpl();
pref.setName(name);
pref.setValues(values);
- pref.setType(PreferenceComposite.TYPE_DEFAULT);
if (prefSet == null)
{
prefSet = new PreferenceSetImpl();
}
- prefSet.add(pref);
+ addPreference(pref);
return pref;
}
@@ -567,68 +578,39 @@
}
- /**
- * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addDisplayName(java.util.Locale, java.lang.String)
- */
- public void addDisplayName(Locale locale, String displayName)
+ public void addDescription(Description description)
{
- if (displayNames == null)
+ if (descriptions == null)
{
- displayNames = new DisplayNameSetImpl(MutableDisplayName.TYPE_PORTLET);
+ descriptions = new DescriptionSetImpl(MutableDescription.TYPE_PORTLET);
}
- displayNames.addDisplayName(new DisplayNameImpl(locale, displayName, MutableDisplayName.TYPE_PORTLET));
+ descriptions.addDescription(description);
}
/**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @return
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addDisplayName(java.util.Locale, java.lang.String)
*/
- public String getDisplayName()
+ public void addDisplayName(Locale locale, String displayName)
{
- DisplayName dn = getDisplayName(Locale.getDefault());
- if (dn != null)
+ if (displayNames == null)
{
- return dn.getDisplayName();
+ displayNames = new DisplayNameSetImpl(MutableDisplayName.TYPE_PORTLET);
}
- return null;
- }
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @param dn
- */
- public void setDisplayName(String dn)
- {
- addDisplayName(Locale.getDefault(), dn);
+ displayNames.addDisplayName(new DisplayNameImpl(locale, displayName, MutableDisplayName.TYPE_PORTLET));
+
}
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @return
- */
- public String getDescription()
+ public void addDisplayName(DisplayName displayName)
{
- Description desc = getDescription(Locale.getDefault());
- if (desc != null)
+ if (displayNames == null)
{
- return desc.getDescription();
+ displayNames = new DisplayNameSetImpl(MutableDisplayName.TYPE_PORTLET);
}
- return null;
- }
- /**
- * Remove when Castor is mapped correctly
- * @deprecated
- * @param desc
- */
- public void setDescription(String desc)
- {
- addDescription(Locale.getDefault(), desc);
+ displayNames.addDisplayName(displayName);
}
/**
@@ -670,6 +652,37 @@
public void setPreferenceValidatorClassname(String string)
{
preferenceValidatorClassname = string;
+ }
+
+ /**
+ * <p>
+ * addPreference
+ * </p>
+ *
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addPreference(org.apache.pluto.om.common.Preference)
+ * @param preference
+ */
+ public void addPreference(Preference preference)
+ {
+ if (prefSet == null)
+ {
+ prefSet = new PreferenceSetImpl();
+ }
+ prefSet.add(preference);
+
+ }
+
+ /**
+ * <p>
+ * addSecurityRoleRef
+ * </p>
+ *
+ * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addSecurityRoleRef(org.apache.pluto.om.common.SecurityRoleRef)
+ * @param securityRef
+ */
+ public void addSecurityRoleRef(SecurityRoleRef securityRef)
+ {
+ securityRoleRefSet.add(securityRef);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org