Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9e459fc9 by Tony CHEMIT at 2017-08-19T00:06:28+02:00 improve presets decoration - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - services/src/main/java/fr/ird/observe/services/decoration/DecoratorService.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java @@ -26,6 +26,7 @@ import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.services.decoration.DecoratorService; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; import java.awt.BorderLayout; @@ -82,7 +83,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } - Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class); + Decorator<RemoteDataSourceConfiguration> remoteDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(RemoteDataSourceConfiguration.class,DecoratorService.WITH_URL); ui.getRemoteConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(remoteDecorator)); DefaultListModel<RemoteDataSourceConfiguration> remoteModel = new DefaultListModel<>(); @@ -134,7 +135,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { SwingUtilities.invokeLater(ui::repaint); }); - Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class); + Decorator<ServerDataSourceConfiguration> serverDecorator = ObserveSwingApplicationContext.get().getDecoratorService().getDecoratorByType(ServerDataSourceConfiguration.class,DecoratorService.WITH_URL); ui.getServerConfigurations().setCellRenderer(new DecoratorListCellRenderer<>(serverDecorator)); DefaultListModel<ServerDataSourceConfiguration> ServerModel = new DefaultListModel<>(); ui.getModel().getServerDataSourceConfigurations().forEach(ServerModel::addElement); ===================================== services/src/main/java/fr/ird/observe/services/decoration/DecoratorService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/decoration/DecoratorService.java +++ b/services/src/main/java/fr/ird/observe/services/decoration/DecoratorService.java @@ -175,6 +175,7 @@ public class DecoratorService extends DecoratorProvider { public static final String HAULING_IDENTIFIER = "haulingIdentifier"; public static final String TRIP_CONTEXT = "Trip"; + public static final String WITH_URL = "WithUrl"; /** la locale du referentiel. */ private ReferentialLocale referentialLocale; @@ -274,7 +275,9 @@ public class DecoratorService extends DecoratorProvider { registerObserveDecorator(SectionTemplate.class, "${id}$s##${floatlineLengths}$s", " "); registerObserveDecorator(RemoteDataSourceConfiguration.class, "${name}$s", " "); + registerObserveDecorator(WITH_URL,RemoteDataSourceConfiguration.class, "${name}$s##${url}$s", " "); registerObserveDecorator(ServerDataSourceConfiguration.class, "${name}$s", " "); + registerObserveDecorator(WITH_URL,ServerDataSourceConfiguration.class, "${name}$s##${url}$s", " "); registerObserveDecorator(FloatingObjectReference.class, "${name}$s", " "); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9e459fc9eca7fcfb09107a24b760... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9e459fc9eca7fcfb09107a24b760... You're receiving this email because of your account on gitlab.com.