minor cleanups

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@798 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog
index 4246f9381916aea848aab25331f288f72a3fc699..bca45658ef6e32a60794c27de3d625bf53ffe9f4 100644 (file)
--- a/SOGo/UI/SOGoUI/ChangeLog
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * UIxComponent.m: minor code reorgs (v0.9.31)
+
 2005-07-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * SOGoAptFormatter.[hm]: added -titlePlaceholder API for properly

diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index ce4cd22801cd2de5f8735bb4beb82cd79cf32c47..246ccc22fe978449b12b7317246e3c8ff00388ca 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -145,23 +145,25 @@ static BOOL uixDebugEnabled = NO;
 }
 
 - (NSMutableDictionary *)_queryParameters {
-  if(!self->queryParameters) {
-    WORequest *req;
-    NSString  *uri;
-    NSRange   r;
+  // TODO: this code is weird, should use WORequest methods for parsing
+  WORequest *req;
+  NSString  *uri;
+  NSRange   r;
+  
+  if (self->queryParameters)
+    return self->queryParameters;
+
+  self->queryParameters = [[NSMutableDictionary alloc] initWithCapacity:8];
     
-    self->queryParameters = [[NSMutableDictionary alloc] initWithCapacity:8];
+  req = [[self context] request];
+  uri = [req uri];
+  r   = [uri rangeOfString:@"?" options:NSBackwardsSearch];
+  if (r.length > 0) {
+    NSString *qs;
     
-    req = [[self context] request];
-    uri = [req uri];
-    r   = [uri rangeOfString:@"?" options:NSBackwardsSearch];
-    if (r.length > 0) {
-      NSString *qs;
-      
-      qs = [uri substringFromIndex:NSMaxRange(r)];
-      [self _parseQueryString:qs];
-    }    
-  }
+    qs = [uri substringFromIndex:NSMaxRange(r)];
+    [self _parseQueryString:qs];
+  }    
   return self->queryParameters;
 }
 
@@ -178,7 +180,7 @@ static BOOL uixDebugEnabled = NO;
 }
 
 - (void)setSelectedDateQueryParameter:(NSCalendarDate *)_newDate
-                        inDictionary:(NSMutableDictionary *)_qp;
+  inDictionary:(NSMutableDictionary *)_qp;
 {
   if(_newDate != nil)
     [_qp setObject:[self dateStringForDate:_newDate] forKey:@"day"];

diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version
index afe528390b380287fbc66a551a06813de8b6fa9e..598e4e7574fff6b066d7abefc3ab7db4e947eba5 100644 (file)
--- a/SOGo/UI/SOGoUI/Version
+++ b/SOGo/UI/SOGoUI/Version
@@ -1,5 +1,5 @@
 # version file
 
-SUBMINOR_VERSION:=30
+SUBMINOR_VERSION:=31
 
 # v0.9.18 requires NGExtensions v4.5.136