Author: mes
Date: 2011-01-18 15:35:14 -0800 (Tue, 18 Jan 2011)
New Revision: 23497
Modified:
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/CyAction.java
Log:
minor updated to support menu and toolbar gravity
Modified:
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-01-18 20:00:11 UTC (rev 23496)
+++
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-01-18 23:35:14 UTC (rev 23497)
@@ -46,6 +46,8 @@
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An abstract implementation of the CyAction interface. Instead of using this
@@ -56,9 +58,8 @@
*/
public abstract class AbstractCyAction extends AbstractAction implements
CyAction {
protected String preferredMenu = null;
- protected String preferredButtonGroup = null;
- protected float menuGravity = 1.0f;
- protected float toolbarGravity = 1.0f;
+ protected float menuGravity = 100.0f; // end of menu
+ protected float toolbarGravity = 100.0f; // end of toolbar
protected boolean acceleratorSet = false;
protected KeyStroke acceleratorKeyStroke = null;
protected String name;
@@ -68,6 +69,8 @@
protected String enableFor = null;
protected CyApplicationManager applicationManager;
+ private static final Logger logger =
LoggerFactory.getLogger(AbstractCyAction.class);
+
/**
* Creates a new AbstractCyAction object.
*
@@ -89,13 +92,14 @@
* <ul>
* <li>title</li>
* <li>preferredMenu</li>
- * <li>preferredButtonGroup</li>
* <li>iconName</li>
* <li>tooltip</li>
* <li>inToolBar</li>
* <li>inMenuBar</li>
* <li>enableFor</li>
* <li>accelerator</li>
+ * <li>menuGravity</li>
+ * <li>toolBarGravity</li>
* </ul>
* @param applicationManager The application manager providing context
for this action.
*/
@@ -106,10 +110,6 @@
if ( prefMenu != null )
setPreferredMenu(prefMenu);
- String prefButtonGroup =
(String)(configProps.get("preferredButtonGroup"));
- if ( prefButtonGroup != null )
- setPreferredButtonGroup(prefButtonGroup);
-
String iconName = (String)(configProps.get("iconName"));
if ( iconName != null )
putValue(SMALL_ICON,new
ImageIcon(getClass().getResource(iconName)));
@@ -131,6 +131,24 @@
String keyComboString = (String) configProps.get("accelerator");
if (keyComboString != null)
setAcceleratorKeyStroke(
AcceleratorParser.parse(keyComboString) );
+
+ String menuGravityString = (String)
configProps.get("menuGravity");
+ if ( menuGravityString != null ) {
+ try {
+ menuGravity = Float.valueOf(menuGravityString);
+ } catch (NumberFormatException nfe) {
+ logger.warn("failed to set menuGravity with: "
+ menuGravityString, nfe);
+ }
+ }
+
+ String toolbarGravityString = (String)
configProps.get("toolBarGravity");
+ if ( toolbarGravityString != null ) {
+ try {
+ toolbarGravity =
Float.valueOf(toolbarGravityString);
+ } catch (NumberFormatException nfe) {
+ logger.warn("failed to set toolBarGravity with:
" + toolbarGravityString, nfe);
+ }
+ }
}
/**
@@ -228,22 +246,7 @@
preferredMenu = new_preferred;
}
- /**
- * {@inheritDoc}
- */
- public String getPreferredButtonGroup() {
- return preferredButtonGroup;
- }
-
/**
- * Sets the preferred button group.
- * @param new_preferred The preferred button group for this action.
- */
- public void setPreferredButtonGroup(String new_preferred) {
- preferredButtonGroup = new_preferred;
- }
-
- /**
* {@inheritDoc}
*/
public boolean useCheckBoxMenuItem() {
Modified:
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/CyAction.java
===================================================================
---
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/CyAction.java
2011-01-18 20:00:11 UTC (rev 23496)
+++
core3/swing-application-api/trunk/src/main/java/org/cytoscape/application/swing/CyAction.java
2011-01-18 23:35:14 UTC (rev 23497)
@@ -98,13 +98,6 @@
*/
String getPreferredMenu();
- /**
- * Buttons will be grouped according to name and according to gravity
- * within the group.
- * @return The name identifying the button group.
- */
- String getPreferredButtonGroup();
-
/**
* Returns whether or not a checkbox menu item should be used.
* @return whether or not a checkbox menu item should be used.
--
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.
