Author: mwebb
Date: Tue Feb 26 20:28:09 2008
New Revision: 631478
URL: http://svn.apache.org/viewvc?rev=631478&view=rev
Log:
cleaned up all of the compile warnings that Eclipse is generating in its
default mode. Most of this was due to java generics issues.
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirChooser.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpDirectoryTableModel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpFileTableModel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/IPRestrictorTable.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/MessagePanel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/TreePluginPanelContainer.java
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/UserManagerPanel.java
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirChooser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirChooser.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirChooser.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirChooser.java
Tue Feb 26 20:28:09 2008
@@ -31,6 +31,7 @@
import java.io.FileFilter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@@ -207,7 +208,7 @@
}
}
- ArrayList dirs = new ArrayList();
+ List<File> dirs = new ArrayList<File>();
while(true) {
dirs.add(dir);
if(FILE_VIEW.isRoot(dir)) {
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/DirectoryPanel.java
Tue Feb 26 20:28:09 2008
@@ -35,7 +35,6 @@
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listener.Connection;
/**
* This panel monitor all user directory create and remove activities.
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpConnectionTableModel.java
Tue Feb 26 20:28:09 2008
@@ -52,7 +52,7 @@
"Login Time",
"Last Access Time",
"IP"};
- private List connections = new Vector();
+ private List<Connection> connections = new Vector<Connection>();
private FtpServerContext serverContext;
private EventListenerList listeners = new EventListenerList();
@@ -75,7 +75,7 @@
/**
* Get column class - always string
*/
- public Class getColumnClass(int index) {
+ public Class<String> getColumnClass(int index) {
return String.class;
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpDirectoryTableModel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpDirectoryTableModel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpDirectoryTableModel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpDirectoryTableModel.java
Tue Feb 26 20:28:09 2008
@@ -19,6 +19,7 @@
package org.apache.ftpserver.gui;
+import java.util.List;
import java.util.Vector;
import javax.swing.event.EventListenerList;
@@ -44,13 +45,13 @@
"User",
"Time"};
- private Vector entries = new Vector();
+ private List<TableEntry> entries = new Vector<TableEntry>();
private EventListenerList listeners = new EventListenerList();
/**
* Get column class - always string
*/
- public Class getColumnClass(int index) {
+ public Class<String> getColumnClass(int index) {
return String.class;
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpFileTableModel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpFileTableModel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpFileTableModel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/FtpFileTableModel.java
Tue Feb 26 20:28:09 2008
@@ -19,6 +19,7 @@
package org.apache.ftpserver.gui;
+import java.util.List;
import java.util.Vector;
import javax.swing.table.AbstractTableModel;
@@ -41,12 +42,12 @@
"User",
"Time"};
- private Vector entries = new Vector();
+ private List<TableEntry> entries = new Vector<TableEntry>();
/**
* Get column class - always string
*/
- public Class getColumnClass(int index) {
+ public Class<String> getColumnClass(int index) {
return String.class;
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/IPRestrictorTable.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/IPRestrictorTable.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/IPRestrictorTable.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/IPRestrictorTable.java
Tue Feb 26 20:28:09 2008
@@ -23,6 +23,7 @@
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
@@ -53,7 +54,7 @@
"Permission"
};
- private Vector entries = new Vector();
+ private List<Entry> entries = new Vector<Entry>();
private EventListenerList modelListeners = new EventListenerList();
private JTable table;
@@ -439,8 +440,8 @@
/**
* Get column class.
*/
- public Class getColumnClass(int colIdx) {
- Class type = null;
+ public Class<?> getColumnClass(int colIdx) {
+ Class<?> type = null;
if(colIdx == 0) {
type = String.class;
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/MessagePanel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/MessagePanel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/MessagePanel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/MessagePanel.java
Tue Feb 26 20:28:09 2008
@@ -26,6 +26,7 @@
import java.awt.event.ActionListener;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.List;
import java.util.Properties;
import java.util.Vector;
@@ -42,8 +43,8 @@
import javax.swing.event.ListSelectionListener;
import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.interfaces.MessageResource;
import org.apache.ftpserver.interfaces.FtpServerContext;
+import org.apache.ftpserver.interfaces.MessageResource;
/**
* This is FTP server response panel. User can customize server responses.
@@ -62,7 +63,7 @@
private JTextArea txtArea;
private String[] languages;
- private Vector messageKeys;
+ private List<String> messageKeys;
private Properties messageProps;
private int oldKeySelIndex = -1;
@@ -164,8 +165,8 @@
// get properties
MessageResource msgRes = serverContext.getMessageResource();
Properties prop = msgRes.getMessages(language);
- Vector keyList = new Vector();
- for(Enumeration keys = prop.propertyNames(); keys.hasMoreElements();) {
+ List<String> keyList = new Vector<String>();
+ for(Enumeration<?> keys = prop.propertyNames();
keys.hasMoreElements();) {
String key = (String)keys.nextElement();
keyList.add(key);
}
@@ -175,7 +176,7 @@
// load list
list.removeAll();
- list.setListData(keyList);
+ list.setListData(keyList.toArray());
list.setSelectedIndex(0);
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/StatisticsPanel.java
Tue Feb 26 20:28:09 2008
@@ -151,7 +151,7 @@
/**
* Get column class - always string
*/
- public Class getColumnClass(int index) {
+ public Class<String> getColumnClass(int index) {
return String.class;
}
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/TreePluginPanelContainer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/TreePluginPanelContainer.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/TreePluginPanelContainer.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/TreePluginPanelContainer.java
Tue Feb 26 20:28:09 2008
@@ -21,6 +21,7 @@
import java.awt.BorderLayout;
import java.util.ArrayList;
+import java.util.List;
import java.util.Vector;
import javax.swing.JComponent;
@@ -50,8 +51,8 @@
private static final long serialVersionUID = -6807863406907626635L;
- private ArrayList pluginPanels = new ArrayList();
- private Vector treeListeners = new Vector();
+ private List<PluginPanel> pluginPanels = new ArrayList<PluginPanel>();
+ private List<TreeModelListener> treeListeners = new
Vector<TreeModelListener>();
private FtpServerContext serverContext;
Modified:
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/UserManagerPanel.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/UserManagerPanel.java?rev=631478&r1=631477&r2=631478&view=diff
==============================================================================
---
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/UserManagerPanel.java
(original)
+++
mina/ftpserver/trunk/admin-gui/src/main/java/org/apache/ftpserver/gui/UserManagerPanel.java
Tue Feb 26 20:28:09 2008
@@ -592,7 +592,7 @@
user.setHomeDirectory(directoryTxt.getText());
user.setEnabled(enabledChkBox.isSelected());
- List authorities = new ArrayList();
+ List<Authority> authorities = new ArrayList<Authority>();
if(writeChkBox.isSelected()) {
authorities.add(new WritePermission());
