[Git][ultreiaio/ird-observe][develop] 2 commits: fix site build

30 Jun 2017

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


Commits:
f6b80c70 by Tony CHEMIT at 2017-06-30T14:46:53+02:00
fix site  build

- - - - -
c1fae2b3 by Tony CHEMIT at 2017-06-30T16:55:13+02:00
L'application reste en espagnol après redémarrage (See #710)

- - - - -


6 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java
- − src/site/markdown/model.md
- src/site/site_fr.xml


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
@@ -571,9 +571,7 @@ public abstract class ObserveRunner extends ApplicationRunner {
 
         ObserveMainUI ui = ObserveMainUIInitializer.initUI(context, config);
 
-        UIHelper.setMainUIVisible(ui);
-
-        context.getSwingSessionHelper().addComponent(ui, false);
+        ObserveMainUIInitializer.setMainUIVisible(context,ui, false);
         return ui;
     }
 


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
@@ -42,6 +42,29 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigatio
 import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel;
 import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+import javax.swing.JSplitPane;
+import javax.swing.JTree;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
+import javax.swing.border.Border;
+import javax.swing.border.LineBorder;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.tree.TreePath;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.i18n.I18n;
@@ -50,17 +73,6 @@ import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.nuiton.jaxx.widgets.error.ErrorDialogUI;
 
-import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.LineBorder;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.tree.TreePath;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
 
 import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION;
 import static org.nuiton.i18n.I18n.t;
@@ -81,11 +93,11 @@ public class ObserveMainUIInitializer {
 
     private final ObserveMainUI ui;
 
-    public ObserveMainUIInitializer(ObserveMainUI ui) {
+    ObserveMainUIInitializer(ObserveMainUI ui) {
         this.ui = ui;
     }
 
-    public void changeNavigationNode(TreeSelectionEvent event) {
+    private void changeNavigationNode(TreeSelectionEvent event) {
 
         ObserveSwingDataSource source = ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource();
         if (source == null || !source.isOpen()) {
@@ -150,7 +162,7 @@ public class ObserveMainUIInitializer {
         }
     }
 
-    public void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) {
+    private void doOpencontent(ObserveMainUI ui, TreePath path, Class<? extends ContentUI<?, ?>> uiClass) {
 
         ContentUIManager manager = ui.getContentUIManager();
 
@@ -367,10 +379,23 @@ public class ObserveMainUIInitializer {
         }
 
         // show ui
-        UIHelper.setMainUIVisible(ui);
+        setMainUIVisible(rootContext, ui, true);
+    }
+
+    public static void setMainUIVisible(ObserveSwingApplicationContext rootContext, ObserveMainUI ui, boolean replace) {
+
+        // force le redimensionnement du splitpane
+        ui.getSplitpane().revalidate();
+
+        // force le redimensionnement du splitpane2
+        ui.getSplitpane2().revalidate();
+
+        // affichage de l'interface graphique
+        SwingUtilities.invokeLater(() -> ui.setVisible(true));
+        rootContext.getSwingSessionHelper().addComponent(ui, replace);
     }
 
-    protected void initialize() {
+    void initialize() {
 
         ObserveActionMap actionMap = ui.getObserveActionMap();
 
@@ -483,14 +508,14 @@ public class ObserveMainUIInitializer {
     private Border focusBorder;
     private Border noFocusBorder;
 
-    public Border getFocusBorder() {
+    private Border getFocusBorder() {
         if (focusBorder == null) {
             focusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getFocusBorderColor(), 3, true);
         }
         return focusBorder;
     }
 
-    public Border getNoFocusBorder() {
+    private Border getNoFocusBorder() {
         if (noFocusBorder == null) {
             noFocusBorder = new LineBorder(ObserveSwingApplicationContext.get().getConfig().getNoFocusBorderColor(), 3, true);
         }
@@ -513,7 +538,7 @@ public class ObserveMainUIInitializer {
         }
     }
 
-    protected void updateBusyState(boolean busy) {
+    private void updateBusyState(boolean busy) {
         if (busy) {
             // ui bloquee
             if (log.isDebugEnabled()) {


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageActionSupport.java
@@ -63,6 +63,7 @@ public abstract class ChangeApplicationLanguageActionSupport extends AbstractUIA
 
             // sauvegarde de la nouvelle locale
             config.setLocale(newLocale);
+            config.saveForUser();
             ObserveUICallback.ui.run();
         }
 


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageActionSupport.java
@@ -66,6 +66,7 @@ public abstract class ChangeDbLanguageActionSupport extends AbstractUIAction {
 
         // sauvegarde de la nouvelle locale
         config.setDbLocale(newLocale.getLocale());
+        config.saveForUser();
         ObserveUICallback.ui.run();
 
     }


=====================================
src/site/markdown/model.md deleted
=====================================
--- a/src/site/markdown/model.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# ObServe - model
-
-Vous trouverez sur cette page les liens vers la modélisation de la couche de persistence.
-
-Nous maintenons pour le moment deux versions de ce modèle sur le format *zargo*.
-
-## Version 5
-
-* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-
-## Version 7
-
-* [model commun](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model senne](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model palangre](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)
-* [model properties](https://gitlab.com/ultreiaio/ird-observe/blob/develop/doc/modelisation/zargo...)


=====================================
src/site/site_fr.xml
=====================================
--- a/src/site/site_fr.xml
+++ b/src/site/site_fr.xml
@@ -80,10 +80,13 @@
     </menu>
 
     <menu name="Modélisation">
-      <item name="Fichier argoUML (commun)" href="model/observe-common.zargo"/>
-      <item name="Fichier argoUML (Seine)" href="model/observe-seine.zargo"/>
-      <item name="Fichier argoUML (Palangre)" href="model/observe-longline.zargo"/>
-      <item name="Modèle physique" href="model/observe_mpd.pdf"/>
+      <item name="Fichier argoUML (commun) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v7/observe-common.zargo"/>
+      <item name="Fichier argoUML (Seine) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v7/observe-seine.zargo"/>
+      <item name="Fichier argoUML (Palangre) v7" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v7/observe-longline.zargo"/>
+      <item name="Fichier argoUML (commun) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v5/observe-common.zargo"/>
+      <item name="Fichier argoUML (Seine) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v5/observe-seine.zargo"/>
+      <item name="Fichier argoUML (Palangre) v5" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/zargo/v5/observe-longline.zargo"/>
+      <item name="Modèle physique" href="https://gitlab.com/ultreiaio/ird-observe/raw/develop/doc/modelisation/observe_mpd.pdf"/>
     </menu>
 
     <menu ref="reports"/>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/79713d64d7780515a2100141529...

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

    

Tony CHEMIT

tags

participants (1)