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:53:38 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl PreferenceValueImpl.java PreferenceSetImpl.java PreferenceImpl.java
weaver 2003/10/17 12:53:38
Modified: portal/src/java/org/apache/jetspeed/om/preference/impl
PreferenceValueImpl.java PreferenceSetImpl.java
PreferenceImpl.java
Log:
refactored Preferences
Revision Changes Path
1.2 +24 -5 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceValueImpl.java
Index: PreferenceValueImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceValueImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreferenceValueImpl.java 10 Oct 2003 05:12:11 -0000 1.1
+++ PreferenceValueImpl.java 17 Oct 2003 19:53:37 -0000 1.2
@@ -72,9 +72,19 @@
public class PreferenceValueImpl implements Serializable, PreferenceValue
{
- private long preferenceId;
- private long id;
private String value;
+
+ public PreferenceValueImpl()
+ {
+ super();
+ }
+
+ public PreferenceValueImpl(String value)
+ {
+ this();
+ this.value = value;
+ }
+
/**
* @return
*/
@@ -113,6 +123,15 @@
protected final static void convertStringsToValueObjects(Collection stringValues, List valueObjects)
{
+ if (valueObjects == null)
+ {
+ throw new IllegalArgumentException("valueObjects arg cannot be null");
+ }
+ if (stringValues == null)
+ {
+ throw new IllegalArgumentException("stringValues arg cannot be null");
+ }
+
Iterator itr = stringValues.iterator();
int count = 0;
try
@@ -127,8 +146,8 @@
}
else
{
- PreferenceValueImpl valueObj = new PreferenceValueImpl();
-
+ PreferenceValueImpl valueObj = new PreferenceValueImpl();
+
valueObj.setValue(strValue);
valueObjects.add(valueObj);
}
1.2 +28 -3 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java
Index: PreferenceSetImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceSetImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreferenceSetImpl.java 10 Oct 2003 05:12:11 -0000 1.1
+++ PreferenceSetImpl.java 17 Oct 2003 19:53:37 -0000 1.2
@@ -91,9 +91,34 @@
super(wrappedSet);
}
+ /**
+ * @param c
+ */
+ public PreferenceSetImpl(Collection c)
+ {
+ super(c);
+ }
+
+ /**
+ * @param initialCapacity
+ * @param loadFactor
+ */
+ public PreferenceSetImpl(int initialCapacity, float loadFactor)
+ {
+ super(initialCapacity, loadFactor);
+ }
+
+ /**
+ * @param initialCapacity
+ */
+ public PreferenceSetImpl(int initialCapacity)
+ {
+ super(initialCapacity);
+ }
+
public PreferenceSetImpl()
{
- prefMap = new HashMap();
+ super();
}
/**
@@ -109,7 +134,7 @@
*/
public Preference add(String name, Collection values)
{
- PreferenceImpl pref = new PreferenceImpl();
+ DefaultPreferenceImpl pref = new DefaultPreferenceImpl();
pref.setType(preferenceType);
1.3 +7 -367 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceImpl.java
Index: PreferenceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/preference/impl/PreferenceImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreferenceImpl.java 11 Oct 2003 23:39:12 -0000 1.2
+++ PreferenceImpl.java 17 Oct 2003 19:53:37 -0000 1.3
@@ -51,382 +51,22 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.jetspeed.om.preference.impl;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import org.apache.jetspeed.om.common.MutableDescription;
-import org.apache.jetspeed.om.common.MutableDescriptionSet;
-import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.impl.DescriptionImpl;
-import org.apache.jetspeed.om.impl.DescriptionSetImpl;
-import org.apache.jetspeed.util.HashCodeBuilder;
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.PersistenceBrokerAware;
-import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.pluto.om.common.Description;
-import org.apache.pluto.om.common.Preference;
-
/**
- *
* <p>
- * AbstractPreferenceImpl
+ * PreferenceImpl
* </p>
*
+ *
+ * @
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
- * @version $Id$
+ * @version $ $
*
*/
-public class PreferenceImpl implements PreferenceComposite, Serializable, PersistenceBrokerAware
+public class PreferenceImpl extends AbstractPreference
{
- private String name;
- protected Collection values;
- private boolean readOnly;
- /** a collection of <code>PreferenceValueObjects</code>
- * that can be persisted in a unique fashion.
- */
- private List valueObjects;
-
- /** Localized Descriptions */
- private MutableDescriptionSet descriptions;
-
- /** Unique key for O/R tools*/
- protected long id;
-
- /** FK to parent portlet */
- protected long parentId;
-
- /** The type of preference this is either the portlet default or user defined */
- private String type;
-
- public PreferenceImpl()
- {
- //values = new ArrayList();
- super();
- }
-
- /**
- * @see org.apache.pluto.om.common.Preference#getName()
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * @see org.apache.pluto.om.common.Preference#getValues()
- */
- public Iterator getValues()
- {
-
- return values.iterator();
- }
-
- /**
- * @see org.apache.pluto.om.common.Preference#isModifiable()
- */
- public boolean isReadOnly()
- {
- return readOnly;
- }
-
- /**
- * @see org.apache.pluto.om.common.PreferenceCtrl#setName(java.lang.String)
- */
- public void setName(String name)
- {
- this.name = name;
- }
-
- /**
- * @see org.apache.pluto.om.common.PreferenceCtrl#setValues(java.util.Collection)
- */
- public void setValues(Collection values)
- {
- this.values = values;
- }
-
- /**
- * @see org.apache.pluto.om.common.PreferenceCtrl#setDescription(java.lang.String)
- */
- public void setDescription(String description)
- {
- // TODO: Is this still needed as we are using localized text???
- //this.description = description;
- if (descriptions == null)
- {
- descriptions = new DescriptionSetImpl(MutableDescription.TYPE_PREFERENCE);
- }
-
- descriptions.addDescription(new DescriptionImpl(Locale.getDefault(), description, MutableDescription.TYPE_PREFERENCE));
- }
-
- /**
- * @see org.apache.pluto.om.common.PreferenceCtrl#setModifiable(boolean)
- */
- public void setReadOnly(boolean modifiable)
- {
- this.readOnly = modifiable;
- }
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj)
- {
- if (obj != null && obj instanceof Preference)
- {
- Preference pref = (Preference) obj;
- return pref.getName().equals(this.getName());
- }
-
- return false;
- }
-
- /**
- * @see java.lang.Object#hashCode()
- */
- public int hashCode()
- {
- HashCodeBuilder hasher = new HashCodeBuilder(23, 83);
- hasher.append(name);
- return hasher.toHashCode();
- }
-
- /**
- * @see org.apache.jetspeed.om.common.PreferenceComposite#addDescription(java.util.Locale, java.lang.String)
- */
- public void addDescription(Locale locale, String description)
- {
- if (descriptions == null)
- {
- descriptions = new DescriptionSetImpl(MutableDescription.TYPE_PREFERENCE);
- }
- descriptions.addDescription(new DescriptionImpl(locale, description, MutableDescription.TYPE_PREFERENCE));
- }
-
- /**
- * @see org.apache.jetspeed.om.common.PreferenceComposite#getDescription(java.util.Locale)
- */
- public Description getDescription(Locale locale)
- {
- if (descriptions != null)
- {
- return descriptions.get(locale);
- }
- return null;
- }
-
- /**
- * Remove when Castor is properly mapped
- * @deprecated
- * @return
- */
- public String getDescription()
- {
- Description desc = getDescription(Locale.getDefault());
- if (desc != null)
- {
- return desc.getDescription();
- }
-
- return null;
- }
-
- /**
- * @see org.apache.jetspeed.om.common.PreferenceComposite#getValueAt(int)
- */
- public String getValueAt(int index)
- {
- return getValueArray()[index];
- }
-
- /**
- * @see org.apache.jetspeed.om.common.PreferenceComposite#getValueArray()
- */
- public String[] getValueArray()
- {
- if (valueObjects != null)
- {
- return (String[]) valueObjects.toArray(new String[valueObjects.size()]);
- }
-
- return null;
- }
-
- /**
- * @see org.apache.jetspeed.om.common.PreferenceComposite#setValueAt(int, java.lang.String)
- */
- public void setValueAt(int index, String value)
- {
- if (valueObjects == null)
- {
- valueObjects = new ArrayList();
- }
-
- valueObjects.set(index, value);
-
- }
-
- /**
- * @return
- */
- public String getType()
- {
- return type;
- }
-
- /**
- * @param string
- */
- public void setType(String string)
- {
- type = string;
- }
-
- /**
- * <p>
- * setReadOnly
- * </p>
- *
- * Why???
- *
- * @see org.apache.pluto.om.common.PreferenceCtrl#setReadOnly(java.lang.String)
- * @param arg0
- */
- public void setReadOnly(String arg0)
- {
- setReadOnly(new Boolean(arg0).booleanValue());
-
- }
-
- /**
- * <p>
- * isValueSet
- * </p>
- *
- * @see org.apache.pluto.om.common.Preference#isValueSet()
- * @return
- */
- public boolean isValueSet()
- {
- return values != null && values.size() > 0;
- }
-
- /**
- * <p>
- * afterDelete
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#afterDelete(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void afterDelete(PersistenceBroker arg0) throws PersistenceBrokerException
- {
-
- }
-
- /**
- * <p>
- * afterInsert
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#afterInsert(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void afterInsert(PersistenceBroker arg0) throws PersistenceBrokerException
- {
-
- }
-
- /**
- * <p>
- * afterLookup
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#afterLookup(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void afterLookup(PersistenceBroker arg0) throws PersistenceBrokerException
- {
- //TODO we should move this out to a field conversion so as to remove the requirement to implement PersistenceBrokerAware
- values = PreferenceValueImpl.convertValueObjectsToStrings(this.valueObjects);
-
- }
-
- /**
- * <p>
- * afterUpdate
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#afterUpdate(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void afterUpdate(PersistenceBroker arg0) throws PersistenceBrokerException
- {
-
- }
-
- /**
- * <p>
- * beforeDelete
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#beforeDelete(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void beforeDelete(PersistenceBroker arg0) throws PersistenceBrokerException
- {
-
- }
-
- /**
- * <p>
- * beforeInsert
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#beforeInsert(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void beforeInsert(PersistenceBroker arg0) throws PersistenceBrokerException
- {
- if (this.valueObjects == null)
- {
- this.valueObjects = new ArrayList(values.size());
- }
- PreferenceValueImpl.convertStringsToValueObjects(values, valueObjects);
-
- }
-
- /**
- * <p>
- * beforeUpdate
- * </p>
- *
- * @see org.apache.ojb.broker.PersistenceBrokerAware#beforeUpdate(org.apache.ojb.broker.PersistenceBroker)
- * @param arg0
- * @throws org.apache.ojb.broker.PersistenceBrokerException
- */
- public void beforeUpdate(PersistenceBroker arg0) throws PersistenceBrokerException
- {
- if (this.valueObjects == null)
- {
- this.valueObjects = new ArrayList(values.size());
- }
- PreferenceValueImpl.convertStringsToValueObjects(values, valueObjects);
-
- }
+ private static final String CLASS_NAME = PreferenceImpl.class.getName();
+ private String ojbConcreteClass = CLASS_NAME;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org