added Base object to XMLReader class

the Base object handling must be changed for the whole VocaluxeLib!
This commit is contained in:
Alexander Eckart committed 2013-02-22 17:11:25 +01:00
1 parent 406e75408b
commit 08658e20e3
3 files changed
+8 -4

No files matched your search

+2 -2
View File
@@ -163,7 +163,7 @@ namespace Vocaluxe.Base
foreach (string file in files) foreach (string file in files)
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(path, file)); CXMLReader xmlReader = new CXMLReader((Path.Combine(path, file)));
if (xmlReader != null) if (xmlReader != null)
{ {
@@ -194,7 +194,7 @@ namespace Vocaluxe.Base
if (coverTheme.Name != String.Empty) if (coverTheme.Name != String.Empty)
{ {
CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(CSettings.sFolderCover, coverTheme.File)); CXMLReader xmlReader = new CXMLReader((Path.Combine(CSettings.sFolderCover, coverTheme.File)));
if (xmlReader != null) if (xmlReader != null)
{ {
+1
View File
@@ -38,6 +38,7 @@ namespace Vocaluxe
{ {
// Init Log // Init Log
CLog.Init(); CLog.Init();
CXMLReader.Base = CMain.Base;
CSettings.CreateFolders(); CSettings.CreateFolders();
Application.DoEvents(); Application.DoEvents();
+5 -2
View File
@@ -7,6 +7,7 @@ namespace Vocaluxe.Menu
{ {
public class CXMLReader public class CXMLReader
{ {
public static Basic Base;
private XPathNavigator _Navigator; private XPathNavigator _Navigator;
public CXMLReader(string uri) public CXMLReader(string uri)
@@ -20,7 +21,7 @@ namespace Vocaluxe.Menu
get { return _Navigator; } get { return _Navigator; }
} }
public static CXMLReader OpenFile(string sUri) public CXMLReader OpenFile(string sUri)
{ {
try try
{ {
@@ -28,7 +29,9 @@ namespace Vocaluxe.Menu
} }
catch (Exception) catch (Exception)
{ {
//TODO: How to log from here? if (Base != null)
Base.Log.LogError("Can't open XML file: " + sUri);
return null; return null;
} }
} }