Changeset 22820

Timestamp:

09/09/10 10:30:05 (17 months ago)

Author:

alex

Message:

Changed methods that conflict with Moose keywords, renamed other methods in turn (extends => parents, parents => ancestors)

File:

• branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Model/ClassDescriptor.pm (modified) (9 diffs)

branches/mnw21/pathquery_refactor/intermine/perl/lib/InterMine/Model/ClassDescriptor.pm

@@ -68 +68 @@
 
  Usage   : my $cd = new InterMine::Model::ClassDescriptor(model => $model,
-                             name => "Gene", extends => ["BioEntity"]);
+                             name => "Gene", parents => ["BioEntity"]);
 
  Function: create a new ClassDescriptor object
- Args    : model - the InterMine::Model that this class is a part of
-           name - the class name
-           extends - a list of the classes and interfaces that this classes
+ Args    : model   - the InterMine::Model that this class is a part of
+           name    - the class name
+           parents - a list of the classes and interfaces that this classes
                      extends
 
@@ -103 +103 @@
 );
 
-has extends => (
+has parents => (
     is         => 'ro',
     isa        => ArrayRef[Str],
@@ -128 +128 @@
 }
 
-has parents => (
-    reader     => 'get_parents',
+has ancestors => (
+    reader     => 'get_ancestors',
     isa        => ClassDescriptorList,
     lazy       => 1,
@@ -136 +136 @@
     my $self = shift;
     my @inheritance_path = ($self,);
-    my @classes = $self->extends_class_descriptors();
+    my @classes = $self->parental_class_descriptors();
     for my $class (@classes) {
-        push @inheritance_path, get_parents($class);
+        push @inheritance_path, $class->get_ancestors;
     }
     return \@inheritance_path;
@@ -152 +152 @@
 
 
-=head2 extends
-
- Usage   : @parent_class_names = $cd->extends();
+=head2 parents
+
+ Usage   : @parent_class_names = $cd->parents();
  Function: return a list of the names of the classes/interfaces that this class
            directly extends
  Args    : none
 
-=head2 extends_class_descriptors
-
- Usage   : @parent_cds = $cd->extends_class_descriptors();
+=head2 parental_class_descriptors
+
+ Usage   : @parent_cds = $cd->parental_class_descriptors();
  Function: return a list of the ClassDescriptor objects for the
            classes/interfaces that this class directly extends
@@ -167 +167 @@
 
 =cut
-has extends_class_descriptors => (
+
+has parental_class_descriptors => (
     is         => 'ro',
     isa        => ClassDescriptorList,
@@ -175 +176 @@
     my $self = shift;
     return [map {$self->model->get_classdescriptor_by_name($_)}
-            $self->extends];
+            $self->parents];
     },
 );
@@ -249 +250 @@
 
 =cut
+
 sub sub_class_of
 {
@@ -257 +259 @@
     return 1;
   } else {
-    for my $extendee_class_desc ($self->extends_class_descriptors()) {
-      if ($extendee_class_desc->sub_class_of($other_class_desc)) {
+    for my $parent ($self->parental_class_descriptors()) {
+      if ($parent->sub_class_of($other_class_desc)) {
         return 1;
       }