Update of /var/cvs/applications/scan/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv504/src/org/mmbase/util
Modified Files:
HTMLElement.java HTMLElementCheckBox.java
HTMLElementPassword.java HTMLElementRadio.java
HTMLElementSelect.java HTMLElementText.java
HTMLElementTextArea.java
Removed Files:
DateSupport.java DateSupport_default.properties
Log Message:
cleaned up a bit Vector->LIst (can now perhaps return List in ProcessorModule).
Moved DateSupport to vwms, because it is used there as well
See also: http://cvs.mmbase.org/viewcvs/applications/scan/src/org/mmbase/util
Index: HTMLElement.java
===================================================================
RCS file: /var/cvs/applications/scan/src/org/mmbase/util/HTMLElement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- HTMLElement.java 1 Aug 2008 22:01:32 -0000 1.10
+++ HTMLElement.java 3 Sep 2008 15:23:39 -0000 1.11
@@ -9,9 +9,8 @@
*/
package org.mmbase.util;
-import java.util.Enumeration;
-import java.util.StringTokenizer;
-import java.util.Vector;
+import java.util.*;
+
import org.mmbase.module.ProcessorModule;
import org.mmbase.util.logging.Logger;
@@ -26,7 +25,7 @@
*
* @application SCAN
* @author Jan van Oosterom
-* @version $Id: HTMLElement.java,v 1.10 2008/08/01 22:01:32 michiel Exp $
+* @version $Id: HTMLElement.java,v 1.11 2008/09/03 15:23:39 michiel Exp $
*
*/
public abstract class HTMLElement {
@@ -52,7 +51,7 @@
/**
* contains the Vector with the items returned by the
ProcessorInteface.getList(value) if the PROC tag is present
*/
- protected Vector valuesList = null;
+ protected List valuesList = null;
/**
* added to the SIZE= tag
Index: HTMLElementCheckBox.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/util/HTMLElementCheckBox.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- HTMLElementCheckBox.java 29 Sep 2004 14:29:24 -0000 1.6
+++ HTMLElementCheckBox.java 3 Sep 2008 15:23:39 -0000 1.7
@@ -32,7 +32,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementCheckBox.java,v 1.6 2004/09/29 14:29:24 pierre Exp
$
+ * @version $Id: HTMLElementCheckBox.java,v 1.7 2008/09/03 15:23:39 michiel
Exp $
*/
public class HTMLElementCheckBox extends HTMLElement {
// Note: more appropriate would be to extend from HTMLElementSelect
@@ -60,7 +60,7 @@
if (moreValues) {
String val = null;
String basic = "<input type=\"checkbox\" name=\"" +name+ "\"
value=\"";
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
Vector list = new Vector();
@@ -133,7 +133,7 @@
} else if (moredouble) {
String val = null;
String basic = "<input type=\"checkbox\" name=\"" +name+ "\"
value=\"";
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
Vector list = new Vector();
Index: HTMLElementPassword.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/util/HTMLElementPassword.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- HTMLElementPassword.java 29 Sep 2004 14:29:24 -0000 1.6
+++ HTMLElementPassword.java 3 Sep 2008 15:23:39 -0000 1.7
@@ -22,7 +22,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementPassword.java,v 1.6 2004/09/29 14:29:24 pierre Exp
$
+ * @version $Id: HTMLElementPassword.java,v 1.7 2008/09/03 15:23:39 michiel
Exp $
*/
public class HTMLElementPassword extends HTMLElement {
// Note: more appropriate would be to extend from HTMLElementText
@@ -39,7 +39,7 @@
protected String generate() {
String html = "";
if (moreValues) {
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
if (e.hasMoreElements()) {
String val = (String) e.nextElement();
html += name + "<input type=\"password\" name=\"" + name + "\"
";
Index: HTMLElementRadio.java
===================================================================
RCS file: /var/cvs/applications/scan/src/org/mmbase/util/HTMLElementRadio.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- HTMLElementRadio.java 29 Sep 2004 14:29:24 -0000 1.7
+++ HTMLElementRadio.java 3 Sep 2008 15:23:39 -0000 1.8
@@ -33,7 +33,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementRadio.java,v 1.7 2004/09/29 14:29:24 pierre Exp $
+ * @version $Id: HTMLElementRadio.java,v 1.8 2008/09/03 15:23:39 michiel Exp $
*/
public class HTMLElementRadio extends HTMLElement {
// Note: more appropriate would be to extend from HTMLElementCheckbox
@@ -62,7 +62,7 @@
}
if (moreValues) {
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
String basic = "<input type=\"radio\" name=\"" + name + "\"
value=\"";
Vector list = new Vector();
@@ -133,7 +133,7 @@
i = 0;
}
} else if (moredouble) {
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
String basic = "<input type=\"radio\" name=\"" + name + "\"
value=\"";
Vector list = new Vector();
Index: HTMLElementSelect.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/util/HTMLElementSelect.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- HTMLElementSelect.java 29 Sep 2004 14:29:24 -0000 1.7
+++ HTMLElementSelect.java 3 Sep 2008 15:23:39 -0000 1.8
@@ -36,7 +36,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementSelect.java,v 1.7 2004/09/29 14:29:24 pierre Exp $
+ * @version $Id: HTMLElementSelect.java,v 1.8 2008/09/03 15:23:39 michiel Exp $
*/
public class HTMLElementSelect extends HTMLElement {
@@ -73,12 +73,12 @@
String val = null;
Vector list = new Vector();
- Vector vec = valuesList;
+ List vec = valuesList;
// log.debug("ServScan->"+vec);
if (sorted!=null && (sorted.equals("ALPHA") ||
sorted.equals("\"ALPHA\""))) {
vec=SortedVector.SortVector(vec);
}
- Enumeration e = vec.elements();
+ Enumeration e = Collections.enumeration(vec);
int j=0;
while (e.hasMoreElements() && ((j++<max)||max==-1)) {
val = (String) e.nextElement();
@@ -140,7 +140,7 @@
String val = null;
String val2 = null;
Vector list = new Vector();
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
while (e.hasMoreElements()) {
val = (String) e.nextElement();
if (e.hasMoreElements()) {
Index: HTMLElementText.java
===================================================================
RCS file: /var/cvs/applications/scan/src/org/mmbase/util/HTMLElementText.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- HTMLElementText.java 29 Sep 2004 14:29:24 -0000 1.6
+++ HTMLElementText.java 3 Sep 2008 15:23:39 -0000 1.7
@@ -23,7 +23,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementText.java,v 1.6 2004/09/29 14:29:24 pierre Exp $
+ * @version $Id: HTMLElementText.java,v 1.7 2008/09/03 15:23:39 michiel Exp $
*/
public class HTMLElementText extends HTMLElement {
/**
@@ -38,7 +38,7 @@
protected String generate() {
String html = "";
if (moreValues) {
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
if (e.hasMoreElements()) {
String val = (String) e.nextElement();
if (val.equals("null")) {
Index: HTMLElementTextArea.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/util/HTMLElementTextArea.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- HTMLElementTextArea.java 29 Sep 2004 14:29:25 -0000 1.6
+++ HTMLElementTextArea.java 3 Sep 2008 15:23:39 -0000 1.7
@@ -24,7 +24,7 @@
*
* @application SCAN
* @author Jan van Oosterom
- * @version $Id: HTMLElementTextArea.java,v 1.6 2004/09/29 14:29:25 pierre Exp
$
+ * @version $Id: HTMLElementTextArea.java,v 1.7 2008/09/03 15:23:39 michiel
Exp $
*/
public class HTMLElementTextArea extends HTMLElement {
// Note: more appropriate would be to extend from HTMLElementText
@@ -43,7 +43,7 @@
if (moreValues) {
if (valuesList != null) {
String val = null;
- Enumeration e = valuesList.elements();
+ Enumeration e = Collections.enumeration(valuesList);
if (e.hasMoreElements()) {
val = (String) e.nextElement();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
