Changeset 958

Timestamp:

01/14/11 23:59:28 (2 years ago)

Author:

stefan

Message:

mark invalid files after \bibliography red + enable quick jump to bib entries

Location:

trunk

Files:

• data/codehelper/commands.xml (modified) (1 diff)
• src/jlatexeditor/codehelper/BackgroundParser.java (modified) (9 diffs)
• src/jlatexeditor/codehelper/BibParser.java (modified) (5 diffs)
• src/jlatexeditor/codehelper/JumpTo.java (modified) (1 diff)
• src/jlatexeditor/JLatexEditorJFrame.java (modified) (1 diff)
• src/jlatexeditor/tools/SVN.java (modified) (3 diffs)
• src/sce/codehelper/CodeHelperPane.java (modified) (4 diffs)
• src/util/Tuple.java (moved) (moved from trunk/src/util/Pair.java) (1 diff)

trunk/data/codehelper/commands.xml

@@ -136 +136 @@
 
   <command name="\bibliography" usage="\bibliography{@file@}" hint="set bibliography file">
-    <argument name="file" value="" completion="true" hint="filename of the bibliography file"/>
+    <argument name="file" type="file" value="" completion="true" hint="filename of the bibliography file"/>
   </command>
 

trunk/src/jlatexeditor/codehelper/BackgroundParser.java

@@ -27 +27 @@
 
   private long bibModified = 0;
-  private ArrayList<BibEntry> bibEntries = new ArrayList<BibEntry>();
+  private ArrayList<FilePos<BibEntry>> bibEntries = new ArrayList<FilePos<BibEntry>>();
 
   private HashSet<File> files = new HashSet<File>();
@@ -35 +35 @@
   private Trie<FilePos> labelDefs = new Trie<FilePos>();
   private Trie<FilePos> labelRefs = new Trie<FilePos>();
-  private Trie<BibEntry> cites = new Trie<BibEntry>();
+  private Trie<FilePos<BibEntry>> cites = new Trie<FilePos<BibEntry>>();
 
   private DefaultTreeModel structure = new DefaultTreeModel(new DefaultMutableTreeNode());
@@ -47 +47 @@
   }
 
-  public ArrayList<BibEntry> getBibEntries() {
+  public ArrayList<FilePos<BibEntry>> getBibEntries() {
     return bibEntries;
   }
@@ -71 +71 @@
   }
 
-  public Trie<BibEntry> getCites() {
+  public Trie<FilePos<BibEntry>> getCites() {
     return cites;
   }
@@ -279 +279 @@
 
     bibEntries = BibParser.parseBib(bibFile);
-    cites = new Trie<BibEntry>();
-    for (BibEntry bibEntry : bibEntries) {
-      cites.add(bibEntry.getEntryName(), bibEntry);
+    cites = new Trie<FilePos<BibEntry>>();
+    for (FilePos<BibEntry> bibEntry : bibEntries) {
+      cites.add(bibEntry.getName(), bibEntry);
     }
   }
@@ -289 +289 @@
     ArrayList<BibEntry> entries = new ArrayList<BibEntry>();
 
-    for (BibEntry entry : bibEntries) {
+    for (FilePos<BibEntry> entry : bibEntries) {
       boolean all = true;
       for (String key : keys) {
-        if (entry.getText().toLowerCase().indexOf(key) == -1) {
+        if (entry.getElement().getText().toLowerCase().indexOf(key) == -1) {
           all = false;
           break;
         }
       }
-      if (all) entries.add(entry);
+      if (all) entries.add(entry.getElement());
     }
 
@@ -329 +329 @@
   }
 
-  public static class FilePos extends DefaultMutableTreeNode {
+  public static class FilePos<E> extends DefaultMutableTreeNode {
     private String name;
 
     private String file;
     private int lineNr;
+
+    private E element;
 
     public FilePos(String name, String file, int lineNr) {
@@ -341 +343 @@
     }
 
+    public FilePos(String name, String file, int lineNr, E element) {
+      super(element);
+      this.name = name;
+      this.file = file;
+      this.lineNr = lineNr;
+      this.element = element;
+    }
+
     public String getName() {
       return name;
@@ -351 +361 @@
     public int getLineNr() {
       return lineNr;
+    }
+
+    public E getElement() {
+      return element;
     }
 

trunk/src/jlatexeditor/codehelper/BibParser.java

@@ -12 +12 @@
  */
 public class BibParser {
-  public static ArrayList<BibEntry> parseBib(File file) {
-    ArrayList<BibEntry> results = new ArrayList<BibEntry>();
+  public static ArrayList<BackgroundParser.FilePos<BibEntry>> parseBib(File file) {
+    ArrayList<BackgroundParser.FilePos<BibEntry>> results = new ArrayList<BackgroundParser.FilePos<BibEntry>>();
 
     String bib;
@@ -22 +22 @@
     }
 
+    int lineNr = 0;
+    int lastAt = 0;
     int at = -1;
     while ((at = bib.indexOf("@", at + 1)) != -1) {
+      lineNr += countNewLinesBetween(bib, lastAt, at);
+
       int openBracket = bib.indexOf('{', at);
       if (openBracket == -1) break;
@@ -36 +40 @@
 
       BibEntry entry = new BibEntry();
+      BackgroundParser.FilePos<BibEntry> filePos = new BackgroundParser.FilePos<BibEntry>(name, file.getAbsolutePath(), lineNr, entry);
 
       int index = comma + 1;
@@ -60 +65 @@
                       entry.getYear()
       );
-      results.add(entry);
+      results.add(filePos);
+
+      lastAt = at;
     }
 
@@ -66 +73 @@
   }
 
-  private static String removeBraces(String string) {
+  private static int countNewLinesBetween(String bib, int start, int end) {
+    int count = 0;
+    for (int i = start; i < end; i++) {
+      if (bib.charAt(i) == '\n') count++;
+    }
+    return count;
+  }
+
+  private static String removeBraces(String string) {
     if (string.startsWith("{") || string.startsWith("\"")) string = string.substring(1);
     if (string.endsWith("}") || string.endsWith("\"")) string = string.substring(0, string.length() - 1);

trunk/src/jlatexeditor/codehelper/JumpTo.java

@@ -86 +86 @@
             return;
           }
+        } else
+        if (command.equals("cite")) {
+          BackgroundParser.FilePos filePos = backgroundParser.getCites().get(word.word);
+          if (filePos != null) {
+            jLatexEditorJFrame.open(new FileDoc(new File(filePos.getFile())), filePos.getLineNr());
+            return;
+          }
         }
       }

trunk/src/jlatexeditor/JLatexEditorJFrame.java

@@ -1213 +1213 @@
               "");
       if (message != null) {
-        Pair<Boolean, String> result = null;
+        Tuple<Boolean, String> result = null;
         try {
           result = SVN.getInstance().commit(getMainEditor().getFile().getParentFile(), message);

trunk/src/jlatexeditor/tools/SVN.java

@@ -1 +1 @@
 package jlatexeditor.tools;
 
-import util.Pair;
+import util.Tuple;
 import util.ProcessUtil;
 import util.StreamUtils;
@@ -62 +62 @@
   }
 
-  public synchronized Pair<Boolean, String> commit(File dir, String message) throws Exception {
+  public synchronized Tuple<Boolean, String> commit(File dir, String message) throws Exception {
     message = message.replace('"', ' ');
     message = message.replace('\\', ' ');
@@ -92 +92 @@
     checkProcessResult(svn, "SVN update");
 
-    return new Pair<Boolean, String>(success, builder.toString());
+    return new Tuple<Boolean, String>(success, builder.toString());
   }
 

trunk/src/sce/codehelper/CodeHelperPane.java

@@ -2 +2 @@
 
 import sce.component.*;
-import util.Pair;
+import util.Tuple;
 
 import javax.swing.*;
@@ -224 +224 @@
 
     // set the caret position and remove it from template
-    Pair<String, SCEDocumentPosition> pair = getTransformedTemplate(templateWithAt, arguments, row, column);
+    Tuple<String, SCEDocumentPosition> pair = getTransformedTemplate(templateWithAt, arguments, row, column);
     templateWithAt = pair.first;
 
@@ -303 +303 @@
   }
 
-  private Pair<String, SCEDocumentPosition> getTransformedTemplate(String templateWithAt, ArrayList<CHCommandArgument> arguments, int row, int column) {
+  private Tuple<String, SCEDocumentPosition> getTransformedTemplate(String templateWithAt, ArrayList<CHCommandArgument> arguments, int row, int column) {
     int cursorIndex = templateWithAt.lastIndexOf("@|@");
     if (cursorIndex != -1) {
@@ -324 +324 @@
     }
 
-    return new Pair<String,SCEDocumentPosition>(templateWithAt, document.createDocumentPosition(caret_row, caret_column));
+    return new Tuple<String,SCEDocumentPosition>(templateWithAt, document.createDocumentPosition(caret_row, caret_column));
   }
 

trunk/src/util/Tuple.java

@@ -1 +1 @@
 package util;
 
-public class Pair<S, T> {
+public class Tuple<S, T> {
   public S first;
   public T second;
 
-  public Pair(S first, T second) {
+  public Tuple(S first, T second) {
     this.first = first;
     this.second = second;