1 files changed, 15 insertions, 19 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
index c1d831e..ec6d054 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/sigid/DetachedLocRefMOAIdFormatter.java
@@ -5,7 +5,6 @@ package at.knowcenter.wag.egov.egiz.sig.sigid;
 
 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
 import at.knowcenter.wag.egov.egiz.exceptions.SettingsException;
-import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;
 
 /**
  * @author wprinz
@@ -13,31 +12,28 @@ import at.knowcenter.wag.egov.egiz.sig.ConnectorFactory;
  */
 public class DetachedLocRefMOAIdFormatter implements IdFormatter
 {
-	public static final String MOA_SIG_ID_KEY = "default.moa.signature.id";
+  /**
+   * The SIG_ID prefix.
+   * Default value: etsi-bka-moa-1.0
+   */
+  public static String SIG_ID_PREFIX = "etsi-bka-moa-1.0"; //$NON-NLS-1$
+  public static String SIG_ID_KEY = "default.moa.algorithm.id";
 
   /**
    * @see at.knowcenter.wag.egov.egiz.sig.sigid.IdFormatter#formatIds(java.lang.String[])
    */
   public String formatIds(String[] ids)
   {
-	String sig_id_prefix = null;
+	String tmp = null;
 	
-	try
-	{
-		//FIXME make better
-		//connector is hard coded since this method is called only when using MOA!
-		boolean sig_id_visible = ConnectorFactory.needsSIG_ID("moa");
-		
-		if (sig_id_visible)
-		{
-	      sig_id_prefix = SettingsReader.getInstance().getValueFromKey(MOA_SIG_ID_KEY);
-		}
-	} catch (SettingsException e)
-	{
-	  e.printStackTrace();
-	}
+	try {
+		tmp = SettingsReader.getInstance().getValueFromKey(SIG_ID_KEY);
+		if(tmp != null)
+			SIG_ID_PREFIX = tmp;
+	} catch (SettingsException e) {
+		e.printStackTrace();
+	}  
 	
-    return sig_id_prefix;
+    return SIG_ID_PREFIX;
   }
-
 }