From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../bku/slcommands/impl/xsect/URIDereferncerAdapter.java   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/URIDereferncerAdapter.java')

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/URIDereferncerAdapter.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/URIDereferncerAdapter.java
index c94937be..5ae728b3 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/URIDereferncerAdapter.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/xsect/URIDereferncerAdapter.java
@@ -30,8 +30,7 @@ import javax.xml.crypto.URIReferenceException;
 import javax.xml.crypto.XMLCryptoContext;
 
 import at.gv.egiz.bku.utils.urldereferencer.StreamData;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
-import at.gv.egiz.bku.utils.urldereferencer.URLDereferencerContext;
+import at.gv.egiz.bku.utils.urldereferencer.URLDereferencer;
 
 /**
  * An URIDereferencer implementation that uses an {@link URLDereferencer} to
@@ -44,17 +43,17 @@ public class URIDereferncerAdapter implements URIDereferencer {
   /**
    * The context for dereferencing.
    */
-  protected URLDereferencerContext urlDereferencerContext;
+  protected URLDereferencer dereferencer;
 
   /**
    * Creates a new URIDereferencerAdapter instance with the given
    * <code>urlDereferencerContext</code>.
    * 
-   * @param urlDereferencerContext the context to be used for dereferencing
+   * @param urlDereferencer the context to be used for dereferencing
    */
-  public URIDereferncerAdapter(URLDereferencerContext urlDereferencerContext) {
+  public URIDereferncerAdapter(URLDereferencer urlDereferencer) {
     super();
-    this.urlDereferencerContext = urlDereferencerContext;
+    this.dereferencer = urlDereferencer;
   }
 
   /* (non-Javadoc)
@@ -78,10 +77,9 @@ public class URIDereferncerAdapter implements URIDereferencer {
     
     if (uri.isAbsolute()) {
 
-      URLDereferencer dereferencer = URLDereferencer.getInstance();
       StreamData streamData;
       try {
-        streamData = dereferencer.dereference(uriString, urlDereferencerContext);
+        streamData = dereferencer.dereference(uriString);
       } catch (IOException e) {
         throw new URIReferenceException(e.getMessage(), e);
       }
-- 
cgit v1.2.3