minor fixes

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

diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m
index 108c915913d781ce269d420a7148b80d16b57858..ca5d725c4fce6e5995c3c327d38e068c6dd0fa32 100644 (file)
--- 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 2ae91216d40e3b539edfb779438fd1563ede63d0..4adb50a074d9e129c519adda755788b4715958d5 100644 (file)
--- 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 8f6d3a162666c570c140327e098b020b557fb631..d111042585c0079b20859ab7506d414d219d6321 100644 (file)
--- 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</#DataCell>
       </#TestTree>
       --- snap ---
+
+    TestTree.wox
+      ---snip---
+        <var:treeview list="root" sublist="item.sublist" item="item"
+                      currentPath="currentPath" zoom="isZoom"
+                      showItem="showItem"
+        >
+          <var:tree-header const:isTreeElement="YES">treecell</var:tree-header>
+          <var:tree-header const:isTreeElement="NO" const:bgcolor="#FFDAAA">
+            <b>first name</b>
+          </var:tree-header>
+        </var:treeview>
+      ---snap---
 */
 
 #include <NGObjWeb/WODynamicElement.h>

diff --git a/sope-appserver/samples/WOxExtTest/ChangeLog b/sope-appserver/samples/WOxExtTest/ChangeLog
index b6032aff03553826381e4239078f0ba7168dfeae..2d5a7838ddab48d93800afcc12357a70c443cbc4 100644 (file)
--- a/sope-appserver/samples/WOxExtTest/ChangeLog
+++ b/sope-appserver/samples/WOxExtTest/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-28  Helge Hess  <helge.hess@opengroupware.org>
+
+       * Resources/TreeView.plist: fixed a missing semicolon (breaks on
+         MacOSX)
+
 2004-09-27  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 5dede7b9eed40791eecaaa6d47edbc9cf4070cfd..717ba5a89eda04cffe037d3f77dd710a0c0fad86 100644 (file)
--- 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 9dc4c52bb1c1db68f91705fe6a2147f87fbd5730..41b9cdcee6467331d1e2a51a0c435acd6739f5f0 100644 (file)
--- a/sope-core/NGExtensions/ChangeLog
+++ b/sope-core/NGExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-27  Helge Hess  <helge.hess@opengroupware.org>
+
+       * NGBundleManager.m: removed a warning on MacOSX (v4.3.117)
+
 2004-09-23  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * NGExtensions.xcode: added NGResourceLocator class

diff --git a/sope-core/NGExtensions/NGBundleManager.m b/sope-core/NGExtensions/NGBundleManager.m
index c44a2d5f8fe29813f662506fd6e21453c508d57b..2f7066dd5a76b12bfcbd048aa9e82f1c5efd9df8 100644 (file)
--- a/sope-core/NGExtensions/NGBundleManager.m
+++ b/sope-core/NGExtensions/NGBundleManager.m
@@ -21,6 +21,7 @@
 
 #include "NGBundleManager.h"
 #include "common.h"
+#include <NGExtensions/NSObject+Logs.h>
 #import <Foundation/NSFileManager.h>
 #import <EOControl/EOQualifier.h>
 #include <ctype.h>
@@ -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 e37e3b3f2489c4fea1459ce52f662b0a4ca2a90f..b53ee6fd72dfa11660bbc3b9349d7fdc31598ea5 100644 (file)
--- 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