Permalink
Browse files

minor cleanups

  • Loading branch information...
maul-esel committed Apr 25, 2012
1 parent fa7e2c1 commit c1bbe5c2e97447ca4af85d456f00ecc477010228
@@ -3,8 +3,6 @@
using System.Reflection;
using System.Runtime.InteropServices;
using System.Windows;
-using ChameleonCoder.Files;
-using ChameleonCoder.Resources;
namespace ChameleonCoder
{
@@ -58,17 +56,17 @@ public ChameleonCoderApp()
{
FileMan = new Files.FileManager(this);
PluginMan = new Plugins.PluginManager(this);
- ResourceMan = new ResourceManager(this);
+ ResourceMan = new Resources.ResourceManager(this);
ContentMemberMan = new Resources.RichContent.ContentMemberManager(this);
- ResourceTypeMan = new ResourceTypeManager(this);
+ ResourceTypeMan = new Resources.ResourceTypeManager(this);
RunningObject = this; // TODO!
// setting the Language the user chose
ChameleonCoder.Properties.Resources.Culture = new System.Globalization.CultureInfo(Settings.ChameleonCoderSettings.Default.Language); // setting retrieval fails if invoked from COM
// associate the instances created in XAML with the classes
- ResourceMan.SetCollections((ResourceCollection)RunningApp.Resources["resources"], (ResourceCollection)RunningApp.Resources["resourceHierarchy"]); // fails if invoked from cOM (App == null)
+ ResourceMan.SetCollections((Resources.ResourceCollection)RunningApp.Resources["resources"], (Resources.ResourceCollection)RunningApp.Resources["resourceHierarchy"]); // fails if invoked from cOM (App == null)
}
/// <summary>
@@ -84,7 +82,7 @@ public void Exit(int exitCode)
Environment.Exit(exitCode);
}
- public FileManager FileMan
+ public Files.FileManager FileMan
{
get;
private set;
@@ -96,7 +94,7 @@ public Plugins.PluginManager PluginMan
private set;
}
- public ResourceManager ResourceMan
+ public Resources.ResourceManager ResourceMan
{
get;
private set;
@@ -108,7 +106,7 @@ public Resources.RichContent.ContentMemberManager ContentMemberMan
private set;
}
- public ResourceTypeManager ResourceTypeMan
+ public Resources.ResourceTypeManager ResourceTypeMan
{
get;
private set;
@@ -100,6 +100,7 @@ public void Open(string path)
/// <summary>
/// loads the resources contained in the file
/// </summary>
+ [Obsolete]
public void Load()
{
foreach (XmlNode node in doc.SelectNodes(DocumentXPath.Resources, manager))
@@ -134,6 +135,7 @@ public bool IsOpened
/// <summary>
/// gets whether the file instance is loaded or not
/// </summary>
+ [Obsolete]
public bool IsLoaded
{
get;
@@ -117,6 +117,7 @@ public void Shutdown()
/// <summary>
/// loads the resources in all opened files
/// </summary>
+ [Obsolete]
public void LoadAll()
{
foreach (IDataFile file in Files)

0 comments on commit c1bbe5c

Please sign in to comment.