From 47d47e40ad7487d45a3b610696b3814713f1f008 Mon Sep 17 00:00:00 2001 From: veronie Date: Sun, 31 Jan 2021 18:35:42 +0100 Subject: [PATCH] Renamed Filter classes. They aren't Composites themselves. --- ...FilterComposite.java => BggUserSourceFilter.java} | 2 +- ...eFilterComposite.java => FamilySourceFilter.java} | 2 +- ...ilterComposite.java => GeeklistSourceFilter.java} | 2 +- .../src/xyz/veronie/bgg/ui/parts/FetchPart.java | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) rename xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/{BggUserSourceFilterComposite.java => BggUserSourceFilter.java} (96%) rename xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/{FamilySourceFilterComposite.java => FamilySourceFilter.java} (96%) rename xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/{GeeklistSourceFilterComposite.java => GeeklistSourceFilter.java} (96%) diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilterComposite.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilter.java similarity index 96% rename from xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilterComposite.java rename to xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilter.java index f11860d..6ec3f55 100644 --- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilterComposite.java +++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/BggUserSourceFilter.java @@ -28,7 +28,7 @@ import xyz.veronie.bgg.types.Subtype; import xyz.veronie.bgg.types.UserFlag; import xyz.veronie.bgg.ui.filters.composites.FilterFlagComposite; -public class BggUserSourceFilterComposite { +public class BggUserSourceFilter { @Inject private IEventBroker eventBroker; @Inject private ResultConfigManager configManager; diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilterComposite.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilter.java similarity index 96% rename from xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilterComposite.java rename to xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilter.java index db3839d..87d63d8 100644 --- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilterComposite.java +++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/FamilySourceFilter.java @@ -35,7 +35,7 @@ import xyz.veronie.bgg.ui.helpers.BatLayouts; /// These are the controls to retrieve thing IDs for a given family ID @Creatable -public class FamilySourceFilterComposite { +public class FamilySourceFilter { @Inject private IEventBroker eventBroker; @Inject private ResultConfigManager configManager; diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilterComposite.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilter.java similarity index 96% rename from xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilterComposite.java rename to xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilter.java index f991931..ea66648 100644 --- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilterComposite.java +++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/filters/GeeklistSourceFilter.java @@ -25,7 +25,7 @@ import xyz.veronie.bgg.ui.helpers.BatLayouts; /// These are the controls to retrieve thing IDs for a given family ID @Creatable -public class GeeklistSourceFilterComposite { +public class GeeklistSourceFilter { @Inject private IEventBroker eventBroker; @Inject private ResultConfigManager configManager; diff --git a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/FetchPart.java b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/FetchPart.java index 7205410..04c9cb4 100644 --- a/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/FetchPart.java +++ b/xyz.veronie.bgg.ui/src/xyz/veronie/bgg/ui/parts/FetchPart.java @@ -38,9 +38,9 @@ import xyz.veronie.bgg.result.ThingProvider; import xyz.veronie.bgg.types.EventConstants; import xyz.veronie.bgg.types.ResultAction; import xyz.veronie.bgg.types.SourceFilter; -import xyz.veronie.bgg.ui.filters.BggUserSourceFilterComposite; -import xyz.veronie.bgg.ui.filters.FamilySourceFilterComposite; -import xyz.veronie.bgg.ui.filters.GeeklistSourceFilterComposite; +import xyz.veronie.bgg.ui.filters.BggUserSourceFilter; +import xyz.veronie.bgg.ui.filters.FamilySourceFilter; +import xyz.veronie.bgg.ui.filters.GeeklistSourceFilter; import xyz.veronie.bgg.ui.helpers.BatColors; import xyz.veronie.bgg.ui.helpers.BatLayouts; @@ -213,7 +213,7 @@ public class FetchPart { userFilterPage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); IEclipseContext userFilterCtx = EclipseContextFactory.create(); userFilterCtx.set(Composite.class, userFilterPage); // parent - ContextInjectionFactory.make(BggUserSourceFilterComposite.class, context, userFilterCtx); + ContextInjectionFactory.make(BggUserSourceFilter.class, context, userFilterCtx); btnBggUser.addSelectionListener(new SelectionListener() { @Override @@ -235,7 +235,7 @@ public class FetchPart { familyPage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); IEclipseContext familyFilterCtx = EclipseContextFactory.create(); familyFilterCtx.set(Composite.class, familyPage); // parent - ContextInjectionFactory.make(FamilySourceFilterComposite.class, context, familyFilterCtx);; + ContextInjectionFactory.make(FamilySourceFilter.class, context, familyFilterCtx);; btnFamily.addSelectionListener(new SelectionListener() { @Override @@ -256,7 +256,7 @@ public class FetchPart { geeklistPage.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); IEclipseContext geeklistFilterCtx = EclipseContextFactory.create(); geeklistFilterCtx.set(Composite.class, geeklistPage); // parent - ContextInjectionFactory.make(GeeklistSourceFilterComposite.class, context, geeklistFilterCtx); + ContextInjectionFactory.make(GeeklistSourceFilter.class, context, geeklistFilterCtx); btnGeeklist.addSelectionListener(new SelectionListener() { @Override