Author: clopes
Date: 2012-04-17 13:12:04 -0700 (Tue, 17 Apr 2012)
New Revision: 28856
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
Log:
Fixed NPEs
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-04-17 20:09:17 UTC (rev 28855)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/BrowserTable.java
2012-04-17 20:12:04 UTC (rev 28856)
@@ -367,18 +367,19 @@
final Class<?> columnType = model.getColumn(column).getType();
if (columnType == List.class) {
- final ValidatedObjectAndEditString value =
-
(ValidatedObjectAndEditString)model.getValueAt(row, column);
+ final ValidatedObjectAndEditString value =
(ValidatedObjectAndEditString) model.getValueAt(row, column);
- final List list = (List)value.getValidatedObject();
- if (list != null) {
- cellMenu = new JPopupMenu();
- final Object[] listItems = list.toArray();
-
- if (listItems.length != 0) {
- final String idField =
-
model.getAttributes().getPrimaryKey().getName();
- getCellContentView(List.class,
listItems, idField, e);
+ if (value != null) {
+ final List<?> list = (List<?>)
value.getValidatedObject();
+
+ if (list != null) {
+ cellMenu = new JPopupMenu();
+ final Object[] listItems =
list.toArray();
+
+ if (listItems.length != 0) {
+ final String idField =
model.getAttributes().getPrimaryKey().getName();
+ getCellContentView(List.class,
listItems, idField, e);
+ }
}
}
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
2012-04-17 20:09:17 UTC (rev 28855)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/HyperLinkOut.java
2012-04-17 20:12:04 UTC (rev 28856)
@@ -31,12 +31,10 @@
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
@@ -56,9 +54,9 @@
* @param value DOCUMENT ME!
* @param menuStructure DOCUMENT ME!
*/
- public HyperLinkOut(String value, final Map<String, Map<String,
String>> menuStructure,
- final OpenBrowser openBrowser)
- {
+ public HyperLinkOut(String value,
+ final Map<String, Map<String,
String>> menuStructure,
+ final OpenBrowser openBrowser)
{
this.value = value;
this.structure = menuStructure;
this.openBrowser = openBrowser;
@@ -94,23 +92,21 @@
}
private void buildLinks() {
- String fullName;
-
- JMenu cat;
-
+ if (structure == null)
+ return;
+
for (final String category : structure.keySet()) {
- cat = new JMenu(category);
-
+ JMenu cat = new JMenu(category);
Map<String, String> children = structure.get(category);
for (final String name : children.keySet()) {
JMenuItem dbLink = new JMenuItem(name);
dbLink.addActionListener(new ActionListener() {
- public void
actionPerformed(ActionEvent e) {
- final String url =
-
structure.get(category).get(name).replace("%ID%", value);
+ public void actionPerformed(ActionEvent
e) {
+ final String url =
structure.get(category).get(name).replace("%ID%", value);
openBrowser.openURL(url);
- }});
+ }
+ });
cat.add(dbLink);
}
--
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.
