Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
2 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java
Changes:
| ... | ... | @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; |
| 25 | 25 |
import fr.ird.observe.client.ui.ObserveKeyStrokes;
|
| 26 | 26 |
import fr.ird.observe.client.ui.storage.StorageStep;
|
| 27 | 27 |
import fr.ird.observe.client.ui.util.UIHelper;
|
| 28 |
+import org.apache.commons.lang3.StringUtils;
|
|
| 28 | 29 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 29 | 30 |
|
| 30 | 31 |
import javax.swing.AbstractAction;
|
| ... | ... | @@ -90,7 +91,9 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI |
| 90 | 91 |
}
|
| 91 | 92 |
|
| 92 | 93 |
public void changeFilename(String filename) {
|
| 93 |
- ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename));
|
|
| 94 |
+ if (StringUtils.isNoneEmpty(filename)) {
|
|
| 95 |
+ ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename));
|
|
| 96 |
+ }
|
|
| 94 | 97 |
}
|
| 95 | 98 |
|
| 96 | 99 |
}
|
| ... | ... | @@ -33,6 +33,7 @@ import javax.swing.JTree; |
| 33 | 33 |
import javax.swing.tree.DefaultTreeCellRenderer;
|
| 34 | 34 |
import java.awt.Color;
|
| 35 | 35 |
import java.awt.Component;
|
| 36 |
+import java.awt.Dimension;
|
|
| 36 | 37 |
|
| 37 | 38 |
/**
|
| 38 | 39 |
* Created on 14/11/16.
|
| ... | ... | @@ -86,6 +87,14 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen |
| 86 | 87 |
JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus);
|
| 87 | 88 |
comp.setToolTipText(text);
|
| 88 | 89 |
comp.setIcon(icon);
|
| 90 |
+ Dimension size = comp.getPreferredSize();
|
|
| 91 |
+ double height = size.getHeight();
|
|
| 92 |
+ if (height > 50) {
|
|
| 93 |
+ log.error(String.format("Size is amazing: %s for node: %s", size, text));
|
|
| 94 |
+ Dimension newSize = new Dimension((int) size.getWidth(), 32);
|
|
| 95 |
+ comp.setSize(newSize);
|
|
| 96 |
+ comp.setPreferredSize(newSize);
|
|
| 97 |
+ }
|
|
| 89 | 98 |
return comp;
|
| 90 | 99 |
}
|
| 91 | 100 |
|