antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

removed type preservation code in setStringValue() - if the property was

Browse source 
of a different type previously, it is set to STRING instead of trying to
get a boolean, number, date etc. out of the string value.
This commit is contained in:
hns 2001-05-06 18:03:27 +00:00
parent 3009a40358
commit fdced7ceed
2 changed files with 3 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/helma/objectmodel/Property.java
View file

@ -67,33 +67,10 @@ public final class Property implements IProperty, Serializable, Cloneable {
public void setStringValue (String value) throws ParseException { public void setStringValue (String value) throws ParseException {
if (type == NODE) if (type == NODE)
unregisterNode (); unregisterNode ();
// IServer.getLogger().log ("setting string value of property "+propname + " to "+value);
if (type == DATE) {
SimpleDateFormat dateformat = new SimpleDateFormat ();
dateformat.setLenient (true);
Date date = dateformat.parse (value);
this.lvalue = date.getTime ();
return;
}
if (type == BOOLEAN) {
if ("true".equalsIgnoreCase (value))
this.bvalue = true;
else if ("false".equalsIgnoreCase (value))
this.bvalue = false;
return;
}
if (type == INTEGER) {
this.lvalue = Long.parseLong (value);
return;
}
if (type == FLOAT) {
this.dvalue = new Double (value).doubleValue ();
return;
}
if (type == JAVAOBJECT) if (type == JAVAOBJECT)
this.jvalue = null; this.jvalue = null;
this.svalue = value;
type = STRING; type = STRING;
this.svalue = value;
} }
public void setIntegerValue (long value) { public void setIntegerValue (long value) {

34
src/helma/objectmodel/db/Property.java
View file

@ -140,41 +140,11 @@ public final class Property implements IProperty, Serializable, Cloneable {
public void setStringValue (String value) { public void setStringValue (String value) {
if (type == NODE) if (type == NODE)
unregisterNode (); unregisterNode ();
// IServer.getLogger().log ("setting string value of property "+propname + " to "+value);
// mark property as dirty
dirty = true;
// if this is not a string property, try to parse a value out of it
if (type == DATE) {
SimpleDateFormat dateformat = new SimpleDateFormat ();
try {
dateformat.setLenient (true);
Date date = dateformat.parse (value);
this.lvalue = date.getTime ();
return;
} catch (ParseException nodate) {
node.nmgr.logEvent ("Couldn't parse date: was expecting something like "+dateformat.format (new Date()));
// store as plain string
}
}
if (type == BOOLEAN) {
if ("true".equalsIgnoreCase (value))
this.bvalue = true;
else if ("false".equalsIgnoreCase (value))
this.bvalue = false;
return;
}
if (type == INTEGER) {
this.lvalue = Long.parseLong (value);
return;
}
if (type == FLOAT) {
this.dvalue = new Double (value).doubleValue ();
return;
}
if (type == JAVAOBJECT) if (type == JAVAOBJECT)
this.jvalue = null; this.jvalue = null;
this.svalue = value;
type = STRING; type = STRING;
this.svalue = value;
dirty = true;
} }