From 8bf867d9054b74058f5e5cfb38fc67a67c892d18 Mon Sep 17 00:00:00 2001 From: Ian Hoogeboom Date: Mon, 16 Dec 2019 10:19:00 +0100 Subject: [PATCH 1/5] Make .pch default in open and save patches If still the 'All' is choosen on opening, get the fileservice of the first file. No other synth than the NM is supported, so make .pch the default. --- .../src/net/sf/nmedit/nomad/core/Nomad.java | 11 +++++++++-- .../service/fileService/FileServiceTool.java | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java index 0b1f43cc..f0167ba6 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java @@ -539,8 +539,15 @@ public void fileSave(boolean saveAs) (saveAs && fs.isSaveOperationSupported(d)) || ((!saveAs)&&fs.isDirectSaveOperationSupported(d)); - if (add) - chooser.addChoosableFileFilter(fs.getFileFilter()); + if (add) { +// chooser.addChoosableFileFilter(fs.getFileFilter()); + // setFileFilter also add's it, otherwise you will get two entries. + // set the NmFileChooser as default + if (fs.getFileFilter().getExtension().contentEquals("pch")) + chooser.setFileFilter(fs.getFileFilter()); + else + chooser.addChoosableFileFilter(fs.getFileFilter()); + } } File sfile = d.getFile(); diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java index fadfafc0..639ce459 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java @@ -37,14 +37,26 @@ public static void addChoosableFileFilters(JFileChooser chooser) { FileService service = i.next(); if (service.isOpenFileOperationSupported()) - chooser.addChoosableFileFilter(service.getFileFilter()); + // setFileFilter also add's it, otherwise you will get two entries. + // set the NmFileChooser as default + if (service.getFileFilter().getExtension().contentEquals("pch")) + chooser.setFileFilter(service.getFileFilter()); + else + chooser.addChoosableFileFilter(service.getFileFilter()); } } public static FileService lookupFileService(JFileChooser chooser) { FileFilter fileFilter = chooser.getFileFilter(); - return (fileFilter == null) ? null : lookupFileService(fileFilter); + + FileService service = (fileFilter == null) ? null : lookupFileService(fileFilter); + + // if the service == null, the 'all types' filter is probably choosen, try the FileService based on file type + if (service == null) + service = lookupFileService(chooser.getSelectedFiles()[0]); + + return service; } private static FileService lookupFileService(FileFilter fileFilter) From cf9c62b5fb3f520ad5cf85049ade211267cab45b Mon Sep 17 00:00:00 2001 From: Ian Hoogeboom Date: Mon, 16 Dec 2019 11:26:43 +0100 Subject: [PATCH 2/5] Updated changelog --- nomad/changelog.txt | 54 ++++++++++++++++++- .../src/net/sf/nmedit/nomad/core/Nomad.java | 2 +- .../service/fileService/FileServiceTool.java | 2 +- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/nomad/changelog.txt b/nomad/changelog.txt index aaa40ef2..3f9034e0 100644 --- a/nomad/changelog.txt +++ b/nomad/changelog.txt @@ -2,8 +2,60 @@ Nomad - Nord Modular Editor --------------------------- Copyright (C) 2006 Christian Schneider, Marcus Andersson +Copyright (C) 2019 Ian Hoogeboom + + +Version 0.4.20191216 +-------------------- + +new features / improvements: +- made the .pch file dype the default open and save service + +bugs fixed: +- opening the file with the 'all type' gave a service error + + +Version 0.4.20191212 +-------------------- + +First 0.4 version release + +new features / improvements: +- updated the icon and splash screen to read to identify the 0.4 version + + +Version 0.4.0beta +-------------------- + +Beta version, not released + +new features / improvements: +- changed the name of the enum variables and used the enum class +- added coremidi4j for later macOS versions MIDI +- updated the sac and jar bundler library +- probably forgot some other changes to make it work again... + +bugs fixed: +- make MIDI work again on macOS + +other: +- moving older projects to separate archive location in the project +- moving unused WaldorfMiniworks4Pole code to separate archive location in the project +- many more cleanup... + + +Version 0.3.2-pre +----------------- + +Preview release + +bugs fixed: +- empty module pane problem +- invalid MidiPlug problem +- no popups on modules/connectors shown + +The 0.3 and 0.2 version page can be found on: http://nmedit.sf.net -http://nmedit.sf.net Version 0.2.2-pre ----------------- diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java index f0167ba6..8b83d1d0 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 Christian Schneider +/* Copyright (C) 2006 Christian Schneider, 2019 Ian Hoogeboom * * This file is part of Nomad. * diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java index 639ce459..a76ad24b 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 Christian Schneider +/* Copyright (C) 2006 Christian Schneider, 2019 Ian Hoogeboom * * This file is part of Nomad. * From 348975f068858f99b0fc470d78b403904c82bb32 Mon Sep 17 00:00:00 2001 From: Ian Hoogeboom Date: Mon, 16 Dec 2019 11:31:40 +0100 Subject: [PATCH 3/5] Comment header updates --- nomad/changelog.txt | 2 +- .../src/net/sf/nmedit/nomad/core/Nomad.java | 1 + .../nomad/core/service/fileService/FileServiceTool.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nomad/changelog.txt b/nomad/changelog.txt index 3f9034e0..a58f6d58 100644 --- a/nomad/changelog.txt +++ b/nomad/changelog.txt @@ -9,7 +9,7 @@ Version 0.4.20191216 -------------------- new features / improvements: -- made the .pch file dype the default open and save service +- made the .pch file type the default open and save service bugs fixed: - opening the file with the 'all type' gave a service error diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java index 8b83d1d0..c96ea33d 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java @@ -19,6 +19,7 @@ /* * Created on Nov 23, 2006 + * Updated on Dec 16, 2019 */ package net.sf.nmedit.nomad.core; diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java index a76ad24b..974f2f5b 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/service/fileService/FileServiceTool.java @@ -16,6 +16,10 @@ * along with Nomad; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +/* + * Updated on Dec 16, 2019 + */ package net.sf.nmedit.nomad.core.service.fileService; import java.io.File; From df75ceb7981b023d448efbfa21592a57259281cb Mon Sep 17 00:00:00 2001 From: Ian Hoogeboom Date: Mon, 16 Dec 2019 11:36:23 +0100 Subject: [PATCH 4/5] Update changelog.txt --- nomad/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nomad/changelog.txt b/nomad/changelog.txt index a58f6d58..e27f77a4 100644 --- a/nomad/changelog.txt +++ b/nomad/changelog.txt @@ -5,7 +5,7 @@ Copyright (C) 2006 Christian Schneider, Marcus Andersson Copyright (C) 2019 Ian Hoogeboom -Version 0.4.20191216 +Version 0.4.working. -------------------- new features / improvements: From e402568c0a64e47bf98979966625f3addf5815c1 Mon Sep 17 00:00:00 2001 From: Ian Hoogeboom Date: Mon, 16 Dec 2019 12:03:40 +0100 Subject: [PATCH 5/5] Changed file type error text --- .../src/net/sf/nmedit/nomad/core/Nomad.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java index c96ea33d..88a4b5d8 100644 --- a/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java +++ b/nomad/nomad-source/plugins/net.sf.nmedit.nomad.core/src/net/sf/nmedit/nomad/core/Nomad.java @@ -16,7 +16,6 @@ * along with Nomad; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - /* * Created on Nov 23, 2006 * Updated on Dec 16, 2019 @@ -577,7 +576,7 @@ public void fileSave(boolean saveAs) } else { - JOptionPane.showMessageDialog(mainWindow, "Could not find service to save file."); + JOptionPane.showMessageDialog(mainWindow, "Unknown file type."); } } @@ -615,7 +614,7 @@ public void fileOpen() if (service == null) { - JOptionPane.showMessageDialog(mainWindow, "Could not find service to open file."); + JOptionPane.showMessageDialog(mainWindow, "Unknown file type."); return; } Runnable run = new Runnable()