[Git][ultreiaio/ird-observe][develop] 4 commits: [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527 - Observe-commits

24 Jun 2020


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


Commits:
6730aa38 by Tony Chemit at 2020-06-24T17:21:57+02:00
[LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527

- - - - -
0b2a9f6c by Tony Chemit at 2020-06-24T17:22:07+02:00
Impossible de changer deux fois la langue - Closes #1539

- - - - -
252cb6a0 by Tony Chemit at 2020-06-24T17:22:07+02:00
Impossible d'afficher le `À propos` - Closes #1540

- - - - -
c88625b1 by Tony Chemit at 2020-06-24T17:22:33+02:00
Disfonctionnement de raccourcis - Closes #1497

- - - - -


5 changed files:

- client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx
- client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java
- client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java
- pom.xml


Changes:

=====================================
client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
=====================================
@@ -133,7 +133,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener
             ClientConfigOption.OBSTUNA_CAN_MIGRATE.getKey(),
     };
 
-    private final SimpleDateFormat dateFormat = new SimpleDateFormat();
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy HH:mm z");
     /**
      * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette
      * valeur peut être programmées lors des actions.
@@ -426,7 +426,7 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener
     }
 
     public String getApplicationName() {
-        return get().getOption(ApplicationConfig.APP_NAME);
+        return get().getOption("application.name");
     }
 
     @Override


=====================================
client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx
=====================================
@@ -90,12 +90,6 @@ public void destroy() {
     handler.destroy();
 }
 
-@Override
-protected void finalize() throws Throwable {
-    super.finalize();
-    destroy();
-}
-
 ]]>
   </script>
 


=====================================
client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUIHandler.java
=====================================
@@ -34,10 +34,10 @@ import fr.ird.observe.client.util.busy.BusyModel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport;
 import org.nuiton.jaxx.widgets.error.ErrorDialogUI;
 
 import javax.swing.JComponent;
-import javax.swing.KeyStroke;
 import java.awt.KeyboardFocusManager;
 import java.util.Locale;
 
@@ -92,6 +92,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien
         ErrorDialogUI.init(ui);
 
         BusyModel busyModel = getClientUIContext().getBusyModel();
+        JAXXObjectActionSupport.makeActionsEnabledOnlyIfMenuItemParentIsOpened(ui.getJMenuBar());
 
         ObserveKeyStrokesSupport.addKeyStrokeFromMnemonic(ui);
 
@@ -101,7 +102,6 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI>, WithClien
         BusyLayerUI.create(ui, busyModel);
 
         ui.getMenu().setEnabled(!busyModel.isBusy());
-        ui.getMenuLanguage().setAccelerator(KeyStroke.getKeyStroke("pressed L"));
 
         reload(model, getClientConfig(), busyModel);
 


=====================================
client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java
=====================================
@@ -50,6 +50,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import javax.swing.BoundedRangeModel;
+import java.beans.PropertyChangeListener;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -64,6 +65,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
 
     private static final Logger log = LogManager.getLogger(DataSourceEditorBodyContent.class);
 
+    private final PropertyChangeListener reload;
     private DataSourceEditorMenu editorMenu;
     private DataSourceEditorNavigationMenu navigationMenu;
     private ObserveSwingDataSource dataSource;
@@ -71,6 +73,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
     public DataSourceEditorBodyContent() {
         super(1, DataSourceEditor.class);
         setSupplier(SingletonSupplier.of(createSupplier()));
+        this.reload = e -> reload();
     }
 
     private Supplier<DataSourceEditor> createSupplier() {
@@ -92,24 +95,15 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi
 
         editorMenu.getUiModel().init();
         navigationMenu.getUiModel().init();
-
-        getClientUIContext().getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, evt -> reload());
+        mainUI.getBusyModel().addPropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload);
         ShowDataSourcePresetsAction.init(mainUI, mainUI.getShowDataSourcePresets(), ShowDataSourcePresetsAction.class);
     }
 
-//    @Override
-//    public void uninstall(ObserveMainUI mainUI) {
-//        super.uninstall(mainUI);
-//        if (dataSource != null && dataSource.isOpen()) {
-//            log.info("Closing main data source..");
-//            try {
-//                dataSource.close();
-//            } finally {
-//                setDataSource(null);
-//                getObserveDataSourcesManager().setMainDataSource(null);
-//            }
-//        }
-//    }
+    @Override
+    public void uninstall(ObserveMainUI mainUI) {
+        super.uninstall(mainUI);
+        mainUI.getBusyModel().removePropertyChangeListener(BusyModel.BUSY_PROPERTY_NAME, reload);
+    }
 
     @Override
     public void show(ObserveMainUI mainUI) {


=====================================
pom.xml
=====================================
@@ -24,7 +24,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2020.32</version>
+    <version>2020.33</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -170,7 +170,7 @@
 
     <!--    <lib.version.java4all.topia>1.17</lib.version.java4all.topia>-->
     <!--<lib.version.java4all.eugene>3.0<-alpha-22</lib.version.java4all.eugene>-->
-<!--    <lib.version.java4all.jaxx>3.0-alpha-67-SNAPSHOT</lib.version.java4all.jaxx>-->
+<!--    <lib.version.java4all.jaxx>3.0-alpha-70-SNAPSHOT</lib.version.java4all.jaxx>-->
     <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
     <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
     <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ef7cc91e4a2bf49bfc655ff3...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0ef7cc91e4a2bf49bfc655ff3...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] 4 commits: [LL][Logbook] opération de pêche / décimaux : gestion de la virgule - Closes #1527

Tony CHEMIT

tags

participants (1)