Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit: [10883] plugins/TextAutocomplete/trunk
|
From: <sh...@us...> - 2007-10-12 10:21:45
|
Revision: 10883
http://jedit.svn.sourceforge.net/jedit/?rev=10883&view=rev
Author: shlomy
Date: 2007-10-12 03:21:43 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Changed the Ant build to use Java 1.5 for compilation.
Removed many compilation warnings.
Modified Paths:
--------------
plugins/TextAutocomplete/trunk/.classpath
plugins/TextAutocomplete/trunk/build.xml
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/ActionException.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/AutoComplete.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/Completion.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/CompletionPopup.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/MaxWordsExceededException.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/PreferencesManager.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/TextAutocompletePane.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEditorUI.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEvent.java
plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListTreeSet.java
plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/AbstractJEditTest.java
plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/CompletionPopupTest.java
plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestOutOfDateException.java
plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestUtils.java
plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/WordTypedListenerTest.java
Modified: plugins/TextAutocomplete/trunk/.classpath
===================================================================
--- plugins/TextAutocomplete/trunk/.classpath 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/.classpath 2007-10-12 10:21:43 UTC (rev 10883)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="net/jakubholy/jedit/**/*.java" excluding="tests/|testProperties/" kind="src" path=""/>
+ <classpathentry excluding="tests/|testProperties/" including="net/jakubholy/jedit/**/*.java" kind="src" path=""/>
<classpathentry kind="src" path="testProperties"/>
<classpathentry kind="src" path="tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
- <classpathentry kind="var" path="JEDIT_HOME/jedit.jar"/>
+ <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jEdit"/>
<classpathentry kind="output" path="eclipse_bin"/>
</classpath>
Modified: plugins/TextAutocomplete/trunk/build.xml
===================================================================
--- plugins/TextAutocomplete/trunk/build.xml 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/build.xml 2007-10-12 10:21:43 UTC (rev 10883)
@@ -37,7 +37,7 @@
<!-- (Once defined property cannot be changed => these only applies
if the given properties are not yet set) -->
<property name="crosscompiler.lib" value="${java.home}/lib"/>
- <property name="crosscompiler.version" value="1.3"/>
+ <property name="crosscompiler.version" value="1.5"/>
<property name="jedit.user.home" value="${jedit.install.dir}"/>
<property name="jedit.jars.dir" value="${jedit.install.dir}/jars"/>
<property name="errorlist.jar" value="${jedit.jars.dir}/ErrorList.jar"/>
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/ActionException.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/ActionException.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/ActionException.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -8,6 +8,7 @@
* @author aja
*
*/
+@SuppressWarnings("serial")
public class ActionException extends Exception {
/** No cause type given for this exception. */
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/AutoComplete.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/AutoComplete.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/AutoComplete.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -91,7 +91,8 @@
/**
* Holds an instance of AutoComplete for each buffer that has got one.
*/
- static Map bufferToAutoComplete = new IdentityHashMap();
+ static Map<Buffer, AutoComplete> bufferToAutoComplete =
+ new IdentityHashMap<Buffer, AutoComplete>();
/**
* Create a new AutoComplete that starts working for the given buffer if the buffer has none.
@@ -336,7 +337,8 @@
public static void destroyAllAutoCompletes()
{
Log.log(Log.DEBUG, TextAutocompletePlugin.class, "Detaching and destroying all autocompletes...");
- for (Iterator acIter = bufferToAutoComplete.values().iterator(); acIter.hasNext();)
+ for (Iterator<AutoComplete> acIter =
+ bufferToAutoComplete.values().iterator(); acIter.hasNext();)
{
AutoComplete autoComplete = (AutoComplete) acIter.next();
autoComplete.detach();
@@ -666,12 +668,4 @@
return buffer;
}
- /**
- * Set the buffer this AutoComplete is attached to.
- * This won't attach the AutoComplete to the buffer.
- * @param buffer
- */
- private void setBuffer(Buffer buffer) {
- this.buffer = buffer;
- }
} // AutoComplete }}} **********************************************************
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/Completion.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/Completion.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/Completion.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -9,7 +9,7 @@
*/
//{{{ Completion class
class Completion
-implements Comparable
+implements Comparable<Object>
{
private final String word;
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/CompletionPopup.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/CompletionPopup.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/CompletionPopup.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -74,6 +74,7 @@
// the popup
// TODO: (medium) Dispose the popup whenever sb. else than the popup/the textArea gains the focus
// - add 2 focus listeners for that;
+@SuppressWarnings("serial")
public class CompletionPopup extends JWindow
{
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/MaxWordsExceededException.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/MaxWordsExceededException.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/MaxWordsExceededException.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -8,6 +8,7 @@
* remembered words would exceed the maximum allowed (set in preferences).
* @author Jakub Holy
*/
+@SuppressWarnings("serial")
public class MaxWordsExceededException extends Exception
{
/** The word that we wanted to remember but couldn't because of the limit. */
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/PreferencesManager.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/PreferencesManager.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/PreferencesManager.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -68,10 +68,10 @@
NameSpace bsNameSpace = new NameSpace(BeanShell.getNameSpace(), "PreferencesManager");
/** List of keys used to accept the selected completion. */
- List acceptKeys = null;
- List disposeKeys = null;
- List selectionUpKeys = null;
- List selectionDownKeys = null;
+ List<Integer> acceptKeys = null;
+ List<Integer> disposeKeys = null;
+ List<Integer> selectionUpKeys = null;
+ List<Integer> selectionDownKeys = null;
/**
* Holds the filename filter pattern.
@@ -393,15 +393,15 @@
* set or contains no valid keys.
* @see KeyEvent
*/
- private java.util.ArrayList
+ private java.util.ArrayList<Integer>
propertyToKeyCodes(String propertyName)
{
- java.util.ArrayList keyCodes = null;
+ java.util.ArrayList<Integer> keyCodes = null;
String acceptkeysProp = jEdit.getProperty(propertyName);
if(acceptkeysProp != null)
{
StringTokenizer token = new StringTokenizer( acceptkeysProp, ", ");
- keyCodes = new java.util.ArrayList( token.countTokens() );
+ keyCodes = new java.util.ArrayList<Integer>( token.countTokens() );
Field key = null;
while(token.hasMoreTokens())
{
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/TextAutocompletePane.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/TextAutocompletePane.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/TextAutocompletePane.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -46,6 +46,7 @@
* @author Jakub Holý
*
*/
+@SuppressWarnings("serial")
public class TextAutocompletePane extends AbstractOptionPane
{
/*
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEditorUI.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEditorUI.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEditorUI.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -9,13 +9,11 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.GridLayout;
-import java.awt.LayoutManager;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Observable;
import java.util.Observer;
-import javax.swing.BoxLayout;
import javax.swing.DefaultListModel;
import javax.swing.JDialog;
import javax.swing.JPanel;
@@ -28,6 +26,7 @@
* GUI to display and edit the list of remembered words of a buffer.
* @author Jakub Holy
*/
+@SuppressWarnings("serial")
public class WordListEditorUI extends JDialog implements Observer {
/** Name of property used to store window geometry. */
@@ -231,7 +230,7 @@
// Set the content of the word list
this.rereadWords();
- GUIUtilities.centerOnScreen(this);
+ //this.setLocationRelativeTo(null);
GUIUtilities.loadGeometry(this, GEOMETRY_PROP);
pack();
}// </editor-fold>//GEN-END:initComponents
@@ -365,10 +364,6 @@
super.dispose();
}
- private boolean isIgnoreWordListEvents() {
- return ignoreWordListEvents;
- }
-
private void setIgnoreWordListEvents(boolean ignoreWordListEvents) {
this.ignoreWordListEvents = ignoreWordListEvents;
}
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEvent.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEvent.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListEvent.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -7,6 +7,7 @@
* @see net.jakubholy.jedit.autocomplete.WordList
* @author Jakub Holy
*/
+@SuppressWarnings("serial")
public class WordListEvent extends EventObject
{
Modified: plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListTreeSet.java
===================================================================
--- plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListTreeSet.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/net/jakubholy/jedit/autocomplete/WordListTreeSet.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -16,8 +16,9 @@
*/
public class WordListTreeSet implements WordList {
- protected java.util.TreeSet treeSet = new java.util.TreeSet();
- private Vector tmpVector = new Vector( 10 );
+ protected java.util.TreeSet<Completion> treeSet =
+ new java.util.TreeSet<Completion>();
+ private Vector<Completion> tmpVector = new Vector<Completion>( 10 );
/* (non-Javadoc)
* @see net.jakubholy.jedit.autocomplete.WordList#getCompletions(java.lang.String)
@@ -31,11 +32,11 @@
// Find the first matching element
//
- Iterator iter = treeSet.iterator();
+ Iterator<Completion> iter = treeSet.iterator();
Completion completion = null;
boolean found = false;
while (iter.hasNext()) {
- completion = (Completion) iter.next();
+ completion = iter.next();
if ( completion.hasPrefix(prefix) ) {
found = true;
break;
@@ -49,7 +50,7 @@
// Find all consecutive matching elements
tmpVector.add( completion );
while (iter.hasNext()) {
- completion = (Completion) iter.next();
+ completion = iter.next();
if ( completion.hasPrefix(prefix) ) {
tmpVector.add( completion );
@@ -61,7 +62,7 @@
// Return the result
Completion[] words = new Completion[ tmpVector.size() ];
- words = (Completion[]) tmpVector.toArray( words );
+ words = tmpVector.toArray( words );
return words;
}
else
@@ -75,11 +76,11 @@
*/
public synchronized Completion[] getAllWords() {
Completion[] words = new Completion[ treeSet.size() ];
- Iterator iter = treeSet.iterator();
+ Iterator<Completion> iter = treeSet.iterator();
int i = 0;
while (iter.hasNext()) {
- words[ i++ ] = (Completion) iter.next();
+ words[ i++ ] = iter.next();
}
return words;
} // getAllWords
Modified: plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/AbstractJEditTest.java
===================================================================
--- plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/AbstractJEditTest.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/AbstractJEditTest.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -2,8 +2,6 @@
import junit.framework.TestCase;
-import org.gjt.sp.jedit.msg.BufferUpdate;
-
/**
* Parent of all jEdit test cases that need running jEdit.
* @author Jakub Holy
Modified: plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/CompletionPopupTest.java
===================================================================
--- plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/CompletionPopupTest.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/CompletionPopupTest.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -65,6 +65,7 @@
* inserted by typing its number.
* @see CompletionPopup.KeyHandler
*/
+ @SuppressWarnings("deprecation")
public void testSelectCompletionByNumber() {
KeyEvent numTwoEvt = new KeyEvent(
thePopup,
Modified: plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestOutOfDateException.java
===================================================================
--- plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestOutOfDateException.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestOutOfDateException.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -10,6 +10,7 @@
*
* @author Jakub Holy
*/
+@SuppressWarnings("serial")
public class TestOutOfDateException extends RuntimeException
{
Modified: plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestUtils.java
===================================================================
--- plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestUtils.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/TestUtils.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -7,7 +7,6 @@
import java.io.IOException;
import java.util.ResourceBundle;
-import org.gjt.sp.jedit.EditPlugin;
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.util.Log;
Modified: plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/WordTypedListenerTest.java
===================================================================
--- plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/WordTypedListenerTest.java 2007-10-12 01:47:09 UTC (rev 10882)
+++ plugins/TextAutocomplete/trunk/tests/net/jakubholy/jedit/autocomplete/WordTypedListenerTest.java 2007-10-12 10:21:43 UTC (rev 10883)
@@ -6,17 +6,15 @@
import net.jakubholy.jedit.autocomplete.WordTypedListener.Filter;
-import org.gjt.sp.jedit.jEdit;
-
public class WordTypedListenerTest extends AbstractJEditBufferTest implements Observer
{
WordTypedListener listener = null;
private Filter isWordChecker;
/** List of events generated by the listener. */
- Vector events = null;
+ Vector<Object> events = null;
/** List of events expected to be generated by the listener. */
- private Vector expectedEvents = null;
+ private Vector<WordTypedEvent> expectedEvents = null;
public WordTypedListenerTest(String arg0)
{
@@ -37,8 +35,8 @@
listener.setCheckIsWord( isWordChecker );
buffer.addBufferListener( listener );
- events = new Vector(10);
- expectedEvents = new Vector(10);
+ events = new Vector<Object>(10);
+ expectedEvents = new Vector<WordTypedEvent>(10);
}
///////////////////////////////////////////////////////////////////////////
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|