[Git][ultreiaio/ird-observe][develop] 2 commits: Affichage des heures sur l'écran de synchro avancée du référentiel (See #689)

5 Jul 2017

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


Commits:
3b0bd578 by Tony CHEMIT at 2017-07-05T14:14:15+02:00
Affichage des heures sur l'écran de synchro avancée du référentiel (See #689)

- - - - -
0b91b599 by Tony CHEMIT at 2017-07-05T14:14:42+02:00
Sur la sycnrho avancée de référentiel, on doit pouvoir accepter des modifications depuis aussi des bases locales

- - - - -


2 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
@@ -143,13 +143,13 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy
         if (model.getConfigModel().getCentralSourceModel().getDbMode() == null) {
             return;
         }
-        boolean leftToRightEnabled = Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation())
+        boolean leftToRightEnabled = model.getConfigModel().getCentralSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation())
                                              .map(ObserveDataSourceInformation::canWriteReferential)
                                              .orElse(false);
         if (log.isDebugEnabled()) {
             log.debug("Update synchro modes: leftToRight: " + leftToRightEnabled);
         }
-        boolean rightToLeftEnabled = Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation())
+        boolean rightToLeftEnabled = model.getConfigModel().getLocalSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation())
                                              .map(ObserveDataSourceInformation::canWriteReferential)
                                              .orElse(false);
         if (log.isDebugEnabled()) {


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java
@@ -28,34 +28,27 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.decorator.Decorator;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultTreeCellRenderer;
 import java.awt.Color;
 import java.awt.Component;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import javax.swing.Icon;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import org.nuiton.decorator.Decorator;
+
 
 import static org.nuiton.i18n.I18n.t;
 
 /**
- * Le renderer pour décorer l'arbre de sélection des données.
- *
  * @author Tony Chemit - dev@tchemit.fr
  * @since 1.2
  */
 public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRenderer {
 
-    /** Logger */
-    private static final Log log = LogFactory.getLog(ReferentialSynchronizeTreeCellRenderer.class);
-
     private static final long serialVersionUID = 1L;
 
-    private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy hh:mm");
+    private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy HH:mm");
 
     protected transient DecoratorService decoratorService;
 
@@ -105,7 +98,7 @@ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRende
             ReferenceReferentialSynchroNodeSupport node1 = (ReferenceReferentialSynchroNodeSupport) node;
 
             icon = node1.getIcon();
-            ReferentialReference reference = node1.getUserObject();
+            ReferentialReference<?> reference = node1.getUserObject();
             Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator(reference.getType());
             text = "<html><body>" + decorator.toString(reference);
             text += " <i>(" + reference.getVersion() + " - " + dateFormat.format(reference.getLastUpdateDate()) + ")</i>";



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/02bf1386e0d2e83b28aa58208e2...

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

    

Tony CHEMIT

tags

participants (1)