Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
cba03f18
by Tony Chemit at 2020-12-14T16:28:07+01:00
-
87feceb6
by Tony Chemit at 2020-12-15T09:49:31+01:00
3 changed files:
- client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/BackupsManager.java
- client/core/src/main/java/fr/ird/observe/dto/decoration/WithDecoratorService.java
Changes:
| ... | ... | @@ -179,7 +179,9 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig |
| 179 | 179 |
private File feedBackDirectoryFile;
|
| 180 | 180 |
|
| 181 | 181 |
public static ClientConfig forTest() {
|
| 182 |
- return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME);
|
|
| 182 |
+ ClientConfig clientConfig = new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME);
|
|
| 183 |
+ clientConfig.setBackupUse(false);
|
|
| 184 |
+ return clientConfig;
|
|
| 183 | 185 |
}
|
| 184 | 186 |
|
| 185 | 187 |
public static void initI18n(ClientConfig config) {
|
| ... | ... | @@ -126,7 +126,7 @@ public class BackupsManager implements Closeable { |
| 126 | 126 |
|
| 127 | 127 |
try {
|
| 128 | 128 |
List<BackupStorage> backups;
|
| 129 |
- if (Files.exists(storePath)) {
|
|
| 129 |
+ if (config.isBackupUse() && Files.exists(storePath)) {
|
|
| 130 | 130 |
try (BufferedReader reader = Files.newBufferedReader(storePath, StandardCharsets.UTF_8)) {
|
| 131 | 131 |
Type typeOfT = new TypeToken<List<BackupStorage>>() {
|
| 132 | 132 |
}.getType();
|
| ... | ... | @@ -24,6 +24,9 @@ package fr.ird.observe.dto.decoration; |
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.client.ClientUIContextApplicationComponent;
|
| 26 | 26 |
|
| 27 |
+/**
|
|
| 28 |
+ * FIXME Remove this, decoration should not be exposed but internal
|
|
| 29 |
+ */
|
|
| 27 | 30 |
public interface WithDecoratorService {
|
| 28 | 31 |
|
| 29 | 32 |
default DecoratorService getDecoratorService() {
|