Removed initWithStylesheet's dependence on NUIStyle.nss

tombenner · Dec 30, 2012 · c330646 · c330646
1 parent 0a93ffa
commit c330646
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/NUI/Core/NUISettings.m b/NUI/Core/NUISettings.m
@@ -15,10 +15,10 @@ @implementation NUISettings
 
 + (void)init
 {
-    instance = [self getInstance];
+    [self initWithStylesheet:@"NUIStyle"];
 }
 
-+ (void)initWithStylesheet:(NSString *)name
++ (void)initWithStylesheet:(NSString*)name
 {
     instance = [self getInstance];
     NUIStyleParser *parser = [[NUIStyleParser alloc] init];
@@ -27,7 +27,6 @@ + (void)initWithStylesheet:(NSString *)name
 
 + (BOOL)hasProperty:(NSString*)property withExplicitClass:(NSString*)className
 {
-    instance = [self getInstance];
     NSMutableDictionary *ruleSet = [instance.settings objectForKey:className];
     if (ruleSet == nil) {
         return NO;
@@ -51,7 +50,6 @@ + (BOOL)hasProperty:(NSString*)property withClass:(NSString*)className
 
 + (id)get:(NSString*)property withExplicitClass:(NSString*)className
 {
-    instance = [self getInstance];
     NSMutableDictionary *ruleSet = [instance.settings objectForKey:className];
     return [ruleSet objectForKey:property];
 }
@@ -134,7 +132,6 @@ + (NUISettings*)getInstance
         if(instance == nil) {
             [[NUISwizzler new] swizzleAll];
             instance = [NUISettings new];
-            [self initWithStylesheet:@"NUIStyle"];
         }
     }