GitLab

at 2024-09-19T15:07:42+02:00

L'action n'est active que si une source de donnée est active - See #2826

 import fr.ird.observe.navigation.id.Project;

 import fr.ird.observe.server.security.InvalidAuthenticationTokenException;

 import fr.ird.observe.services.ObserveServiceMainFactory;

+import io.ultreia.java4all.bean.AbstractJavaBean;

+import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;

 import io.ultreia.java4all.i18n.I18n;

 import io.ultreia.java4all.util.sql.SqlScript;

 import org.apache.logging.log4j.LogManager;

  * @author Tony Chemit - dev@tchemit.fr

  * @since 5.0

  */

-public class ObserveDataSourcesManager implements Closeable {

+@GenerateJavaBeanDefinition

+public class ObserveDataSourcesManager extends AbstractJavaBean implements Closeable {

 

     private static final Logger log = LogManager.getLogger(ObserveDataSourcesManager.class);

+    public static final String PROPERTY_MAIN_DATA_SOURCE = "mainDataSource";

     private final List<ObserveSwingDataSource> dataSources = new LinkedList<>();

     private final ClientConfig config;

     private final ObserveServiceMainFactory serviceFactory;

 

     public void setMainDataSource(ObserveSwingDataSource dataSource) {

         this.dataSource = dataSource;

+        firePropertyChange(PROPERTY_MAIN_DATA_SOURCE, dataSource);

     }

 

     public Optional<ObserveSwingDataSource> getOptionalMainDataSource() {

 

 import com.google.auto.service.AutoService;

 import fr.ird.observe.client.ObserveSwingApplicationContext;

+import fr.ird.observe.client.datasource.api.ObserveDataSourcesManager;

 import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;

 import fr.ird.observe.client.datasource.editor.ps.data.dcp.actions.ShowFloatingObjectPresetsUI;

 import fr.ird.observe.client.main.ObserveMainUI;

 import io.ultreia.java4all.util.SingletonSupplier;

 import org.nuiton.jaxx.runtime.context.JAXXInitialContext;

 

+import javax.swing.JMenuItem;

 import java.util.function.Supplier;

 

 /**

     @Override

     public void install(ObserveMainUI mainUI) {

         super.install(mainUI);

-        ShowFloatingObjectPresetsUI.init(mainUI, mainUI.getShowFloatingObjectPresets(), new ShowFloatingObjectPresetsUI());

+        ObserveSwingApplicationContext applicationContext = (ObserveSwingApplicationContext) ObserveSwingApplicationContext.get();

+        ObserveDataSourcesManager dataSourcesManager = applicationContext.getDataSourcesManager();

+        JMenuItem editor = mainUI.getShowFloatingObjectPresets();

+        dataSourcesManager.addPropertyChangeListener(ObserveDataSourcesManager.PROPERTY_MAIN_DATA_SOURCE, evt -> {

+            ObserveSwingDataSource newValue = (ObserveSwingDataSource) evt.getNewValue();

+            editor.setEnabled(newValue != null);

+        });

+        ShowFloatingObjectPresetsUI.init(mainUI, editor, new ShowFloatingObjectPresetsUI());

     }

 }
 observe.ui.action.exit.tip=quit Observe

 observe.ui.action.export.tip=Export

 observe.ui.action.floatingObjectPresets=Manage floating object presets

-observe.ui.action.floatingObjectPresets.tip=Manage floating object presets

+observe.ui.action.floatingObjectPresets.tip=Manage floating object presets (requires an open data source)

 observe.ui.action.goDown.tip=Go down in navigation tree

 observe.ui.action.goUp.tip=Go up in navigation tree

 observe.ui.action.goto.next.stage=Next step

 observe.ui.action.exit.tip=Salir de ObServe

 observe.ui.action.export.tip=Export

 observe.ui.action.floatingObjectPresets=Manage floating object presets \#TODO

-observe.ui.action.floatingObjectPresets.tip=Manage floating object presets \#TODO

+observe.ui.action.floatingObjectPresets.tip=Manage floating object presets (requires an open data source) \#TODO

 observe.ui.action.goDown.tip=Descender hacia etapas porteriores

 observe.ui.action.goUp.tip=Ascender hacia etapas anteriores

 observe.ui.action.goto.next.stage=Siguiente

 observe.ui.action.exit.tip=Quitter ObServe

 observe.ui.action.export.tip=Exporter

 observe.ui.action.floatingObjectPresets=Gérer les objets flottants de référence

-observe.ui.action.floatingObjectPresets.tip=Gérer les objets flottants de référence

+observe.ui.action.floatingObjectPresets.tip=Gérer les objets flottants de référence (nécessite une source de données ouverte)

 observe.ui.action.goDown.tip=Descendre dans la navigation

 observe.ui.action.goUp.tip=Remonter dans la navigation

 observe.ui.action.goto.next.stage=Suivant

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

Commits:

5 changed files:

Changes: