Revision: 17612
http://sourceforge.net/p/gate/code/17612
Author: markagreenwood
Date: 2014-03-10 08:51:17 +0000 (Mon, 10 Mar 2014)
Log Message:
-----------
I think that's sorted the serialVersionUID for most of the swing classes
Modified Paths:
--------------
gate/trunk/src/main/gate/gui/BooleanRenderer.java
gate/trunk/src/main/gate/swing/AbstractTreeTableModel.java
gate/trunk/src/main/gate/swing/ColorGenerator.java
gate/trunk/src/main/gate/swing/IconTableCellRenderer.java
gate/trunk/src/main/gate/swing/JChoice.java
gate/trunk/src/main/gate/swing/JFontChooser.java
gate/trunk/src/main/gate/swing/JTreeTable.java
gate/trunk/src/main/gate/swing/TreeTableModel.java
gate/trunk/src/main/gate/swing/WaitDialog.java
gate/trunk/src/main/gate/swing/XJEditorPane.java
gate/trunk/src/main/gate/swing/XJFileChooser.java
gate/trunk/src/main/gate/swing/XJMenu.java
gate/trunk/src/main/gate/swing/XJMenuItem.java
gate/trunk/src/main/gate/swing/XJPopupMenu.java
gate/trunk/src/main/gate/swing/XJTabbedPane.java
gate/trunk/src/main/gate/swing/XJTable.java
gate/trunk/src/main/gate/swing/XJTextPane.java
Modified: gate/trunk/src/main/gate/gui/BooleanRenderer.java
===================================================================
--- gate/trunk/src/main/gate/gui/BooleanRenderer.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/gui/BooleanRenderer.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -25,25 +25,19 @@
@SuppressWarnings("serial")
public class BooleanRenderer extends DefaultTableCellRenderer {
@Override
- public Component getTableCellRendererComponent(JTable table,
- Object value,
- boolean isSelected,
- boolean hasFocus,
- int row,
- int column){
- /*Component comp = super.getTableCellRendererComponent(table,
- "",
- isSelected, hasFocus,
- row, column);*/
- if(value instanceof Boolean &&
- value != null &&
- ((Boolean)value).booleanValue()){
+ public Component getTableCellRendererComponent(JTable table, Object value,
+ boolean isSelected, boolean hasFocus, int row, int column) {
+ super.getTableCellRendererComponent(table, "", isSelected, hasFocus, row,
+ column);
+ if(value instanceof Boolean && value != null
+ && ((Boolean)value).booleanValue()) {
setIcon(MainFrame.getIcon("tick"));
-// setIcon(MainFrame.getIcon((isSelected) ? "tick_white" : "tick"));
+ // setIcon(MainFrame.getIcon((isSelected) ? "tick_white" :
+ // "tick"));
} else {
setIcon(null);
}
return this;
- }//public Component getTableCellRendererComponent
-}//class BooleanRenderer extends DefaultTableCellRenderer
\ No newline at end of file
+ }// public Component getTableCellRendererComponent
+}// class BooleanRenderer extends DefaultTableCellRenderer
Modified: gate/trunk/src/main/gate/swing/AbstractTreeTableModel.java
===================================================================
--- gate/trunk/src/main/gate/swing/AbstractTreeTableModel.java 2014-03-10
08:38:23 UTC (rev 17611)
+++ gate/trunk/src/main/gate/swing/AbstractTreeTableModel.java 2014-03-10
08:51:17 UTC (rev 17612)
@@ -14,7 +14,9 @@
*/
package gate.swing;
-import javax.swing.event.*;
+import javax.swing.event.EventListenerList;
+import javax.swing.event.TreeModelEvent;
+import javax.swing.event.TreeModelListener;
import javax.swing.tree.TreePath;
/**
@@ -201,7 +203,7 @@
public void setValueAt(Object aValue, Object node, int column){}
@Override
- abstract public Class getColumnClass(int column);
+ abstract public Class<?> getColumnClass(int column);
@Override
abstract public boolean isCellEditable(Object node, int column);
@Override
Modified: gate/trunk/src/main/gate/swing/ColorGenerator.java
===================================================================
--- gate/trunk/src/main/gate/swing/ColorGenerator.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/ColorGenerator.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -25,16 +25,12 @@
*/
public class ColorGenerator {
- /** Debug flag
- */
- private static final boolean DEBUG = false;
-
/**
* Creates a new ColorGenerator
*
*/
public ColorGenerator() {
- for(int i = 0; i < 8; i++)availableSpacesList[i] = new LinkedList();
+ for(int i = 0; i < 8; i++)availableSpacesList[i] = new
LinkedList<ColorSpace>();
ColorSpace usedCS = new ColorSpace(0,0,0,255);
availableSpacesList[0].addLast(new ColorSpace(usedCS.baseR +
usedCS.radius/2,
@@ -84,7 +80,7 @@
listToRead = listToRead % 8;
if(availableSpacesList[listToRead].isEmpty()){
- usedCS = (ColorSpace)usedSpacesList.removeFirst();
+ usedCS = usedSpacesList.removeFirst();
availableSpacesList[listToRead].addLast(new ColorSpace(usedCS.baseR,
usedCS.baseG,
usedCS.baseB,
@@ -124,7 +120,7 @@
usedCS.radius/2));
}
- usedCS = (ColorSpace)availableSpacesList[listToRead].removeFirst();
+ usedCS = availableSpacesList[listToRead].removeFirst();
Color res = new Color(usedCS.baseR + usedCS.radius/2,
usedCS.baseG + usedCS.radius/2,
usedCS.baseB + usedCS.radius/2);
@@ -163,10 +159,11 @@
}
/** */
- LinkedList[] availableSpacesList = new LinkedList[8];
+ @SuppressWarnings("unchecked")
+ LinkedList<ColorSpace>[] availableSpacesList = new LinkedList[8];
/** */
- LinkedList usedSpacesList = new LinkedList();
+ LinkedList<ColorSpace> usedSpacesList = new LinkedList<ColorSpace>();
/** */
int listToRead = 0;
Modified: gate/trunk/src/main/gate/swing/IconTableCellRenderer.java
===================================================================
--- gate/trunk/src/main/gate/swing/IconTableCellRenderer.java 2014-03-10
08:38:23 UTC (rev 17611)
+++ gate/trunk/src/main/gate/swing/IconTableCellRenderer.java 2014-03-10
08:51:17 UTC (rev 17612)
@@ -6,6 +6,7 @@
import javax.swing.JTable;
import javax.swing.table.DefaultTableCellRenderer;
+@SuppressWarnings("serial")
public class IconTableCellRenderer extends DefaultTableCellRenderer {
@Override
Modified: gate/trunk/src/main/gate/swing/JChoice.java
===================================================================
--- gate/trunk/src/main/gate/swing/JChoice.java 2014-03-10 08:38:23 UTC (rev
17611)
+++ gate/trunk/src/main/gate/swing/JChoice.java 2014-03-10 08:51:17 UTC (rev
17612)
@@ -13,10 +13,30 @@
*/
package gate.swing;
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import javax.swing.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Insets;
+import java.awt.ItemSelectable;
+import java.awt.Point;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.util.EventListener;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.AbstractButton;
+import javax.swing.Box;
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JToggleButton;
import javax.swing.event.ListDataListener;
/**
@@ -26,6 +46,7 @@
* set of buttons in a flow layout. If more options are available, a
* simple {@link JComboBox} is used instead.
*/
+@SuppressWarnings("serial")
public class JChoice extends JPanel implements ItemSelectable{
@Override
Modified: gate/trunk/src/main/gate/swing/JFontChooser.java
===================================================================
--- gate/trunk/src/main/gate/swing/JFontChooser.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/JFontChooser.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -16,14 +16,35 @@
package gate.swing;
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GraphicsEnvironment;
+import java.awt.Window;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
import java.awt.font.TextAttribute;
import java.util.HashMap;
import java.util.Map;
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+@SuppressWarnings("serial")
public class JFontChooser extends JPanel {
public JFontChooser(){
@@ -170,7 +191,7 @@
}// initListeners()
protected void updateFont(){
- Map fontAttrs = new HashMap();
+ Map<TextAttribute, Object> fontAttrs = new HashMap<TextAttribute,
Object>();
fontAttrs.put(TextAttribute.FAMILY, familyCombo.getSelectedItem());
fontAttrs.put(TextAttribute.SIZE, new
Float((String)sizeCombo.getSelectedItem()));
Modified: gate/trunk/src/main/gate/swing/JTreeTable.java
===================================================================
--- gate/trunk/src/main/gate/swing/JTreeTable.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/JTreeTable.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -326,7 +326,7 @@
}
@Override
- public Class getColumnClass(int column) {
+ public Class<?> getColumnClass(int column) {
if(column == 0) return TreeTableModel.class;
else return treeTableModel.getColumnClass(column);
}
Modified: gate/trunk/src/main/gate/swing/TreeTableModel.java
===================================================================
--- gate/trunk/src/main/gate/swing/TreeTableModel.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/TreeTableModel.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -45,7 +45,7 @@
/**
* Returns the type for column number <code>column</code>.
*/
- public Class getColumnClass(int column);
+ public Class<?> getColumnClass(int column);
/**
* Returns the value to be displayed for node <code>node</code>,
Modified: gate/trunk/src/main/gate/swing/WaitDialog.java
===================================================================
--- gate/trunk/src/main/gate/swing/WaitDialog.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/WaitDialog.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -16,9 +16,15 @@
package gate.swing;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Frame;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JWindow;
/**
* A small window used to show messages to the user during processing.
@@ -27,12 +33,9 @@
* The window has its own thread for updating the animated pictures displayed.
*
*/
+@SuppressWarnings("serial")
public class WaitDialog extends JWindow implements Runnable {
- /** Debug flag
- */
- private static final boolean DEBUG = false;
-
/** *
*/
Box centerBox;
@@ -112,7 +115,6 @@
/** */
void jbInit() throws Exception {
JPanel centerPanel = new JPanel();
- Container content = getContentPane();
centerBox = Box.createVerticalBox();
centerPanel.setLayout(borderLayout1);
//centerPanel.setBorder(new LineBorder(Color.darkGray, 2));
Modified: gate/trunk/src/main/gate/swing/XJEditorPane.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJEditorPane.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJEditorPane.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -1,21 +1,23 @@
package gate.swing;
+import gate.event.StatusListener;
+import gate.gui.MainFrame;
+import gate.util.Err;
+
import java.awt.event.ActionEvent;
import java.io.IOException;
import java.net.URL;
import java.util.LinkedList;
import java.util.Vector;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.HTMLFrameHyperlinkEvent;
-import gate.event.StatusListener;
-import gate.gui.MainFrame;
-import gate.util.Err;
-
/**
* An enhanced version of {@link javax.swing.JEditorPane} that is able of
* handling hyperlinks from the HTML document displayed.
@@ -44,8 +46,8 @@
}//protected void init()
protected void initLocalData(){
- backUrls = new LinkedList();
- forwardUrls = new LinkedList();
+ backUrls = new LinkedList<URL>();
+ forwardUrls = new LinkedList<URL>();
try{
backAction = new BackAction();
forwardAction = new ForwardAction();
@@ -110,7 +112,7 @@
public void actionPerformed(ActionEvent e){
backUrls.addLast(getPage());
try{
- setPage((URL)forwardUrls.removeFirst());
+ setPage(forwardUrls.removeFirst());
}catch(IOException ioe){
ioe.printStackTrace(Err.getPrintWriter());
}
@@ -126,7 +128,7 @@
public void actionPerformed(ActionEvent e){
forwardUrls.addFirst(getPage());
try{
- setPage((URL)backUrls.removeLast());
+ setPage(backUrls.removeLast());
}catch(IOException ioe){
ioe.printStackTrace(Err.getPrintWriter());
}
@@ -143,30 +145,32 @@
}
public synchronized void removeStatusListener(StatusListener l) {
if (statusListeners != null && statusListeners.contains(l)) {
- Vector v = (Vector) statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v = (Vector<StatusListener>)
statusListeners.clone();
v.removeElement(l);
statusListeners = v;
}
}
public synchronized void addStatusListener(StatusListener l) {
- Vector v = statusListeners == null ? new Vector(2) : (Vector)
statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v = statusListeners == null ? new
Vector<StatusListener>(2) : (Vector<StatusListener>) statusListeners.clone();
if (!v.contains(l)) {
v.addElement(l);
statusListeners = v;
}
}
- protected LinkedList backUrls;
- protected LinkedList forwardUrls;
+ protected LinkedList<URL> backUrls;
+ protected LinkedList<URL> forwardUrls;
protected Action backAction;
protected Action forwardAction;
- private transient Vector statusListeners;
+ private transient Vector<StatusListener> statusListeners;
protected void fireStatusChanged(String e) {
if (statusListeners != null) {
- Vector listeners = statusListeners;
+ Vector<StatusListener> listeners = statusListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((StatusListener) listeners.elementAt(i)).statusChanged(e);
+ listeners.elementAt(i).statusChanged(e);
}
}
}
Modified: gate/trunk/src/main/gate/swing/XJFileChooser.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJFileChooser.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJFileChooser.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -41,6 +41,7 @@
* <br><br>
* Resource paths are saved in the user config file.
*/
+@SuppressWarnings("serial")
public class XJFileChooser extends JFileChooser {
/** key used when saving the file location to be retrieved later */
private String resource;
Modified: gate/trunk/src/main/gate/swing/XJMenu.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJMenu.java 2014-03-10 08:38:23 UTC (rev
17611)
+++ gate/trunk/src/main/gate/swing/XJMenu.java 2014-03-10 08:51:17 UTC (rev
17612)
@@ -27,6 +27,7 @@
* Adds also a description and a StatusListener as parameters.
* The description is used in the statusListener.
*/
+@SuppressWarnings("serial")
public class XJMenu extends JMenu {
public XJMenu(){
super();
Modified: gate/trunk/src/main/gate/swing/XJMenuItem.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJMenuItem.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJMenuItem.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -16,18 +16,22 @@
package gate.swing;
-import java.awt.event.*;
+import gate.event.StatusListener;
-import javax.swing.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-import gate.event.StatusListener;
-
/**
* Extension of a JMenuItem that adds a description and a StatusListener
* as parameters. The description is used in the statusListener.
*/
+@SuppressWarnings("serial")
public class XJMenuItem extends JMenuItem {
public XJMenuItem(Icon icon, String description, StatusListener listener){
Modified: gate/trunk/src/main/gate/swing/XJPopupMenu.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJPopupMenu.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJPopupMenu.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -15,12 +15,16 @@
package gate.swing;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
+
/**
* A modified version of JPopupMenu that uses {@link MenuLayout} as its layout.
*/
+@SuppressWarnings("serial")
public class XJPopupMenu extends JPopupMenu {
public XJPopupMenu() {
super();
Modified: gate/trunk/src/main/gate/swing/XJTabbedPane.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJTabbedPane.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJTabbedPane.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -25,6 +25,7 @@
/**
* An extended version of {@link javax.swing.JTabbedPane}.
*/
+@SuppressWarnings("serial")
public class XJTabbedPane extends JTabbedPane {
public XJTabbedPane(int tabPlacement){
Modified: gate/trunk/src/main/gate/swing/XJTable.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJTable.java 2014-03-10 08:38:23 UTC (rev
17611)
+++ gate/trunk/src/main/gate/swing/XJTable.java 2014-03-10 08:51:17 UTC (rev
17612)
@@ -498,7 +498,7 @@
* @param column the column index.
* @param comparator the comparator to be used.
*/
- public void setComparator(int column, Comparator comparator){
+ public void setComparator(int column, Comparator<?> comparator){
columnData.get(column).comparator = comparator;
}
@@ -559,9 +559,10 @@
}
}
+ @SuppressWarnings({"rawtypes","unchecked"})
protected class ValueHolderComparator implements Comparator<ValueHolder>{
private Comparator comparator;
-
+
protected Comparator getComparator() {
return comparator;
}
@@ -693,7 +694,7 @@
return sourceModel.getColumnName(columnIndex);
}
@Override
- public Class getColumnClass(int columnIndex){
+ public Class<?> getColumnClass(int columnIndex){
return sourceModel.getColumnClass(columnIndex);
}
@@ -747,7 +748,7 @@
}
//get an appropriate comparator
- Comparator comparator = columnData.get(sortedColumn).comparator;
+ Comparator<?> comparator = columnData.get(sortedColumn).comparator;
if(comparator == null){
//use the default comparator
if(defaultComparator == null) defaultComparator = new
ObjectComparator();
@@ -902,7 +903,7 @@
int column;
int columnWidth;
- Comparator comparator;
+ Comparator<?> comparator;
}
@Override
Modified: gate/trunk/src/main/gate/swing/XJTextPane.java
===================================================================
--- gate/trunk/src/main/gate/swing/XJTextPane.java 2014-03-10 08:38:23 UTC
(rev 17611)
+++ gate/trunk/src/main/gate/swing/XJTextPane.java 2014-03-10 08:51:17 UTC
(rev 17612)
@@ -28,6 +28,7 @@
* changes. This is needed by applications that want to be able to change the
* font in the entire application by changing the UI defaults table.
*/
+@SuppressWarnings("serial")
public class XJTextPane extends JTextPane {
public XJTextPane() {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
