Changeset 119

Timestamp:

10/13/02 16:16:49 (21 years ago)

Author:

piso

Message:

findMatchingTags(): support relative directories in tag path; avoid NPE if
directory is null.

File:

• trunk/j/src/org/armedbear/j/TagCommands.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/TagCommands.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: TagCommands.java,v 1.3 2002-10-12 13:07:49 piso Exp $
+ * $Id: TagCommands.java,v 1.4 2002-10-13 16:16:49 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -138 +138 @@
             // No exact match in the current buffer. Look in the current
             // directory.
-            list =
-                TagCommands.findMatchingTagsInDirectory(expression,
-                    buffer.getCurrentDirectory(), mode);
+            final File currentDirectory = buffer.getCurrentDirectory();
+            list = findMatchingTagsInDirectory(expression, currentDirectory,
+                                               mode);
             if (list == null) {
                 // Look at all the directories in the buffer's tag path.
@@ -147 +147 @@
                     for (int i = 0; i < dirs.size(); i++) {
                         String dir = (String) dirs.get(i);
-                        File directory = File.getInstance(dir);
-                        if (directory.equals(buffer.getCurrentDirectory()))
+                        File directory =
+                            File.getInstance(currentDirectory, dir);
+                        if (directory == null)
+                            continue;
+                        if (directory.equals(currentDirectory))
                             continue;
                         List tagsInDir =
-                            TagCommands.findMatchingTagsInDirectory(expression,
-                                directory, mode);
+                            findMatchingTagsInDirectory(expression, directory,
+                                                        mode);
                         if (tagsInDir != null) {
                             if (list == null)