1 files changed, 33 insertions, 12 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFException.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFException.java
index c72bc130..345a7d26 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFException.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFException.java
@@ -1,33 +1,54 @@
 /*******************************************************************************
+ * Copyright 2017 Graz University of Technology
+ * EAAF-Core Components has been developed in a cooperation between EGIZ,  
+ * A-SIT+, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+/*******************************************************************************
+ *******************************************************************************/
+/*******************************************************************************
  *******************************************************************************/
 package at.gv.egiz.eaaf.core.exceptions;
 
+import at.gv.egiz.eaaf.core.impl.logging.LogMessageProviderFactory;
+
 public class EAAFException extends Exception {
 
 	private static final long serialVersionUID = 1L;
 
 	private String errorId = null;
 	private Object[] params = null;
-
-	public EAAFException(String msg) {
-		super(msg);
-		
-	}
 	
-	public EAAFException(String msg, Throwable e) {
-		super(msg, e);
-		
+	public EAAFException(String errorId) {
+		super(LogMessageProviderFactory.getMessager().getMessage(errorId, null));
+		this.errorId = errorId;
 	}
 	
-	public EAAFException(String errorId, Object[] params, String msg) {
-		super(msg);
+	public EAAFException(String errorId, Object[] params) {
+		super(LogMessageProviderFactory.getMessager().getMessage(errorId, params));
 		this.errorId = errorId;
 		this.params = params;
 		
 	}
 	
-	public EAAFException(String errorId, Object[] params, String msg, Throwable e) {
-		super(msg, e);
+	public EAAFException(String errorId, Object[] params, Throwable e) {
+		super(LogMessageProviderFactory.getMessager().getMessage(errorId, params), e);
 		this.errorId = errorId;
 		this.params = params;