Author: scooter
Date: 2012-07-10 17:00:31 -0700 (Tue, 10 Jul 2012)
New Revision: 29824
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/MenuGravityTracker.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/PopupMenuGravityTracker.java
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
Log:
Commit changes to support context menu clean-up
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
2012-07-10 19:14:03 UTC (rev 29823)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
2012-07-11 00:00:31 UTC (rev 29824)
@@ -104,6 +104,10 @@
if (menuString.isEmpty())
throw new IllegalArgumentException("menu string has
zero length");
+ // Special case: if we have a popup menu and the menu is "."
return the rootGravityTracker
+ if (menuString.equals(".") && rootPopupGravityTracker != null)
+ return rootPopupGravityTracker;
+
final List<MenuNameAndGravity> namesAndGravities =
parseMenuString(menuString);
MenuGravityTracker parentGravityTracker = null;
MenuGravityTracker gravityTracker = null;
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/MenuGravityTracker.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/MenuGravityTracker.java
2012-07-10 19:14:03 UTC (rev 29823)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/MenuGravityTracker.java
2012-07-11 00:00:31 UTC (rev 29824)
@@ -93,7 +93,7 @@
menu.remove(component);
}
- private int getInsertLocation(final String newMenuText, final double
newGravity) {
+ private int getInsertLocation(final String newMenuText, final double
newGravity) {
if (newGravity == GravityTracker.USE_ALPHABETIC_ORDER) {
for (int i = 0; i < menu.getMenuComponentCount(); ++i) {
final Component item = menu.getMenuComponent(i);
@@ -118,5 +118,5 @@
}
return menu.getMenuComponentCount();
- }
+ }
}
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/PopupMenuGravityTracker.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/PopupMenuGravityTracker.java
2012-07-10 19:14:03 UTC (rev 29823)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/PopupMenuGravityTracker.java
2012-07-11 00:00:31 UTC (rev 29824)
@@ -95,7 +95,7 @@
menu.remove(menu.getComponentIndex(component));
}
- private int getInsertLocation(final String newMenuText, final double
newGravity) {
+ private int getInsertLocation(final String newMenuText, final double
newGravity) {
if (newGravity == GravityTracker.USE_ALPHABETIC_ORDER) {
for (int i = 0; i < menu.getComponentCount(); ++i) {
final Component item = menu.getComponent(i);
@@ -120,5 +120,5 @@
}
return menu.getComponentCount();
- }
+ }
}
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
===================================================================
---
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
2012-07-10 19:14:03 UTC (rev 29823)
+++
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/ServiceProperties.java
2012-07-11 00:00:31 UTC (rev 29824)
@@ -90,4 +90,48 @@
* Preferred action properties.
*/
public static final String PREFERRED_ACTION = "preferredAction";
+
+ /**
+ * Insert separator before this menu item
+ */
+ public static final String INSERT_SEPARATOR_BEFORE =
"insertSeparatorBefore";
+
+ /**
+ * Insert separator after this menu item
+ */
+ public static final String INSERT_SEPARATOR_AFTER =
"insertSeparatorAfter";
+
+ /**
+ * Define standard context menus. This is done here so that they will
+ * be consistenty used since this is the only way to define gravity for
these...
+ */
+ public static final String APPS_MENU = "Apps[1]"; // Default menu if
nothing else is specified
+
+ // Network context menus
+ public static final String NETWORK_ADD_MENU = "Add[-1100]";
+ public static final String NETWORK_DELETE_MENU = "Delete[-1090]";
+ public static final String NETWORK_EDIT_MENU = "Edit[-1080]";
+ public static final String NETWORK_SELECT_MENU = "Select[-1070]";
+ public static final String NETWORK_GROUP_MENU = "Group[-1060]";
+ public static final String NETWORK_LAYOUT_MENU = "Layout[-1050]";
+ public static final String NETWORK_APPS_MENU = "Apps[1]";
+ public static final String NETWORK_PREFERENCES_MENU =
"Preferences[1000]";
+
+ // Node context menus
+ public static final String NODE_EDIT_MENU = "Edit[-1100]";
+ public static final String NODE_SELECT_MENU = "Select[-1090]";
+ public static final String NODE_GROUP_MENU = "Group[-1080]";
+ public static final String NODE_NESTED_NETWORKS_MENU = "Nested
Networks[-1070]";
+ public static final String NODE_APPS_MENU = "Apps[1]"; // This is the
default menu if no preferredMenu is defined
+ public static final String NODE_LINKOUTS_MENU = "Linkouts[1001]";
+ public static final String NODE_DYNAMIC_LINKOUTS_MENU = "Dynamic
Linkouts[1050]";
+ public static final String NODE_PREFERENCES_MENU = "Preferences[1100]";
+
+ // Edge context menus
+ public static final String EDGE_EDIT_MENU = "Edit[-1100]";
+ public static final String EDGE_SELECT_MENU = "Select[-1100]";
+ public static final String EDGE_APPS_MENU = "Apps[1]";
+ public static final String EDGE_LINKOUTS_MENU = "Linkouts[1001]";
+ public static final String EDGE_DYNAMIC_LINKOUTS_MENU = "Dynamic
Linkouts[1050]";
+ public static final String EDGE_PREFERENCES_MENU = "Preferences[1100]";
}
--
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.
