Author: mes
Date: 2011-09-16 16:10:23 -0700 (Fri, 16 Sep 2011)
New Revision: 26847
Modified:
core3/impl/branches/no-spring/table-browser-impl/osgi.bnd
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
core3/impl/branches/no-spring/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
Log:
tweaks to fix various startup exceptions
Modified: core3/impl/branches/no-spring/table-browser-impl/osgi.bnd
===================================================================
--- core3/impl/branches/no-spring/table-browser-impl/osgi.bnd 2011-09-16
23:08:57 UTC (rev 26846)
+++ core3/impl/branches/no-spring/table-browser-impl/osgi.bnd 2011-09-16
23:10:23 UTC (rev 26847)
@@ -4,5 +4,5 @@
Bundle-Activator: ${bundle.namespace}.CyActivator
-Private-Package: ${bundle.namespace},${bundle.namespace}.*
+Private-Package: ${bundle.namespace}.*
Modified:
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
===================================================================
---
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
2011-09-16 23:08:57 UTC (rev 26846)
+++
core3/impl/branches/no-spring/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
2011-09-16 23:10:23 UTC (rev 26847)
@@ -58,19 +58,19 @@
* A class that encapsulates the creation of JPopupMenus based
* on TaskFactory services.
*/
-class PopupMenuHelper {
+public class PopupMenuHelper {
private final TaskManager taskManager;
private final Map<TableCellTaskFactory, Map> tableCellFactoryMap;
private final Map<TableColumnTaskFactory, Map> tableColumnFactoryMap;
- PopupMenuHelper(final TaskManager taskManager) {
+ public PopupMenuHelper(final TaskManager taskManager) {
this.taskManager = taskManager;
tableCellFactoryMap = new HashMap<TableCellTaskFactory,
Map>();
tableColumnFactoryMap = new HashMap<TableColumnTaskFactory,
Map>();
}
- void createColumnHeaderMenu(final CyColumn column, final Component
invoker, final int x,
+ public void createColumnHeaderMenu(final CyColumn column, final
Component invoker, final int x,
final int y)
{
if (tableColumnFactoryMap.isEmpty())
@@ -87,7 +87,7 @@
menu.show(invoker, x, y);
}
- void createTableCellMenu(final CyColumn column, final Object
primaryKeyValue,
+ public void createTableCellMenu(final CyColumn column, final Object
primaryKeyValue,
final Component invoker, final int x, final
int y)
{
if (tableCellFactoryMap.isEmpty())
Modified:
core3/impl/branches/no-spring/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
===================================================================
---
core3/impl/branches/no-spring/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
2011-09-16 23:08:57 UTC (rev 26846)
+++
core3/impl/branches/no-spring/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMenuManager.java
2011-09-16 23:10:23 UTC (rev 26847)
@@ -146,11 +146,15 @@
public void addTaskFactory(final TaskFactory taskFactory,
@SuppressWarnings("rawtypes") Map properties) {
- final Object serviceType = properties.get(METADATA_MENU_KEY);
- if (serviceType == null)
- throw new NullPointerException(
- "Service Type metadata is null. This
value is required.");
+ // first filter the service...
+ final Object serviceType = properties.get("service.type");
+ if ( serviceType == null || !(serviceType instanceof String) ||
!((String)serviceType).equals("vizmapUI.taskFactory") )
+ return;
+ final Object menuDef = properties.get(METADATA_MENU_KEY);
+ if (menuDef == null)
+ throw new NullPointerException("Menu metadata is
missing.");
+
// This is a menu item for Main Command Button.
final Object title = properties.get(METADATA_TITLE_KEY);
if (title == null)
@@ -166,9 +170,9 @@
}
});
- if(serviceType.toString().equals(MAIN_MENU))
+ if(menuDef.toString().equals(MAIN_MENU))
mainMenu.add(menuItem);
- else if(serviceType.toString().equals(CONTEXT_MENU))
+ else if(menuDef.toString().equals(CONTEXT_MENU))
edit.add(menuItem);
}
--
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.
