Revision: 17499
http://sourceforge.net/p/gate/code/17499
Author: markagreenwood
Date: 2014-03-01 15:48:31 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
some generic tidying
Modified Paths:
--------------
gate/trunk/src/main/gate/gui/creole/manager/AvailablePlugins.java
gate/trunk/src/main/gate/gui/creole/manager/PluginUpdateManager.java
gate/trunk/src/main/gate/gui/jape/JapeViewer.java
gate/trunk/src/main/gate/gui/wordnet/WordNetViewer.java
Modified: gate/trunk/src/main/gate/gui/creole/manager/AvailablePlugins.java
===================================================================
--- gate/trunk/src/main/gate/gui/creole/manager/AvailablePlugins.java
2014-03-01 15:47:16 UTC (rev 17498)
+++ gate/trunk/src/main/gate/gui/creole/manager/AvailablePlugins.java
2014-03-01 15:48:31 UTC (rev 17499)
@@ -33,7 +33,6 @@
import gate.swing.IconTableCellRenderer;
import gate.swing.XJFileChooser;
import gate.swing.XJTable;
-import gate.util.GateException;
import gate.util.GateRuntimeException;
import java.awt.BorderLayout;
@@ -105,7 +104,7 @@
private ResourcesListModel resourcesListModel;
- private JList resourcesList;
+ private JList<ResourceInfo> resourcesList;
private JTextField filterTextField;
@@ -177,7 +176,7 @@
.setCellRenderer(cbCellRenderer);
resourcesListModel = new ResourcesListModel();
- resourcesList = new JList(resourcesListModel);
+ resourcesList = new JList<ResourceInfo>(resourcesListModel);
resourcesList.setCellRenderer(new ResourcesListCellRenderer());
// this is needed because otherwise the list gets really narrow most of the
@@ -494,10 +493,10 @@
}
}
- private class ResourcesListModel extends AbstractListModel {
+ private class ResourcesListModel extends AbstractListModel<ResourceInfo> {
@Override
- public Object getElementAt(int index) {
+ public ResourceInfo getElementAt(int index) {
int row = mainTable.getSelectedRow();
if(row == -1) return null;
row = mainTable.rowViewToModel(row);
@@ -523,7 +522,7 @@
private class ResourcesListCellRenderer extends DefaultListCellRenderer {
@Override
- public Component getListCellRendererComponent(JList list, Object value,
+ public Component getListCellRendererComponent(JList<?> list, Object value,
int index, boolean isSelected, boolean cellHasFocus) {
Gate.ResourceInfo rInfo = (Gate.ResourceInfo)value;
// prepare the renderer
@@ -542,7 +541,6 @@
protected boolean unsavedChanges() {
- @SuppressWarnings("unchecked")
Set<URL> creoleDirectories = Gate.getCreoleRegister().getDirectories();
Iterator<URL> pluginIter = loadNowByURL.keySet().iterator();
@@ -568,7 +566,6 @@
protected Set<URL> updateAvailablePlugins() {
- @SuppressWarnings("unchecked")
Set<URL> creoleDirectories = Gate.getCreoleRegister().getDirectories();
// update the data structures to reflect the user's choices
Modified: gate/trunk/src/main/gate/gui/creole/manager/PluginUpdateManager.java
===================================================================
--- gate/trunk/src/main/gate/gui/creole/manager/PluginUpdateManager.java
2014-03-01 15:47:16 UTC (rev 17498)
+++ gate/trunk/src/main/gate/gui/creole/manager/PluginUpdateManager.java
2014-03-01 15:48:31 UTC (rev 17499)
@@ -28,7 +28,6 @@
import gate.resources.img.svg.RemoveIcon;
import gate.resources.img.svg.UpdateSiteIcon;
import gate.resources.img.svg.UpdatesIcon;
-import gate.resources.img.svg.UserPluginIcon;
import gate.swing.CheckBoxTableCellRenderer;
import gate.swing.IconTableCellRenderer;
import gate.swing.SpringUtilities;
@@ -135,8 +134,6 @@
private static final String GATE_UPDATE_SITES = "gate.update.sites";
- private static final String SUPPRESS_USER_PLUGINS = "suppress.user.plugins";
-
private static final String SUPPRESS_UPDATE_INSTALLED =
"suppress.update.install";
@@ -493,7 +490,7 @@
if(defaultUpdateSites.length % 2 == 0) {
// TODO the problem here is that we want to make sure new sites show up
in
// the list, but this means that if a user deletes a site it will respawn
- // next time they start GATE, not sure if ther is a better solution.
+ // next time they start GATE, not sure if there is a better solution.
for(int i = 0; i < defaultUpdateSites.length; ++i) {
try {
Modified: gate/trunk/src/main/gate/gui/jape/JapeViewer.java
===================================================================
--- gate/trunk/src/main/gate/gui/jape/JapeViewer.java 2014-03-01 15:47:16 UTC
(rev 17498)
+++ gate/trunk/src/main/gate/gui/jape/JapeViewer.java 2014-03-01 15:48:31 UTC
(rev 17499)
@@ -54,6 +54,8 @@
ANNIEConstants,
ProgressListener {
+ private static final long serialVersionUID = -6026605466406110590L;
+
/**
* The text area where the JAPE source will be displayed
*/
Modified: gate/trunk/src/main/gate/gui/wordnet/WordNetViewer.java
===================================================================
--- gate/trunk/src/main/gate/gui/wordnet/WordNetViewer.java 2014-03-01
15:47:16 UTC (rev 17498)
+++ gate/trunk/src/main/gate/gui/wordnet/WordNetViewer.java 2014-03-01
15:48:31 UTC (rev 17499)
@@ -14,20 +14,37 @@
*/
package gate.gui.wordnet;
-import java.awt.*;
+import gate.creole.AbstractVisualResource;
+import gate.wordnet.LexicalRelation;
+import gate.wordnet.Relation;
+import gate.wordnet.SemanticRelation;
+import gate.wordnet.Synset;
+import gate.wordnet.Verb;
+import gate.wordnet.VerbFrame;
+import gate.wordnet.WordNet;
+import gate.wordnet.WordNetException;
+import gate.wordnet.WordSense;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.net.URL;
+import java.util.List;
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTextField;
+import javax.swing.JTextPane;
-import gate.Gate;
-import gate.creole.AbstractVisualResource;
-import gate.wordnet.*;
-
public class WordNetViewer extends AbstractVisualResource
implements ActionListener{
+ private static final long serialVersionUID = -3934904786556278822L;
+
protected JLabel searchLabel = new JLabel();
protected JTextField searchWordTextField = new JTextField();
protected JButton searchButton = new JButton();
@@ -45,7 +62,6 @@
protected JPopupMenu adjectivePopup;
protected JPopupMenu adverbPopup;
- private static final String propertiesFile =
"file://D:/Gate/temp/file_properties.xml";
private WordNet wnMain = null;
private boolean sentenceFrames = false;
@@ -154,7 +170,7 @@
}
private void addToResult(StringBuffer display, String text, int wordType) {
- java.util.List senses = null;
+ List<WordSense> senses = null;
try {
wnMain.cleanup();
senses = wnMain.lookupWord(text, wordType);
@@ -197,7 +213,7 @@
WordSense currSense = (WordSense) senses.get(i);
Synset currSynset = currSense.getSynset();
addToPopupMenu(currSense, currSynset, wordType, senses);
- java.util.List words = currSynset.getWordSenses();
+ List<WordSense> words = currSynset.getWordSenses();
String wordsString = getWords(words);
display.append(" " + (i+1) + ". " + wordsString + " -- " +
currSynset.getGloss());
@@ -206,15 +222,15 @@
}
}
- private void addToPopupMenu(WordSense wordSense, Synset synset, int
wordType, java.util.List senses){
- java.util.List semRelations = null;
+ private void addToPopupMenu(WordSense wordSense, Synset synset, int
wordType, List<WordSense> senses){
+ List<SemanticRelation> semRelations = null;
try {
semRelations = synset.getSemanticRelations();
} catch (Exception e){
e.printStackTrace();
}
- java.util.List lexRelations = null;
+ List<LexicalRelation> lexRelations = null;
try {
lexRelations = wordSense.getLexicalRelations();
} catch (Exception e){
@@ -351,7 +367,7 @@
}
}
- private void relHypernym(java.util.List senses){
+ private void relHypernym(List<WordSense> senses){
StringBuffer display = new StringBuffer("");
for (int i = 0; i<senses.size(); i++){
//display.append(getDescription(Relation.REL_HYPERNYM));
@@ -360,7 +376,7 @@
display.append(i+1);
display.append("\n");
- WordSense currSense = (WordSense) senses.get(i);
+ WordSense currSense = senses.get(i);
Synset currSynset = currSense.getSynset();
recursiveHypernym(currSynset, display, " =>");
}
@@ -369,7 +385,7 @@
}
private void recursiveHypernym(Synset synset, StringBuffer display, String
prefix){
- java.util.List words = synset.getWordSenses();
+ List<WordSense> words = synset.getWordSenses();
String wordsString = getWords(words);
display.append(prefix);
@@ -379,7 +395,7 @@
display.append(synset.getGloss());
display.append("\n");
- java.util.List hList = null;
+ List<SemanticRelation> hList = null;
try {
hList = synset.getSemanticRelations(Relation.REL_HYPERNYM);
} catch (Exception e){
@@ -393,7 +409,7 @@
}
- private void relHoloMeroHypo(java.util.List senses, int relationType,
+ private void relHoloMeroHypo(List<WordSense> senses, int relationType,
String relRefString){
StringBuffer display = new StringBuffer("");
for (int i = 0; i<senses.size(); i++){
@@ -421,7 +437,7 @@
String prefix, boolean symbPrefix,
int relationType, String relRefString){
- java.util.List words = synset.getWordSenses();
+ List<WordSense> words = synset.getWordSenses();
String wordsString = getWords(words);
display.append(prefix);
@@ -433,7 +449,7 @@
display.append(synset.getGloss());
display.append("\n");
- java.util.List holoList = null;
+ List<SemanticRelation> holoList = null;
try {
holoList = synset.getSemanticRelations(relationType);
} catch (Exception e){
@@ -450,7 +466,7 @@
}
}
- private void relAntonymSeeAlso(java.util.List senses,
+ private void relAntonymSeeAlso(List<WordSense> senses,
int relType, String relRefString){
StringBuffer display = new StringBuffer("");
boolean semantic_see_also = true;
@@ -458,7 +474,7 @@
WordSense currSense = (WordSense) senses.get(i);
Synset currSynset = currSense.getSynset();
try {
- java.util.List antonyms = currSense.getLexicalRelations(relType);
+ List<LexicalRelation> antonyms =
currSense.getLexicalRelations(relType);
if (antonyms!=null && antonyms.size()>0){
semantic_see_also = false;
//display.append(getDescription(relType));
@@ -493,14 +509,14 @@
}
}
- private void relAtributeSimilarTo(java.util.List senses, int releationType,
+ private void relAtributeSimilarTo(List<WordSense> senses, int releationType,
String relRefString){
StringBuffer display = new StringBuffer("");
for (int i = 0; i<senses.size(); i++){
WordSense currSense = (WordSense) senses.get(i);
Synset currSynset = currSense.getSynset();
try {
- java.util.List atributes =
currSynset.getSemanticRelations(releationType);
+ List<SemanticRelation> atributes =
currSynset.getSemanticRelations(releationType);
if (atributes!=null && atributes.size()>0){
//display.append(getDescription(releationType));
display.append("\n");
@@ -533,10 +549,10 @@
}
- private String getWords(java.util.List words){
+ private String getWords(List<WordSense> words){
StringBuffer wordsString = new StringBuffer("");
for (int j = 0; j<words.size(); j++){
- WordSense word = (WordSense) words.get(j);
+ WordSense word = words.get(j);
wordsString.append(word.getWord().getLemma().replace('_',' '));
if (j<(words.size()-1)){
wordsString.append(", ");
@@ -545,13 +561,13 @@
return wordsString.toString();
}
- private void sentenceFrames(java.util.List senses){
+ private void sentenceFrames(List<WordSense> senses){
StringBuffer display = new StringBuffer("");
for (int i=0; i<senses.size(); i++) {
WordSense currSense = (WordSense) senses.get(i);
Synset currSynset = currSense.getSynset();
Verb currVerb = (Verb) currSense;
- java.util.List frames = currVerb.getVerbFrames();
+ List<VerbFrame> frames = currVerb.getVerbFrames();
display.append("\nSense ");
display.append(i+1);
@@ -713,10 +729,12 @@
private class RelationItem extends JMenuItem{
+ private static final long serialVersionUID = -4096509078870160667L;
+
int relType;
- java.util.List senses;
+ List<WordSense> senses;
- public RelationItem(String name, int type, java.util.List sen) {
+ public RelationItem(String name, int type, List<WordSense> sen) {
super(name);
this.addActionListener(WordNetViewer.this);
relType = type;
@@ -728,10 +746,9 @@
return relType;
}
- public java.util.List getSenses(){
+ public List<WordSense> getSenses(){
return senses;
}
-
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Flow-based real-time traffic analytics software. Cisco certified tool.
Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer
Customize your own dashboards, set traffic alerts and generate reports.
Network behavioral analysis & security monitoring. All-in-one tool.
http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
