code cleanups

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1226 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index fe23db1c1e4509641d787b25312d2f17e0cde4a0..537790e2a8b923f1b585e8fecb3930c7fd180720 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-12  Helge Hess  <helge.hess@opengroupware.org>
+
+       * WEResourceManager.m: minor code cleanups, log the flat template
+         subpath if it could not be found (v4.5.85)
+
 2005-11-17  Helge Hess  <helge.hess@opengroupware.org>
 
        * v4.5.84

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index 1a557b95c560c2f8668369266938fbd410f91643..f88a137261b66ada047a44bb696438b17eec679e 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=84
+SUBMINOR_VERSION:=85
 
 # v4.5.76 requires libNGObjWeb v4.5.176
 # v4.5.75 requires libNGObjWeb v4.5.174

diff --git a/sope-appserver/WEExtensions/WEResourceManager.m b/sope-appserver/WEExtensions/WEResourceManager.m
index 9e0e99003da8908bff49cc3bda5236b20b07d245..54afa723b87c5257dd8bc6ff20b4827269085f01 100644 (file)
--- a/sope-appserver/WEExtensions/WEResourceManager.m
+++ b/sope-appserver/WEExtensions/WEResourceManager.m
@@ -170,8 +170,10 @@ static NSString *themesDirName = @"Themes";
                          fhsName:@"templates/"] copy];
   if (debugOn)
     NSLog(@"template pathes: %@", templatePathes);
-  if ([templatePathes count] == 0)
-    NSLog(@"Note: found no directories containing flat templates.");
+  if (![templatePathes isNotEmpty]) {
+    NSLog(@"Note: found no directories containing flat templates (subpath=%@)",
+         [[self class] gsTemplatesSubpath]);
+  }
 }
 
 + (NSArray *)availableThemes {
@@ -203,7 +205,7 @@ static NSString *themesDirName = @"Themes";
   
   lthemes = [[[themes allObjects] 
               sortedArrayUsingSelector:@selector(compare:)] copy];
-  if ([lthemes count] > 0) {
+  if ([lthemes isNotEmpty]) {
     NSLog(@"Note: located themes: %@", 
          [lthemes componentsJoinedByString:@", "]);
   }
@@ -213,7 +215,7 @@ static NSString *themesDirName = @"Themes";
 }
 
 - (id)initWithPath:(NSString *)_path {
-  if ((self = [super initWithPath:_path])) {
+  if ((self = [super initWithPath:_path]) != nil) {
     if ([WOApplication isCachingEnabled]) {
       self->keyToComponentPath =
        [[NSMutableDictionary alloc] initWithCapacity:128];