--- parser3/src/classes/classes.C	2009/08/11 10:50:50	1.24
+++ parser3/src/classes/classes.C	2016/04/01 16:27:31	1.28
@@ -1,20 +1,20 @@
 /** @file
 	Parser: @b Methoded and Methoded_array classes.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_CLASSES_C="$Date: 2009/08/11 10:50:50 $";
-
 #include "classes.h"
 #include "pa_request.h"
 
+volatile const char * IDENT_CLASSES_C="$Id: classes.C,v 1.28 2016/04/01 16:27:31 moko Exp $" IDENT_CLASSES_H;
+
 // Methoded
 
 void Methoded::register_directly_used(Request& r) {
 	if(used_directly()) {
-		r.classes().put(name(), this);
+		r.classes().put(type(), this);
 	}
 
 	// prevent system classes from modification [calling set_method]
@@ -41,24 +41,21 @@ Methoded_array::Methoded_array() {
 }
 
 static void configure_admin_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->configure_admin(*r);
+	methoded->configure_admin(*r);
 }
 void Methoded_array::configure_admin(Request& r) {
 	for_each(configure_admin_one, &r);
 }
 
 static void configure_user_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->configure_user(*r);
+	methoded->configure_user(*r);
 }
 void Methoded_array::configure_user(Request& r) {
 	for_each(configure_user_one, &r);
 }
 
 static void register_one(Methoded_array::element_type methoded, Request *r) {
-	if(methoded)
-		methoded->register_directly_used(*r);
+	methoded->register_directly_used(*r);
 }
 void Methoded_array::register_directly_used(Request& r) {
 	for_each(register_one, &r);