diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/util')
4 files changed, 14 insertions, 16 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/pki/base/common/src/com/netscape/cmscore/util/Debug.java index 66e316c11..8c41d5bb5 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/Debug.java +++ b/pki/base/common/src/com/netscape/cmscore/util/Debug.java @@ -40,15 +40,15 @@ public class Debug so I create a thread-local DateFormatter for each thread */ private static String DATE_PATTERN = "dd/MMM/yyyy:HH:mm:ss"; - private static ThreadLocal mFormatObject = new ThreadLocal() { - protected synchronized Object initialValue() { + private static ThreadLocal<SimpleDateFormat> mFormatObject = new ThreadLocal<SimpleDateFormat>() { + protected synchronized SimpleDateFormat initialValue() { return new SimpleDateFormat(DATE_PATTERN); } }; /* the dateformatter should be accessed with this function */ private static SimpleDateFormat getDateFormatter() { - return ((SimpleDateFormat) (mFormatObject.get())); + return mFormatObject.get(); } public static final boolean ON = false; diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java index 27d5b6c79..7853346f5 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java @@ -50,7 +50,7 @@ public class FileAsString { private void readFile() throws IOException { BufferedReader br = createBufferedReader(mFilename); - StringBuffer buf = new StringBuffer(""); + StringBuffer buf = new StringBuffer(); int bytesread = 0; do { @@ -60,7 +60,6 @@ public class FileAsString { if (bytesread > 0) { buf.append(cbuf, 0, bytesread); } - String s = new String(buf); } while (bytesread != -1); br.close(); diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java index 454c3c8db..eb1d1097a 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java @@ -63,7 +63,6 @@ public class FileDialogFilter implements FilenameFilter { */ boolean searchPattern(String fileName, String filter) { int filterCursor = 0; - int fileNameCursor = 0; int filterChar = filter.charAt(filterCursor); diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index 3ee2d3ab4..caf05c6df 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -165,12 +165,12 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { public void updateThreadPanel() { Thread currentThread = Thread.currentThread(); - Vector data = new Vector(); + Vector<Vector<String>> data = new Vector<Vector<String>>(); Thread threads[] = new Thread[100]; int numThreads = Thread.enumerate(threads); for (int i = 0; i < numThreads; i++) { - Vector row = new Vector(); + Vector<String> row = new Vector<String>(); row.addElement(threads[i].getName()); row.addElement(threads[i].getThreadGroup().getName()); @@ -185,7 +185,7 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { data.addElement(row); } - Vector colNames = new Vector(); + Vector<String> colNames = new Vector<String>(); colNames.addElement("Name"); colNames.addElement("Group"); @@ -220,13 +220,13 @@ class ThreadTableModel extends AbstractTableModel { * */ private static final long serialVersionUID = -6977965542104110870L; - Vector rowData; - Vector columnNames; + Vector<Vector<String>> rowData; + Vector<String> columnNames; public ThreadTableModel() { } - public void setInfo(Vector _rowData, Vector _columnNames) { + public void setInfo(Vector<Vector<String>> _rowData, Vector<String> _columnNames) { rowData = _rowData; columnNames = _columnNames; } @@ -243,16 +243,16 @@ class ThreadTableModel extends AbstractTableModel { return columnNames.size(); } - public Object getValueAt(int row, int column) { - return ((Vector) rowData.elementAt(row)).elementAt(column); + public String getValueAt(int row, int column) { + return rowData.elementAt(row).elementAt(column); } public boolean isCellEditable(int row, int column) { return false; } - public void setValueAt(Object value, int row, int column) { - ((Vector) rowData.elementAt(row)).setElementAt(value, column); + public void setValueAt(String value, int row, int column) { + rowData.elementAt(row).setElementAt(value, column); fireTableCellUpdated(row, column); } } |