- From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 23 Sep 2009 09:22:15 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklisttree
In directory hutz:/tmp/cvs-serv14911/src/org/w3c/unicorn/tasklisttree
Modified Files:
TLTNode.java TLTCond.java TLTIf.java TLTExec.java
Log Message:
log cleanup
Index: TLTNode.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklisttree/TLTNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TLTNode.java 28 Aug 2009 12:40:12 -0000 1.2
+++ TLTNode.java 23 Sep 2009 09:22:13 -0000 1.3
@@ -32,7 +32,7 @@
*
*/
public TLTNode() {
- TLTNode.logger.trace("Constructor");
+ logger.trace("Constructor");
NodeID = 0;
executionList = new ArrayList<TLTExec>();
ifList = new ArrayList<TLTIf>();
@@ -50,10 +50,10 @@
*/
public TLTNode(int NodeID, ArrayList<TLTExec> executionList,
ArrayList<TLTIf> ifList) {
- TLTNode.logger.trace("Constructor");
- TLTNode.logger.trace("NodeID : " + NodeID);
- TLTNode.logger.trace("Number of executions : " + executionList.size());
- TLTNode.logger.trace("Number of ifs : " + ifList.size());
+ logger.trace("Constructor");
+ logger.trace("NodeID : " + NodeID);
+ logger.trace("Number of executions : " + executionList.size());
+ logger.trace("Number of ifs : " + ifList.size());
this.NodeID = NodeID;
this.executionList = executionList;
this.ifList = ifList;
@@ -65,7 +65,7 @@
* The level of execution
*/
public void setID(int NodeID) {
- TLTNode.logger.trace("setID : " + NodeID);
+ logger.trace("setID : " + NodeID);
this.NodeID = NodeID;
}
@@ -76,7 +76,7 @@
* The "exec" to add
*/
public void addExec(TLTExec exec) {
- TLTNode.logger.trace("addExec : " + exec.getId());
+ logger.trace("addExec : " + exec.getId());
if (!executionList.contains(exec)) {
executionList.add(exec);
}
@@ -89,7 +89,7 @@
* The "if" to add
*/
public void addIf(TLTIf tltIf) {
- TLTNode.logger.trace("addIf : ");
+ logger.trace("addIf : ");
ifList.add(tltIf);
}
@@ -98,7 +98,7 @@
* @return The list of executions
*/
public List<TLTExec> getExecutionList() {
- TLTNode.logger.trace("getExecutionList");
+ logger.trace("getExecutionList");
return executionList;
}
@@ -129,7 +129,7 @@
* @return The list of "ifs"
*/
public ArrayList<TLTIf> getIfList() {
- TLTNode.logger.trace("getIfList");
+ logger.trace("getIfList");
return ifList;
}
@@ -138,7 +138,7 @@
* @return The level of execution
*/
public int getID() {
- TLTNode.logger.trace("getLevel");
+ logger.trace("getLevel");
return NodeID;
}
Index: TLTExec.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklisttree/TLTExec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TLTExec.java 28 Aug 2009 12:40:12 -0000 1.2
+++ TLTExec.java 23 Sep 2009 09:22:13 -0000 1.3
@@ -44,8 +44,7 @@
toTrace += obs.getID() + ", ";
this.observer = obs;
}
- TLTExec.logger
- .trace(toTrace + type + ", " + value + ", " + param + ")");
+ logger.trace(toTrace + type + ", " + value + ", " + param + ")");
this.id = id;
this.value = value;
this.type = type;
@@ -59,7 +58,7 @@
* The id of the exec
*/
public void setObserver(Observer obs) {
- TLTExec.logger.trace("setObserver(" + obs.getID() + ")");
+ logger.trace("setObserver(" + obs.getID() + ")");
this.observer = obs;
}
@@ -67,7 +66,7 @@
*
*/
public Observer getObserver() {
- TLTExec.logger.trace("getObserver()");
+ logger.trace("getObserver()");
return this.observer;
}
@@ -77,7 +76,7 @@
* The id of the exec
*/
public void setId(String id) {
- TLTExec.logger.trace("setId(" + id + ")");
+ logger.trace("setId(" + id + ")");
this.id = id;
}
@@ -87,7 +86,7 @@
* The observer to run
*/
public void setValue(String value) {
- TLTExec.logger.trace("setValue(" + value + ")");
+ logger.trace("setValue(" + value + ")");
this.value = value;
}
@@ -97,7 +96,7 @@
* The observer to run
*/
public void setType(String type) {
- TLTExec.logger.trace("setType(" + type + ")");
+ logger.trace("setType(" + type + ")");
this.type = type;
}
@@ -107,7 +106,7 @@
* The parameter of the exec
*/
public void setParam(ParamType param) {
- TLTExec.logger.trace("setParam(" + param + ")");
+ logger.trace("setParam(" + param + ")");
this.param = param;
}
@@ -116,7 +115,7 @@
* @return The id of the exec
*/
public String getId() {
- TLTExec.logger.trace("getId()");
+ logger.trace("getId()");
return id;
}
@@ -125,7 +124,7 @@
* @return The observer or subtask to run
*/
public String getValue() {
- TLTExec.logger.trace("getValue()");
+ logger.trace("getValue()");
return value;
}
@@ -134,7 +133,7 @@
* @return The type of execution Observer or subtask
*/
public String getType() {
- TLTExec.logger.trace("getType()");
+ logger.trace("getType()");
return type;
}
@@ -143,7 +142,7 @@
* @return The parameter of the exec
*/
public ParamType getParam() {
- TLTExec.logger.trace("getParam()");
+ logger.trace("getParam()");
return param;
}
Index: TLTCond.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklisttree/TLTCond.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- TLTCond.java 21 Sep 2009 13:15:03 -0000 1.5
+++ TLTCond.java 23 Sep 2009 09:22:13 -0000 1.6
@@ -39,7 +39,7 @@
* The type of the condition
*/
public TLTCond(String id, Observer observer, EnumCondType type, String value) {
- TLTCond.logger.trace("constructor(" + id + ", " + observer + ", "
+ logger.trace("constructor(" + id + ", " + observer + ", "
+ type.value() + ")");
this.id = id;
this.observer = observer;
@@ -51,7 +51,7 @@
*
*/
public TLTCond() {
- TLTCond.logger.trace("constructor()");
+ logger.trace("constructor()");
}
public abstract boolean check(UnicornCall unicornCall) throws UnicornException;
@@ -79,7 +79,7 @@
* The id of the condition
*/
public void setId(String id) {
- TLTCond.logger.trace("setId(" + id + ")");
+ logger.trace("setId(" + id + ")");
this.id = id;
}
@@ -89,7 +89,7 @@
* The observer the condition depends on
*/
public void setObserver(Observer observer) {
- TLTCond.logger.trace("setObserver(" + observer + ")");
+ logger.trace("setObserver(" + observer + ")");
this.observer = observer;
}
@@ -99,7 +99,7 @@
* The result of the test
*/
public void setResult(boolean result) {
- TLTCond.logger.trace("setResult(" + result + ")");
+ logger.trace("setResult(" + result + ")");
this.result = result;
}
@@ -109,7 +109,7 @@
* The type of the condition
*/
public void setType(EnumCondType type) {
- TLTCond.logger.trace("setType(" + type.value() + ")");
+ logger.trace("setType(" + type.value() + ")");
this.type = type;
}
@@ -119,7 +119,7 @@
* The type of the condition
*/
public void setType(String type) {
- TLTCond.logger.trace("setType(" + type + ")");
+ logger.trace("setType(" + type + ")");
for (EnumCondType val : EnumCondType.values()) {
if (val.value().equals(type)) {
this.type = val;
@@ -133,7 +133,7 @@
* value of the condition
*/
public void setValue(String value) {
- TLTCond.logger.trace("setValue(" + value + ")");
+ logger.trace("setValue(" + value + ")");
this.value = value;
}
@@ -141,7 +141,7 @@
* @return The id of the condition
*/
public String getId() {
- TLTCond.logger.trace("getId()");
+ logger.trace("getId()");
return id;
}
@@ -150,7 +150,7 @@
* @return The observer the condition depends on
*/
public Observer getObserver() {
- TLTCond.logger.trace("getObserver()");
+ logger.trace("getObserver()");
return observer;
}
@@ -159,7 +159,7 @@
* @return The result of the test
*/
public boolean getResult() {
- TLTCond.logger.trace("getResult()");
+ logger.trace("getResult()");
return result;
}
@@ -168,7 +168,7 @@
* @return The type of the condition
*/
public EnumCondType getType() {
- TLTCond.logger.trace("getType()");
+ logger.trace("getType()");
return type;
}
@@ -177,7 +177,7 @@
* @return The value of the condition
*/
public String getValue() {
- TLTCond.logger.trace("getValue()");
+ logger.trace("getValue()");
return value;
}
Index: TLTIf.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/tasklisttree/TLTIf.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TLTIf.java 21 Sep 2009 13:16:54 -0000 1.3
+++ TLTIf.java 23 Sep 2009 09:22:13 -0000 1.4
@@ -30,7 +30,7 @@
*
*/
public TLTIf() {
- TLTIf.logger.trace("Constructor");
+ logger.trace("Constructor");
this.conds = new ArrayList<TLTCond>();
this.ifOk = new TLTNode();
this.ifNotOk = new TLTNode();
@@ -46,8 +46,8 @@
* The next node if the condition is ok
*/
public TLTIf(ArrayList<TLTCond> cond, TLTNode ifOk) {
- TLTIf.logger.trace("Constructor");
- TLTIf.logger.trace("Cond : ");
+ logger.trace("Constructor");
+ logger.trace("Cond : ");
this.conds = cond;
this.ifOk = ifOk;
this.ifNotOk = new TLTNode();
@@ -65,8 +65,8 @@
* The next node if the condition is not ok
*/
public TLTIf(ArrayList<TLTCond> cond, TLTNode ifOk, TLTNode ifNotOK) {
- TLTIf.logger.trace("Constructor");
- TLTIf.logger.trace("Cond : ");
+ logger.trace("Constructor");
+ logger.trace("Cond : ");
this.conds = cond;
this.ifOk = ifOk;
this.ifNotOk = ifNotOK;
@@ -97,7 +97,7 @@
* @param ifOk
*/
public void setIfOk(TLTNode ifOk) {
- TLTIf.logger.trace("setIfOk");
+ logger.trace("setIfOk");
this.ifOk = ifOk;
}
@@ -107,7 +107,7 @@
* @param ifNotOk
*/
public void setIfNotOk(TLTNode ifNotOk) {
- TLTIf.logger.trace("setIfNotOk");
+ logger.trace("setIfNotOk");
this.ifNotOk = ifNotOk;
}
@@ -117,7 +117,7 @@
* @param cond
*/
public void addCond(TLTCond cond) {
- TLTIf.logger.trace("addCond : " + cond.getId());
+ logger.trace("addCond : " + cond.getId());
this.conds.add(cond);
}
@@ -126,7 +126,7 @@
* @return The child node corresponding to the "ok" case
*/
public TLTNode getIfOk() {
- TLTIf.logger.trace("getIfOk");
+ logger.trace("getIfOk");
return ifOk;
}
@@ -135,7 +135,7 @@
* @return The child node corresponding to the "notOk" case
*/
public TLTNode getIfNotOk() {
- TLTIf.logger.trace("getIfNotOk");
+ logger.trace("getIfNotOk");
return ifNotOk;
}
@@ -144,7 +144,7 @@
* @return The condition
*/
public ArrayList<TLTCond> getCondArray() {
- TLTIf.logger.trace("getCond");
+ logger.trace("getCond");
return conds;
}
Received on Wednesday, 23 September 2009 09:22:25 UTC