Thread: [Squirrel-sql-commits] sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecom
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
Update of /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12412/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion Modified Files: CodeCompletionAutoCorrectInfo.java CodeCompletionCatalogInfo.java CodeCompletionColumnInfo.java CodeCompletionFunctionInfo.java CodeCompletionInfo.java CodeCompletionInfoCollection.java CodeCompletionKeywordInfo.java CodeCompletionPlugin.java CodeCompletionSchemaInfo.java CodeCompletionStoredProcedureInfo.java CodeCompletionTableInfo.java CodeCompletionTypeInfo.java CodeCompletorModel.java CompleteCodeAction.java CompletionFunctionsModel.java StandardCompletorModel.java Removed Files: CodeCompletionCandidates.java CodeCompletor.java CodeCompletorListener.java PopupManager.java Log Message: Moved the completion popup's view and controller logic to fw. Index: StandardCompletorModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/StandardCompletorModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StandardCompletorModel.java 22 Apr 2005 12:58:24 -0000 1.3 --- StandardCompletorModel.java 26 May 2005 00:14:40 -0000 1.4 *************** *** 27,30 **** --- 27,31 ---- import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; + import net.sourceforge.squirrel_sql.fw.completion.CompletionCandidates; import java.sql.SQLException; *************** *** 70,74 **** } ! CodeCompletionCandidates getCompletionCandidates(String textTillCarret) { String stringToParse = getStringToParse(textTillCarret); --- 71,75 ---- } ! CompletionCandidates getCompletionCandidates(String textTillCarret) { String stringToParse = getStringToParse(textTillCarret); *************** *** 153,157 **** int replacementStart = textTillCarret.length() - stringToReplace.length(); ! return new CodeCompletionCandidates(ccis, replacementStart, stringToReplace); } --- 154,158 ---- int replacementStart = textTillCarret.length() - stringToReplace.length(); ! return new CompletionCandidates(ccis, replacementStart, stringToReplace); } Index: CodeCompletionAutoCorrectInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionAutoCorrectInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CodeCompletionAutoCorrectInfo.java 23 Jan 2005 21:03:01 -0000 1.1 --- CodeCompletionAutoCorrectInfo.java 26 May 2005 00:14:39 -0000 1.2 *************** *** 2,5 **** --- 2,6 ---- + public class CodeCompletionAutoCorrectInfo extends CodeCompletionInfo { --- CodeCompletor.java DELETED --- Index: CodeCompletionInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionInfo.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CodeCompletionInfo.java 25 Aug 2004 07:47:22 -0000 1.5 --- CodeCompletionInfo.java 26 May 2005 00:14:40 -0000 1.6 *************** *** 1,80 **** - /* - * Copyright (C) 2003 Gerd Wagner - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ package net.sourceforge.squirrel_sql.plugins.codecompletion; import net.sourceforge.squirrel_sql.client.session.SchemaInfo; - import java.sql.DatabaseMetaData; import java.sql.SQLException; - public abstract class CodeCompletionInfo implements Comparable - { - private String _upperCaseCompletionString; - - public abstract String getCompareString(); - - public String getCompletionString() - { - return getCompareString(); - } - - public int compareTo(Object obj) - { - CodeCompletionInfo other = (CodeCompletionInfo)obj; - - if(null == _upperCaseCompletionString) - { - _upperCaseCompletionString = getCompareString().toUpperCase(); - } - - if(null == other._upperCaseCompletionString) - { - other._upperCaseCompletionString = other.getCompareString().toUpperCase(); - } - - return _upperCaseCompletionString.compareTo(other._upperCaseCompletionString); - } - - /** - * Param must be an upper case string if not the result will always be false - */ - public boolean upperCaseCompletionStringStartsWith(String testString) - { - if(null == _upperCaseCompletionString) - { - _upperCaseCompletionString = getCompareString().toUpperCase(); - } - - return _upperCaseCompletionString.startsWith(testString); - } - - /** - * Param must be an upper case string if not the result will always be false - */ - public boolean upperCaseCompletionStringEquals(String testString) - { - if(null == _upperCaseCompletionString) - { - _upperCaseCompletionString = getCompareString().toUpperCase(); - } - - return _upperCaseCompletionString.equals(testString); - } /** * Default implementation --- 1,12 ---- package net.sourceforge.squirrel_sql.plugins.codecompletion; + import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo; import net.sourceforge.squirrel_sql.client.session.SchemaInfo; import java.sql.SQLException; + public abstract class CodeCompletionInfo extends CompletionInfo + { /** * Default implementation *************** *** 85,95 **** } - /** - * Default implementation - */ - public boolean hasColumns() - { - return false; - } } --- 17,20 ---- Index: CodeCompletionKeywordInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionKeywordInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CodeCompletionKeywordInfo.java 15 Jun 2004 15:07:04 -0000 1.3 --- CodeCompletionKeywordInfo.java 26 May 2005 00:14:40 -0000 1.4 *************** *** 18,22 **** package net.sourceforge.squirrel_sql.plugins.codecompletion; - import net.sourceforge.squirrel_sql.plugins.codecompletion.CodeCompletionInfo; public class CodeCompletionKeywordInfo extends CodeCompletionInfo --- 18,21 ---- Index: CodeCompletionPlugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionPlugin.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CodeCompletionPlugin.java 21 Apr 2005 16:10:34 -0000 1.7 --- CodeCompletionPlugin.java 26 May 2005 00:14:40 -0000 1.8 *************** *** 61,65 **** public String getInternalName() { ! return "codecompletion"; } --- 61,65 ---- public String getInternalName() { ! return "completion"; } Index: CodeCompletionCatalogInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionCatalogInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CodeCompletionCatalogInfo.java 15 Jun 2004 15:07:04 -0000 1.2 --- CodeCompletionCatalogInfo.java 26 May 2005 00:14:40 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- package net.sourceforge.squirrel_sql.plugins.codecompletion; + public class CodeCompletionCatalogInfo extends CodeCompletionInfo { --- CodeCompletionCandidates.java DELETED --- Index: CodeCompletorModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletorModel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CodeCompletorModel.java 22 Apr 2005 12:58:24 -0000 1.7 --- CodeCompletorModel.java 26 May 2005 00:14:40 -0000 1.8 *************** *** 21,27 **** import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; ! public class CodeCompletorModel { private StandardCompletorModel _standardCompletorModel; --- 21,29 ---- import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; + import net.sourceforge.squirrel_sql.fw.completion.CompletionCandidates; + import net.sourceforge.squirrel_sql.fw.completion.ICompletorModel; ! public class CodeCompletorModel implements ICompletorModel { private StandardCompletorModel _standardCompletorModel; *************** *** 36,40 **** } ! public CodeCompletionCandidates getCompletionCandidates(String textTillCarret) { if(false == _functionsAdded) --- 38,42 ---- } ! public CompletionCandidates getCompletionCandidates(String textTillCarret) { if(false == _functionsAdded) *************** *** 45,49 **** } ! CodeCompletionCandidates functionResult = _completionFunctionsModel.getCompletionCandidates(textTillCarret); if(null == functionResult) --- 47,51 ---- } ! CompletionCandidates functionResult = _completionFunctionsModel.getCompletionCandidates(textTillCarret); if(null == functionResult) Index: CodeCompletionSchemaInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionSchemaInfo.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CodeCompletionSchemaInfo.java 15 Jun 2004 15:07:04 -0000 1.2 --- CodeCompletionSchemaInfo.java 26 May 2005 00:14:40 -0000 1.3 *************** *** 18,21 **** --- 18,22 ---- package net.sourceforge.squirrel_sql.plugins.codecompletion; + public class CodeCompletionSchemaInfo extends CodeCompletionInfo { Index: CodeCompletionFunctionInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionFunctionInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CodeCompletionFunctionInfo.java 15 Jun 2004 15:07:04 -0000 1.3 --- CodeCompletionFunctionInfo.java 26 May 2005 00:14:40 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- package net.sourceforge.squirrel_sql.plugins.codecompletion; + public class CodeCompletionFunctionInfo extends CodeCompletionInfo { Index: CompletionFunctionsModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CompletionFunctionsModel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CompletionFunctionsModel.java 23 Jan 2005 21:03:01 -0000 1.2 --- CompletionFunctionsModel.java 26 May 2005 00:14:40 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.plugins.codecompletion.completionfunctions.*; + import net.sourceforge.squirrel_sql.fw.completion.CompletionCandidates; *************** *** 28,32 **** } ! public CodeCompletionCandidates getCompletionCandidates(String textTillCarret) { int lastIndexOfLineFeed = textTillCarret.lastIndexOf('\n'); --- 29,33 ---- } ! public CompletionCandidates getCompletionCandidates(String textTillCarret) { int lastIndexOfLineFeed = textTillCarret.lastIndexOf('\n'); *************** *** 47,51 **** if(null != functionResults) { ! return new CodeCompletionCandidates(functionResults, lastIndexOfHash, functionSting); } } --- 48,52 ---- if(null != functionResults) { ! return new CompletionCandidates(functionResults, lastIndexOfHash, functionSting); } } Index: CodeCompletionColumnInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionColumnInfo.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CodeCompletionColumnInfo.java 6 Jul 2004 22:52:26 -0000 1.4 --- CodeCompletionColumnInfo.java 26 May 2005 00:14:40 -0000 1.5 *************** *** 18,21 **** --- 18,22 ---- package net.sourceforge.squirrel_sql.plugins.codecompletion; + import java.sql.Types; --- PopupManager.java DELETED --- --- CodeCompletorListener.java DELETED --- Index: CompleteCodeAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CompleteCodeAction.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompleteCodeAction.java 22 Apr 2005 12:58:24 -0000 1.5 --- CompleteCodeAction.java 26 May 2005 00:14:40 -0000 1.6 *************** *** 23,26 **** --- 23,29 ---- import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISession; + import net.sourceforge.squirrel_sql.fw.completion.Completor; + import net.sourceforge.squirrel_sql.fw.completion.CompletorListener; + import net.sourceforge.squirrel_sql.fw.completion.CompletionInfo; import javax.swing.text.BadLocationException; *************** *** 32,36 **** { private ISQLEntryPanel _sqlEntryPanel; ! private CodeCompletor _cc; --- 35,39 ---- { private ISQLEntryPanel _sqlEntryPanel; ! private Completor _cc; *************** *** 42,54 **** CodeCompletorModel model = new CodeCompletorModel(session, codeCompletionInfos, sqlEntryPanel.getIdentifier()); ! _cc = new CodeCompletor((JTextComponent)_sqlEntryPanel.getTextComponent(), model); _sqlEntryPanel.addSQLTokenListener(model.getSQLTokenListener()); _cc.addCodeCompletorListener ( ! new CodeCompletorListener() { ! public void completionSelected(CodeCompletionInfo completion, int replaceBegin) ! {performCompletionSelected(completion, replaceBegin);} } ); --- 45,57 ---- CodeCompletorModel model = new CodeCompletorModel(session, codeCompletionInfos, sqlEntryPanel.getIdentifier()); ! _cc = new Completor((JTextComponent)_sqlEntryPanel.getTextComponent(), model); _sqlEntryPanel.addSQLTokenListener(model.getSQLTokenListener()); _cc.addCodeCompletorListener ( ! new CompletorListener() { ! public void completionSelected(CompletionInfo completion, int replaceBegin) ! {performCompletionSelected((CodeCompletionInfo) completion, replaceBegin);} } ); Index: CodeCompletionTypeInfo.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/codecompletion/src/net/sourceforge/squirrel_sql/plugins/codecompletion/CodeCompletionTypeInfo.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CodeCompletionTypeInfo.java 15 Jun 2004 15:07:04 -0000 1.3 --- CodeCompletionTypeInfo.java 26 May 2005 00:14:40 -0000 1.4 *************** *** 18,22 **** package net.sourceforge.squirrel_sql.plugins.codecompletion; - import net.sourceforge.squirrel_sql.plugins.codecompletion.CodeCompletionInfo; public class CodeCompletionTypeInfo extends CodeCompletionInfo --- 18,21 ---- |