From 770a77ee455ed03dbca084e56386d50e8bcffcc2 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 27 Sep 2004 22:24:31 +0000 Subject: [PATCH] minor fixes git-svn-id: http://svn.opengroupware.org/SOPE/trunk@179 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- .../NGObjWeb/Templates/WOxElemBuilder.m | 3 ++ sope-appserver/WEExtensions/WETreeData.m | 1 - sope-appserver/WEExtensions/WETreeView.m | 18 +++++++++-- sope-appserver/samples/WOxExtTest/ChangeLog | 5 ++++ .../WOxExtTest/Resources/TreeView.plist | 4 +-- sope-core/NGExtensions/ChangeLog | 4 +++ sope-core/NGExtensions/NGBundleManager.m | 30 ++++++++++++++----- sope-core/NGExtensions/Version | 2 +- 8 files changed, 53 insertions(+), 14 deletions(-) diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m index 108c9159..ca5d725c 100644 --- a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m +++ b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m @@ -146,6 +146,9 @@ static BOOL debugOn = NO; Class clazz; cn = [_classNames objectAtIndex:i]; +#if 0 + NSLog(@"builder class: %@", cn); +#endif if ((clazz = NSClassFromString(cn)) == Nil) { if (missingBuilders == nil) diff --git a/sope-appserver/WEExtensions/WETreeData.m b/sope-appserver/WEExtensions/WETreeData.m index 2ae91216..4adb50a0 100644 --- a/sope-appserver/WEExtensions/WETreeData.m +++ b/sope-appserver/WEExtensions/WETreeData.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ /* WETreeDate diff --git a/sope-appserver/WEExtensions/WETreeView.m b/sope-appserver/WEExtensions/WETreeView.m index 8f6d3a16..d1110425 100644 --- a/sope-appserver/WEExtensions/WETreeView.m +++ b/sope-appserver/WEExtensions/WETreeView.m @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ /* WETreeView @@ -129,6 +128,19 @@ <#DataCell">some content --- snap --- + + TestTree.wox + ---snip--- + + treecell + + first name + + + ---snap--- */ #include diff --git a/sope-appserver/samples/WOxExtTest/ChangeLog b/sope-appserver/samples/WOxExtTest/ChangeLog index b6032aff..2d5a7838 100644 --- a/sope-appserver/samples/WOxExtTest/ChangeLog +++ b/sope-appserver/samples/WOxExtTest/ChangeLog @@ -1,3 +1,8 @@ +2004-09-28 Helge Hess + + * Resources/TreeView.plist: fixed a missing semicolon (breaks on + MacOSX) + 2004-09-27 Helge Hess * GNUmakefile.preamble (WOxExtTest_LIB_DIRS): fixed some linking path diff --git a/sope-appserver/samples/WOxExtTest/Resources/TreeView.plist b/sope-appserver/samples/WOxExtTest/Resources/TreeView.plist index 5dede7b9..717ba5a8 100644 --- a/sope-appserver/samples/WOxExtTest/Resources/TreeView.plist +++ b/sope-appserver/samples/WOxExtTest/Resources/TreeView.plist @@ -37,7 +37,7 @@ key = one.two.one.one.two; sublist = (); } - ) + ); } ); }, @@ -129,7 +129,7 @@ key = three.three; sublist = (); } - ) + ); }, { firstName = "Dieter"; diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 9dc4c52b..41b9cdce 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,7 @@ +2004-09-27 Helge Hess + + * NGBundleManager.m: removed a warning on MacOSX (v4.3.117) + 2004-09-23 Marcus Mueller * NGExtensions.xcode: added NGResourceLocator class diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m index c44a2d5f..2f7066dd 100644 --- a/sope-core/NGExtensions/NGBundleManager.m +++ b/sope-core/NGExtensions/NGBundleManager.m @@ -21,6 +21,7 @@ #include "NGBundleManager.h" #include "common.h" +#include #import #import #include @@ -544,9 +545,12 @@ static NSString *NGEnvVarPathSeparator = @":"; */ #if !LIB_FOUNDATION_LIBRARY && !GNUSTEP_BASE_LIBRARY -# warning incorrect behaviour if NGExtensions is dynamically loaded ! + // Note: incorrect behaviour if NGExtensions is dynamically loaded ! // TODO: can we do anything about this? Can we detect the situation and // print a log instead of the compile warning? + // Note: the above refers to the situation when a framework is implicitly + // loaded by loading a bundle (the framework is not linked against + // the main tool) #endif bundle = [NSBundle mainBundle]; NSMapInsert(self->classToBundle, aClass, bundle); @@ -675,7 +679,7 @@ static NSString *NGEnvVarPathSeparator = @":"; return nil; } -// initialization +/* initialization */ - (NSString *)makeBundleInfoPath:(NSString *)_path { #if (NeXT_Foundation_LIBRARY || APPLE_Foundation_LIBRARY) && !defined(GSWARN) @@ -690,17 +694,20 @@ static NSString *NGEnvVarPathSeparator = @":"; - (id)_initializeLoadedBundle:(NSBundle *)_bundle info:(NSDictionary *)_bundleInfo { - id handler = nil; + id handler; /* check whether a handler was specified */ - - if ((handler = [_bundleInfo objectForKey:@"bundleHandler"])) { + + if ((handler = [_bundleInfo objectForKey:@"bundleHandler"]) != nil) { + [self debugWithFormat:@"lookup bundle handler %@ of bundle: %@", + handler, _bundle]; + if ((handler = NSClassFromString(handler)) == nil) { NSLog(@"ERROR: did not find handler class %@ of bundle %@.", [_bundleInfo objectForKey:@"bundleHandler"], [_bundle bundlePath]); handler = [_bundle principalClass]; } - + handler = [handler alloc]; if ([handler respondsToSelector:@selector(initForBundle:bundleManager:)]) @@ -716,6 +723,9 @@ static NSString *NGEnvVarPathSeparator = @":"; } } else { + [self debugWithFormat: + @"no bundle handler, lookup principal class of bundle: %@", + _bundle]; if ((handler = [_bundle principalClass]) == nil) /* use NGBundle class as default bundle handler */ handler = [NGBundle class]; @@ -1749,7 +1759,7 @@ static BOOL _doesInfoMatch(NSArray *keys, NSDictionary *dict, NSDictionary *info return [[bundles copy] autorelease]; } -// notifications +/* notifications */ - (void)_bundleDidLoadNotifcation:(NSNotification *)_notification { NSDictionary *ui = [_notification userInfo]; @@ -1765,6 +1775,12 @@ static BOOL _doesInfoMatch(NSArray *keys, NSDictionary *dict, NSDictionary *info categories:[ui objectForKey:@"NSLoadedCategories"]]; } +/* debugging */ + +- (BOOL)isDebuggingEnabled { + return debugOn; +} + @end /* NGBundleManager */ @implementation NSBundle(BundleManagerSupport) diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index e37e3b3f..b53ee6fd 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=116 +SUBMINOR_VERSION:=117 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 -- 2.39.5