Author: mguesdon
Date: Thu May 29 14:05:16 2014
New Revision: 37919
URL: http://svn.gna.org/viewcvs/gnustep?rev=37919&view=rev
Log:
* GSWeb/GSWConstants.[hm]
add GSWClassName_Component
* GSWeb/GSWComponentDefinition.m
fix -componentClass to use GSWClassName_Component
Modified:
libs/gsweb/trunk/ChangeLog
libs/gsweb/trunk/GSWeb/GSWComponentDefinition.m
libs/gsweb/trunk/GSWeb/GSWConstants.h
libs/gsweb/trunk/GSWeb/GSWConstants.m
Modified: libs/gsweb/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gsweb/trunk/ChangeLog?rev=37919&r1=37918&r2=37919&view=diff
==============================================================================
--- libs/gsweb/trunk/ChangeLog (original)
+++ libs/gsweb/trunk/ChangeLog Thu May 29 14:05:16 2014
@@ -1,3 +1,8 @@
+2014-05-29 Manuel Guesdon <[email protected]>
+ * GSWeb/GSWConstants.[hm]
+ add GSWClassName_Component
+ * GSWeb/GSWComponentDefinition.m
+ fix -componentClass to use GSWClassName_Component
2014-05-29 Manuel Guesdon <[email protected]>
* GSWDatabase/WODisplayGroup.m
respect GNUstep coding standard (curly brackets placement,
indentation)
Modified: libs/gsweb/trunk/GSWeb/GSWComponentDefinition.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gsweb/trunk/GSWeb/GSWComponentDefinition.m?rev=37919&r1=37918&r2=37919&view=diff
==============================================================================
--- libs/gsweb/trunk/GSWeb/GSWComponentDefinition.m (original)
+++ libs/gsweb/trunk/GSWeb/GSWComponentDefinition.m Thu May 29 14:05:16 2014
@@ -76,7 +76,7 @@
[super init];
ASSIGN(_name, [aName stringByDeletingPathExtension]); // does it ever
happen that
ASSIGN(_className, aName); // those are
different? dw.
- _componentClass = NSClassFromString(_className);
+ ASSIGN(_componentClass,NSClassFromString(_className));
ASSIGN(_path, aPath);
ASSIGN(_url, baseURL);
ASSIGN(_frameworkName, aFrameworkName);
@@ -90,9 +90,11 @@
_instancePool = [NSMutableArray new];
_lockInstancePool = [GSWApp isConcurrentRequestHandlingEnabled];
- if ((_name != nil) && (_frameworkName != nil)) {
- _componentClass = NSClassFromString(_className);
- }
+ if (_name != nil
+ && _frameworkName != nil)
+ {
+ ASSIGN(_componentClass,NSClassFromString(_className));
+ }
myBasePath = [aPath stringByAppendingPathComponent: aName];
ASSIGN(_htmlPath,[myBasePath stringByAppendingPathExtension:@"html"]);
ASSIGN(_wodPath,[myBasePath
stringByAppendingPathExtension:GSWComponentDeclarationsSuffix[GSWebNamingConv]]);
@@ -135,7 +137,7 @@
DESTROY(_frameworkName);
DESTROY(_language);
DESTROY(_className);
- _componentClass = Nil;
+ DESTROY(_componentClass);
DESTROY(_template);
DESTROY(_htmlPath);
DESTROY(_wodPath);
@@ -419,34 +421,21 @@
/** Find the class of the component **/
-(Class) componentClass
{
- Class componentClass = Nil;
-
- if (_componentClass) {
- return _componentClass;
- }
-
- componentClass = _componentClass;
- if (!componentClass) {
- componentClass=NSClassFromString(_name);//???
- }
- if (!componentClass) // There's no class with that name
- {
- BOOL createClassesOk=NO;
- NSString* superClassName=nil;
- // If we haven't found a superclass, use GSWComponent as the superclass
- if (!superClassName)
- superClassName=@"WOComponent";
- // Create class
- createClassesOk=[GSWApplication createUnknownComponentClasses:[NSArray
arrayWithObject:_name]
- superClassName:superClassName];
-
- // Use it
- componentClass=NSClassFromString(_name);
- };
- //call GSWApp isCaching
- _componentClass=componentClass;
-
- return componentClass;
+ if (_componentClass==Nil)
+ {
+ ASSIGN(_componentClass,NSClassFromString(_name));
+ if (_componentClass==Nil) // There's no class with that name
+ {
+ BOOL createClassesOk=NO;
+ // Create class with GSWComponent as the superclass
+ createClassesOk=[GSWApplication
createUnknownComponentClasses:[NSArray arrayWithObject:_name]
+
superClassName:GSWClassName_Component[GSWebNamingConv]];
+
+ ASSIGN(_componentClass,NSClassFromString(_name));
+ };
+ }
+
+ return _componentClass;
};
//--------------------------------------------------------------------
Modified: libs/gsweb/trunk/GSWeb/GSWConstants.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gsweb/trunk/GSWeb/GSWConstants.h?rev=37919&r1=37918&r2=37919&view=diff
==============================================================================
--- libs/gsweb/trunk/GSWeb/GSWConstants.h (original)
+++ libs/gsweb/trunk/GSWeb/GSWConstants.h Thu May 29 14:05:16 2014
@@ -94,6 +94,7 @@
GSWEB_EXPORT NSString* GSWClassName_ResourceManager[2];
GSWEB_EXPORT NSString* GSWClassName_StatisticsStore[2];
GSWEB_EXPORT NSString* GSWClassName_ServerSessionStore[2];
+GSWEB_EXPORT NSString* GSWClassName_Component[2];
GSWEB_EXPORT NSString* GSWClassName_DefaultAdaptor[2];
GSWEB_EXPORT NSString* GSWClassName_DefaultContext[2];
GSWEB_EXPORT NSString* GSWClassName_DefaultResponse[2];
Modified: libs/gsweb/trunk/GSWeb/GSWConstants.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gsweb/trunk/GSWeb/GSWConstants.m?rev=37919&r1=37918&r2=37919&view=diff
==============================================================================
--- libs/gsweb/trunk/GSWeb/GSWConstants.m (original)
+++ libs/gsweb/trunk/GSWeb/GSWConstants.m Thu May 29 14:05:16 2014
@@ -90,6 +90,7 @@
NSString* GSWClassName_ResourceManager[2]={ @"GSWResourceManager",
@"WOResourceManager" };
NSString* GSWClassName_StatisticsStore[2]={ @"GSWStatisticsStore",
@"WOStatisticsStore" };
NSString* GSWClassName_ServerSessionStore[2]={ @"GSWServerSessionStore",
@"WOServerSessionStore" };
+NSString* GSWClassName_Component[2]={ @"GSWComponent", @"WOComponent" };
NSString* GSWClassName_DefaultAdaptor[2]={ @"GSWDefaultAdaptor",
@"WODefaultAdaptor" };
NSString* GSWClassName_DefaultContext[2]={ @"GSWContext", @"WOContext" };
NSString* GSWClassName_DefaultResponse[2]={ @"GSWResponse", @"WOResponse" };
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
