Update of /var/cvs/applications/scan/src/org/mmbase/module/gui/html
In directory james.mmbase.org:/tmp/cvs-serv5976/src/org/mmbase/module/gui/html
Modified Files:
HtmlBase.java MMEdit.java scanparser.java
Log Message:
various code conventionial changes
See also:
http://cvs.mmbase.org/viewcvs/applications/scan/src/org/mmbase/module/gui/html
Index: HtmlBase.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/HtmlBase.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- HtmlBase.java 27 Aug 2007 14:12:10 -0000 1.57
+++ HtmlBase.java 23 Aug 2008 18:56:59 -0000 1.58
@@ -33,7 +33,7 @@
*
* @application SCAN
* @author Daniel Ockeloen
- * @version $Id: HtmlBase.java,v 1.57 2007/08/27 14:12:10 michiel Exp $
+ * @version $Id: HtmlBase.java,v 1.58 2008/08/23 18:56:59 michiel Exp $
*/
public class HtmlBase extends ProcessorModule {
/**
@@ -118,7 +118,7 @@
* Generate a list of values from a command to the processor
*/
public Vector getList(scanpage sp,StringTagger tagger, String value)
throws ParseException {
- String line = Strip.DoubleQuote(value,Strip.BOTH);
+ String line = Strip.doubleQuote(value,Strip.BOTH);
StringTokenizer tok = new StringTokenizer(line,"-\n\r");
if (tok.hasMoreTokens()) {
String cmd=tok.nextToken();
@@ -164,7 +164,7 @@
Enumeration f=tagger.Values("FIELDS").elements();
for (;f.hasMoreElements();) {
- String
fieldname=Strip.DoubleQuote((String)f.nextElement(),Strip.BOTH);
+ String
fieldname=Strip.doubleQuote((String)f.nextElement(),Strip.BOTH);
result=node.getStringValue(fieldname);
if (result!=null && !result.equals("null")) {
@@ -426,7 +426,7 @@
if (where==null || wherevector.contains(new
Integer(node.getIntValue("number")))) {
for (Iterator f=tagger.Values("FIELDS").iterator();
f.hasNext();) {
// hack hack this is way silly Strip needs to be fixed
-
tmp=node.getValue(Strip.DoubleQuote((String)f.next(),Strip.BOTH));
+
tmp=node.getValue(Strip.doubleQuote((String)f.next(),Strip.BOTH));
if (tmp!=null && !tmp.equals("null")) {
results.addElement(""+tmp);
} else {
@@ -966,7 +966,7 @@
node=(MMObjectNode)e.nextElement();
for (f=fields.elements();f.hasMoreElements();) {
// hack hack this is way silly, StringTagger needs to be
fixed
-
fieldname=Strip.DoubleQuote((String)f.nextElement(),Strip.BOTH);
+
fieldname=Strip.doubleQuote((String)f.nextElement(),Strip.BOTH);
if (fieldname.indexOf('(')>=0) {
result=""+node.getValue(fieldname);
} else {
@@ -1155,7 +1155,7 @@
Enumeration f=tagger.Values("FIELDS").elements();
for (;f.hasMoreElements();) {
// hack hack this is way silly Strip needs to be fixed
- String
fieldname=Strip.DoubleQuote((String)f.nextElement(),Strip.BOTH);
+ String
fieldname=Strip.doubleQuote((String)f.nextElement(),Strip.BOTH);
result=node.getStringValue(fieldname);
if (result!=null && !result.equals("null")) {
results+=" "+result;
@@ -1176,7 +1176,7 @@
int posdot,posarc,posunder,pos;
Enumeration f=fields.elements();
for (;f.hasMoreElements();) {
- fieldname=Strip.DoubleQuote((String)f.nextElement(),Strip.BOTH);
+ fieldname=Strip.doubleQuote((String)f.nextElement(),Strip.BOTH);
// get the first part (Example : episodes.);
// we got two styles:
// episodes.html_body
Index: MMEdit.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/MMEdit.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- MMEdit.java 21 Jun 2007 15:50:23 -0000 1.13
+++ MMEdit.java 23 Aug 2008 18:56:59 -0000 1.14
@@ -24,7 +24,7 @@
* @application SCAN
* @author Daniel Ockeloen
* @author Hans Speijer
- * @version $Id: MMEdit.java,v 1.13 2007/06/21 15:50:23 nklasens Exp $
+ * @version $Id: MMEdit.java,v 1.14 2008/08/23 18:56:59 michiel Exp $
*/
public class MMEdit extends ProcessorModule {
@@ -122,7 +122,7 @@
Vector result = new Vector();
CommandHandlerInterface handler;
- StringTokenizer tok = new
StringTokenizer(Strip.DoubleQuote(command,Strip.BOTH),"-\n\r");
+ StringTokenizer tok = new
StringTokenizer(Strip.doubleQuote(command,Strip.BOTH),"-\n\r");
String token = tok.nextToken();
if (token.startsWith ("DATE")) {
Index: scanparser.java
===================================================================
RCS file:
/var/cvs/applications/scan/src/org/mmbase/module/gui/html/scanparser.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- scanparser.java 1 Aug 2008 22:01:32 -0000 1.77
+++ scanparser.java 23 Aug 2008 18:56:59 -0000 1.78
@@ -31,7 +31,7 @@
* @application SCAN
* @rename SCANParser
* @author Daniel Ockeloen
- * @version $Id: scanparser.java,v 1.77 2008/08/01 22:01:32 michiel Exp $
+ * @version $Id: scanparser.java,v 1.78 2008/08/23 18:56:59 michiel Exp $
*/
public class scanparser extends ProcessorModule {
@@ -1556,7 +1556,7 @@
ll1=System.currentTimeMillis();
cmd=dodollar(cmd,session,sp);
- cmd=Strip.Whitespace(cmd,Strip.BOTH);
+ cmd=Strip.whitespace(cmd,Strip.BOTH);
String oldcmd=cmd;
if (sp.reload) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
