- From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 23 Sep 2009 09:17:05 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/input
In directory hutz:/tmp/cvs-serv14303/src/org/w3c/unicorn/input
Modified Files:
FileItemInputModule.java URIInputModule.java
FakeUploadInputModule.java DirectInputModule.java
Log Message:
log cleanup
Index: FakeUploadInputModule.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/input/FakeUploadInputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FakeUploadInputModule.java 28 Aug 2009 12:40:04 -0000 1.2
+++ FakeUploadInputModule.java 23 Sep 2009 09:17:03 -0000 1.3
@@ -49,10 +49,8 @@
*/
protected FakeUploadInputModule(final InputModule aInputModule)
throws IOException {
- InputModule.logger.trace("Constructor");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("Input module : " + aInputModule + ".");
- }
+ logger.trace("Constructor");
+ logger.debug("Input module : " + aInputModule + ".");
this.aMimeType = aInputModule.getMimeType();
this.sContent = aInputModule.getStringContent();
}
@@ -61,7 +59,7 @@
* Get the filename of the input
*/
public String getFileName() {
- InputModule.logger.trace("getFileName");
+ logger.trace("getFileName");
return this.sFileName;
}
@@ -69,7 +67,7 @@
* Get the stream of the input using the content
*/
public InputStream getInputStream() throws IOException {
- InputModule.logger.trace("getInputStream");
+ logger.trace("getInputStream");
final PipedOutputStream aPipedOutputStream = new PipedOutputStream();
aPipedOutputStream.write(this.sContent.getBytes());
aPipedOutputStream.close();
@@ -79,22 +77,22 @@
}
public EnumInputMethod getEnumInputMethod() {
- InputModule.logger.trace("getEnumInputMethod");
+ logger.trace("getEnumInputMethod");
return this.aEnumInputMethod;
}
public MimeType getMimeType() {
- InputModule.logger.trace("getMimeType");
+ logger.trace("getMimeType");
return this.aMimeType;
}
public Object getParameterValue() {
- InputModule.logger.trace("getParameterValue");
+ logger.trace("getParameterValue");
return this.sContent;
}
public String getStringContent() throws IOException {
- InputModule.logger.trace("getStringContent");
+ logger.trace("getStringContent");
return this.sContent;
}
@@ -102,7 +100,7 @@
* Dispose the object
*/
public void dispose() {
- InputModule.logger.trace("dispose");
+ logger.trace("dispose");
}
/**
Index: FileItemInputModule.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/input/FileItemInputModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FileItemInputModule.java 3 Sep 2009 17:34:53 -0000 1.3
+++ FileItemInputModule.java 23 Sep 2009 09:17:03 -0000 1.4
@@ -45,12 +45,9 @@
*/
protected FileItemInputModule(final MimeType aMimeType,
final Object oInputParameterValue) {
- InputModule.logger.trace("Constructor");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("Mime type : " + aMimeType + ".");
- InputModule.logger.debug("Input parameter value : "
- + oInputParameterValue + ".");
- }
+ logger.trace("Constructor");
+ logger.debug("Mime type : " + aMimeType + ".");
+ logger.debug("Input parameter value : " + oInputParameterValue + ".");
if (!(oInputParameterValue instanceof FileItem)) {
throw new IllegalArgumentException("Object oInputParameterValue : "
+ oInputParameterValue.toString() + ".");
@@ -60,32 +57,32 @@
}
public EnumInputMethod getEnumInputMethod() {
- InputModule.logger.trace("getEnumInputMethod");
+ logger.trace("getEnumInputMethod");
return this.aEnumInputMethod;
}
public String getFileName() {
- InputModule.logger.trace("getFileName");
+ logger.trace("getFileName");
return this.aFileItem.getName();
}
public InputStream getInputStream() throws IOException {
- InputModule.logger.trace("getInputStream");
+ logger.trace("getInputStream");
return this.aFileItem.getInputStream();
}
public MimeType getMimeType() {
- InputModule.logger.trace("getMimeType");
+ logger.trace("getMimeType");
return this.aMimeType;
}
public Object getParameterValue() {
- InputModule.logger.trace("getParameterValue");
+ logger.trace("getParameterValue");
return this.aFileItem;
}
public String getStringContent() {
- InputModule.logger.trace("getStringContent");
+ logger.trace("getStringContent");
return this.aFileItem.getString();
}
@@ -94,7 +91,7 @@
*/
public void dispose() {
if (null != this.aFileItem) {
- InputModule.logger.trace("dispose");
+ logger.trace("dispose");
this.aFileItem.delete();
this.aFileItem = null;
}
Index: DirectInputModule.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/input/DirectInputModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DirectInputModule.java 28 Aug 2009 12:40:04 -0000 1.2
+++ DirectInputModule.java 23 Sep 2009 09:17:03 -0000 1.3
@@ -42,12 +42,9 @@
*/
protected DirectInputModule(final MimeType aMimeType,
final Object oInputParameterValue) {
- InputModule.logger.trace("Constructor");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("Mime type : " + aMimeType + ".");
- InputModule.logger.debug("Input parameter value : "
- + oInputParameterValue + ".");
- }
+ logger.trace("Constructor");
+ logger.debug("Mime type : " + aMimeType + ".");
+ logger.debug("Input parameter value : " + oInputParameterValue + ".");
if (!(oInputParameterValue instanceof String)) {
throw new IllegalArgumentException("Object oInputParameterValue : "
+ oInputParameterValue.toString() + ".");
@@ -66,31 +63,29 @@
*/
protected DirectInputModule(final InputModule aInputModule)
throws IOException {
- InputModule.logger.trace("Constructor");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("Input module : " + aInputModule + ".");
- }
+ logger.trace("Constructor");
+ logger.debug("Input module : " + aInputModule + ".");
this.sInput = aInputModule.getStringContent();
this.aMimeType = aInputModule.getMimeType();
}
public EnumInputMethod getEnumInputMethod() {
- InputModule.logger.trace("getEnumInputMethod");
+ logger.trace("getEnumInputMethod");
return this.aEnumInputMethod;
}
public MimeType getMimeType() {
- InputModule.logger.trace("getMimeType");
+ logger.trace("getMimeType");
return this.aMimeType;
}
public Object getParameterValue() {
- InputModule.logger.trace("getParameterValue");
+ logger.trace("getParameterValue");
return this.sInput;
}
public String getStringContent() {
- InputModule.logger.trace("getStringContent");
+ logger.trace("getStringContent");
return this.sInput;
}
@@ -98,7 +93,7 @@
* Dispose the object
*/
public void dispose() {
- InputModule.logger.trace("dispose");
+ logger.trace("dispose");
}
/**
Index: URIInputModule.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/input/URIInputModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- URIInputModule.java 28 Aug 2009 16:11:41 -0000 1.3
+++ URIInputModule.java 23 Sep 2009 09:17:03 -0000 1.4
@@ -53,11 +53,8 @@
*/
protected URIInputModule(final MimeType aMimeType,
final Object oInputParameterValue) {
- InputModule.logger.trace("Constructor.");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("oInputParameterValue : "
- + oInputParameterValue + ".");
- }
+ logger.trace("Constructor.");
+ logger.debug("oInputParameterValue : " + oInputParameterValue + ".");
if (!(oInputParameterValue instanceof String)) {
throw new IllegalArgumentException("Object oInputParameterValue : "
+ oInputParameterValue.toString() + ".");
@@ -76,10 +73,8 @@
* odd error occurs
*/
protected URIInputModule(final InputModule aInputModule) throws IOException {
- InputModule.logger.trace("Constructor.");
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("InputModule : " + aInputModule + ".");
- }
+ logger.trace("Constructor.");
+ logger.debug("InputModule : " + aInputModule + ".");
this.aMimeType = aInputModule.getMimeType();
final Date aDate = new Date();
final String sFileName;
@@ -98,32 +93,30 @@
}
public EnumInputMethod getEnumInputMethod() {
- InputModule.logger.trace("getEnumInputMethod");
+ logger.trace("getEnumInputMethod");
return this.aEnumInputMethod;
}
public MimeType getMimeType() {
- InputModule.logger.trace("getMimeType");
+ logger.trace("getMimeType");
return this.aMimeType;
}
public Object getParameterValue() {
- InputModule.logger.trace("getParameterValue");
+ logger.trace("getParameterValue");
return this.sURI;
}
public String getStringContent() throws IOException {
- InputModule.logger.trace("getString.");
+ logger.trace("getString.");
final URL aURL = new URL(this.sURI);
final String sResult = (String) aURL.openConnection().getContent();
- if (InputModule.logger.isDebugEnabled()) {
- InputModule.logger.debug("sResult : " + sResult + ".");
- }
+ logger.debug("sResult : " + sResult + ".");
return sResult;
}
public String getURI() {
- InputModule.logger.trace("getURI");
+ logger.trace("getURI");
return this.sURI;
}
@@ -131,9 +124,9 @@
* Dispose the object
*/
public void dispose() {
- InputModule.logger.trace("dispose");
+ logger.trace("dispose");
if (null != this.aFile && this.aFile.delete()) {
- InputModule.logger.info("File deleted.");
+ logger.info("File deleted.");
this.aFile = null;
}
}
Received on Wednesday, 23 September 2009 09:17:14 UTC