Changeset 847

Timestamp:

11/09/08 02:30:39 (3 years ago)

Author:

szabgab

Message:

rebless document when saved with a different extension

Location:

trunk/lib/Padre

Files:

• Document.pm (modified) (2 diffs)
• Wx/MainWindow.pm (modified) (1 diff)

trunk/lib/Padre/Document.pm

@@ -181 +181 @@
         $self->set_mimetype( $self->guess_mimetype );
     }
-    $self->rebless($class);
+    $self->rebless;
 
     return $self;
@@ -187 +187 @@
 
 sub rebless {
-    my ($self, $class) = @_;
-
-    # If we blessed as the base class, and the mime type has a
-    # specific subclass, rebless it.
+    my ($self) = @_;
+
+    # Rebless as either to a subclass if there is a mime-type or
+    # to the the base class, 
     # This isn't exactly the most elegant way to do this, but will
     # do for a first implementation.
-    if ( $class eq __PACKAGE__ ) {
-        my $subclass = $MIME_CLASS{$self->mimetype};
-        if ( $subclass ) {
-            Class::Autouse->autouse($subclass);
-            bless $self, $subclass;
-        }
+    my $subclass = $MIME_CLASS{$self->mimetype} || __PACKAGE__;
+    if ( $subclass ) {
+        Class::Autouse->autouse($subclass);
+        bless $self, $subclass;
     }
     

trunk/lib/Padre/Wx/MainWindow.pm

@@ -1052 +1052 @@
     $doc->set_mimetype( $doc->guess_mimetype );
     $doc->editor->padre_setup;
+    $doc->rebless;
 
     $self->refresh_all;