code reorgs

[sope] / sope-appserver / WEExtensions / WEMonthOverview.m

diff --git a/sope-appserver/WEExtensions/WEMonthOverview.m b/sope-appserver/WEExtensions/WEMonthOverview.m
index 60eb9e034becc6afbad4ec6d1cee3dba13e79d63..6ddf7d9fae6fc3b8e7dbb23bd6ffdfa04c77aaf2 100644 (file)
--- a/sope-appserver/WEExtensions/WEMonthOverview.m
+++ b/sope-appserver/WEExtensions/WEMonthOverview.m
@@ -146,7 +146,7 @@ static NSString *WEMonthOverview_ContentMode = @"WEMonthOverview_ContentMode";
 - (NSDictionary *)monthOverviewContext {
   return [self objectForKey:@"WEMonthOverview"];
 }
-- (NSArray *)monthOverviewQueryObjects {
+- (NSMutableArray *)monthOverviewQueryObjects {
   return [[self monthOverviewContext] valueForKey:@"query"];
 }
 
@@ -189,7 +189,7 @@ static NSString *retStrForInt(int i) {
   case 10: return @"10";
     // TODO: find useful count!
   default: {
-    unsigned char buf[32];
+    char buf[32];
     sprintf(buf, "%i", i);
     return [[StrClass alloc] initWithCString:buf];
   }
@@ -846,31 +846,31 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
 }
 
 
-- (void)takeContentValues:(WORequest *)_req
-                inContext:(WOContext *)_ctx
-                    index:(int)_idx
+- (void)takeContentValues:(WORequest *)_req inContext:(WOContext *)_ctx
+  index:(int)_idx
 {
   WOComponent *comp;
   NSString    *s;
   NSArray     *array;
-  int         i, idx, cnt, count;
+  int         i, cnt, count;
 
   comp  = [_ctx component];
   array = [self->list valueInComponent:comp];
   count = [array count];
   
   [_ctx appendElementIDComponent:@"c"]; // append content mode
-
-  cnt = [self->matrix[_idx] count];
-  for (i=0; i<cnt; i++) {
+  
+  for (i = 0, cnt = [self->matrix[_idx] count]; i < cnt; i++) {
+    int idx;
+    
     idx = [[self->matrix[_idx] objectAtIndex:i] intValue];
 
-    if (self->index)
+    if (self->index != nil)
       [self->index setUnsignedIntValue:idx inComponent:comp];
-    if (self->item)
+    if (self->item != nil)
       [self->item setValue:[array objectAtIndex:idx] inComponent:comp];
     
-    s = (self->identifier)
+    s = (self->identifier != nil)
       ? [[self->identifier stringValueInComponent:comp] retain]
       : retStrForInt(idx);
     
@@ -888,7 +888,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
   NSString       *week;
   int            i, j;
   unsigned int   weekOfYear;
-  unsigned char  buf[32];
+  char           buf[32];
   
   [self _calcMatrixInContext:_ctx];
   
@@ -1018,6 +1018,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
 
 @end /* WEMonthOverview */
 
+
 @implementation WEMonthLabel
 
 - (id)initWithName:(NSString *)_name
@@ -1045,6 +1046,8 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
   [super dealloc];
 }
 
+/* handle requests */
+
 - (void)takeValuesFromRequest:(WORequest *)_req inContext:(WOContext *)_ctx {
   NSDictionary *monthViewContextDict;
   NSString     *orient;
@@ -1055,16 +1058,16 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
   isEdge = ([orient rangeOfString:@"/"].length > 0);
   
   monthViewContextDict  = [_ctx monthOverviewContext];
-  if ((tmp = [monthViewContextDict objectForKey:orient]) != nil) {
-    if (!isEdge) {
-      [_ctx appendElementIDComponent:orient];
-      [self->template takeValuesFromRequest:_req inContext:_ctx];
-      [_ctx deleteLastElementIDComponent];
-    }
-    else {
-      [self->template takeValuesFromRequest:_req inContext:_ctx];
-    }
+  if ((tmp = [monthViewContextDict objectForKey:orient]) == nil)
+    return;
+
+  if (!isEdge) {
+    [_ctx appendElementIDComponent:orient];
+    [self->template takeValuesFromRequest:_req inContext:_ctx];
+    [_ctx deleteLastElementIDComponent];
   }
+  else
+    [self->template takeValuesFromRequest:_req inContext:_ctx];
 }
 
 - (id)invokeActionForRequest:(WORequest *)_req inContext:(WOContext *)_ctx {
@@ -1109,6 +1112,8 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
   return result;
 }
 
+/* generate response */
+
 - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
   NSDictionary   *monthViewContextDict;
   NSMutableArray *queryContext;
@@ -1182,6 +1187,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
 
 @end /* WEMonthLabel */
 
+
 @implementation WEMonthTitle
 
 - (id)initWithName:(NSString *)_name
@@ -1247,6 +1253,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
 
 @end /* WEMonthTitle */
 
+
 @interface WEMonthOverviewInfoMode : WEContextConditional
 @end
 
@@ -1258,6 +1265,7 @@ _takeValuesInCell(WEMonthOverview *self, WORequest *request,
 
 @end /* WEMonthOverviewInfoMode */
 
+
 @interface WEMonthOverviewContentMode : WEContextConditional
 @end