Changeset 661

Timestamp:

02/04/10 21:53:25 (3 years ago)

Author:

joerg

Message:

 

Location:

trunk/src/jlatexeditor

Files:

• gui/StatusBar.java (modified) (10 diffs)
• JLatexEditorJFrame.java (modified) (2 diffs)

trunk/src/jlatexeditor/gui/StatusBar.java

@@ -10 +10 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.awt.geom.Rectangle2D;
 import java.io.File;
@@ -17 +19 @@
  * StatusBar.
  */
-public class StatusBar extends JPanel implements ActionListener {
+public class StatusBar extends JPanel implements ActionListener, MouseListener {
   private JLatexEditorJFrame jLatexEditor;
 
@@ -24 +26 @@
   private JPanel left = new JPanel();
 
-  private boolean checkForUpdates = true;
+  private boolean hadException = false;
   private JLabel updatesAvailable = new JLabel("SVN updates are available.");
+  private CheckForUpdates updateChecker = new CheckForUpdates();
 
   private ArrayList<String> messges = new ArrayList<String>();
@@ -45 +48 @@
     updatesAvailable.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEtchedBorder(), BorderFactory.createEmptyBorder(1,3,1,3)));
     updatesAvailable.setVisible(false);
+    updatesAvailable.addMouseListener(this);
     center.add(updatesAvailable);
 
@@ -50 +54 @@
     setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
 
-    new CheckForUpdates().start();
+    updateChecker.start();
   }
 
@@ -58 +62 @@
   }
 
-  public synchronized void checkForUpdates() {
-    if(!checkForUpdates) return;
+  public void checkForUpdates() {
+    updateChecker.check();
+  }
 
+  private synchronized void checkForUpdates_() {
     boolean hasUpdates = false;
 
@@ -66 +72 @@
     if(!file.exists()) return;
     File dir = file.getParentFile();
+    if(!new File(dir, ".svn").exists()) return;
+    
     try {
       ArrayList<SVN.StatusResult> results = SVN.getInstance().status(dir);
@@ -72 +80 @@
       }
     } catch (Exception e) {
-      e.printStackTrace();
-      checkForUpdates = false;
+      if(!hadException) e.printStackTrace();
+      hadException = true;
     }
 
-    System.out.println(hasUpdates);
-    updatesAvailable.setVisible(hasUpdates);
+    setUpdatesAvailableVisible(hasUpdates);
   }
 
@@ -86 +93 @@
   public void actionPerformed(ActionEvent e) {
     checkForUpdates();
+  }
+
+  public void mouseClicked(MouseEvent e) {
+  }
+
+  public void mousePressed(MouseEvent e) {
+    setUpdatesAvailableVisible(false);
+    jLatexEditor.actionPerformed(new ActionEvent(this, 0, "svn update"));
+  }
+
+  public void mouseReleased(MouseEvent e) {
+  }
+
+  public void mouseEntered(MouseEvent e) {
+  }
+
+  public void mouseExited(MouseEvent e) {
   }
 
@@ -127 +151 @@
     }
 
+    public synchronized void check() {
+      notifyAll();
+    }
+
     public void run() {
-      checkForUpdates();
+      while(true) {
+        checkForUpdates_();
 
-      try {
-        synchronized (this) { wait(120000); }
-      } catch (InterruptedException e) { }
+        try {
+          synchronized (this) { wait(120000); }
+        } catch (InterruptedException e) { }
+      }
     }
   }

trunk/src/jlatexeditor/JLatexEditorJFrame.java

@@ -697 +697 @@
       checkExternalModification(false);
       statusBar.showMessage("SVN update", builder.toString());
+      statusBar.setUpdatesAvailableVisible(false);
     } else
     // svn commit
@@ -1021 +1022 @@
 
         backgroundParser.parse();
+        statusBar.checkForUpdates();
       }
       if(closeIcon.contains(e.getX() - closeIcon.getX(), e.getY() - closeIcon.getY())) {