1 files changed, 93 insertions, 96 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/LocRefDereferencer.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/LocRefDereferencer.java
index f5394157..e513738c 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/LocRefDereferencer.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/LocRefDereferencer.java
@@ -14,99 +14,96 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package at.gv.egiz.bku.slcommands.impl.xsect;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.xml.crypto.Data;
-import javax.xml.crypto.OctetStreamData;
-import javax.xml.crypto.URIDereferencer;
-import javax.xml.crypto.URIReference;
-import javax.xml.crypto.URIReferenceException;
-import javax.xml.crypto.XMLCryptoContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import at.gv.egiz.bku.utils.urldereferencer.StreamData;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
-
-/**
- * An URIDereferencer implementation that dereferences <code>LocRef</code>
- * references.
- * 
- * @author mcentner
- */
-public class LocRefDereferencer implements URIDereferencer {
-
-  /**
-   * Logging facility.
-   */
-  private static Log log = LogFactory.getLog(LocRefDereferencer.class);
-
-  /**
-   * The <code>LocRef</code>-reference to be dereferenced by
-   * {@link #dereference(URIReference, XMLCryptoContext)}.
-   */
-  protected String locRef;
-
-  /**
-   * The context to be used for dereferencing.
-   */
-  protected URLDereferencerContext dereferencerContext;
-
-  /**
-   * Creates a new instance of this LocRefDereferencer with the given
-   * <code>dereferencerContext</code> and <code>locRef</code> reference.
-   * 
-   * @param dereferencerContext
-   *          the context to be used for dereferencing
-   * @param locRef
-   *          the <code>LocRef</code>-reference (must be an absolute URI)
-   * 
-   * @throws URISyntaxException
-   *           if <code>LocRef</code> is not an absolute URI
-   */
-  public LocRefDereferencer(URLDereferencerContext dereferencerContext,
-      String locRef) throws URISyntaxException {
-
-    this.dereferencerContext = dereferencerContext;
-
-    URI locRefUri = new URI(locRef);
-    if (locRefUri.isAbsolute()) {
-      this.locRef = locRef;
-    } else {
-      throw new IllegalArgumentException(
-          "Parameter 'locRef' must be an absolut URI.");
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * javax.xml.crypto.URIDereferencer#dereference(javax.xml.crypto.URIReference,
-   * javax.xml.crypto.XMLCryptoContext)
-   */
-  @Override
-  public Data dereference(URIReference uriReference, XMLCryptoContext context)
-      throws URIReferenceException {
-
-    URLDereferencer dereferencer = URLDereferencer.getInstance();
-    StreamData streamData;
-    try {
-      streamData = dereferencer.dereference(locRef, dereferencerContext);
-    } catch (IOException e) {
-      log.info("Failed to dereference URI'" + locRef + "'. " + e.getMessage(),
-          e);
-      throw new URIReferenceException("Failed to dereference URI '" + locRef
-          + "'. " + e.getMessage(), e);
-    }
-    return new OctetStreamData(streamData.getStream(), locRef, streamData
-        .getContentType());
-  }
-
-}
+package at.gv.egiz.bku.slcommands.impl.xsect;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.xml.crypto.Data;
+import javax.xml.crypto.OctetStreamData;
+import javax.xml.crypto.URIDereferencer;
+import javax.xml.crypto.URIReference;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.XMLCryptoContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.gv.egiz.bku.utils.urldereferencer.StreamData;
+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
+
+/**
+ * An URIDereferencer implementation that dereferences <code>LocRef</code>
+ * references.
+ * 
+ * @author mcentner
+ */
+public class LocRefDereferencer implements URIDereferencer {
+
+  /**
+   * Logging facility.
+   */
+  private final Logger log = LoggerFactory.getLogger(LocRefDereferencer.class);
+
+  /**
+   * The <code>LocRef</code>-reference to be dereferenced by
+   * {@link #dereference(URIReference, XMLCryptoContext)}.
+   */
+  protected String locRef;
+
+  /**
+   * The URLDereferencer to be used for dereferencing.
+   */
+  protected URLDereferencer dereferencer;
+
+  /**
+   * Creates a new instance of this LocRefDereferencer with the given
+   * <code>dereferencerContext</code> and <code>locRef</code> reference.
+   * 
+   * @param dereferencer
+   *          the context to be used for dereferencing
+   * @param locRef
+   *          the <code>LocRef</code>-reference (must be an absolute URI)
+   * 
+   * @throws URISyntaxException
+   *           if <code>LocRef</code> is not an absolute URI
+   */
+  public LocRefDereferencer(URLDereferencer dereferencer,
+      String locRef) throws URISyntaxException {
+
+    this.dereferencer = dereferencer;
+
+    URI locRefUri = new URI(locRef);
+    if (locRefUri.isAbsolute()) {
+      this.locRef = locRef;
+    } else {
+      throw new IllegalArgumentException(
+          "Parameter 'locRef' must be an absolut URI.");
+    }
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * javax.xml.crypto.URIDereferencer#dereference(javax.xml.crypto.URIReference,
+   * javax.xml.crypto.XMLCryptoContext)
+   */
+  @Override
+  public Data dereference(URIReference uriReference, XMLCryptoContext context)
+      throws URIReferenceException {
+
+    StreamData streamData;
+    try {
+      streamData = dereferencer.dereference(locRef);
+    } catch (IOException e) {
+      log.info("Failed to dereference URI '{}'.", locRef, e);
+      throw new URIReferenceException("Failed to dereference URI '" + locRef
+          + "'. " + e.getMessage(), e);
+    }
+    return new OctetStreamData(streamData.getStream(), locRef, streamData
+        .getContentType());
+  }
+
+}