Author: mes
Date: 2010-09-15 10:52:30 -0700 (Wed, 15 Sep 2010)
New Revision: 21873
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAction.java
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/data/FileReader.java
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennCanvas.java
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennDialog.java
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennFrame.java
Log:
fixed all warnings
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAction.java
===================================================================
--- csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAction.java
2010-09-15 17:52:00 UTC (rev 21872)
+++ csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAction.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -51,6 +51,8 @@
public class VennAction extends CytoscapeAction {
+ private static final long serialVersionUID = 1850323456657887666L;
+
public VennAction() {
super("Venn/Euler Diagram");
setPreferredMenu("Plugins");
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
2010-09-15 17:52:00 UTC (rev 21872)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/VennAnalytic.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -136,7 +136,7 @@
}
private void processAreaData(String[][] data, double[] areas) {
- HashMap sets = new HashMap();
+ HashMap<String,Double> sets = new HashMap<String,Double>();
for (int i = 0; i < data.length; i++) {
String[] s = data[i][0].split("&");
for (int j = 0; j < s.length; j++) {
@@ -147,11 +147,11 @@
}
}
circleLabels = new String[sets.size()];
- Set keys = sets.keySet();
- Iterator it = keys.iterator();
+ Set<String> keys = sets.keySet();
+ Iterator<String> it = keys.iterator();
while (it.hasNext()) {
- String key = (String) it.next();
- int j = ((Double) sets.get(key)).intValue();
+ String key = it.next();
+ int j = sets.get(key).intValue();
circleLabels[j] = key;
}
nRows = data.length;
@@ -166,7 +166,7 @@
int[] subsets = new int[nCircles];
String[] s = data[i][0].split("&");
for (int j = 0; j < s.length; j++) {
- int jj = ((Double) sets.get(s[j])).intValue();
+ int jj = sets.get(s[j]).intValue();
subsets[jj] = 1;
}
int k = decode(subsets);
@@ -181,9 +181,10 @@
}
private void processElementData(String[][] data) {
- HashMap[] categories = new HashMap[2];
- categories[0] = new HashMap();
- categories[1] = new HashMap();
+ @SuppressWarnings("unchecked")
+ HashMap<String,Double>[] categories = new HashMap[2];
+ categories[0] = new HashMap<String,Double>();
+ categories[1] = new HashMap<String,Double>();
for (int i = 0; i < data.length; i++) {
for (int j = 0; j < 2; j++) {
if (!categories[j].containsKey(data[i][j])) {
@@ -193,11 +194,11 @@
}
}
circleLabels = new String[categories[1].size()];
- Set keys = categories[1].keySet();
- Iterator it = keys.iterator();
+ Set<String> keys = categories[1].keySet();
+ Iterator<String> it = keys.iterator();
while (it.hasNext()) {
- String key = (String) it.next();
- int j = ((Double) categories[1].get(key)).intValue();
+ String key = it.next();
+ int j = categories[1].get(key).intValue();
circleLabels[j] = key;
}
nRows = data.length;
@@ -210,8 +211,8 @@
centers = new double[nCircles][2];
int[][] subsets = new int[categories[0].size()][nCircles];
for (int i = 0; i < nRows; i++) {
- int i1 = ((Double) categories[0].get(data[i][0])).intValue();
- int j1 = ((Double) categories[1].get(data[i][1])).intValue();
+ int i1 = categories[0].get(data[i][0]).intValue();
+ int j1 = categories[1].get(data[i][1]).intValue();
subsets[i1][j1]++;
}
for (int i = 0; i < subsets.length; i++)
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/data/FileReader.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/data/FileReader.java
2010-09-15 17:52:00 UTC (rev 21872)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/data/FileReader.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -18,9 +18,10 @@
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.Map;
+import java.util.List;
public abstract class FileReader {
- private static Map separators = new LinkedHashMap();
+ private static Map<String,int[]> separators = new
LinkedHashMap<String,int[]>();
private static String separator = " ";
private static int nCols;
private static int nRows;
@@ -83,7 +84,7 @@
}
private static String[][] reformData(String[][] data) {
- ArrayList d = new ArrayList(nRows);
+ List<String[]> d = new ArrayList<String[]>(nRows);
for (int i = 0; i < nRows; i++) {
for (int j = 0; j < nCols - 1; j++) {
data[i][j] = data[i][j].trim();
@@ -97,9 +98,9 @@
}
String[][] result = new String[d.size()][2];
for (int i = 0; i < d.size(); i++) {
- Object[] o = (Object[]) d.get(i);
- result[i][0] = (String) o[0];
- result[i][1] = (String) o[1];
+ String[] o = d.get(i);
+ result[i][0] = o[0];
+ result[i][1] = o[1];
}
return result;
}
@@ -141,7 +142,7 @@
} else {
Object[] keys = separators.keySet().toArray();
separator = (String) keys[0];
- nCols = 1 + ((int[]) separators.get(separator))[1];
+ nCols = 1 + separators.get(separator)[1];
}
fin.close();
} catch (java.io.IOException ie) {
@@ -159,7 +160,7 @@
for (int j = 0; j < keys.length; j++) {
String key = (String) keys[j];
if (record.substring(i, i + 1).equals(key)) {
- int[] counts = (int[]) separators.get(key);
+ int[] counts = separators.get(key);
counts[0]++;
break;
}
@@ -172,7 +173,7 @@
Object[] keys = separators.keySet().toArray();
for (int j = 0; j < keys.length; j++) {
String key = (String) keys[j];
- int[] counts = (int[]) separators.get(key);
+ int[] counts = separators.get(key);
if (counts[0] == 0 || n > 0 && counts[0] != counts[1]) {
separators.remove(key);
} else {
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennCanvas.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennCanvas.java
2010-09-15 17:52:00 UTC (rev 21872)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennCanvas.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -25,6 +25,7 @@
import java.text.DecimalFormat;
public class VennCanvas extends JPanel {
+ private static final long serialVersionUID = 1763987987676643266L;
private BufferedImage bi;
private int size;
private double mins, maxs;
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennDialog.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennDialog.java
2010-09-15 17:52:00 UTC (rev 21872)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennDialog.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -48,6 +48,7 @@
public class VennDialog extends JDialog implements ActionListener,
ItemListener {
+ private static final long serialVersionUID = 1554446356623443266L;
private String attrName;
private List<CyNetwork> networks;
private boolean printIntersection;
Modified:
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennFrame.java
===================================================================
---
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennFrame.java
2010-09-15 17:52:00 UTC (rev 21872)
+++
csplugins/trunk/ucsd/mes/VennDiagram/src/edu/uic/ncdm/venn/display/VennFrame.java
2010-09-15 17:52:30 UTC (rev 21873)
@@ -26,6 +26,7 @@
import cytoscape.Cytoscape;
public class VennFrame extends JDialog {
+ private static final long serialVersionUID = 1850323456623443266L;
private int RESIDUAL_SIZE = 100;
private int STRESS_SIZE = 50;
private int SIZE = 700;
@@ -88,6 +89,7 @@
private class WarningCellRenderer extends JLabel
implements TableCellRenderer {
+ private static final long serialVersionUID =
1763432456623443266L;
private VennDiagram vd;
private Color warningColor = new Color(1.0f,0f,0f,0.25f);
public WarningCellRenderer(VennDiagram vd) {
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
