From 02728d103a337c3b907fc145f38274d42e2733fd Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Mon, 15 Jul 2019 22:00:12 +0200 Subject: [PATCH] Use SWT's FileDialog instead of self-written one --- .../logic/model/editor/SaveLoadManager.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java index fa2c8a1d..96aad40a 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java @@ -2,7 +2,10 @@ package net.mograsim.logic.model.editor; import java.io.IOException; -import net.mograsim.logic.model.editor.ui.DialogManager; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Shell; + import net.mograsim.logic.model.model.ViewModelModifiable; import net.mograsim.logic.model.serializing.DeserializedSubmodelComponent; import net.mograsim.logic.model.serializing.SubmodelComponentSerializer; @@ -27,10 +30,15 @@ public class SaveLoadManager public void openSaveAsDialog() { - String result[] = DialogManager.openMultiTextDialog("Save as...", "Save", "Cancel", "Path"); + Shell fdShell = new Shell(); + FileDialog fd = new FileDialog(fdShell, SWT.SAVE); + fd.setText("Save as..."); + fd.setFilterExtensions(new String[] { "*.json" }); + String result = fd.open(); + fdShell.dispose(); if (result != null) { - savePath = result[0]; + savePath = result; innerSave(); } } @@ -56,10 +64,15 @@ public class SaveLoadManager public static void openLoadDialog() throws IOException { - String[] result = DialogManager.openMultiTextDialog("Load Component...", "Load", "Cancel", "Path"); + Shell fdShell = new Shell(); + FileDialog fd = new FileDialog(fdShell, SWT.OPEN); + fd.setText("Load component..."); + fd.setFilterExtensions(new String[] { "*.json" }); + String result = fd.open(); + fdShell.dispose(); if (result != null) { - new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result[0])); + new Editor((DeserializedSubmodelComponent) SubmodelComponentSerializer.deserialize(new ViewModelModifiable(), result)); } } } -- 2.17.1