Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made CXMLReader.OpenFile private so factory method has to be used

Browse Source
This commit is contained in:
Flamefire committed 2013-02-25 20:15:24 +01:00
1 parent 78870ae26d
commit 13e856db16
9 files changed
+33 -131
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CConfig.cs
+2 -12
View File
@@ -121,19 +121,9 @@ namespace Vocaluxe.Base
public static bool LoadConfig() public static bool LoadConfig()
{ {
#region Inits CXMLReader xmlReader = CXMLReader.OpenFile(CSettings.sFileConfig);
CXMLReader xmlReader; if (xmlReader == null)
try
{
xmlReader = new CXMLReader(CSettings.sFileConfig);
}
catch (Exception e)
{
CLog.LogError("Error opening Config.xml " + CSettings.sFileConfig + ": " + e.Message);
return false; return false;
}
#endregion Inits
string value = string.Empty; string value = string.Empty;
Vocaluxe/Base/CFont.cs
+3 -10
View File
@@ -673,17 +673,10 @@ namespace Vocaluxe.Base
/// <returns></returns> /// <returns></returns>
private static bool LoadFontList() private static bool LoadFontList()
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(System.IO.Path.Combine(CSettings.sFolderFonts, CSettings.sFileFonts));
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(System.IO.Path.Combine(CSettings.sFolderFonts, CSettings.sFileFonts));
}
catch (Exception e)
{
CLog.LogError("Error loading default fonts: " + e.Message);
return false; return false;
}
_Fonts.Clear(); _Fonts.Clear();
string value = string.Empty; string value = string.Empty;
Vocaluxe/Base/CLanguage.cs
+4 -20
View File
@@ -239,17 +239,9 @@ namespace Vocaluxe.Base
private static bool LoadPartyLanguageFile(int PartyModeID, string file) private static bool LoadPartyLanguageFile(int PartyModeID, string file)
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(file);
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(file);
}
catch (Exception e)
{
CLog.LogError("Error opening Party Language File " + file + ": " + e.Message);
return false; return false;
}
string value = string.Empty; string value = string.Empty;
if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value)) if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value))
@@ -295,17 +287,9 @@ namespace Vocaluxe.Base
SLanguage lang = new SLanguage(); SLanguage lang = new SLanguage();
lang.LanguageFilePath = Path.Combine(CSettings.sFolderLanguages, FileName); lang.LanguageFilePath = Path.Combine(CSettings.sFolderLanguages, FileName);
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(lang.LanguageFilePath);
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(lang.LanguageFilePath);
}
catch (Exception e)
{
CLog.LogError("Error opening Language File " + FileName + ": " + e.Message);
return; return;
}
string value = string.Empty; string value = string.Empty;
if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value)) if (xmlReader.GetValue("//resources/string[@name='language']", ref value, value))
Vocaluxe/Base/CParty.cs
+3 -10
View File
@@ -220,18 +220,11 @@ namespace Vocaluxe.Base
pm.ScreenFiles = new List<string>(); pm.ScreenFiles = new List<string>();
pm.NoErrors = false; pm.NoErrors = false;
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(file);
try
{
xmlReader = new CXMLReader(file);
}
catch (Exception e)
{
CLog.LogError("Error opening party mode file " + file + ": " + e.Message);
//Error...
if (xmlReader == null)
return pm; return pm;
}
bool loaded = true; bool loaded = true;
Vocaluxe/Base/CProfiles.cs
+2 -10
View File
@@ -360,17 +360,9 @@ namespace Vocaluxe.Base
SProfile profile = new SProfile(); SProfile profile = new SProfile();
profile.ProfileFile = Path.Combine(CSettings.sFolderProfiles, FileName); profile.ProfileFile = Path.Combine(CSettings.sFolderProfiles, FileName);
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(profile.ProfileFile);
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(profile.ProfileFile);
}
catch (Exception e)
{
CLog.LogError("Error opening Profile File " + FileName + ": " + e.Message);
return; return;
}
string value = String.Empty; string value = String.Empty;
if (xmlReader.GetValue("//root/Info/PlayerName", ref value, value)) if (xmlReader.GetValue("//root/Info/PlayerName", ref value, value))
Vocaluxe/Base/CTheme.cs
+8 -40
View File
@@ -147,17 +147,9 @@ namespace Vocaluxe.Base
public static bool LoadSkin(int SkinIndex) public static bool LoadSkin(int SkinIndex)
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(_Skins[SkinIndex].Path, _Skins[SkinIndex].FileName));
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(Path.Combine(_Skins[SkinIndex].Path, _Skins[SkinIndex].FileName));
}
catch (Exception e)
{
CLog.LogError("Error loading skin " + _Skins[SkinIndex].FileName + ": " + e.Message);
return false; return false;
}
string value = String.Empty; string value = String.Empty;
@@ -264,17 +256,9 @@ namespace Vocaluxe.Base
return false; return false;
} }
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(_Themes[ThemeIndex].Path, _Themes[ThemeIndex].FileName));
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(Path.Combine(_Themes[ThemeIndex].Path, _Themes[ThemeIndex].FileName));
}
catch (Exception e)
{
CLog.LogError("Error loading theme " + _Themes[ThemeIndex].FileName + ": " + e.Message);
return false; return false;
}
int skinIndex = GetSkinIndex(_Themes[ThemeIndex].PartyModeID); int skinIndex = GetSkinIndex(_Themes[ThemeIndex].PartyModeID);
@@ -419,17 +403,9 @@ namespace Vocaluxe.Base
public static bool AddTheme(string FilePath, int PartyModeID) public static bool AddTheme(string FilePath, int PartyModeID)
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(FilePath);
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(FilePath);
}
catch (Exception e)
{
CLog.LogError("Error loading theme " + FilePath + ": " + e.Message);
return false; return false;
}
Theme theme = new Theme(); Theme theme = new Theme();
@@ -494,17 +470,9 @@ namespace Vocaluxe.Base
foreach (string file in files) foreach (string file in files)
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(Path.Combine(path, file));
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(Path.Combine(path, file));
}
catch (Exception e)
{
CLog.LogError("Error loading skin " + file + ": " + e.Message);
continue; continue;
}
Skin skin = new Skin(); Skin skin = new Skin();
Vocaluxe/Lib/Playlist/CPlaylistFile.cs
+2 -10
View File
@@ -120,17 +120,9 @@ namespace Vocaluxe.Lib.Playlist
private void LoadPlaylist() private void LoadPlaylist()
{ {
CXMLReader xmlReader; CXMLReader xmlReader = CXMLReader.OpenFile(PlaylistFile);
if (xmlReader == null)
try
{
xmlReader = new CXMLReader(PlaylistFile);
}
catch (Exception e)
{
CLog.LogError("Error opening Playlist File " + PlaylistFile + ": " + e.Message);
return; return;
}
string value = String.Empty; string value = String.Empty;
if (xmlReader.GetValue("//root/Info/PlaylistName", ref value, value)) if (xmlReader.GetValue("//root/Info/PlaylistName", ref value, value))
VocaluxeLib/Menu/CMenu.cs
+5 -16
View File
@@ -172,27 +172,16 @@ namespace Vocaluxe.Menu
{ {
string file = Path.Combine(XmlPath, _ThemeName + ".xml"); string file = Path.Combine(XmlPath, _ThemeName + ".xml");
CXMLReader xmlReader = null; CXMLReader xmlReader = CXMLReader.OpenFile(file);
if (xmlReader == null)
try return;
{
xmlReader = new CXMLReader(file);
}
catch (Exception e)
{
if (xmlReader != null)
xmlReader = null;
CBase.Log.LogError("Error loading theme file " + file + ": " + e.Message);
}
bool VersionCheck = false; bool VersionCheck = false;
if (xmlReader != null) VersionCheck = CheckVersion(_ScreenVersion, xmlReader);
VersionCheck = CheckVersion(_ScreenVersion, xmlReader);
int SkinIndex = CBase.Theme.GetSkinIndex(_PartyModeID); int SkinIndex = CBase.Theme.GetSkinIndex(_PartyModeID);
if (xmlReader != null && VersionCheck && SkinIndex != -1) if (VersionCheck && SkinIndex != -1)
{ {
_ThemePath = XmlPath; _ThemePath = XmlPath;
LoadThemeBasics(xmlReader, SkinIndex); LoadThemeBasics(xmlReader, SkinIndex);
VocaluxeLib/Menu/CXMLReader.cs
+4 -3
View File
@@ -9,7 +9,8 @@ namespace Vocaluxe.Menu
{ {
private XPathNavigator _Navigator; private XPathNavigator _Navigator;
public CXMLReader(string uri) //Private method. Use OpenFile factory method to get an instance
private CXMLReader(string uri)
{ {
XPathDocument xPathDoc = new XPathDocument(uri); XPathDocument xPathDoc = new XPathDocument(uri);
_Navigator = xPathDoc.CreateNavigator(); _Navigator = xPathDoc.CreateNavigator();
@@ -26,9 +27,9 @@ namespace Vocaluxe.Menu
{ {
return new CXMLReader(sUri); return new CXMLReader(sUri);
} }
catch (Exception) catch (Exception e)
{ {
CBase.Log.LogError("Can't open XML file: " + sUri); CBase.Log.LogError("Can't open XML file: " + sUri + ": " + e.Message);
return null; return null;
} }
} }