From 3574963b1e79a4c1c2711e350531838bf1cc59c1 Mon Sep 17 00:00:00 2001 From: AJ Date: Thu, 1 Nov 2018 09:54:03 -0400 Subject: [PATCH] Throw exception if failed to read press brake program. --- CincyLib/PressBrake/Program.cs | 4 ++-- CincyLib/PressBrake/ProgramReader.cs | 28 ++++------------------------ 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/CincyLib/PressBrake/Program.cs b/CincyLib/PressBrake/Program.cs index 7900624..cf394c6 100644 --- a/CincyLib/PressBrake/Program.cs +++ b/CincyLib/PressBrake/Program.cs @@ -45,14 +45,14 @@ namespace CincyLib.PressBrake public static Program Read(string file) { var reader = new ProgramReader(); - var success= reader.Read(file); + reader.Read(file); return reader.Program; } public static Program Read(Stream stream) { var reader = new ProgramReader(); - var success = reader.Read(stream); + reader.Read(stream); return reader.Program; } } diff --git a/CincyLib/PressBrake/ProgramReader.cs b/CincyLib/PressBrake/ProgramReader.cs index 0ab217d..f5e76a2 100644 --- a/CincyLib/PressBrake/ProgramReader.cs +++ b/CincyLib/PressBrake/ProgramReader.cs @@ -14,32 +14,14 @@ namespace CincyLib.PressBrake Program = new Program(); } - public bool Read(string file) + public void Read(string file) { - Stream stream = null; + var stream = File.OpenRead(file); Program.FilePath = file; - - var success = false; - - try - { - stream = File.OpenRead(file); - success = Read(stream); - } - catch (SystemException ex) - { - Debug.WriteLine(ex.Message); - } - finally - { - if (stream != null) - stream.Close(); - } - - return success; + Read(stream); } - public bool Read(Stream stream) + public void Read(Stream stream) { var xml = XDocument.Load(stream); @@ -72,8 +54,6 @@ namespace CincyLib.PressBrake var step = ReadStep(item); Program.Steps.Add(step); } - - return true; } private ToolSetup ReadToolSetup(XElement x)