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

Commits:

3 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java
    ... ... @@ -68,6 +68,10 @@ public abstract class ObserveKeyStrokes {
    68 68 
         public static final KeyStroke KEY_STROKE_SHOW_EMPTY_PROGRAM = KeyStroke.getKeyStroke("ctrl pressed F5");
    69 69 
         public static final KeyStroke KEY_STROKE_CONFIGURE_LOCAL_SOURCE = KeyStroke.getKeyStroke("ctrl pressed L");
    70 70 
         public static final KeyStroke KEY_STROKE_CONFIGURE_REMOTE_SOURCE = KeyStroke.getKeyStroke("ctrl pressed R");
    71 
    +    public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed A");
    72 
    +    public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B");
    73 
    +    public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C");
    74 
    +
    71 75 
         public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S");
    72 76 
         public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER");
    73 77 
         public static final KeyStroke KEY_STROKE_RESET_DATA = KeyStroke.getKeyStroke("pressed F7");

  • client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
    ... ... @@ -36,17 +36,20 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
    36 36 
     import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
    37 37 
     import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine;
    38 38 
     import org.apache.commons.lang3.tuple.Pair;
    39 
    -import org.apache.logging.log4j.Logger;
    40 39 
     import org.apache.logging.log4j.LogManager;
    40 
    +import org.apache.logging.log4j.Logger;
    41 41 
     import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
    42 42 
     import org.nuiton.jaxx.runtime.spi.UIHandler;
    43 43 
     import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
    44 44
    45 
    +import javax.swing.AbstractAction;
    46 
    +import javax.swing.JComponent;
    45 47 
     import javax.swing.JScrollPane;
    46 48 
     import javax.swing.JTree;
    47 49 
     import javax.swing.border.TitledBorder;
    48 50 
     import javax.swing.event.TreeSelectionListener;
    49 51 
     import java.awt.Color;
    52 
    +import java.awt.event.ActionEvent;
    50 53 
     import java.util.Optional;
    51 54
    52 55 
     import static org.nuiton.i18n.I18n.t;
    ... ... @@ -75,7 +78,7 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy
    75 78
    76 79 
         @Override
    77 80 
         public void afterInit(ReferentialSynchroUI ui) {
    78 
    -        super.afterInit(this.ui);
    81 
    +
    79 82
    80 83 
             ConfigUI configUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG);
    81 84 
             JAXXInitialContext tx = new JAXXInitialContext().add(configUI).add(this);
    ... ... @@ -84,6 +87,33 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy
    84 87
    85 88 
             configUI.getExtraConfig().add(extraConfig);
    86 89
    90 
    +        configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT, "fromLeft");
    91 
    +        configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT, "fromRight");
    92 
    +        configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH, "fromBoth");
    93 
    +        configUI.getActionMap().put("fromLeft", new AbstractAction() {
    94 
    +            @Override
    95 
    +            public void actionPerformed(ActionEvent e) {
    96 
    +                extraConfig.getLEFT_TO_RIGHT().doClick();
    97 
    +            }
    98 
    +        });
    99 
    +        configUI.getActionMap().put("fromRight", new AbstractAction() {
    100 
    +            @Override
    101 
    +            public void actionPerformed(ActionEvent e) {
    102 
    +                extraConfig.getRIGHT_TO_LEFT().doClick();
    103 
    +            }
    104 
    +        });
    105 
    +        configUI.getActionMap().put("fromBoth", new AbstractAction() {
    106 
    +            @Override
    107 
    +            public void actionPerformed(ActionEvent e) {
    108 
    +                extraConfig.getBOTH().doClick();
    109 
    +            }
    110 
    +        });
    111 
    +        ObserveKeyStrokes.addKeyStroke(extraConfig.getLEFT_TO_RIGHT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT);
    112 
    +        ObserveKeyStrokes.addKeyStroke(extraConfig.getRIGHT_TO_LEFT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT);
    113 
    +        ObserveKeyStrokes.addKeyStroke(extraConfig.getBOTH(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH);
    114 
    +
    115 
    +        super.afterInit(this.ui);
    116 
    +
    87 117 
             ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction());
    88 118 
             ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getApplyAction());
    89 119 
         }

  • services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java
    ... ... @@ -152,7 +152,7 @@ public class UpdateSqlStatementGenerator<D extends ReferentialDto> {
    152 152 
                 }
    153 153 
             }
    154 154
    155 
    -        String updateSql = TopiaSqlStatements.generateUpdateStatement(metadataEntity, parameters.substring(2), referentialDto.getId());
    155 
    +        String updateSql = TopiaSqlStatements.generateUpdateStatement(metadataEntity, referentialDto.getId(), parameters.substring(2));
    156 156 
             result.add(updateSql);
    157 157
    158 158 
             String id = referentialDto.getId();

    • —
    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.