- From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 25 Sep 2008 17:37:46 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/org/w3c/unicorn/tasklisttree
In directory hutz:/tmp/cvs-serv15770/org/w3c/unicorn/tasklisttree
Modified Files:
TLTCond.java TLTExec.java
Log Message:
simplified logs a bit.
Index: TLTCond.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tasklisttree/TLTCond.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- TLTCond.java 2 Sep 2008 13:22:16 -0000 1.4
+++ TLTCond.java 25 Sep 2008 17:37:44 -0000 1.5
@@ -29,10 +29,7 @@
* @param type The type of the condition
*/
public TLTCond(String id, Observer observer, EnumCondType type, String value) {
- TLTCond.logger.trace("Constructor");
- TLTCond.logger.trace("Id : " + id);
- TLTCond.logger.trace("Observer : " + observer);
- TLTCond.logger.trace("Type : " + type.value());
+ TLTCond.logger.trace("constructor(" + id + ", " + observer + ", " + type.value() + ")");
this.id = id;
this.observer = observer;
this.type = type;
@@ -43,7 +40,7 @@
*
*/
public TLTCond() {
- TLTCond.logger.trace("Constructor");
+ TLTCond.logger.trace("constructor()");
}
/**
@@ -51,7 +48,7 @@
* @param id The id of the condition
*/
public void setId(String id) {
- TLTCond.logger.trace("setId : " + id);
+ TLTCond.logger.trace("setId(" + id + ")");
this.id = id;
}
@@ -60,7 +57,7 @@
* @param observer The observer the condition depends on
*/
public void setObserver(Observer observer) {
- TLTCond.logger.trace("setObserver : " + observer);
+ TLTCond.logger.trace("setObserver(" + observer + ")");
this.observer = observer;
}
@@ -69,7 +66,7 @@
* @param result The result of the test
*/
public void setResult(boolean result) {
- TLTCond.logger.trace("setResult : " + result);
+ TLTCond.logger.trace("setResult(" + result + ")");
this.result = result;
}
/**
@@ -77,7 +74,7 @@
* @param type The type of the condition
*/
public void setType(EnumCondType type){
- TLTCond.logger.trace("setType : " + type.value());
+ TLTCond.logger.trace("setType(" + type.value() + ")");
this.type = type;
}
@@ -87,7 +84,7 @@
* @param type The type of the condition
*/
public void setType(String type){
- TLTCond.logger.trace("setType : " + type);
+ TLTCond.logger.trace("setType(" + type + ")");
for(EnumCondType val : EnumCondType.values()){
if(val.value().equals(type))this.type=val;
}
@@ -98,7 +95,7 @@
* @param value value of the condition
*/
public void setValue(String value){
- TLTCond.logger.trace("setValue : " + value);
+ TLTCond.logger.trace("setValue(" + value + ")");
this.value=value;
}
@@ -106,7 +103,7 @@
* @return The id of the condition
*/
public String getId() {
- TLTCond.logger.trace("getId");
+ TLTCond.logger.trace("getId()");
return id;
}
@@ -115,7 +112,7 @@
* @return The observer the condition depends on
*/
public Observer getObserver() {
- TLTCond.logger.trace("getObserver");
+ TLTCond.logger.trace("getObserver()");
return observer;
}
@@ -124,7 +121,7 @@
* @return The result of the test
*/
public boolean getResult() {
- TLTCond.logger.trace("getResult");
+ TLTCond.logger.trace("getResult()");
return result;
}
@@ -133,7 +130,7 @@
* @return The type of the condition
*/
public EnumCondType getType(){
- TLTCond.logger.trace("getType");
+ TLTCond.logger.trace("getType()");
return type;
}
@@ -142,12 +139,15 @@
* @return The value of the condition
*/
public String getValue(){
- TLTCond.logger.trace("getValue");
+ TLTCond.logger.trace("getValue()");
return value;
}
public String toString(){
- return new String("TLTCond "+this.id+" observer "+this.observer+" value "+this.value);
+ if(this.observer != null) {
+ return new String("TLTCond{id: "+this.id+", observer: "+this.observer.getID()+", value: "+this.value+"}");
+ }
+ return new String("TLTCond{id: "+this.id+", value: "+this.value+"}");
}
}
Index: TLTExec.java
===================================================================
RCS file: /sources/public/2006/unicorn/org/w3c/unicorn/tasklisttree/TLTExec.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TLTExec.java 5 Sep 2008 14:53:05 -0000 1.5
+++ TLTExec.java 25 Sep 2008 17:37:44 -0000 1.6
@@ -29,15 +29,12 @@
* @param param The parameter of the exec
*/
public TLTExec(String id,Observer obs, String value,String type, ParamType param) {
- TLTExec.logger.trace("Constructor");
- TLTExec.logger.trace("Id : " + id);
- TLTExec.logger.trace("Type : " + type);
- TLTExec.logger.trace("Value : " + value);
- TLTExec.logger.trace("Param : " + param);
+ String toTrace = "constructor(" + id + ", ";
if (type.equals("observation")) {
- TLTExec.logger.trace("Observer : " + obs.getID());
+ toTrace += obs.getID() + ", ";
this.observer=obs;
}
+ TLTExec.logger.trace(toTrace + type + ", " + value + ", " + param + ")");
this.id = id;
this.value = value;
this.type=type;
@@ -50,7 +47,7 @@
* @param id The id of the exec
*/
public void setObserver(Observer obs) {
- TLTExec.logger.trace("setObserver : " + obs.getID());
+ TLTExec.logger.trace("setObserver(" + obs.getID() + ")");
this.observer = obs;
}
@@ -58,7 +55,7 @@
*
*/
public Observer getObserver() {
- TLTExec.logger.trace("getObserver");
+ TLTExec.logger.trace("getObserver()");
return this.observer;
}
@@ -68,7 +65,7 @@
* @param id The id of the exec
*/
public void setId(String id) {
- TLTExec.logger.trace("setId : " + id);
+ TLTExec.logger.trace("setId(" + id + ")");
this.id = id;
}
@@ -77,7 +74,7 @@
* @param value The observer to run
*/
public void setValue(String value) {
- TLTExec.logger.trace("setValue : " + value);
+ TLTExec.logger.trace("setValue(" + value + ")");
this.value = value;
}
@@ -86,7 +83,7 @@
* @param value The observer to run
*/
public void setType(String type) {
- TLTExec.logger.trace("setType : " + type);
+ TLTExec.logger.trace("setType(" + type + ")");
this.type = type;
}
@@ -95,7 +92,7 @@
* @param param The parameter of the exec
*/
public void setParam(ParamType param) {
- TLTExec.logger.trace("setParam : " + param);
+ TLTExec.logger.trace("setParam(" + param + ")");
this.param = param;
}
@@ -104,7 +101,7 @@
* @return The id of the exec
*/
public String getId() {
- TLTExec.logger.trace("getId");
+ TLTExec.logger.trace("getId()");
return id;
}
@@ -113,7 +110,7 @@
* @return The observer or subtask to run
*/
public String getValue() {
- TLTExec.logger.trace("getValue");
+ TLTExec.logger.trace("getValue()");
return value;
}
@@ -123,7 +120,7 @@
* @return The type of execution Observer or subtask
*/
public String getType() {
- TLTExec.logger.trace("getType");
+ TLTExec.logger.trace("getType()");
return type;
}
@@ -132,11 +129,11 @@
* @return The parameter of the exec
*/
public ParamType getParam() {
- TLTExec.logger.trace("getParam");
+ TLTExec.logger.trace("getParam()");
return param;
}
public String toString(){
- return new String("TLTExec "+this.id+"value "+this.value+" type "+this.getType()+" param "+this.param);
+ return "TLTExec{id: "+this.id+", value: "+this.value+", type: "+this.getType()+", param: "+this.param+"}";
}
}
Received on Thursday, 25 September 2008 17:38:22 UTC