tom2rd
diff --git a/‎Flickr4Java/src/main/java/com/flickr4java/flickr/Flickr.java‎
Lines changed: 18 additions & 23 deletions b/‎Flickr4Java/src/main/java/com/flickr4java/flickr/Flickr.java‎
Lines changed: 18 additions & 23 deletions
diff --git a/‎Flickr4Java/src/main/java/com/flickr4java/flickr/SOAPResponse.java‎
Lines changed: 13 additions & 4 deletions b/‎Flickr4Java/src/main/java/com/flickr4java/flickr/SOAPResponse.java‎
Lines changed: 13 additions & 4 deletions
@@ -78,11 +78,6 @@ public class Flickr {
      */
     public static boolean debugRequest = false;
 
-    /**
-     * If set to true, trace messages will be printed to STDOUT.
-     */
-    public static boolean tracing = false;
-
     private String apiKey;
 
     private String sharedSecret;
@@ -156,9 +151,9 @@ public class Flickr {
     private StatsInterface statsInterface;
 
     private CamerasInterface cameraInterface;
-    
+
     private SuggestionsInterface suggestionsInterface;
-    
+
     private GroupDiscussInterface discussionInterface;
 
     /**
@@ -617,30 +612,30 @@ public CamerasInterface getCamerasInterface() {
         }
         return cameraInterface;
     }
-    
+
     /**
      * Get the SuggestionsInterface.
      * 
      * @return The SuggestionsInterface
      */
-        public SuggestionsInterface getSuggestionsInterface() {
-            if (suggestionsInterface == null) {
-            	suggestionsInterface = new SuggestionsInterface(apiKey, sharedSecret, transport);
-            }
-            return suggestionsInterface;
+    public SuggestionsInterface getSuggestionsInterface() {
+        if (suggestionsInterface == null) {
+            suggestionsInterface = new SuggestionsInterface(apiKey, sharedSecret, transport);
         }
-    
+        return suggestionsInterface;
+    }
+
     /**
-    * Get the GroupDiscussInterface.
-    * 
-    * @return The GroupDiscussInterface
-    */
-      
+     * Get the GroupDiscussInterface.
+     * 
+     * @return The GroupDiscussInterface
+     */
+
     public GroupDiscussInterface getDiscussionInterface() {
-    if (discussionInterface == null) {
-    	discussionInterface= new GroupDiscussInterface(apiKey, sharedSecret, transport);
-    }
-    	return discussionInterface;
+        if (discussionInterface == null) {
+            discussionInterface = new GroupDiscussInterface(apiKey, sharedSecret, transport);
+        }
+        return discussionInterface;
     }
 
 }
@@ -5,6 +5,7 @@
 import org.apache.axis.message.SOAPBody;
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.message.SOAPFault;
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -19,30 +20,33 @@
  */
 public class SOAPResponse implements Response {
 
+    private static Logger _log = Logger.getLogger(SOAPResponse.class);
+
     private List<Element> payload;
 
     private String errorCode;
 
     private String errorMessage;
 
-    private SOAPEnvelope envelope;
+    private final SOAPEnvelope envelope;
 
     public SOAPResponse(SOAPEnvelope envelope) {
         this.envelope = envelope;
     }
 
+    @Override
     public void parse(Document document) {
         try {
             SOAPBody body = (SOAPBody) envelope.getBody();
 
             if (Flickr.debugStream) {
-                System.out.println("SOAP RESPONSE.parse");
-                System.out.println(body.getAsString());
+                _log.debug("SOAP RESPONSE.parse");
+                _log.debug(body.getAsString());
             }
 
             SOAPFault fault = (SOAPFault) body.getFault();
             if (fault != null) {
-                System.err.println("FAULT: " + fault.getAsString());
+                _log.warn("FAULT: " + fault.getAsString());
                 errorCode = fault.getFaultCode();
                 errorMessage = fault.getFaultString();
             } else {
@@ -63,25 +67,30 @@ public String getStat() {
         return null;
     }
 
+    @Override
     public Element getPayload() {
         if (payload.isEmpty()) {
             throw new RuntimeException("SOAP response payload has no elements");
         }
         return payload.get(0);
     }
 
+    @Override
     public Collection<Element> getPayloadCollection() {
         return payload;
     }
 
+    @Override
     public boolean isError() {
         return errorCode != null;
     }
 
+    @Override
     public String getErrorCode() {
         return errorCode;
     }
 
+    @Override
     public String getErrorMessage() {
         return errorMessage;
     }