branch develop updated (82b5909 -> d192ea3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 82b5909 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new d6cea90 improve error logging new d192ea3 Ajout de raccourcis claviers sur l'écran de configuration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d192ea3827f7c9017b0cf7f0762bac6905faf59b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 24 09:34:24 2016 +0100 Ajout de raccourcis claviers sur l'écran de configuration commit d6cea907fdb90719ec340e338b7ae7b8c4973ceb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 24 09:15:42 2016 +0100 improve error logging Summary of changes: .../ui/actions/menu/config/ShowConfigAction.java | 21 ++++++++++++++++++--- .../services/topia/ObserveServiceFactoryTopia.java | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d6cea907fdb90719ec340e338b7ae7b8c4973ceb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 24 09:15:42 2016 +0100 improve error logging --- .../java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index f558a82..5ae748e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -242,7 +242,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { return method.invoke(target, args); } catch (InvocationTargetException e) { if (log.isErrorEnabled()) { - log.error("Error in method " + method.getName(), e); + log.error("Error in method " + method.getName(), e.getCause()); } throw e.getCause(); } finally { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d192ea3827f7c9017b0cf7f0762bac6905faf59b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 24 09:34:24 2016 +0100 Ajout de raccourcis claviers sur l'écran de configuration --- .../ui/actions/menu/config/ShowConfigAction.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java index bfc426c..58293bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java @@ -28,12 +28,14 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfigOption; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; import fr.ird.observe.application.swing.ui.ObserveUIMode; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesListDto; +import jaxx.runtime.swing.config.ConfigCategoryUI; import jaxx.runtime.swing.config.ConfigUI; import jaxx.runtime.swing.config.ConfigUIHelper; import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; @@ -50,6 +52,7 @@ import javax.swing.Icon; import javax.swing.JComboBox; import javax.swing.JPanel; import javax.swing.JTable; +import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; @@ -101,10 +104,22 @@ public class ShowConfigAction extends AbstractUIAction { ObserveConfigUIBuilder helper = buildUI(config, dataSource); helper.setCloseAction(this::quit); ConfigUI configUI = helper.buildUI(mainUI, "observe.config.category.application"); - // si on ne met pas ça, à la fermeture la fenetre principale est fermée - configUI.getHandler().setTopContainer(mainUI); - getMainUI().getConfiguration().setContentContainer(configUI); + configUI.getQuit().setMnemonic('Q'); + int tabCount = configUI.getCategories().getTabCount(); + for (int i = 0; i < tabCount; i++) { + ConfigCategoryUI categoryUI = (ConfigCategoryUI) configUI.getCategories().getComponentAt(i); + categoryUI.getSave().setMnemonic('E'); + categoryUI.getReset().setMnemonic('A'); + ObserveKeyStrokes.addKeyStrokeFromMnemonic(categoryUI); + } + ObserveKeyStrokes.addKeyStrokeFromMnemonic(configUI); + JPanel jPanel = new JPanel(); + jPanel.setLayout(new BorderLayout()); + jPanel.add(configUI, BorderLayout.CENTER); + getMainUI().getConfiguration().setContentContainer(jPanel); + // si on ne met pas ça, à la fermeture la fenetre principale est fermée + configUI.getHandler().setTopContainer(jPanel); mainUI.getModel().setMode(ObserveUIMode.CONFIGURATION); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm