From 3ff3e1022fe109f5725d6964737f8c26ee041dc1 Mon Sep 17 00:00:00 2001
From: Magnus Johansson <kkckkc@gmail.com>
Date: Tue, 16 Aug 2011 11:03:46 +0200
Subject: [PATCH] Refactorings and some find improvements

---
 .../kkckkc/jsourcepad/ui/dialog/find/FindDialog.java     | 9 +++++++++
 .../main/java/kkckkc/jsourcepad/model/Application.java   | 5 -----
 editor/src/main/java/kkckkc/jsourcepad/model/Buffer.java | 5 ++---
 .../main/java/kkckkc/jsourcepad/model/BufferImpl.java    | 2 +-
 editor/src/main/java/kkckkc/jsourcepad/model/Finder.java | 2 ++
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/editor-ui/src/main/java/kkckkc/jsourcepad/ui/dialog/find/FindDialog.java b/editor-ui/src/main/java/kkckkc/jsourcepad/ui/dialog/find/FindDialog.java
index ce52000..a7f870f 100644
--- a/editor-ui/src/main/java/kkckkc/jsourcepad/ui/dialog/find/FindDialog.java
+++ b/editor-ui/src/main/java/kkckkc/jsourcepad/ui/dialog/find/FindDialog.java
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.annotation.PostConstruct;
+import javax.swing.*;
 import java.awt.Dialog.ModalityType;
 import java.awt.*;
 import java.awt.event.ActionEvent;
@@ -112,6 +113,10 @@ private void next() {
 
         view.getReplace().setEnabled(findCommand.isFound());
         updateHistory(findCommand, true, false);
+
+        if (! findCommand.isFound()) {
+            JOptionPane.showMessageDialog(view.getJDialog(), "No more found");
+        }
     }
 
     private void previous() {
@@ -123,6 +128,10 @@ private void previous() {
 
         view.getReplace().setEnabled(findCommand.isFound());
         updateHistory(findCommand, true, false);
+
+        if (! findCommand.isFound()) {
+            JOptionPane.showMessageDialog(view.getJDialog(), "No more found");
+        }
     }
 
     private void replace() {
diff --git a/editor/src/main/java/kkckkc/jsourcepad/model/Application.java b/editor/src/main/java/kkckkc/jsourcepad/model/Application.java
index 2a5cd70..eeaddbb 100644
--- a/editor/src/main/java/kkckkc/jsourcepad/model/Application.java
+++ b/editor/src/main/java/kkckkc/jsourcepad/model/Application.java
@@ -20,7 +20,6 @@
 import kkckkc.syntaxpane.parse.grammar.textmate.ColorUtils;
 import kkckkc.syntaxpane.style.*;
 import kkckkc.utils.io.FileUtils;
-import org.mortbay.jetty.servlet.Context;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 
@@ -102,10 +101,6 @@ public SettingsManager getSettingsManager() {
         return settingsManager;
     }
 
-    public Context getHttpServer() {
-	    return beanFactory.getBean(Context.class);
-    }
-
 	public ExecutorService getThreadPool() {
 	    return threadPool;
     }
diff --git a/editor/src/main/java/kkckkc/jsourcepad/model/Buffer.java b/editor/src/main/java/kkckkc/jsourcepad/model/Buffer.java
index 4359bdc..4bca43a 100644
--- a/editor/src/main/java/kkckkc/jsourcepad/model/Buffer.java
+++ b/editor/src/main/java/kkckkc/jsourcepad/model/Buffer.java
@@ -12,7 +12,6 @@
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.text.JTextComponent;
-import javax.swing.text.Keymap;
 import java.io.BufferedReader;
 import java.io.IOException;
 
@@ -65,7 +64,7 @@ public enum ScrollAlignment { TOP, MIDDLE }
 	// Text manipulation
 	public String getText(Interval interval);
 	public void insertText(int position, String content, @Nullable Anchor[] anchors);
-	public void replaceText(Interval interval, String content, Anchor[] anchors);
+	public void replaceText(Interval interval, String content, @Nullable Anchor[] anchors);
 	
 	public void remove(Interval interval);
 
@@ -104,7 +103,7 @@ public enum Direction { Forward, Backward }
 	public ActionMap getActionMap();
 
     public Finder getFinder();
-    public Finder newFinder(Interval scope, String searchFor, Finder.Options options);
+    public Finder newFinder(@Nullable Interval scope, String searchFor, Finder.Options options);
 
 
     public void undo();
diff --git a/editor/src/main/java/kkckkc/jsourcepad/model/BufferImpl.java b/editor/src/main/java/kkckkc/jsourcepad/model/BufferImpl.java
index f345ace..c739296 100644
--- a/editor/src/main/java/kkckkc/jsourcepad/model/BufferImpl.java
+++ b/editor/src/main/java/kkckkc/jsourcepad/model/BufferImpl.java
@@ -582,7 +582,7 @@ public void scrollTo(int position, ScrollAlignment scrollAlignment) {
         try {
             Rectangle re = this.textComponent.modelToView(position);
             if (scrollAlignment == ScrollAlignment.MIDDLE)
-                re.translate(0, this.textComponent.getVisibleRect().height / 2);
+                re.translate(0, - this.textComponent.getVisibleRect().height / 2);
             JViewport jvp = (JViewport) this.textComponent.getParent();
             jvp.setViewPosition(re.getLocation());
         } catch (BadLocationException e) {
diff --git a/editor/src/main/java/kkckkc/jsourcepad/model/Finder.java b/editor/src/main/java/kkckkc/jsourcepad/model/Finder.java
index 41a25fe..2141404 100644
--- a/editor/src/main/java/kkckkc/jsourcepad/model/Finder.java
+++ b/editor/src/main/java/kkckkc/jsourcepad/model/Finder.java
@@ -46,6 +46,7 @@ public Interval forward(int position) {
         Interval interval = findForward(position);
         if (interval != null) {
             buffer.setSelection(interval);
+            buffer.scrollTo(interval.getStart(), Buffer.ScrollAlignment.MIDDLE);
         }
 
         return interval;
@@ -55,6 +56,7 @@ public Interval backward(int position) {
         Interval interval = findBackward(position);
         if (interval != null) {
             buffer.setSelection(interval);
+            buffer.scrollTo(interval.getStart(), Buffer.ScrollAlignment.MIDDLE);
         }
 
         return interval;