From 1d893b6062509982015ac6de99d35b5517b12c31 Mon Sep 17 00:00:00 2001 From: Guillaume Coutable Date: Wed, 20 Nov 2024 11:58:54 +0100 Subject: [PATCH] [fix] Remove unused parameters Signed-off-by: Guillaume Coutable --- .../emf/services/DefaultLabelService.java | 13 ++----------- .../emf/services/DefaultLabelServiceTests.java | 5 ++--- .../web/papaya/services/PapayaLabelProvider.java | 7 ++----- .../tree/EcoreSampleStyledLabelService.java | 7 ++----- .../starter/services/TaskLabelServiceDelegate.java | 6 ++---- 5 files changed, 10 insertions(+), 28 deletions(-) diff --git a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/DefaultLabelService.java b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/DefaultLabelService.java index cc6c8a885f..95a4ef659f 100644 --- a/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/DefaultLabelService.java +++ b/packages/emf/backend/sirius-components-emf/src/main/java/org/eclipse/sirius/components/emf/services/DefaultLabelService.java @@ -29,9 +29,7 @@ import org.eclipse.emf.edit.provider.ComposedImage; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.ReflectiveItemProvider; -import org.eclipse.sirius.components.collaborative.api.IRepresentationImageProvider; import org.eclipse.sirius.components.core.api.IDefaultLabelService; -import org.eclipse.sirius.components.core.api.IRepresentationMetadataProvider; import org.eclipse.sirius.components.core.api.labels.StyledString; import org.eclipse.sirius.components.emf.ResourceMetadataAdapter; import org.slf4j.Logger; @@ -50,22 +48,15 @@ public class DefaultLabelService implements IDefaultLabelService { private static final String DEFAULT_LABEL_FEATURE = "name"; - private final List representationMetadataProviders; - private final LabelFeatureProviderRegistry labelFeatureProviderRegistry; private final ComposedAdapterFactory composedAdapterFactory; - private final List representationImageProviders; - - private final Logger logger = LoggerFactory.getLogger(LabelFeatureProviderRegistry.class); + private final Logger logger = LoggerFactory.getLogger(DefaultLabelService.class); - public DefaultLabelService(List representationMetadataProviders, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, - List representationImageProviders) { - this.representationMetadataProviders = Objects.requireNonNull(representationMetadataProviders); + public DefaultLabelService(LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory) { this.labelFeatureProviderRegistry = Objects.requireNonNull(labelFeatureProviderRegistry); this.composedAdapterFactory = Objects.requireNonNull(composedAdapterFactory); - this.representationImageProviders = Objects.requireNonNull(representationImageProviders); } @Override diff --git a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DefaultLabelServiceTests.java b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DefaultLabelServiceTests.java index fd19c2943f..5a45e7e7b0 100644 --- a/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DefaultLabelServiceTests.java +++ b/packages/emf/backend/sirius-components-emf/src/test/java/org/eclipse/sirius/components/emf/services/DefaultLabelServiceTests.java @@ -29,7 +29,6 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory; import org.eclipse.emf.edit.provider.StyledString; -import org.eclipse.sirius.components.core.api.IRepresentationMetadataProvider; import org.eclipse.sirius.components.core.api.labels.BorderStyle; import org.eclipse.sirius.components.core.api.labels.UnderLineStyle; import org.junit.jupiter.api.Test; @@ -45,7 +44,7 @@ public void testFindImagePathOnCompositeImage() { ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(List.of(new EcoreItemProviderAdapterFactory())); composedAdapterFactory.addAdapterFactory(new EcoreAdapterFactory()); composedAdapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); - DefaultLabelService labelService = new DefaultLabelService(List.of(new IRepresentationMetadataProvider.NoOp()), new LabelFeatureProviderRegistry(), composedAdapterFactory, List.of()); + DefaultLabelService labelService = new DefaultLabelService(new LabelFeatureProviderRegistry(), composedAdapterFactory); EAttribute attr = EcoreFactory.eINSTANCE.createEAttribute(); List imagePath = labelService.getImagePath(attr); assertThat(imagePath).hasSize(1); @@ -111,7 +110,7 @@ public Object getStyledText(Object object) { @Override public String getText(Object object) { - return getStyledText(object).toString(); + return this.getStyledText(object).toString(); } } } diff --git a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaLabelProvider.java b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaLabelProvider.java index 1c19a14467..4d53cca889 100644 --- a/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaLabelProvider.java +++ b/packages/sirius-web/backend/sirius-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaLabelProvider.java @@ -12,16 +12,13 @@ *******************************************************************************/ package org.eclipse.sirius.web.papaya.services; -import java.util.List; import java.util.Objects; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemStyledLabelProvider; -import org.eclipse.sirius.components.collaborative.api.IRepresentationImageProvider; import org.eclipse.sirius.components.core.api.ILabelServiceDelegate; -import org.eclipse.sirius.components.core.api.IRepresentationMetadataProvider; import org.eclipse.sirius.components.core.api.labels.StyledString; import org.eclipse.sirius.components.emf.services.DefaultLabelService; import org.eclipse.sirius.components.emf.services.LabelFeatureProviderRegistry; @@ -40,8 +37,8 @@ public class PapayaLabelProvider extends DefaultLabelService implements ILabelSe private final IStyledStringConverter styledStringConverter; - public PapayaLabelProvider(List representationMetadataProviders, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, List representationImageProviders, IStyledStringConverter styledStringConverter) { - super(representationMetadataProviders, labelFeatureProviderRegistry, composedAdapterFactory, representationImageProviders); + public PapayaLabelProvider(LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, IStyledStringConverter styledStringConverter) { + super(labelFeatureProviderRegistry, composedAdapterFactory); this.styledStringConverter = Objects.requireNonNull(styledStringConverter); } diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/tree/EcoreSampleStyledLabelService.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/tree/EcoreSampleStyledLabelService.java index 7d889f8289..70696e0855 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/tree/EcoreSampleStyledLabelService.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/services/tree/EcoreSampleStyledLabelService.java @@ -16,10 +16,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.sirius.components.collaborative.api.IRepresentationImageProvider; -import org.eclipse.sirius.components.collaborative.api.IRepresentationMetadataPersistenceService; import org.eclipse.sirius.components.core.api.ILabelServiceDelegate; -import org.eclipse.sirius.components.core.api.IRepresentationMetadataProvider; import org.eclipse.sirius.components.core.api.labels.StyledString; import org.eclipse.sirius.components.core.api.labels.StyledStringFragment; import org.eclipse.sirius.components.core.api.labels.StyledStringFragmentStyle; @@ -37,8 +34,8 @@ public class EcoreSampleStyledLabelService extends DefaultLabelService implement private static final String NAME = "name"; - public EcoreSampleStyledLabelService(List representationMetadataProviders, IRepresentationMetadataPersistenceService representationMetadataPersistenceService, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, List representationImageProviders) { - super(representationMetadataProviders, labelFeatureProviderRegistry, composedAdapterFactory, representationImageProviders); + public EcoreSampleStyledLabelService(LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory) { + super(labelFeatureProviderRegistry, composedAdapterFactory); } @Override diff --git a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/TaskLabelServiceDelegate.java b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/TaskLabelServiceDelegate.java index 7f9e01c2a1..f2f5cc7cbf 100644 --- a/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/TaskLabelServiceDelegate.java +++ b/packages/starters/backend/sirius-components-task-starter/src/main/java/org/eclipse/sirius/components/task/starter/services/TaskLabelServiceDelegate.java @@ -12,14 +12,12 @@ *******************************************************************************/ package org.eclipse.sirius.components.task.starter.services; -import java.util.List; import java.util.Optional; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.sirius.components.core.api.ILabelServiceDelegate; import org.eclipse.sirius.components.core.api.IObjectSearchService; -import org.eclipse.sirius.components.core.api.IRepresentationMetadataProvider; import org.eclipse.sirius.components.core.api.labels.StyledString; import org.eclipse.sirius.components.emf.services.DefaultLabelService; import org.eclipse.sirius.components.emf.services.LabelFeatureProviderRegistry; @@ -37,8 +35,8 @@ public class TaskLabelServiceDelegate extends DefaultLabelService implements ILa private final EditingDomainServices editingDomainServices = new EditingDomainServices(); - public TaskLabelServiceDelegate(List representationMetadataProviders, ComposedAdapterFactory composedAdapterFactory, LabelFeatureProviderRegistry labelFeatureProviderRegistry) { - super(representationMetadataProviders, labelFeatureProviderRegistry, composedAdapterFactory, List.of()); + public TaskLabelServiceDelegate(ComposedAdapterFactory composedAdapterFactory, LabelFeatureProviderRegistry labelFeatureProviderRegistry) { + super(labelFeatureProviderRegistry, composedAdapterFactory); } @Override