tail-cvs

[Márcio V. d. S. <mv...@us...>]

Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9607/src/java/net/sf/tails/swing/frame/autocomplete

Modified Files:
	AutoCompleteFrame.java 
Log Message:


Index: AutoCompleteFrame.java
===================================================================
RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete/AutoCompleteFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AutoCompleteFrame.java	31 Oct 2007 22:42:55 -0000	1.4
--- AutoCompleteFrame.java	1 Nov 2007 14:41:11 -0000	1.5
***************
*** 9,16 ****
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
- import java.util.Arrays;
  import java.util.LinkedList;
  import java.util.List;
- import java.util.ResourceBundle;
  
  import javax.swing.GroupLayout;
--- 9,14 ----
***************
*** 21,24 ****
--- 19,24 ----
  import javax.swing.text.BadLocationException;
  
+ import net.sf.tails.dsl.CodeAssistLoader;
+ 
  import org.gjt.sp.jedit.syntax.JEditTextArea;
  
***************
*** 35,43 ****
  public class AutoCompleteFrame extends JFrame {
  
  	private JEditTextArea jTextArea;
  	private static final long serialVersionUID = 8339682604292292370L;
- 	private static String[] rubyKeyWords;
- 	private static String[] tailIndicatorsKeyWords;
- 	private static String[] tailStrategiesKeyWords;
  	private List<String> filtredRubyKeyWords;
  	private List<String> filtredTailIndicatorsKeyWords;
--- 35,41 ----
  public class AutoCompleteFrame extends JFrame {
  
+ 	private static CodeAssistLoader assistLoader;
  	private JEditTextArea jTextArea;
  	private static final long serialVersionUID = 8339682604292292370L;
  	private List<String> filtredRubyKeyWords;
  	private List<String> filtredTailIndicatorsKeyWords;
***************
*** 45,65 ****
  	private JScrollPane jScrollPane1;
  	private JTable jTable1;
  
  	static{
! 		ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.DSL_IDE");
! 		rubyKeyWords = bundle.getString("RUBY_KEYWORDS").split(" ");
! 		Arrays.sort(rubyKeyWords);
! 		tailIndicatorsKeyWords = bundle.getString("TAIL_INDICATORS_KEYWORDS").split(" ");
! 		Arrays.sort(tailIndicatorsKeyWords);
! 		tailStrategiesKeyWords = bundle.getString("TAIL_STRATEGIES_KEYWORDS").split(" ");
! 		Arrays.sort(tailStrategiesKeyWords);
  	}
  
  	public AutoCompleteFrame(JEditTextArea textArea, String lastWord){
  		this.jTextArea = textArea;
  		
! 		filtredTailIndicatorsKeyWords = filterData(tailIndicatorsKeyWords,lastWord);
! 		filtredRubyKeyWords = filterData(rubyKeyWords,lastWord);
! 		filtredTailStrategiesKeyWords = filterData(tailStrategiesKeyWords,lastWord);
  		
  		initComponents();
--- 43,59 ----
  	private JScrollPane jScrollPane1;
  	private JTable jTable1;
+ 	private String lastWord;
  
  	static{
! 		assistLoader = new CodeAssistLoader();
  	}
  
  	public AutoCompleteFrame(JEditTextArea textArea, String lastWord){
  		this.jTextArea = textArea;
+ 		this.lastWord = lastWord;
  		
! 		filtredTailIndicatorsKeyWords = filterData(assistLoader.getIndicatorSignatures(),lastWord);
! 		filtredRubyKeyWords = filterData(assistLoader.getRubyKeyWords(),lastWord);
! 		filtredTailStrategiesKeyWords = filterData(assistLoader.getStrategySignatures(),lastWord);
  		
  		initComponents();
***************
*** 72,78 ****
  	}
  
! 	private List<String> filterData(String[] keyWords, String prefix) {
  		List<String> result = new LinkedList<String>();
! 		for (String word : keyWords) {
  			if(word.startsWith(prefix)) result.add(word);
  		}
--- 66,72 ----
  	}
  
! 	private List<String> filterData(List<String> list, String prefix) {
  		List<String> result = new LinkedList<String>();
! 		for (String word : list) {
  			if(word.startsWith(prefix)) result.add(word);
  		}
***************
*** 169,173 ****
  		JTable jt = (JTable)evt.getSource();
  		try {
! 			jTextArea.getDocument().insertString(jTextArea.getCaretPosition() , jt.getValueAt(jt.getSelectedRow(), jt.getSelectedColumn()).toString(),null );
  		} catch (BadLocationException e) {
  			e.printStackTrace();
--- 163,167 ----
  		JTable jt = (JTable)evt.getSource();
  		try {
! 			jTextArea.getDocument().replace(jTextArea.getCaretPosition() - lastWord.length() - 1 , lastWord.length() ,jt.getValueAt(jt.getSelectedRow(), jt.getSelectedColumn()).toString(),null );
  		} catch (BadLocationException e) {
  			e.printStackTrace();