Changeset 532

Timestamp:

01/21/10 22:12:36 (3 years ago)

Author:

joerg

Message:

 

Location:

trunk/src/sce

Files:

• codehelper/CodeHelperPane.java (modified) (1 diff)
• component/SCEDocument.java (modified) (2 diffs)
• component/SCEPaneUI.java (modified) (1 diff)
• component/SCESearch.java (modified) (8 diffs)

trunk/src/sce/codehelper/CodeHelperPane.java

@@ -414 +414 @@
     }
 
+    // begin... end completion
+    if(e.getKeyChar() == '}') {
+      String begin = "\\begin";
+
+      int index = column-1;
+      String rowString = document.getRow(row);
+      while(index > 0) {
+        char c = rowString.charAt(index);
+        if(c == '{') break;
+        if(!Character.isLetterOrDigit(c)) return;
+        index--;
+      }
+      String environment = rowString.substring(index+1, column);
+
+      int beginIndex = index - begin.length();
+      if(beginIndex < 0) return;
+      if(rowString.substring(beginIndex, index).equals(begin)) {
+        String indentation = spaces.substring(0, beginIndex);
+        pane.setFreezeCaret(true);
+        document.insert("\n" + indentation + "\\end{" + environment + "}", row, column);
+        pane.setFreezeCaret(false);
+      }
+      e.consume();
+      return;
+    }
+
     // tab completion
     if(e.getKeyCode() == KeyEvent.VK_TAB){

trunk/src/sce/component/SCEDocument.java

@@ -145 +145 @@
    */
   public void setText(String text){
+    // treat Windows line breaks
+    if(text.indexOf((char) 0x0D) != -1) {
+      StringBuilder builder = new StringBuilder(text.length());
+      int lastIndex = 0, index = -1;
+      while((index = text.indexOf((char) 0x0D, index+1)) != -1) {
+        builder.append(text.substring(lastIndex, index));
+        lastIndex = index + 1;
+      }
+      builder.append(text.substring(lastIndex));
+      text = builder.toString();
+    }
+
     clear();
     boolean editable_ = editable;
@@ -817 +829 @@
    * @param listener the listener
    */
-  public void removeSCEDocumentListener(SCESelectionListener listener){
+  public void removeSCESelectionListener(SCESelectionListener listener){
     selectionListeners.remove(listener);
   }

trunk/src/sce/component/SCEPaneUI.java

@@ -35 +35 @@
           "äöüÄÖÜß" +
           "1234567890" +
-          "^<>|+*~'#,;.:-_!\"§$%&/()=?`´\\{[]} ";
+          "^<>|+*~'#,;.:-_!\"§$%&/()=?`´\\{[]}@ ";
 
   public SCEPaneUI(SCEPane pane){

trunk/src/sce/component/SCESearch.java

@@ -2 +2 @@
 
 import javax.swing.*;
-import javax.swing.text.Document;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -144 +143 @@
         .addGap(2);
 
-    SCEPane pane = editor.getTextPane();
-    pane.addKeyListener(this);
-    pane.getDocument().addSCEDocumentListener(this);
-    pane.getDocument().addSCESelectionListener(this);
-
     layout.setHorizontalGroup(groupHorizontal);
     layout.setVerticalGroup(groupVertical);
+
+    SCEPane pane = editor.getTextPane();
+    SCEDocument document = pane.getDocument();
+    pane.addKeyListener(this);
+    document.addSCEDocumentListener(this);
+    document.addSCESelectionListener(this);
 
     updateThread = new UpdateThread();
@@ -181 +181 @@
   }
 
-  public void close() {
-    setVisible(false);
-    clearHighlights();
+  public void setVisible(boolean visibility) {
+    if(visibility) {
+      input.setText("");
+    } else {
+      clearHighlights();
+    }
+    super.setVisible(visibility);
   }
 
@@ -227 +231 @@
 
   public void actionPerformed(ActionEvent e) {
-    if(e.getSource() == buttonClose) close();
+    if(e.getSource() == buttonClose) setVisible(false);
     if(e.getSource() == caseSensitive) {
       updateThread.documentChanged();
@@ -274 +278 @@
   public void keyPressed(KeyEvent e) {
     if(e.getKeyCode() == KeyEvent.VK_ESCAPE){
-      close();
+      setVisible(false);
       e.consume();
     }
@@ -320 +324 @@
     public synchronized void searchChanged() {
       searchChanged = true;
+      if(!isVisible()) return;
       notify();
     }
@@ -325 +330 @@
     public synchronized void documentChanged() {
       documentChanged = true;
+      if(!isVisible()) return;
       notify();
     }
@@ -441 +447 @@
         }
         if(!searchChanged && !documentChanged) continue;
+        if(!isVisible()) continue;
 
         // update document information