[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Correction de la migration 7.4.0 - Closes #1458 - Observe-commits

29 Mar 2020


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


Commits:
b1965e55 by tchemit at 2020-03-29T13:00:06+02:00
Correction de la migration 7.4.0 - Closes #1458

- - - - -
9c0d817d by tchemit at 2020-03-29T13:26:13+02:00
Ajouter l'icone de l'application lors du lancement de l'application en mode autre - Closes #1459

- - - - -


6 changed files:

- client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java
- client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java
- client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
- persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql


Changes:

=====================================
client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss
=====================================
@@ -34,7 +34,6 @@ JSplitPane {
 
 #mainFrame {
   defaultCloseOperation: "do_nothing_on_close";
-  iconImage: {SwingUtil.createImageIcon("logo.png").getImage()};
 }
 
 #menu {


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java
=====================================
@@ -22,6 +22,7 @@
 package fr.ird.observe.client.ui;
 
 import fr.ird.observe.client.ObserveSwingApplicationContext;
+import fr.ird.observe.client.ui.util.UIHelper;
 import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.JSplitPane;
@@ -48,6 +49,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI> {
 
     @Override
     public void afterInit(ObserveMainUI ui) {
+        UIHelper.addApplicationIcon(ui);
         ui.getInitializer().initialize();
     }
 


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java
=====================================
@@ -144,7 +144,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad
 
             JDialog dialog = new JDialog();
             dialog.setSize(1024, 780);
-
+            UIHelper.addApplicationIcon(dialog);
             if (icon != null) {
                 dialog.setIconImage(icon.getImage());
             }


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java
=====================================
@@ -24,8 +24,8 @@ package fr.ird.observe.client.ui.storage;
 import fr.ird.observe.client.constants.DbMode;
 import fr.ird.observe.client.ui.storage.tabs.SecurityModel;
 import fr.ird.observe.client.ui.util.UIHelper;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.nuiton.jaxx.runtime.JAXXContext;
 
 import java.awt.Window;
@@ -88,6 +88,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher {
 
         model.setSteps(steps.toArray(new StorageStep[0]));
         ui.setSize(800, 600);
+        UIHelper.addApplicationIcon(ui);
     }
 
     @Override


=====================================
client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
=====================================
@@ -65,6 +65,7 @@ import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Toolkit;
+import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ComponentAdapter;
@@ -108,6 +109,11 @@ public class UIHelper extends SwingUtil {
     /** Logger */
     static private final Logger log = LogManager.getLogger(UIHelper.class);
 
+
+    public static void addApplicationIcon(Window window) {
+        window.setIconImage(createImageIcon("logo-small.png").getImage());
+    }
+
     public static void displayInfo(String text) {
 
         ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI();


=====================================
persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql
=====================================
@@ -43,5 +43,5 @@ CREATE INDEX idx_observe_longline_catch_stomachFullness ON observe_longline.catc
 DROP TABLE observe_longline.Healthness;
 DROP TABLE observe_longline.StomacFullness;
 
-UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referential.longline.HealthStatus');
-UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referential.longline.StomachFullness');
\ No newline at end of file
+UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus');
+UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness');
\ No newline at end of file



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

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

    

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Correction de la migration 7.4.0 - Closes #1458

Tony CHEMIT

tags

participants (1)