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/06 02:26:20 UTC
cvs commit: jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference PreferenceSetImpl.java PreferenceImpl.java PreferenceSetComposite.java
weaver 2003/10/05 17:26:20
Modified: commons/src/java/org/apache/jetspeed/om/common/preference
PreferenceSetImpl.java PreferenceImpl.java
PreferenceSetComposite.java
Log:
- changes due to new Pluto drop
Revision Changes Path
1.3 +38 -1 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceSetImpl.java
Index: PreferenceSetImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceSetImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreferenceSetImpl.java 6 Aug 2003 19:44:24 -0000 1.2
+++ PreferenceSetImpl.java 6 Oct 2003 00:26:19 -0000 1.3
@@ -59,6 +59,8 @@
import java.util.HashMap;
import java.util.Set;
+import javax.portlet.PreferencesValidator;
+
import org.apache.jetspeed.om.common.AbstractSupportSet;
import org.apache.pluto.om.common.Preference;
@@ -77,6 +79,8 @@
private String preferenceType;
+ private PreferencesValidator validator;
+
/**
* @param wrappedSet
*/
@@ -193,6 +197,39 @@
}
return super.addAll(c);
+ }
+
+ /**
+ * <p>
+ * getPreferencesValidator
+ * </p>
+ *
+ * @see org.apache.pluto.om.common.PreferenceSet#getPreferencesValidator()
+ * @return
+ */
+ public PreferencesValidator getPreferencesValidator()
+ {
+ return validator;
+ }
+
+ /**
+ *
+ * <p>
+ * setPreferenceValidator
+ * </p>
+ * Sets the validaotr that will be used within this prefrence set.
+ *
+ * @param validator
+ *
+ */
+ public void setPreferenceValidator(PreferencesValidator validator)
+ {
+ if (validator == null)
+ {
+ throw new IllegalArgumentException("PreferenceSetImpl.setPreferenceValidator() cannot have a null validator argument.");
+ }
+
+ this.validator = validator;
}
}
1.3 +36 -6 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceImpl.java
Index: PreferenceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreferenceImpl.java 6 Aug 2003 19:44:24 -0000 1.2
+++ PreferenceImpl.java 6 Oct 2003 00:26:19 -0000 1.3
@@ -83,7 +83,7 @@
{
private String name;
protected Collection values;
- private boolean modifiable;
+ private boolean readOnly;
/** a collection of <code>PreferenceValueObjects</code>
* that can be persisted in a unique fashion.
*/
@@ -130,9 +130,9 @@
/**
* @see org.apache.pluto.om.common.Preference#isModifiable()
*/
- public boolean isModifiable()
+ public boolean isReadOnly()
{
- return modifiable;
+ return readOnly;
}
/**
@@ -174,9 +174,9 @@
/**
* @see org.apache.pluto.om.common.PreferenceCtrl#setModifiable(boolean)
*/
- public void setModifiable(boolean modifiable)
+ public void setReadOnly(boolean modifiable)
{
- this.modifiable = modifiable;
+ this.readOnly = modifiable;
}
/**
@@ -292,6 +292,36 @@
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()
+ {
+ // TODO Auto-generated method stub
+ return false;
}
}
1.2 +5 -1 jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java
Index: PreferenceSetComposite.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/java/org/apache/jetspeed/om/common/preference/PreferenceSetComposite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreferenceSetComposite.java 3 Aug 2003 14:52:04 -0000 1.1
+++ PreferenceSetComposite.java 6 Oct 2003 00:26:19 -0000 1.2
@@ -55,6 +55,8 @@
import java.util.Set;
+import javax.portlet.PreferencesValidator;
+
import org.apache.pluto.om.common.PreferenceSet;
import org.apache.pluto.om.common.PreferenceSetCtrl;
@@ -72,4 +74,6 @@
Set getNames();
int size();
+
+ void setPreferenceValidator(PreferencesValidator validator);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org