mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-22 11:11:21 +00:00
* GSWExtensions/GSWLongResponsePage.m
* GSWDatabase/WODisplayGroup.m * GSWeb/GSWHTMLStaticElement.m * GSWeb/GSWDynamicURLString.m fix some warnings git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36269 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
83854b342e
commit
2b86cd2dca
5 changed files with 46 additions and 27 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2013-03-04 David Wetzel <dave@turbocat.de>
|
||||||
|
* GSWExtensions/GSWLongResponsePage.m
|
||||||
|
* GSWDatabase/WODisplayGroup.m
|
||||||
|
* GSWeb/GSWHTMLStaticElement.m
|
||||||
|
* GSWeb/GSWDynamicURLString.m
|
||||||
|
fix some warnings
|
||||||
|
|
||||||
2013-03-03 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
2013-03-03 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||||
* GSWDatabase/WODisplayGroup.h
|
* GSWDatabase/WODisplayGroup.h
|
||||||
* GSWDatabase/WODisplayGroup.m
|
* GSWDatabase/WODisplayGroup.m
|
||||||
|
|
|
@ -360,19 +360,22 @@ static BOOL globalDefaultForValidatesChangesImmediately = NO;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
-(BOOL)_deleteObjectsAtIndexes:(NSArray*)indexes
|
-(BOOL) _deleteObjectsAtIndexes:(NSArray*)indexes
|
||||||
{
|
{
|
||||||
BOOL result=NO;
|
BOOL result = NO;
|
||||||
int indexesCount = 0;
|
|
||||||
|
|
||||||
|
if ([indexes count] > 0)
|
||||||
indexesCount = [indexes count];
|
|
||||||
if (indexesCount>0)
|
|
||||||
{
|
{
|
||||||
NSArray* objects=[_displayedObjects objectsAtIndexes:indexes];
|
NSEnumerator * idxEnumer = [indexes objectEnumerator];
|
||||||
result=[self _deleteObjects:objects];
|
NSMutableArray * objects = [NSMutableArray array];
|
||||||
|
NSNumber * idx = nil;
|
||||||
|
|
||||||
|
while ((idx = [idxEnumer nextObject])) {
|
||||||
|
[objects addObject:[_displayedObjects objectAtIndex:[idx intValue]]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
result=[self _deleteObjects:objects];
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
@ -1668,8 +1671,18 @@ createObjectFailedForDataSource:_dataSource];
|
||||||
|
|
||||||
- (NSArray *)selectedObjects
|
- (NSArray *)selectedObjects
|
||||||
{
|
{
|
||||||
if (!_selectedObjects)
|
if (!_selectedObjects) {
|
||||||
ASSIGN(_selectedObjects,([_displayedObjects objectsAtIndexes:_selection]));
|
NSEnumerator * idxEnumer = [_selection objectEnumerator];
|
||||||
|
NSMutableArray * objects = [NSMutableArray array];
|
||||||
|
NSNumber * idx = nil;
|
||||||
|
|
||||||
|
while ((idx = [idxEnumer nextObject])) {
|
||||||
|
[objects addObject:[_displayedObjects objectAtIndex:[idx intValue]]];
|
||||||
|
}
|
||||||
|
|
||||||
|
// ASSIGN(_selectedObjects,([_displayedObjects objectsAtIndexes:_selection]));
|
||||||
|
ASSIGN(_selectedObjects, objects);
|
||||||
|
}
|
||||||
|
|
||||||
return _selectedObjects;
|
return _selectedObjects;
|
||||||
}
|
}
|
||||||
|
@ -2302,13 +2315,13 @@ createObjectFailedForDataSource:_dataSource];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Deprecated
|
////Deprecated
|
||||||
-(void)editingContext:(EOEditingContext*)editingContext
|
//-(void)editingContext:(EOEditingContext*)editingContext
|
||||||
presentErrorMessage:(NSString*)message
|
// presentErrorMessage:(NSString*)message
|
||||||
{
|
//{
|
||||||
[self _presentAlertWithTitle:@"Editing context error"
|
// [self _presentAlertWithTitle:@"Editing context error"
|
||||||
message:message];
|
// message:message];
|
||||||
}
|
//}
|
||||||
|
|
||||||
-(void)_presentAlertWithTitle:(NSString*)title
|
-(void)_presentAlertWithTitle:(NSString*)title
|
||||||
message:(NSString*)message
|
message:(NSString*)message
|
||||||
|
|
|
@ -298,7 +298,7 @@ Default implementation stops automatic refresh and returns self.
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
-(GSWElement*)invokeActionForRequest:(GSWRequest*)aRequest
|
- (id <GSWActionResults>) invokeActionForRequest:(GSWRequest*)aRequest
|
||||||
inContext:(GSWContext*)aContext
|
inContext:(GSWContext*)aContext
|
||||||
{
|
{
|
||||||
//??
|
//??
|
||||||
|
|
|
@ -336,7 +336,7 @@ static SEL appendStringSel = NULL;
|
||||||
{
|
{
|
||||||
if (!_flags.composed)
|
if (!_flags.composed)
|
||||||
{
|
{
|
||||||
NSString * tmpUrl = [[NSMutableString new] autorelease];
|
NSMutableString * tmpUrl = [[NSMutableString new] autorelease];
|
||||||
|
|
||||||
if (!_flags.beginningComposed)
|
if (!_flags.beginningComposed)
|
||||||
{
|
{
|
||||||
|
|
|
@ -214,7 +214,6 @@ static Class GSWHTMLBareStringClass = Nil;
|
||||||
[tmpElementsMap subdataWithRange:
|
[tmpElementsMap subdataWithRange:
|
||||||
NSMakeRange(elementN,
|
NSMakeRange(elementN,
|
||||||
[tmpElementsMap length]-elementN)]];
|
[tmpElementsMap length]-elementN)]];
|
||||||
tmpElementsMap=tmpElementsMap;
|
|
||||||
for(rmStringN=0;rmStringN<elementN;rmStringN++)
|
for(rmStringN=0;rmStringN<elementN;rmStringN++)
|
||||||
{
|
{
|
||||||
[rmString appendString:[tmpHtmlBareStrings objectAtIndex:rmStringN]];
|
[rmString appendString:[tmpHtmlBareStrings objectAtIndex:rmStringN]];
|
||||||
|
|
Loading…
Reference in a new issue