From 011c80195b81206989c3ba672a971a697cf28d08 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Thu, 23 May 2024 14:47:41 +0300
Subject: [PATCH] [#1370] Operator fails on startup

Rework AgreementDomainRegistry
---
 ...loc.internal.agreements.core.AgreementDomainRegistry.xml | 2 +-
 .../internal/agreements/core/AgreementDomainRegistry.java   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bundles/org.eclipse.passage.loc.agreements.core/OSGI-INF/org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry.xml b/bundles/org.eclipse.passage.loc.agreements.core/OSGI-INF/org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry.xml
index d31ccf1a3..999423a27 100644
--- a/bundles/org.eclipse.passage.loc.agreements.core/OSGI-INF/org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry.xml
+++ b/bundles/org.eclipse.passage.loc.agreements.core/OSGI-INF/org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" deactivate="deactivate" name="org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="load" deactivate="unload" name="org.eclipse.passage.loc.internal.agreements.core.AgreementDomainRegistry">
    <property name="org.eclipse.passage.lic.emf.edit.domain.name" value="agreements"/>
    <property name="org.eclipse.passage.lic.emf.edit.file.extension" value="agreements_xmi"/>
    <service>
diff --git a/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java b/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java
index a409ed358..2860a8e77 100644
--- a/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java
+++ b/bundles/org.eclipse.passage.loc.agreements.core/src/org/eclipse/passage/loc/internal/agreements/core/AgreementDomainRegistry.java
@@ -58,15 +58,13 @@ public final class AgreementDomainRegistry extends BaseDomainRegistry<AgreementG
 	private final Map<String, Agreement> agreements = new HashMap<>();
 	private EventAdmin events;
 
-	@Override
 	@Activate
-	public void activate(Map<String, Object> properties) {
+	public void load(Map<String, Object> properties) {
 		super.activate(properties);
 	}
 
 	@Deactivate
-	@Override
-	public void deactivate(Map<String, Object> properties) {
+	public void unload(Map<String, Object> properties) {
 		agreements.clear();
 		groups.clear();
 		super.deactivate(properties);