Remove unused classes in org.argeo.slc.server package

[gpl/argeo-slc.git] / runtime / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / MarshallerView.java

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
index da559a1da33ae4fdec033a03fc4103b82eda8d19..3701d1cfd9e73a22669525bd0fabc44d27a93a58 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
@@ -1,17 +1,41 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.web.mvc;
 
+import java.util.Iterator;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.stream.StreamResult;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.web.servlet.view.AbstractView;
 
 /** Marshal one of the object of the map to the output. */
 public class MarshallerView extends AbstractView {
+       
+       private final static Log log = LogFactory
+       .getLog(MarshallerView.class);
+
+       
        private String modelKey = null;
        private final Marshaller marshaller;
 
@@ -30,10 +54,35 @@ public class MarshallerView extends AbstractView {
                        HttpServletRequest request, HttpServletResponse response)
                        throws Exception {
                final Object answer;
+       
+               if (log.isDebugEnabled()){
+                       //log.debug("In MarshallerView :: renderMergedOutputModel");
+                       if (modelKey != null )
+                               log.debug("Model key : ["+modelKey+"]");
+                       else log.debug("ModelKey is null");
+               }
+               
+               //TODO : remove this loop
+               if (log.isDebugEnabled()){
+                       Iterator it = model.keySet().iterator();
+                       int i = 0;
+                       while (it.hasNext())
+                                       log.debug(i++ + " [" + it.next().toString()+ "]");
+                       }
+               
                if (modelKey != null) {
-                       if (!model.containsKey(modelKey))
+                       if (!model.containsKey(modelKey)){
+                       /** //TODO : remove this loop
+                               if (log.isDebugEnabled()){
+                                       log.debug("Key not found in Model. Available keys are : ");
+                                       for (Object key : model.keySet()){
+                                               log.debug(key.toString());
+                                       }
+                               }
+                       **/
                                throw new SlcException("Key " + modelKey
                                                + " not found in model.");
+                               }
                        answer = model.get(modelKey);
                } else {
                        if (model.size() != 1)