From c0791c8745f47b8790cb43e8742e8c15a674d0a2 Mon Sep 17 00:00:00 2001 From: fleisch Date: Thu, 12 Jan 2023 14:40:25 +0100 Subject: [PATCH] Added VersionInfo.java property to projectSpace. --- .../java/de/unijena/bioinf/projectspace/InstanceImporter.java | 1 + .../de/unijena/bioinf/projectspace/ProjectSpaceManager.java | 1 + .../de/unijena/bioinf/ms/gui/actions/ProjectSaveAction.java | 4 ---- .../unijena/bioinf/ms/gui/actions/ProjectSaveCopyAction.java | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/InstanceImporter.java b/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/InstanceImporter.java index 57eb624a47..a9397ba37c 100644 --- a/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/InstanceImporter.java +++ b/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/InstanceImporter.java @@ -234,6 +234,7 @@ public static List importProject( List globalFiles = sourceReader.listFiles("*").stream() .filter(p -> !p.equals(PSLocations.FORMAT) && !p.equals(PSLocations.COMPRESSION) && + !p.equals(PSLocations.VERSION) && !p.equals(SummaryLocations.COMPOUND_SUMMARY_ADDUCTS) && !p.equals(SummaryLocations.COMPOUND_SUMMARY) && !p.equals(SummaryLocations.FORMULA_SUMMARY) && diff --git a/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/ProjectSpaceManager.java b/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/ProjectSpaceManager.java index 6a98d79ed5..861593db4a 100644 --- a/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/ProjectSpaceManager.java +++ b/sirius_cli/src/main/java/de/unijena/bioinf/projectspace/ProjectSpaceManager.java @@ -87,6 +87,7 @@ public class ProjectSpaceManager implements IterableWithSize //configure ProjectSpaceProperties config.defineProjectSpaceProperty(FilenameFormatter.PSProperty.class, new FilenameFormatter.PSPropertySerializer()); config.defineProjectSpaceProperty(CompressionFormat.class, new CompressionFormat.Serializer()); + config.defineProjectSpaceProperty(VersionInfo.class, new VersionInfo.Serializer()); //configure compound container config.registerContainer(CompoundContainer.class, new CompoundContainerSerializer()); config.registerComponent(CompoundContainer.class, ProjectSpaceConfig.class, new ProjectSpaceConfigSerializer()); diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveAction.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveAction.java index 48e8a55522..69285cf24a 100644 --- a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveAction.java +++ b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveAction.java @@ -55,8 +55,6 @@ public void actionPerformed(ActionEvent e) { jfc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); jfc.setAcceptAllFileFilterUsed(false); jfc.addChoosableFileFilter(new ProjectDirectoryFilter()); - jfc.addChoosableFileFilter(new ProjectArchivedFilter()); - while (true) { final int state = jfc.showDialog(MF, "Save As"); @@ -68,8 +66,6 @@ public void actionPerformed(ActionEvent e) { if (!selFile.getName().endsWith(".sirius")) selFile = new File(selFile.getParentFile(),selFile.getName() + ".sirius"); - - if (!selFile.exists() || selFile.isDirectory() && Objects.requireNonNull(selFile.list()).length == 0) { SiriusProperties. setAndStoreInBackground(SiriusProperties.DEFAULT_SAVE_DIR_PATH, selFile.getParentFile().getAbsolutePath()); diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveCopyAction.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveCopyAction.java index 0f1a2c47c4..ceef1d5afa 100644 --- a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveCopyAction.java +++ b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/actions/ProjectSaveCopyAction.java @@ -57,9 +57,7 @@ public void actionPerformed(ActionEvent e) { jfc.setCurrentDirectory(PropertyManager.getFile(SiriusProperties.DEFAULT_SAVE_FILE_PATH)); jfc.setFileSelectionMode(JFileChooser.FILES_ONLY); jfc.setAcceptAllFileFilterUsed(false); - jfc.addChoosableFileFilter(new ProjectArchivedFilter()); jfc.addChoosableFileFilter(new ProjectDirectoryFilter()); -// jfc.setApproveButtonText("Export"); File selectedFile = null;