Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
6 changed files:
- client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java
- client-core/src/main/java/fr/ird/observe/client/ui/storage/RemoteUILauncher.java
- client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java
- persistence/src/main/resources/db/migration/7.4/03_rename_referential-H2.sql
Changes:
| ... | ... | @@ -34,7 +34,6 @@ JSplitPane { |
| 34 | 34 |
|
| 35 | 35 |
#mainFrame {
|
| 36 | 36 |
defaultCloseOperation: "do_nothing_on_close";
|
| 37 |
- iconImage: {SwingUtil.createImageIcon("logo.png").getImage()};
|
|
| 38 | 37 |
}
|
| 39 | 38 |
|
| 40 | 39 |
#menu {
|
| ... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 |
package fr.ird.observe.client.ui;
|
| 23 | 23 |
|
| 24 | 24 |
import fr.ird.observe.client.ObserveSwingApplicationContext;
|
| 25 |
+import fr.ird.observe.client.ui.util.UIHelper;
|
|
| 25 | 26 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 26 | 27 |
|
| 27 | 28 |
import javax.swing.JSplitPane;
|
| ... | ... | @@ -48,6 +49,7 @@ public class ObserveMainUIHandler implements UIHandler<ObserveMainUI> { |
| 48 | 49 |
|
| 49 | 50 |
@Override
|
| 50 | 51 |
public void afterInit(ObserveMainUI ui) {
|
| 52 |
+ UIHelper.addApplicationIcon(ui);
|
|
| 51 | 53 |
ui.getInitializer().initialize();
|
| 52 | 54 |
}
|
| 53 | 55 |
|
| ... | ... | @@ -144,7 +144,7 @@ public class AdminUILauncher extends WizardUILancher<AdminStep, AdminUIModel, Ad |
| 144 | 144 |
|
| 145 | 145 |
JDialog dialog = new JDialog();
|
| 146 | 146 |
dialog.setSize(1024, 780);
|
| 147 |
- |
|
| 147 |
+ UIHelper.addApplicationIcon(dialog);
|
|
| 148 | 148 |
if (icon != null) {
|
| 149 | 149 |
dialog.setIconImage(icon.getImage());
|
| 150 | 150 |
}
|
| ... | ... | @@ -24,8 +24,8 @@ package fr.ird.observe.client.ui.storage; |
| 24 | 24 |
import fr.ird.observe.client.constants.DbMode;
|
| 25 | 25 |
import fr.ird.observe.client.ui.storage.tabs.SecurityModel;
|
| 26 | 26 |
import fr.ird.observe.client.ui.util.UIHelper;
|
| 27 |
-import org.apache.logging.log4j.Logger;
|
|
| 28 | 27 |
import org.apache.logging.log4j.LogManager;
|
| 28 |
+import org.apache.logging.log4j.Logger;
|
|
| 29 | 29 |
import org.nuiton.jaxx.runtime.JAXXContext;
|
| 30 | 30 |
|
| 31 | 31 |
import java.awt.Window;
|
| ... | ... | @@ -88,6 +88,7 @@ public abstract class RemoteUILauncher extends StorageUILauncher { |
| 88 | 88 |
|
| 89 | 89 |
model.setSteps(steps.toArray(new StorageStep[0]));
|
| 90 | 90 |
ui.setSize(800, 600);
|
| 91 |
+ UIHelper.addApplicationIcon(ui);
|
|
| 91 | 92 |
}
|
| 92 | 93 |
|
| 93 | 94 |
@Override
|
| ... | ... | @@ -65,6 +65,7 @@ import java.awt.Color; |
| 65 | 65 |
import java.awt.Component;
|
| 66 | 66 |
import java.awt.Container;
|
| 67 | 67 |
import java.awt.Toolkit;
|
| 68 |
+import java.awt.Window;
|
|
| 68 | 69 |
import java.awt.datatransfer.Clipboard;
|
| 69 | 70 |
import java.awt.datatransfer.StringSelection;
|
| 70 | 71 |
import java.awt.event.ComponentAdapter;
|
| ... | ... | @@ -108,6 +109,11 @@ public class UIHelper extends SwingUtil { |
| 108 | 109 |
/** Logger */
|
| 109 | 110 |
static private final Logger log = LogManager.getLogger(UIHelper.class);
|
| 110 | 111 |
|
| 112 |
+ |
|
| 113 |
+ public static void addApplicationIcon(Window window) {
|
|
| 114 |
+ window.setIconImage(createImageIcon("logo-small.png").getImage());
|
|
| 115 |
+ }
|
|
| 116 |
+ |
|
| 111 | 117 |
public static void displayInfo(String text) {
|
| 112 | 118 |
|
| 113 | 119 |
ObserveMainUI ui = ObserveSwingApplicationContext.get().getMainUI();
|
| ... | ... | @@ -43,5 +43,5 @@ CREATE INDEX idx_observe_longline_catch_stomachFullness ON observe_longline.catc |
| 43 | 43 |
DROP TABLE observe_longline.Healthness;
|
| 44 | 44 |
DROP TABLE observe_longline.StomacFullness;
|
| 45 | 45 |
|
| 46 |
-UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referential.longline.HealthStatus');
|
|
| 47 |
-UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referential.longline.StomachFullness');
|
|
| \ No newline at end of file | ||
| 46 |
+UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.Healthness', 'referentiel.longline.HealthStatus');
|
|
| 47 |
+UPDATE observe_common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.longline.StomacFullness', 'referentiel.longline.StomachFullness');
|
|
| \ No newline at end of file |