Changeset 470

Timestamp:

10/26/08 02:14:21 (3 years ago)

Author:

szabgab

Message:

move the methods returning a single document to the Padre::Documents class

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Padre/Document.pm (modified) (1 diff)
• lib/Padre/Documents.pm (added)
• lib/Padre/Wx/MainWindow.pm (modified) (5 diffs)
• lib/Padre/Wx/Menu.pm (modified) (7 diffs)

trunk/MANIFEST

@@ -10 +10 @@
 lib/Padre/DB.pm
 lib/Padre/Document.pm
+lib/Padre/Documents.pm
 lib/Padre/PluginManager.pm
 lib/Padre/Project.pm

trunk/lib/Padre/Document.pm

@@ -147 +147 @@
 our $DEFAULT_LEXER = wxSTC_LEX_AUTOMATIC;
 
-### DODGY HACK
-# This is a temporary method that can generate an "anonymous"
-# document for whatever is in the current buffer. The document
-# is not saved or cached anywhere.
-# This method may be changed to work properly later, but for now
-# feel free to use it wherever needed.
-sub from_selection {
-    $_[0]->from_pageid( $_[0]->notebook->GetSelection );
-}
-
-sub from_pageid {
-    my $class   = shift;
-    my $pageid  = shift;
-
-    # TODO maybe report some error?
-    return if not defined $pageid or $pageid =~ /\D/;
-
-    if ( $pageid == -1 ) {
-        # No page selected
-        return;
-    }
-
-    return if $pageid >= $class->notebook->GetPageCount;
-
-    my $page = $class->notebook->GetPage( $pageid );
-
-    return $page->{Document};
-}
-
-
-
-
-
-#####################################################################
-# Class Methods
-
-sub notebook {
-    Padre->ide->wx->main_window->{notebook};
-}
-
-
-
 
 

trunk/lib/Padre/Wx/MainWindow.pm

@@ -19 +19 @@
 use Padre::Wx::ToolBar ();
 use Padre::Wx::Output  ();
+use Padre::Documents   ();
 
 use base qw{Wx::Frame};
@@ -341 +342 @@
 
 sub selected_document {
-    Padre::Document->from_selection;
+    Padre::Documents->from_selection;
 }
 
@@ -850 +851 @@
     # and it is unused, close it.
     if ( $self->{notebook}->GetPageCount == 1 ) {
-        if ( Padre::Document->from_selection->is_unused ) {
+        if ( Padre::Documents->from_selection->is_unused ) {
             $self->on_close;
         }
@@ -935 +936 @@
     my $self = shift;
     foreach my $id ( $self->pageids ) {
-        my $doc = Padre::Document->from_pageid($id);
+        my $doc = Padre::Documents->from_pageid($id);
         $self->on_save( $doc ) or return 0;
     }
@@ -1244 +1245 @@
 
 sub _DOCUMENT {
-    return (defined $_[0]) ? Padre::Document->from_pageid($_[0]) : Padre::Document->from_selection;
+    return (defined $_[0]) ? Padre::Documents->from_pageid($_[0]) : Padre::Documents->from_selection;
 }
 

trunk/lib/Padre/Wx/Menu.pm

@@ -6 +6 @@
 use Params::Util qw{_INSTANCE};
 
-use Padre::Wx    ();
-use Padre::Util  ();
+use Padre::Wx        ();
+use Padre::Util      ();
+use Padre::Documents ();
 
 our $VERSION = '0.12';
@@ -99 +100 @@
             sub { 
                 if ( $_[ 0 ]->{notebook}->GetPageCount == 1 ) {
-                    if ( Padre::Document->from_selection->is_unused ) {
+                    if ( Padre::Documents->from_selection->is_unused ) {
                         $_[0]->on_close;
                     }
@@ -138 +139 @@
         $menu->{edit}->Append( Wx::wxID_UNDO, '' ),
         sub {
-            my $page = Padre::Document->from_selection->editor;
+            my $page = Padre::Documents->from_selection->editor;
             if ( $page->CanUndo ) {
                 $page->Undo;
@@ -148 +149 @@
         $menu->{edit}->Append( Wx::wxID_REDO, '' ),
         sub {
-            my $page = Padre::Document->from_selection->editor;
+            my $page = Padre::Documents->from_selection->editor;
             if ( $page->CanRedo ) {
                 $page->Redo;
@@ -277 +278 @@
         $menu->{perl_find_unmatched},
         sub {
-            my $doc = Padre::Document->from_selection;
+            my $doc = Padre::Documents->from_selection;
             unless ( $doc and $doc->isa('Padre::Document::Perl') ) {
                 return;
@@ -437 +438 @@
             sub {
                 $DB::single = 1;
-                my $document = Padre::Document->from_selection;
+                my $document = Padre::Documents->from_selection;
                 $_[0]->{menu}->refresh( $document );
                 $_[0]->SetMenuBar( $_[0]->{menu}->{wx} );
@@ -449 +450 @@
             sub {
                 my $self = shift;
-                my $code = Padre::Document->from_selection->text_get;
+                my $code = Padre::Documents->from_selection->text_get;
                 eval $code;
                 if ($@) {