[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2009-04-17 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv22869

Modified Files:
Parameters.java 
Log Message:
Typo


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- Parameters.java 26 Jan 2009 16:34:18 -  1.47
+++ Parameters.java 17 Apr 2009 18:53:49 -  1.48
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.47 2009/01/26 16:34:18 michiel Exp $
+ * @version $Id: Parameters.java,v 1.48 2009/04/17 18:53:49 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -457,7 +457,7 @@
 /**
  * @since MMBase-1.9
  */
-public Parameters setAllIfDefinied(Parameters params) {
+public Parameters setAllIfDefined(Parameters params) {
 for (Parameter param : params.getDefinition()) {
 setIfDefined(param, params.get(param));
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2009-01-26 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv29302

Modified Files:
Parameters.java 
Log Message:
spacing only


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- Parameters.java 27 Oct 2008 18:36:38 -  1.46
+++ Parameters.java 26 Jan 2009 16:34:18 -  1.47
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.46 2008/10/27 18:36:38 michiel Exp $
+ * @version $Id: Parameters.java,v 1.47 2009/01/26 16:34:18 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -567,8 +567,7 @@
 return patternBacking != null ?
 new 
org.mmbase.util.ChainedIteratorMap.EntryString, 
Object(backing.entrySet().iterator(), patternBacking.iterator())
 :
-backing.entrySet().iterator()
-;
+backing.entrySet().iterator();
 }
 public int size() {
 return Parameters.this.size();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-10-27 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv19713/util/functions

Modified Files:
  Tag: MMBase-1_8
Parameters.java 
Log Message:
ported generic 'url' function from HEAD


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -b -r1.23.2.1 -r1.23.2.2
--- Parameters.java 18 Oct 2006 10:01:03 -  1.23.2.1
+++ Parameters.java 27 Oct 2008 17:00:41 -  1.23.2.2
@@ -23,7 +23,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.23.2.1 2006/10/18 10:01:03 michiel Exp $
+ * @version $Id: Parameters.java,v 1.23.2.2 2008/10/27 17:00:41 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -317,6 +317,17 @@
 return this;
 }
 
+/**
+ * @since MMBase-1.8.7
+ */
+public Parameters setAll(Parameters params) {
+Parameter[] def = params.getDefinition();
+for (int i = 0; i  def.length; i++) {
+Parameter param = def[i];
+set(param, params.get(param));
+}
+return this;
+}
 public List subList(int fromIndex, int toIndex) {
 return new Parameters(this, fromIndex, toIndex);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-10-27 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv22436/org/mmbase/util/functions

Modified Files:
Parameters.java 
Log Message:
fixed a @since tag


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Parameters.java 18 Sep 2008 10:40:46 -  1.45
+++ Parameters.java 27 Oct 2008 18:36:38 -  1.46
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.45 2008/09/18 10:40:46 michiel Exp $
+ * @version $Id: Parameters.java,v 1.46 2008/10/27 18:36:38 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -465,7 +465,7 @@
 }
 
 /**
- * @since MMBase-1.9
+ * @since MMBase-1.8.7
  */
 public Parameters setAll(Parameters params) {
 for (Parameter param : params.getDefinition()) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-09-18 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv5803

Modified Files:
Parameters.java 
Log Message:
added also setAll(Parameters)


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Parameters.java 20 Aug 2008 21:57:11 -  1.44
+++ Parameters.java 18 Sep 2008 10:40:46 -  1.45
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.44 2008/08/20 21:57:11 michiel Exp $
+ * @version $Id: Parameters.java,v 1.45 2008/09/18 10:40:46 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -464,6 +464,16 @@
 return this;
 }
 
+/**
+ * @since MMBase-1.9
+ */
+public Parameters setAll(Parameters params) {
+for (Parameter param : params.getDefinition()) {
+set(param, params.get(param));
+}
+return this;
+}
+
 public Parameters subList(int fromIndex, int toIndex) {
 return new Parameters(this, fromIndex, toIndex);
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-08-20 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv32586

Modified Files:
Parameters.java 
Log Message:
subList testcases were failing because of this bug


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- Parameters.java 20 Aug 2008 08:03:22 -  1.40
+++ Parameters.java 20 Aug 2008 12:46:41 -  1.41
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.40 2008/08/20 08:03:22 michiel Exp $
+ * @version $Id: Parameters.java,v 1.41 2008/08/20 12:46:41 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -181,6 +181,7 @@
 backing = params.backing;
 definition = params.definition;
 patternBacking = params.patternBacking;
+patternLimit   = params.patternLimit;
 fromIndex = from + params.fromIndex;
 toIndex   = to   + params.fromIndex;
 if (fromIndex  0) throw new IndexOutOfBoundsException(fromIndex  
0);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-08-20 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv7589

Modified Files:
Parameters.java 
Log Message:
fixed to String for when PatternParameter were used


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- Parameters.java 20 Aug 2008 12:46:41 -  1.41
+++ Parameters.java 20 Aug 2008 21:11:30 -  1.42
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.41 2008/08/20 12:46:41 michiel Exp $
+ * @version $Id: Parameters.java,v 1.42 2008/08/20 21:11:30 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -46,6 +46,8 @@
 protected final MapString, Object backing;
 
 protected final ListMap.EntryString, Object patternBacking;
+
+// Index of the first PatternParameter
 protected int patternLimit = -1;
 
 /**
@@ -211,10 +213,17 @@
 public String toString() {
 StringBuilder buf = new StringBuilder([);
 checkDef();
-for (int i = fromIndex; i  toIndex; i++) {
-if (i  fromIndex) buf.append(, );
+int i = fromIndex;
+for (i = fromIndex; i  toIndex  i  patternLimit; i++) {
+if (buf.length()  1) buf.append(, );
 buf.append(definition[i]).append('=').append(get(i));
 }
+if (patternBacking != null) {
+for (Map.EntryString, Object entry : patternBacking) {
+if (buf.length()  1) buf.append(, );
+
buf.append(entry.getKey()).append('=').append(entry.getValue());
+}
+}
 buf.append(]);
 return buf.toString();
 }
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-08-20 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv8011

Modified Files:
Parameters.java 
Log Message:
The toMap method didn't yet include the patternBacking. Now it does.


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Parameters.java 20 Aug 2008 21:11:30 -  1.42
+++ Parameters.java 20 Aug 2008 21:35:38 -  1.43
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.42 2008/08/20 21:11:30 michiel Exp $
+ * @version $Id: Parameters.java,v 1.43 2008/08/20 21:35:38 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -539,7 +539,22 @@
  * Gives the arguments back as a (unmodifiable) map.
  */
 public MapString, Object toMap() {
-return Collections.unmodifiableMap(backing);
+return new AbstractMapString, Object() {
+public SetMap.EntryString, Object entrySet() {
+return new AbstractSetMap.EntryString, Object() {
+public IteratorMap.EntryString, Object iterator() {
+return patternBacking != null ?
+new 
org.mmbase.util.ChainedIteratorMap.EntryString, 
Object(backing.entrySet().iterator(), patternBacking.iterator())
+:
+backing.entrySet().iterator()
+;
+}
+public int size() {
+return Parameters.this.size();
+}
+};
+}
+};
 }
 
 /**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

[MMBASE CVS] src/org/mmbase/util/functions Parameters.java

2008-08-20 Thread Michiel Meeuwissen 
Update of /var/cvs/src/org/mmbase/util/functions
In directory james.mmbase.org:/tmp/cvs-serv8358

Modified Files:
Parameters.java 
Log Message:
of course also the 'get' must take patternBacking into account


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/functions


Index: Parameters.java
===
RCS file: /var/cvs/src/org/mmbase/util/functions/Parameters.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Parameters.java 20 Aug 2008 21:35:38 -  1.43
+++ Parameters.java 20 Aug 2008 21:57:11 -  1.44
@@ -24,7 +24,7 @@
  *
  * @author Michiel Meeuwissen
  * @since  MMBase-1.7
- * @version $Id: Parameters.java,v 1.43 2008/08/20 21:35:38 michiel Exp $
+ * @version $Id: Parameters.java,v 1.44 2008/08/20 21:57:11 michiel Exp $
  * @see Parameter
  * @see #Parameters(Parameter[])
  */
@@ -511,7 +511,18 @@
  * @return value the parameter value
  */
 public Object get(String parameterName) {
-return backing.get(parameterName);
+Object o = backing.get(parameterName);
+if (o == null) {
+if (backing.containsKey(parameterName)) return null;
+if (patternBacking != null) {
+for (Map.EntryString, Object entry : patternBacking) {
+if (entry.getKey().equals(parameterName)) return 
entry.getValue();
+}
+}
+return null;
+} else {
+return o;
+}
 }
 
 
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs