[26740] use xid init component for tarmed requirements

Author: huthomas

bundles/ch.elexis.base.ch.arzttarife/.project

@@ -26,12 +26,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.pde.ds.core.builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -42,4 +42,15 @@
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1730062113336</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

bundles/ch.elexis.base.ch.arzttarife/META-INF/MANIFEST.MF

@@ -36,4 +36,5 @@ Import-Package: javax.inject,
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/ch.elexis.base.ch.arzttarife.adjuster.TarmedVerrechnebarAdjuster.xml,
- OSGI-INF/ch.elexis.base.ch.arzttarife.service.ArzttarifeModelServiceHolder.xml
+ OSGI-INF/ch.elexis.base.ch.arzttarife.service.ArzttarifeModelServiceHolder.xml,
+ OSGI-INF/ch.elexis.tarmedprefs.XidInitialization.xml

bundles/ch.elexis.base.ch.arzttarife/OSGI-INF/ch.elexis.tarmedprefs.XidInitialization.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="ch.elexis.tarmedprefs.XidInitialization">
+   <reference cardinality="1..1" field="xidService" interface="ch.elexis.core.services.IXidService" name="xidService"/>
+   <implementation class="ch.elexis.tarmedprefs.XidInitialization"/>
+</scr:component>

bundles/ch.elexis.base.ch.arzttarife/src/ch/elexis/tarmedprefs/TarmedRequirements.java

@@ -26,7 +26,6 @@
 import ch.elexis.core.model.IXid;
 import ch.elexis.core.services.holder.CoreModelServiceHolder;
 import ch.elexis.core.services.holder.CoverageServiceHolder;
-import ch.elexis.data.Xid;
 
 public class TarmedRequirements {
 
@@ -53,14 +52,6 @@ public class TarmedRequirements {
 	public static final String RESPONSIBLE_INFO_KEY = "ch.elexis.tarmedprefs.responsible";
 	private static Logger logger = LoggerFactory.getLogger(TarmedRequirements.class);
 
-	static {
-		Xid.localRegisterXIDDomainIfNotExists(DOMAIN_KSK, Messages.TarmedRequirements_kskName, Xid.ASSIGNMENT_REGIONAL);
-		Xid.localRegisterXIDDomainIfNotExists(DOMAIN_NIF, Messages.TarmedRequirements_NifName, Xid.ASSIGNMENT_REGIONAL);
-		Xid.localRegisterXIDDomainIfNotExists(DOMAIN_RECIPIENT_EAN, "rEAN", //$NON-NLS-1$
-				Xid.ASSIGNMENT_REGIONAL);
-		Xid.localRegisterXIDDomainIfNotExists(DOMAIN_SUVA, "Suva-Nr", Xid.ASSIGNMENT_REGIONAL);
-	}
-
 	public static String getEAN(final IContact contact) {
 		if (contact == null) {
 			return null;

bundles/ch.elexis.base.ch.arzttarife/src/ch/elexis/tarmedprefs/XidInitialization.java

@@ -0,0 +1,29 @@
+package ch.elexis.tarmedprefs;
+
+import static ch.elexis.core.constants.XidConstants.DOMAIN_RECIPIENT_EAN;
+
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+import ch.elexis.core.services.IXidService;
+import ch.elexis.data.Xid;
+
+@Component
+public class XidInitialization {
+
+	@Reference
+	private IXidService xidService;
+
+	@Activate
+	private void activate() {
+		xidService.localRegisterXIDDomainIfNotExists(TarmedRequirements.DOMAIN_KSK, Messages.TarmedRequirements_kskName,
+				Xid.ASSIGNMENT_REGIONAL);
+		xidService.localRegisterXIDDomainIfNotExists(TarmedRequirements.DOMAIN_NIF, Messages.TarmedRequirements_NifName,
+				Xid.ASSIGNMENT_REGIONAL);
+		xidService.localRegisterXIDDomainIfNotExists(DOMAIN_RECIPIENT_EAN, "rEAN", //$NON-NLS-1$
+				Xid.ASSIGNMENT_REGIONAL);
+		xidService.localRegisterXIDDomainIfNotExists(TarmedRequirements.DOMAIN_SUVA, "Suva-Nr",
+				Xid.ASSIGNMENT_REGIONAL);
+	}
+}