Changeset 9649

Timestamp:

12/13/09 00:36:26 (2 years ago)

Author:

szabgab

Message:

move the open selector to the document class

Location:

trunk/Padre/lib/Padre

Files:

• Document.pm (modified) (1 diff)
• Document/Perl.pm (modified) (1 diff)
• Wx/Main.pm (modified) (1 diff)

trunk/Padre/lib/Padre/Document.pm

@@ -1384 +1384 @@
 }
 
+# Individual document classes should override this method
+# It gets a string (the current selection) and it should
+# return a list of files that are possible matches to that file.
+# In Perl for example A::B  would be mapped to A/B.pm in various places on
+# the filesystem.
+sub guess_filename_to_open {
+    return;
+}
+
 1;
 

trunk/Padre/lib/Padre/Document/Perl.pm

@@ -1728 +1728 @@
 
 
+sub guess_filename_to_open {
+    my ($self, $text) =  @_;
+
+    my $module = $text;
+    $module =~ s{::}{/}g;
+    $module .= ".pm";
+    my @files;
+    my $filename = File::Spec->catfile( Padre->ide->{original_cwd}, $module, );
+    if ( -e $filename ) {
+        push @files, $filename;
+    } else {
+
+        # relative to the project lib dir
+        my $filename = File::Spec->catfile(
+            $self->project_dir,
+            'lib', $module,
+        );
+        if ( -e $filename ) {
+            push @files, $filename;
+        }
+
+        # relative to the project dir
+        my $filename2 = File::Spec->catfile(
+            $self->project_dir,
+            $module,
+        );
+        if ( -e $filename2 ) {
+            push @files, $filename2;
+        }
+
+        # TO DO: it should not be our @INC but the @INC of the perl used for
+        # script execution
+        foreach my $path (@INC) {
+            my $filename = File::Spec->catfile( $path, $module );
+            if ( -e $filename ) {
+                push @files, $filename;
+
+                #last;
+            }
+        }
+    }
+    
+    return @files;
+}
+
+
 1;
 

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -2930 +2930 @@
         }
     }
-    unless (@files) { # TO DO: and if we are in a Perl environment
-        my $module = $text;
-        $module =~ s{::}{/}g;
-        $module .= ".pm";
-        my $filename = File::Spec->catfile( $self->ide->{original_cwd}, $module, );
-        if ( -e $filename ) {
-            push @files, $filename;
-        } else {
-
-            # relative to the project lib dir
-            my $filename = File::Spec->catfile(
-                $self->current->document->project_dir,
-                'lib', $module,
-            );
-            if ( -e $filename ) {
-                push @files, $filename;
-            }
-
-            # relative to the project dir
-            my $filename2 = File::Spec->catfile(
-                $self->current->document->project_dir,
-                $module,
-            );
-            if ( -e $filename2 ) {
-                push @files, $filename2;
-            }
-
-            # TO DO: it should not be our @INC but the @INC of the perl used for
-            # script execution
-            foreach my $path (@INC) {
-                my $filename = File::Spec->catfile( $path, $module );
-                if ( -e $filename ) {
-                    push @files, $filename;
-
-                    #last;
-                }
-            }
-        }
+    unless (@files) {
+        my $doc = $self->current->document;
+        push @files, $doc->guess_filename_to_open($text);
     }