Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit: [10886] plugins/SuperAbbrevs/trunk
|
From: <sun...@us...> - 2007-10-12 19:38:34
|
Revision: 10886
http://jedit.svn.sourceforge.net/jedit/?rev=10886&view=rev
Author: sune_simonsen
Date: 2007-10-12 12:38:33 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
Removed some warnings.
Modified Paths:
--------------
plugins/SuperAbbrevs/trunk/SuperAbbrevs.props
plugins/SuperAbbrevs/trunk/superabbrevs/SuperAbbrevs.java
plugins/SuperAbbrevs/trunk/superabbrevs/TemplateFactory.java
plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java
plugins/SuperAbbrevs/trunk/superabbrevs/gui/VariablesOptionPane.java
plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateGeneratorParser.java
plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateParser.java
plugins/SuperAbbrevs/trunk/superabbrevs/template/TransformationField.java
Modified: plugins/SuperAbbrevs/trunk/SuperAbbrevs.props
===================================================================
--- plugins/SuperAbbrevs/trunk/SuperAbbrevs.props 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/SuperAbbrevs.props 2007-10-12 19:38:33 UTC (rev 10886)
@@ -1,7 +1,7 @@
plugin.SuperAbbrevsPlugin.name=SuperAbbrevs
plugin.SuperAbbrevsPlugin.author=Sune Simonsen
plugin.SuperAbbrevsPlugin.version=0.30
-plugin.SuperAbbrevsPlugin.depend.0=jedit 04.03.12.00
+plugin.SuperAbbrevsPlugin.depend.0=jedit 04.02.00.00
plugin.SuperAbbrevsPlugin.depend.1=jdk 1.5
plugin.SuperAbbrevsPlugin.activate=defer
#plugin.SuperAbbrevsPlugin.activate=startup
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/SuperAbbrevs.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/SuperAbbrevs.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/SuperAbbrevs.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -3,7 +3,7 @@
import java.util.*;
import java.io.*;
import org.gjt.sp.jedit.View;
-import org.gjt.sp.jedit.bsh.*;
+import bsh.*;
import org.gjt.sp.jedit.textarea.JEditTextArea;
import org.gjt.sp.jedit.textarea.Selection;
import org.gjt.sp.jedit.Buffer;
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/TemplateFactory.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/TemplateFactory.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/TemplateFactory.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -2,7 +2,7 @@
import java.io.*;
-import org.gjt.sp.jedit.bsh.*;
+import bsh.*;
import superabbrevs.lexer.*;
import superabbrevs.template.Template;
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/gui/AbbrevsOptionPane.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -37,6 +37,7 @@
import org.gjt.sp.jedit.*;
import org.gjt.sp.jedit.gui.RolloverButton;
import org.gjt.sp.util.Log;
+import org.gjt.sp.util.StandardUtilities;
import superabbrevs.SuperAbbrevs;
import superabbrevs.SuperAbbrevsIO;
@@ -503,7 +504,7 @@
void sort(int col)
{
lastSort = col;
- MiscUtilities.quicksort(abbrevs,new AbbrevCompare(col));
+ Collections.sort(abbrevs,new AbbrevCompare(col));
fireTableDataChanged();
} //}}}
@@ -612,10 +613,18 @@
} //}}}
//{{{ AbbrevCompare class
- class AbbrevCompare implements MiscUtilities.Compare
+ class AbbrevCompare implements Comparator
{
- int col;
-
+ //{{{ field int col
+ private int col;
+ /**
+ * Getter function for the field col
+ */
+ public int getCol() {
+ return col;
+ }
+ //}}}
+
AbbrevCompare(int col)
{
this.col = col;
@@ -631,18 +640,24 @@
String abbrev1 = a1.abbrev.toLowerCase();
String abbrev2 = a2.abbrev.toLowerCase();
- return MiscUtilities.compareStrings(
- abbrev1,abbrev2,true);
+ return StandardUtilities.compareStrings(abbrev1,abbrev2,true);
}
else
{
String expand1 = a1.expand.toLowerCase();
String expand2 = a2.expand.toLowerCase();
- return MiscUtilities.compareStrings(
- expand1,expand2,true);
+ return StandardUtilities.compareStrings(expand1,expand2,true);
}
}
+
+ public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof AbbrevCompare)) return false;
+
+ AbbrevCompare abbrevCompare = (AbbrevCompare)obj;
+
+ return col == abbrevCompare.col;
+ }
} //}}}
} //}}}
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/gui/VariablesOptionPane.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/gui/VariablesOptionPane.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/gui/VariablesOptionPane.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -33,6 +33,7 @@
import org.gjt.sp.jedit.gui.*;
import org.gjt.sp.jedit.*;
import org.gjt.sp.jedit.View;
+import org.gjt.sp.util.StandardUtilities;
import superabbrevs.SuperAbbrevs;
//}}}
@@ -256,7 +257,7 @@
void sort(int col)
{
lastSort = col;
- MiscUtilities.quicksort(variables,new VariableCompare(col));
+ Collections.sort(variables,new VariableCompare(col));
fireTableDataChanged();
} //}}}
@@ -354,9 +355,17 @@
} //}}}
//{{{ VariableCompare class
- class VariableCompare implements MiscUtilities.Compare
+ class VariableCompare implements Comparator
{
- int col;
+ //{{{ field int col
+ private int col;
+ /**
+ * Getter function for the field col
+ */
+ public int getCol() {
+ return col;
+ }
+ //}}}
VariableCompare(int col)
{
@@ -373,7 +382,7 @@
String name1 = v1.name.toLowerCase();
String name2 = v2.name.toLowerCase();
- return MiscUtilities.compareStrings(
+ return StandardUtilities.compareStrings(
name1,name2,true);
}
else
@@ -381,10 +390,20 @@
String value1 = v1.value.toLowerCase();
String value2 = v2.value.toLowerCase();
- return MiscUtilities.compareStrings(
+ return StandardUtilities.compareStrings(
value1,value2,true);
}
+
+
}
+
+ public boolean equals(Object obj) {
+ if (obj == null || !(obj instanceof VariableCompare)) return false;
+
+ VariableCompare variableCompare = (VariableCompare)obj;
+
+ return col == variableCompare.col;
+ }
} //}}}
} //}}}
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateGeneratorParser.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateGeneratorParser.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateGeneratorParser.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -4,7 +4,7 @@
import superabbrevs.TextUtil;
import java.io.*;
-import org.gjt.sp.jedit.bsh.*;
+import bsh.*;
/**
* @author Sune Simonsen
* class TemplateGeneratorParser
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateParser.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateParser.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/lexer/TemplateParser.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -3,7 +3,7 @@
import superabbrevs.template.*;
import java.io.*;
import java.util.*;
-import org.gjt.sp.jedit.bsh.*;
+import bsh.*;
/**
* @author Sune Simonsen
Modified: plugins/SuperAbbrevs/trunk/superabbrevs/template/TransformationField.java
===================================================================
--- plugins/SuperAbbrevs/trunk/superabbrevs/template/TransformationField.java 2007-10-12 19:26:00 UTC (rev 10885)
+++ plugins/SuperAbbrevs/trunk/superabbrevs/template/TransformationField.java 2007-10-12 19:38:33 UTC (rev 10886)
@@ -1,7 +1,7 @@
package superabbrevs.template;
import superabbrevs.SuperAbbrevsIO;
-import org.gjt.sp.jedit.bsh.*;
+import bsh.*;
import java.io.*;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|