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

Commits:

2 changed files:

Changes:

  • 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
    143 143 
             if (model.getConfigModel().getCentralSourceModel().getDbMode() == null) {
    144 144 
                 return;
    145 145 
             }
    146 
    -        boolean leftToRightEnabled = Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation())
    146 
    +        boolean leftToRightEnabled = model.getConfigModel().getCentralSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation())
    147 147 
                                                  .map(ObserveDataSourceInformation::canWriteReferential)
    148 148 
                                                  .orElse(false);
    149 149 
             if (log.isDebugEnabled()) {
    150 150 
                 log.debug("Update synchro modes: leftToRight: " + leftToRightEnabled);
    151 151 
             }
    152 
    -        boolean rightToLeftEnabled = Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation())
    152 
    +        boolean rightToLeftEnabled = model.getConfigModel().getLocalSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation())
    153 153 
                                                  .map(ObserveDataSourceInformation::canWriteReferential)
    154 154 
                                                  .orElse(false);
    155 155 
             if (log.isDebugEnabled()) {

  • 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
    28 28 
     import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport;
    29 29 
     import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode;
    30 30 
     import fr.ird.observe.services.dto.reference.ReferentialReference;
    31 
    -import org.apache.commons.logging.Log;
    32 
    -import org.apache.commons.logging.LogFactory;
    33 
    -import org.nuiton.decorator.Decorator;
    34 
    -
    35 
    -import javax.swing.Icon;
    36 
    -import javax.swing.JTree;
    37 
    -import javax.swing.tree.DefaultTreeCellRenderer;
    38 31 
     import java.awt.Color;
    39 32 
     import java.awt.Component;
    40 33 
     import java.text.DateFormat;
    41 34 
     import java.text.SimpleDateFormat;
    35 
    +import javax.swing.Icon;
    36 
    +import javax.swing.JTree;
    37 
    +import javax.swing.tree.DefaultTreeCellRenderer;
    38 
    +import org.nuiton.decorator.Decorator;
    39 
    +
    42 40
    43 41 
     import static org.nuiton.i18n.I18n.t;
    44 42
    45 43 
     /**
    46 
    - * Le renderer pour décorer l'arbre de sélection des données.
    47 
    - *
    48 44 
      * @author Tony Chemit - dev@tchemit.fr
    49 45 
      * @since 1.2
    50 46 
      */
    51 47 
     public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRenderer {
    52 48
    53 
    -    /** Logger */
    54 
    -    private static final Log log = LogFactory.getLog(ReferentialSynchronizeTreeCellRenderer.class);
    55 
    -
    56 49 
         private static final long serialVersionUID = 1L;
    57 50
    58 
    -    private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy hh:mm");
    51 
    +    private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy HH:mm");
    59 52
    60 53 
         protected transient DecoratorService decoratorService;
    61 54
    ... ... @@ -105,7 +98,7 @@ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRende
    105 98 
                 ReferenceReferentialSynchroNodeSupport node1 = (ReferenceReferentialSynchroNodeSupport) node;
    106 99
    107 100 
                 icon = node1.getIcon();
    108 
    -            ReferentialReference reference = node1.getUserObject();
    101 
    +            ReferentialReference<?> reference = node1.getUserObject();
    109 102 
                 Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator(reference.getType());
    110 103 
                 text = "<html><body>" + decorator.toString(reference);
    111 104 
                 text += " <i>(" + reference.getVersion() + " - " + dateFormat.format(reference.getLastUpdateDate()) + ")</i>";

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.