From ec7b44717a76019e6479082aca45edbd2647a172 Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Tue, 13 Jun 2023 11:32:38 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B9=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D0=B0=20IBmModelMana?= =?UTF-8?q?ger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/autosort/ExternalDependenciesModule.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java index 0ebcaf69f..990a3d9d3 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java @@ -15,7 +15,6 @@ import org.eclipse.core.runtime.Plugin; import com._1c.g5.v8.dt.core.model.IModelEditingSupport; -import com._1c.g5.v8.dt.core.platform.IBmModelManager; import com._1c.g5.v8.dt.core.platform.IConfigurationProvider; import com.e1c.g5.v8.dt.cli.api.components.BaseCliCommandExternalDependencyModule; @@ -38,7 +37,6 @@ protected void doConfigure() { super.doConfigure(); // V8 DT - bind(IBmModelManager.class).toService(); bind(IConfigurationProvider.class).toService(); bind(IModelEditingSupport.class).toService(); } From 1117b168ca20464753e5eb4a5baaaab884cd4775 Mon Sep 17 00:00:00 2001 From: Almaz Nasibullin Date: Tue, 13 Jun 2023 13:47:19 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D1=85=20=D0=B1=D0=B0=D0=B9=D0=BD=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF | 3 ++- .../internal/autosort/ExternalDependenciesModule.java | 4 ++++ .../autosort/itests/ExternalDependenciesModule.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF index 44b3550fc..b608f7905 100644 --- a/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF +++ b/bundles/com.e1c.v8codestyle.autosort/META-INF/MANIFEST.MF @@ -14,7 +14,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Automatic-Module-Name: com.e1c.v8codestyle.autosort Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Import-Package: com._1c.g5.v8.bm.common.collections;version="[4.0.0,5.0.0)", +Import-Package: com._1c.g5.v8.activitytracking.core;version="[1.0.0,2.0.0)", + com._1c.g5.v8.bm.common.collections;version="[4.0.0,5.0.0)", com._1c.g5.v8.bm.core;version="[8.0.0,9.0.0)", com._1c.g5.v8.bm.core.event;version="[3.0.0,4.0.0)", com._1c.g5.v8.bm.integration;version="[11.0.0,12.0.0)", diff --git a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java index 990a3d9d3..55115f494 100644 --- a/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java +++ b/bundles/com.e1c.v8codestyle.autosort/src/com/e1c/v8codestyle/internal/autosort/ExternalDependenciesModule.java @@ -14,8 +14,10 @@ import org.eclipse.core.runtime.Plugin; +import com._1c.g5.v8.activitytracking.core.ISystemIdleService; import com._1c.g5.v8.dt.core.model.IModelEditingSupport; import com._1c.g5.v8.dt.core.platform.IConfigurationProvider; +import com._1c.g5.v8.dt.core.platform.IDerivedDataManagerProvider; import com.e1c.g5.v8.dt.cli.api.components.BaseCliCommandExternalDependencyModule; /** @@ -39,6 +41,8 @@ protected void doConfigure() // V8 DT bind(IConfigurationProvider.class).toService(); bind(IModelEditingSupport.class).toService(); + bind(ISystemIdleService.class).toService(); + bind(IDerivedDataManagerProvider.class).toService(); } } diff --git a/tests/com.e1c.v8codestyle.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java b/tests/com.e1c.v8codestyle.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java index d909803a9..138979d7e 100644 --- a/tests/com.e1c.v8codestyle.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java +++ b/tests/com.e1c.v8codestyle.autosort.itests/src/com/e1c/v8codestyle/autosort/itests/ExternalDependenciesModule.java @@ -12,7 +12,9 @@ *******************************************************************************/ package com.e1c.v8codestyle.autosort.itests; +import com._1c.g5.v8.activitytracking.core.ISystemIdleService; import com._1c.g5.v8.dt.core.platform.IBmModelManager; +import com._1c.g5.v8.dt.core.platform.IDerivedDataManagerProvider; import com._1c.g5.v8.dt.core.platform.IDtProjectManager; import com._1c.g5.wiring.AbstractServiceAwareModule; import com.e1c.v8codestyle.autosort.ISortService; @@ -39,6 +41,8 @@ protected void doConfigure() bind(ISortService.class).toService(); bind(IBmModelManager.class).toService(); bind(IDtProjectManager.class).toService(); + bind(ISystemIdleService.class).toService(); + bind(IDerivedDataManagerProvider.class).toService(); } }