Changeset 22829

Timestamp:

09/09/10 10:44:31 (17 months ago)

Author:

alex

Message:

Changed method names to deal with changes to ClassDescriptor?

File:

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

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

@@ -2 +2 @@
 
 use Carp qw/confess/;
-use vars qw{ $AUTOLOAD };
 use Scalar::Util qw(weaken);
 
@@ -34 +33 @@
     my $model = $self->{model};
     if ($args->{Name} eq "class") {
-        my @extends = ();
+        my @parents = ();
         if (exists $args->{Attributes}{extends}) {
-        @extends = split /\s+/, $args->{Attributes}{extends};
-        @extends = grep { $_ ne 'java.lang.Object' } @extends;
-        map { s/.*\.(.*)/$1/ } @extends;
+        @parents = split /\s+/, $args->{Attributes}{extends};
+        @parents = grep { $_ ne 'java.lang.Object' } @parents;
+         # strip off any preceding class path (eg. "org.intermine.")
+        map { s/.*\.(.*)/$1/ } @parents;
         }
         $self->{current_class} =
@@ -44 +44 @@
             model   => $model,
             name    => $nameattr,
-            extends => [@extends]
+            parents => [@parents]
         );
         weaken($self->{current_class}->{model});
@@ -258 +258 @@
   }
 
-  my @extends = $cd->extends();
-
-  for my $extendee_name (@extends) {
-    my $extendee = $self->get_classdescriptor_by_name($extendee_name);
-
-    push @fields, $self->_get_fields($extendee);
+  for my $parent ($cd->parental_class_descriptors) {
+    push @fields, $self->_get_fields($parent);
   }
 
@@ -278 +274 @@
 
 =cut
+
 sub get_classdescriptor_by_name {
     my $self = shift;
@@ -294 +291 @@
     }
 
-    my $class = $self->{class_hash}{$classname} || $self->{class_hash}{$self->{package_name} . $classname};
+    my $class =
+    $self->{class_hash}{$classname} ||
+        $self->{class_hash}{$self->{package_name} . $classname};
     confess "$classname not in the model" unless $class;
     return $class;
@@ -350 +349 @@
 
 =cut
+
 sub package_name
 {
@@ -364 +364 @@
 
 =cut
+
 sub model_name
 {