Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
1b3d9f3a
by Tony CHEMIT at 2018-09-19T05:51:41Z
2 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
Changes:
| ... | ... | @@ -407,12 +407,14 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer |
| 407 | 407 |
|
| 408 | 408 |
UsageForDisplayUI<R> usagesUI = UsageForDisplayUI.build(message, usages);
|
| 409 | 409 |
|
| 410 |
- UIHelper.askUser(ui,
|
|
| 411 |
- t("observe.title.show.usage"),
|
|
| 412 |
- usagesUI,
|
|
| 413 |
- JOptionPane.INFORMATION_MESSAGE,
|
|
| 414 |
- new Object[]{t("observe.choice.quit")},
|
|
| 415 |
- 0);
|
|
| 410 |
+ Object[] options = {
|
|
| 411 |
+ t("observe.choice.quit")};
|
|
| 412 |
+ JOptionPane pane = new JOptionPane(usagesUI, JOptionPane.INFORMATION_MESSAGE,
|
|
| 413 |
+ JOptionPane.DEFAULT_OPTION, null,
|
|
| 414 |
+ options, options[0]);
|
|
| 415 |
+ |
|
| 416 |
+ UIHelper.askUser(pane, t("observe.title.show.usage"), options);
|
|
| 417 |
+ |
|
| 416 | 418 |
}
|
| 417 | 419 |
|
| 418 | 420 |
@Override
|
| ... | ... | @@ -37,8 +37,8 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference; |
| 37 | 37 |
import fr.ird.observe.services.security.InvalidAuthenticationTokenException;
|
| 38 | 38 |
import org.apache.commons.beanutils.PropertyUtils;
|
| 39 | 39 |
import org.apache.commons.io.FileUtils;
|
| 40 |
-import org.apache.logging.log4j.Logger;
|
|
| 41 | 40 |
import org.apache.logging.log4j.LogManager;
|
| 41 |
+import org.apache.logging.log4j.Logger;
|
|
| 42 | 42 |
import org.jdesktop.swingx.painter.Painter;
|
| 43 | 43 |
import org.nuiton.decorator.Decorator;
|
| 44 | 44 |
import org.nuiton.jaxx.runtime.JAXXObject;
|
| ... | ... | @@ -185,10 +185,9 @@ public class UIHelper extends SwingUtil { |
| 185 | 185 |
|
| 186 | 186 |
contentPane.setLayout(new BorderLayout());
|
| 187 | 187 |
contentPane.add(pane, BorderLayout.CENTER);
|
| 188 |
- dialog.setResizable(false);
|
|
| 189 | 188 |
|
| 190 | 189 |
dialog.pack();
|
| 191 |
- dialog.setLocationRelativeTo(mainUI);
|
|
| 190 |
+ SwingUtil.center(mainUI, dialog);
|
|
| 192 | 191 |
|
| 193 | 192 |
final PropertyChangeListener listener = event -> {
|
| 194 | 193 |
// Let the defaultCloseOperation handle the closing
|