GitLab

at 2017-08-19T00:06:28+02:00

improve presets decoration

 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;

 

         }

 

-        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<>();

             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);

 

     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;

 

             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", " ");

 

         }

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

2 changed files:

Changes: