[fix] Remove unused parameters

Signed-off-by: Guillaume Coutable <guillaume.coutable@obeo.fr>
eclipse-sirius · Nov 20, 2024 · 1d893b6 · 1d893b6
1 parent 49e4c81
commit 1d893b6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/...nts-emf/src/main/java/org/eclipse/sirius/components/emf/services/DefaultLabelService.java b/...nts-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<IRepresentationMetadataProvider> representationMetadataProviders;
-
     private final LabelFeatureProviderRegistry labelFeatureProviderRegistry;
 
     private final ComposedAdapterFactory composedAdapterFactory;
 
-    private final List<IRepresentationImageProvider> representationImageProviders;
-
-    private final Logger logger = LoggerFactory.getLogger(LabelFeatureProviderRegistry.class);
+    private final Logger logger = LoggerFactory.getLogger(DefaultLabelService.class);
 
-    public DefaultLabelService(List<IRepresentationMetadataProvider> representationMetadataProviders, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory,
-            List<IRepresentationImageProvider> 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/...mf/src/test/java/org/eclipse/sirius/components/emf/services/DefaultLabelServiceTests.java b/...mf/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<String> 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/...-web-papaya/src/main/java/org/eclipse/sirius/web/papaya/services/PapayaLabelProvider.java b/...-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<IRepresentationMetadataProvider> representationMetadataProviders, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, List<IRepresentationImageProvider> 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/...web/src/test/java/org/eclipse/sirius/web/services/tree/EcoreSampleStyledLabelService.java b/...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<IRepresentationMetadataProvider> representationMetadataProviders, IRepresentationMetadataPersistenceService representationMetadataPersistenceService, LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory, List<IRepresentationImageProvider> representationImageProviders) {
-        super(representationMetadataProviders, labelFeatureProviderRegistry, composedAdapterFactory, representationImageProviders);
+    public EcoreSampleStyledLabelService(LabelFeatureProviderRegistry labelFeatureProviderRegistry, ComposedAdapterFactory composedAdapterFactory) {
+        super(labelFeatureProviderRegistry, composedAdapterFactory);
     }
 
     @Override

diff --git a/...in/java/org/eclipse/sirius/components/task/starter/services/TaskLabelServiceDelegate.java b/...in/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<IRepresentationMetadataProvider> representationMetadataProviders, ComposedAdapterFactory composedAdapterFactory, LabelFeatureProviderRegistry labelFeatureProviderRegistry) {
-        super(representationMetadataProviders, labelFeatureProviderRegistry, composedAdapterFactory, List.of());
+    public TaskLabelServiceDelegate(ComposedAdapterFactory composedAdapterFactory, LabelFeatureProviderRegistry labelFeatureProviderRegistry) {
+        super(labelFeatureProviderRegistry, composedAdapterFactory);
     }
 
     @Override