Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 1fd32665 by Tony CHEMIT at 2018-09-20T18:28:57Z Add more accelerator on referential nb synchro config ui - - - - - 4f6ea307 by Tony CHEMIT at 2018-09-20T18:29:16Z fix parameter order to generate update sql statement - - - - - 3 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java ===================================== @@ -68,6 +68,10 @@ public abstract class ObserveKeyStrokes { public static final KeyStroke KEY_STROKE_SHOW_EMPTY_PROGRAM = KeyStroke.getKeyStroke("ctrl pressed F5"); public static final KeyStroke KEY_STROKE_CONFIGURE_LOCAL_SOURCE = KeyStroke.getKeyStroke("ctrl pressed L"); public static final KeyStroke KEY_STROKE_CONFIGURE_REMOTE_SOURCE = KeyStroke.getKeyStroke("ctrl pressed R"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed A"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT = KeyStroke.getKeyStroke("ctrl pressed B"); + public static final KeyStroke KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_SAVE_TABLE_ENTRY = KeyStroke.getKeyStroke("ctrl pressed S"); public static final KeyStroke KEY_STROKE_PRESSED_ENTER = KeyStroke.getKeyStroke("pressed ENTER"); 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; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import org.apache.commons.lang3.tuple.Pair; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; +import javax.swing.AbstractAction; +import javax.swing.JComponent; import javax.swing.JScrollPane; import javax.swing.JTree; import javax.swing.border.TitledBorder; import javax.swing.event.TreeSelectionListener; import java.awt.Color; +import java.awt.event.ActionEvent; import java.util.Optional; import static org.nuiton.i18n.I18n.t; @@ -75,7 +78,7 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy @Override public void afterInit(ReferentialSynchroUI ui) { - super.afterInit(this.ui); + ConfigUI configUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); JAXXInitialContext tx = new JAXXInitialContext().add(configUI).add(this); @@ -84,6 +87,33 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy configUI.getExtraConfig().add(extraConfig); + configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT, "fromLeft"); + configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT, "fromRight"); + configUI.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH, "fromBoth"); + configUI.getActionMap().put("fromLeft", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + extraConfig.getLEFT_TO_RIGHT().doClick(); + } + }); + configUI.getActionMap().put("fromRight", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + extraConfig.getRIGHT_TO_LEFT().doClick(); + } + }); + configUI.getActionMap().put("fromBoth", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + extraConfig.getBOTH().doClick(); + } + }); + ObserveKeyStrokes.addKeyStroke(extraConfig.getLEFT_TO_RIGHT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_LEFT); + ObserveKeyStrokes.addKeyStroke(extraConfig.getRIGHT_TO_LEFT(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_RIGHT); + ObserveKeyStrokes.addKeyStroke(extraConfig.getBOTH(), ObserveKeyStrokes.KEY_STROKE_CONFIGURE_SYNCHRO_FROM_BOTH); + + super.afterInit(this.ui); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getStartAction()); ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui.getApplyAction()); } ===================================== 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> { } } - String updateSql = TopiaSqlStatements.generateUpdateStatement(metadataEntity, parameters.substring(2), referentialDto.getId()); + String updateSql = TopiaSqlStatements.generateUpdateStatement(metadataEntity, referentialDto.getId(), parameters.substring(2)); result.add(updateSql); String id = referentialDto.getId(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee5c5ef04a1ecb2e2ad68cc9edb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee5c5ef04a1ecb2e2ad68cc9edb... You're receiving this email because of your account on gitlab.com.