Author: mes
Date: 2011-12-12 12:44:38 -0800 (Mon, 12 Dec 2011)
New Revision: 27768
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNetworkManager.java
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/FileUtil.java
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewManager.java
Log:
changed parameter names to be camel case
Modified:
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNetworkManager.java
===================================================================
---
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNetworkManager.java
2011-12-12 20:22:10 UTC (rev 27767)
+++
core3/api/trunk/model-api/src/main/java/org/cytoscape/model/CyNetworkManager.java
2011-12-12 20:44:38 UTC (rev 27768)
@@ -60,11 +60,11 @@
/**
* Tests whether a network has been registered with the network
manager or not.
*
- * @param network_id possibly the ID of a network
+ * @param networkId possibly the ID of a network
*
- * @return true if "network_id" does correspond to a network known to
the network manager, else false
+ * @return true if "networkId" does correspond to a network known to
the network manager, else false
*/
- public boolean networkExists(long network_id);
+ public boolean networkExists(long networkId);
/**
* Destroys a network.
Modified:
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
===================================================================
---
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-12-12 20:22:10 UTC (rev 27767)
+++
core3/api/trunk/swing-application-api/src/main/java/org/cytoscape/application/swing/AbstractCyAction.java
2011-12-12 20:44:38 UTC (rev 27768)
@@ -335,10 +335,10 @@
* Sets the preferredMenuString. See the {@link #getPreferredMenu}
* description for formatting description.
*
- * @param new_preferred The string describing the preferred menu name.
+ * @param newPreferredMenu The string describing the preferred menu
name.
*/
- public void setPreferredMenu(String new_preferred) {
- preferredMenu = new_preferred;
+ public void setPreferredMenu(String newPreferredMenu) {
+ preferredMenu = newPreferredMenu;
}
/**
Modified:
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/FileUtil.java
===================================================================
---
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/FileUtil.java
2011-12-12 20:22:10 UTC (rev 27767)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/FileUtil.java
2011-12-12 20:44:38 UTC (rev 27768)
@@ -74,10 +74,10 @@
* @return the location of the selected file
* @param parent the parent of the JFileChooser or FileDialog
* @param title the title of the dialog box
- * @param load_save_custom a flag for the type of file dialog
+ * @param loadSaveCustom a flag for the type of file dialog
* @param filters a non-empty collection of file filters
*/
- File getFile(Component parent, String title, int load_save_custom,
+ File getFile(Component parent, String title, int loadSaveCustom,
Collection<FileChooserFilter> filters);
/**
@@ -87,16 +87,16 @@
* @return the location of the selected file
* @param parent the parent of the JFileChooser or FileDialog
* @param title the title of the dialog box
- * @param load_save_custom a flag for the type of file dialog
- * @param start_dir an alternate start dir, if null the default
+ * @param loadSaveCustom a flag for the type of file dialog
+ * @param startDir an alternate start dir, if null the default
* Cytoscape MUD will be used
- * @param custom_approve_text if this is a custom dialog, then
+ * @param customApproveText if this is a custom dialog, then
* custom text should be on the approve
* button.
* @param filters a non-empty collection of file filters
*/
- File getFile(Component parent, String title, int load_save_custom,
String start_dir,
- String custom_approve_text, Collection<FileChooserFilter>
filters);
+ File getFile(Component parent, String title, int loadSaveCustom, String
startDir,
+ String customApproveText, Collection<FileChooserFilter>
filters);
/**
* Returns an array of File objects, this method should be used instead
@@ -104,10 +104,10 @@
* @return the location of the selected file
* @param parent the parent of the JFileChooser or FileDialog
* @param title the title of the dialog box
- * @param load_save_custom a flag for the type of file dialog
+ * @param loadSaveCustom a flag for the type of file dialog
* @param filters a non-empty collection of file filters
*/
- File[] getFiles(Component parent, String title, int load_save_custom,
+ File[] getFiles(Component parent, String title, int loadSaveCustom,
Collection<FileChooserFilter> filters);
/**
@@ -117,16 +117,16 @@
* @return and array of selected files, or null if none are selected
* @param parent the parent of the JFileChooser or FileDialog
* @param title the title of the dialog box
- * @param load_save_custom a flag for the type of file dialog
- * @param start_dir an alternate start dir, if null the default
+ * @param loadSaveCustom a flag for the type of file dialog
+ * @param startDir an alternate start dir, if null the default
* Cytoscape MUD will be used
- * @param custom_approve_text if this is a custom dialog, then
+ * @param customApproveText if this is a custom dialog, then
* custom text should be on the approve
* button.
* @param filters a non-empty collection of file filters
*/
- File[] getFiles(Component parent, String title, int load_save_custom,
- String start_dir, String custom_approve_text,
+ File[] getFiles(Component parent, String title, int loadSaveCustom,
+ String startDir, String customApproveText,
Collection<FileChooserFilter> filters);
/**
@@ -136,10 +136,10 @@
* @return and array of selected files, or null if none are selected
* @param parent the parent of the JFileChooser or FileDialog
* @param title the title of the dialog box
- * @param load_save_custom a flag for the type of file dialog
- * @param start_dir an alternate start dir, if null the default
+ * @param loadSaveCustom a flag for the type of file dialog
+ * @param startDir an alternate start dir, if null the default
* cytoscape MUD will be used
- * @param custom_approve_text if this is a custom dialog, then
+ * @param customApproveText if this is a custom dialog, then
* custom text should be on the approve
* button.
* @param multiselect Enable selection of multiple files (Macs are
@@ -147,7 +147,7 @@
* FileDialog there -- is this fixed in Java 1.5?)
* @param filters a non-empty collection of file filters
*/
- File[] getFiles(Component parent, String title, int load_save_custom,
- String start_dir, String custom_approve_text, boolean
multiselect,
+ File[] getFiles(Component parent, String title, int loadSaveCustom,
+ String startDir, String customApproveText, boolean
multiselect,
Collection<FileChooserFilter> filters);
}
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
2011-12-12 20:22:10 UTC (rev 27767)
+++
core3/api/trunk/swing-util-api/src/main/java/org/cytoscape/util/swing/JMenuTracker.java
2011-12-12 20:44:38 UTC (rev 27768)
@@ -96,17 +96,17 @@
* omitted, the insertion location will be based on a case-insensitive
alphanumeric
* ordering. An example of a string using weights is
"File[10].New[40]".
*
- * @param menu_string A '.' delimited string identifying menu names.
+ * @param menuString A '.' delimited string identifying menu names.
* @return The last child JMenu object specified by the menu_string
parameter.
*/
- public GravityTracker getGravityTracker(final String menu_string) {
- if (menu_string == null)
+ public GravityTracker getGravityTracker(final String menuString) {
+ if (menuString == null)
throw new NullPointerException("menu string is null");
- if (menu_string.isEmpty())
+ if (menuString.isEmpty())
throw new IllegalArgumentException("menu string has
zero length");
- final List<MenuNameAndGravity> namesAndGravities =
parseMenuString(menu_string);
+ final List<MenuNameAndGravity> namesAndGravities =
parseMenuString(menuString);
MenuGravityTracker parentGravityTracker = null;
MenuGravityTracker gravityTracker = null;
String menu_key = null;
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewManager.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewManager.java
2011-12-12 20:22:10 UTC (rev 27767)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/CyNetworkViewManager.java
2011-12-12 20:44:38 UTC (rev 27768)
@@ -50,20 +50,20 @@
/**
* Returns the network view corresponding to an ID, if found.
*
- * @param network_id a unique ID that hopefully corresponds to a
network view.
+ * @param networkId a unique ID that hopefully corresponds to a
network view.
*
- * @return null if no network view was found corresponding to
"network_id", else the network view
+ * @return null if no network view was found corresponding to
"networkId", else the network view
*/
- public CyNetworkView getNetworkView(long network_id);
+ public CyNetworkView getNetworkView(long networkId);
/**
* Determines whether a network view corresponding to a certain ID is
known to the network view manager.
*
- * @param network_id a unique ID that may correspond to a network view
+ * @param networkId a unique ID that may correspond to a network view
*
- * @return true if a view was found that corresponds to "network_id",
else false
+ * @return true if a view was found that corresponds to "networkId",
else false
*/
- public boolean viewExists(long network_id);
+ public boolean viewExists(long networkId);
/**
* Destroys a network view.
--
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.
