Changeset 585:62af773a1f92

Timestamp:

09/30/09 14:58:23 (4 years ago)

Author:

tgambet

Branch:

default

convert_revision:

svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@586

Message:

fixed method negotiation was broken
+ changed InputModule? constructor visibility to public

Location:

src/org/w3c/unicorn

Files:

• UnicornCall.java (modified) (4 diffs)
• input/DirectInputModule.java (modified) (2 diffs)
• input/FakeUploadInputModule.java (modified) (2 diffs)
• input/URIInputModule.java (modified) (4 diffs)

src/org/w3c/unicorn/UnicornCall.java

@@ -1 @@
-// $Id: UnicornCall.java,v 1.28 2009-09-30 13:40:36 tgambet Exp $
+// $Id: UnicornCall.java,v 1.29 2009-09-30 14:58:22 tgambet Exp $
 // Author: Jean-Guilhem Rouel
 // (c) COPYRIGHT MIT, ERCIM and Keio, 2006.
@@ -21 +21 @@
 import org.w3c.unicorn.exceptions.UnicornException;
 import org.w3c.unicorn.input.InputParameter;
+import org.w3c.unicorn.input.*;
 import org.w3c.unicorn.request.Request;
 import org.w3c.unicorn.request.RequestList;
@@ -171 +172 @@
                         final Request aRequest = Request.createRequest(
                         // the corresponding best input module
-                                        //aInputFactory.getInputModule(aInputMethod.getMethod()),
-                                        inputParameter.getInputModule(),
+                                        //InputFactory.getInputModule(aInputMethod.getMethod()),
+                                        createInputModule(aInputMethod, inputParameter.getInputModule()),
                                         // URL of the service to call
                                         aInputMethod.getCallMethod().getURL().toString(),
@@ -549 +550 @@
                 this.messages = messages;
         }
+        
+        public InputModule createInputModule(InputMethod aInputMethod, InputModule inputModule) {
+                if (aInputMethod.getMethod() == inputModule.getEnumInputMethod()) {
+                        return inputModule;
+                }
+                
+                try {
+                        switch (aInputMethod.getMethod()) {
+                        case DIRECT:
+                                return new DirectInputModule(inputModule);
+                        case UPLOAD:
+                                return new FakeUploadInputModule(inputModule);
+                                //return new FileItemInputModule(inputModule);
+                        case URI:
+                                return new URIInputModule(inputModule);
+                        default:
+                                return null;
+                        }
+                } catch (IOException e) {
+                        logger.error(e.getMessage(), e);
+                        return null;
+                }
+        }
+
 }

src/org/w3c/unicorn/input/DirectInputModule.java

@@ -1 @@
-// $Id: DirectInputModule.java,v 1.3 2009-09-23 09:17:03 tgambet Exp $
+// $Id: DirectInputModule.java,v 1.4 2009-09-30 14:58:23 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -62 +62 @@
          *             for unknown error
          */
-        protected DirectInputModule(final InputModule aInputModule)
+        public DirectInputModule(final InputModule aInputModule)
                         throws IOException {
                 logger.trace("Constructor");

src/org/w3c/unicorn/input/FakeUploadInputModule.java

@@ -1 @@
-// $Id: FakeUploadInputModule.java,v 1.3 2009-09-23 09:17:03 tgambet Exp $
+// $Id: FakeUploadInputModule.java,v 1.4 2009-09-30 14:58:23 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -48 +48 @@
          * @throws IOException
          */
-        protected FakeUploadInputModule(final InputModule aInputModule)
+        public FakeUploadInputModule(final InputModule aInputModule)
                         throws IOException {
                 logger.trace("Constructor");

src/org/w3c/unicorn/input/URIInputModule.java

@@ -1 @@
-// $Id: URIInputModule.java,v 1.4 2009-09-23 09:17:03 tgambet Exp $
+// $Id: URIInputModule.java,v 1.5 2009-09-30 14:58:23 tgambet Exp $
 // Author: Damien LEROY.
 // (c) COPYRIGHT MIT, ERCIM ant Keio, 2006.
@@ -14 +14 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.util.Property;
@@ -24 +26 @@
 public class URIInputModule implements InputModule {
 
+        public static final Log logger = LogFactory.getLog(URIInputModule.class);
+        
         /**
          * Sets the method of input to URI
@@ -73 +77 @@
          *             odd error occurs
          */
-        protected URIInputModule(final InputModule aInputModule) throws IOException {
+        public URIInputModule(final InputModule aInputModule) throws IOException {
                 logger.trace("Constructor.");
                 logger.debug("InputModule : " + aInputModule + ".");