Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 009322bb by Tony Chemit at 2023-07-13T17:26:48+02:00 Do not delete log configuration file when using snapshot - - - - - c7b2088e by Tony Chemit at 2023-07-13T17:27:44+02:00 in SwingReferentialSynchronizeTask, add isLeftModified method, since isLEft method does not give us if left is modified - - - - - 4 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -320,11 +320,8 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig } } - public File initLog() throws IOException { + public File initLog() { File logFile = getLogConfigurationFile(); - if (isVersionSnapshot()) { - Files.deleteIfExists(logFile.toPath()); - } log.info(String.format("Loading user log file at %s", logFile)); ObserveUtil.loadLogConfiguration(ClientResources.LOG_CONFIGURATION_FILE, null, logFile.toPath(), this); ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java ===================================== @@ -87,7 +87,7 @@ public class Apply extends ReferentialSynchroUIActionSupport { Iterator<SwingReferentialSynchronizeTask> iterator = tasksForOneReferential.iterator(); while (iterator.hasNext()) { SwingReferentialSynchronizeTask task = iterator.next(); - if (task.isLeft()) { + if (task.isLeftModified()) { leftModified = true; } else { rightModified = true; ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java ===================================== @@ -75,6 +75,13 @@ public class SwingReferentialSynchronizeTask implements WithClientUIContextApi { return left; } + public final boolean isLeftModified() { + if (left) { + return !taskType.toOtherSide(); + } + return taskType.toOtherSide(); + } + public final SynchronizeTaskType getTaskType() { return taskType; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java ===================================== @@ -60,7 +60,6 @@ import javax.script.ScriptException; import javax.swing.JOptionPane; import javax.swing.UIManager; import java.io.File; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; import java.util.Date; @@ -313,7 +312,7 @@ public class RunObserveListener implements ApplicationRunnerListener, WithClient UIHelper.handlingError(event.getException()); } - public void initLog(ClientConfig config) throws IOException { + public void initLog(ClientConfig config) { File logFile = config.initLog(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6fbc47933358d0626ff28ca66... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6fbc47933358d0626ff28ca66... You're receiving this email because of your account on gitlab.com.