Author: jm
Date: 2012-01-06 14:59:43 -0800 (Fri, 06 Jan 2012)
New Revision: 27949
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
Log:
Fixes #551: Renamed "Submenu definition" to "Apply to". Also fixed
NullPointerException that occurs in ListSingleHandler when list is empty
Modified:
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
===================================================================
---
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
2012-01-06 22:52:39 UTC (rev 27948)
+++
core3/api/trunk/layout-api/src/main/java/org/cytoscape/view/layout/AbstractLayoutAlgorithm.java
2012-01-06 22:59:43 UTC (rev 27949)
@@ -71,7 +71,7 @@
* @return The list single selection object that specifies the submenu
* names to be used for generating selection submenus.
*/
- @Tunable(description="Submenu definition")
+ @Tunable(description="Apply to")
public ListSingleSelection<String> getSubmenuOptions() {
List<String> possibleValues = new ArrayList<String>();
@@ -105,11 +105,13 @@
}
}
- if ( possibleValues.isEmpty() )
- possibleValues.add( humanName );
+// if ( possibleValues.isEmpty() )
+// possibleValues.add( humanName );
submenuDef = new ListSingleSelection<String>( possibleValues );
-
+ if (possibleValues.size() > 0) {
+ submenuDef.setSelectedValue(possibleValues.get(0));
+ }
return submenuDef;
}
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2012-01-06 22:52:39 UTC (rev 27948)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListSingleHandler.java
2012-01-06 22:59:43 UTC (rev 27949)
@@ -51,7 +51,7 @@
}
if ( listSingleSelection.getPossibleValues().isEmpty() ) {
- panel = null;
+ panel = new JPanel();
combobox = null;
return;
}
--
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.
