Author: noelr
Date: 2009-08-07 09:02:37 -0700 (Fri, 07 Aug 2009)
New Revision: 17737
Modified:
cytoscape/trunk/src/cytoscape/actions/BirdsEyeViewAction.java
cytoscape/trunk/src/cytoscape/data/servers/OntologyServer.java
cytoscape/trunk/src/cytoscape/data/webservice/ui/WebServiceContextMenuListener.java
cytoscape/trunk/src/cytoscape/ding/CyGraphLOD.java
cytoscape/trunk/src/cytoscape/util/ProxyHandler.java
cytoscape/trunk/src/cytoscape/view/BirdsEyeViewHandler.java
cytoscape/trunk/src/cytoscape/view/CytoscapeDesktop.java
cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java
cytoscape/trunk/src/cytoscape/visual/ui/VizMapBypassNetworkListener.java
Log:
Changing some "unsafe" string comparisons using == to equals()
Modified: cytoscape/trunk/src/cytoscape/actions/BirdsEyeViewAction.java
===================================================================
--- cytoscape/trunk/src/cytoscape/actions/BirdsEyeViewAction.java
2009-08-07 10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/actions/BirdsEyeViewAction.java
2009-08-07 16:02:37 UTC (rev 17737)
@@ -78,11 +78,11 @@
* @param e DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent e) {
- if ((e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUSED)
- || (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUS)
- || (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_DESTROYED)) {
+ if
(CytoscapeDesktop.NETWORK_VIEW_FOCUSED.equals(e.getPropertyName())
+ ||
(CytoscapeDesktop.NETWORK_VIEW_FOCUS.equals(e.getPropertyName()))
+ ||
(CytoscapeDesktop.NETWORK_VIEW_DESTROYED.equals(e.getPropertyName()))) {
bev.changeView((DGraphView)
Cytoscape.getCurrentNetworkView());
- } else if ( e.getPropertyName() ==
Cytoscape.CYTOSCAPE_INITIALIZED ) {
+ } else if
(Cytoscape.CYTOSCAPE_INITIALIZED.equals(e.getPropertyName())) {
actionPerformed(null);
}
}
Modified: cytoscape/trunk/src/cytoscape/data/servers/OntologyServer.java
===================================================================
--- cytoscape/trunk/src/cytoscape/data/servers/OntologyServer.java
2009-08-07 10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/data/servers/OntologyServer.java
2009-08-07 16:02:37 UTC (rev 17737)
@@ -211,7 +211,7 @@
}
public void propertyChange(PropertyChangeEvent e) {
- if (e.getPropertyName() == Cytoscape.NETWORK_DESTROYED) {
+ if (Cytoscape.NETWORK_DESTROYED.equals(e.getPropertyName())) {
/*
* Remove network name from ontology server.
*/
Modified:
cytoscape/trunk/src/cytoscape/data/webservice/ui/WebServiceContextMenuListener.java
===================================================================
---
cytoscape/trunk/src/cytoscape/data/webservice/ui/WebServiceContextMenuListener.java
2009-08-07 10:44:55 UTC (rev 17736)
+++
cytoscape/trunk/src/cytoscape/data/webservice/ui/WebServiceContextMenuListener.java
2009-08-07 16:02:37 UTC (rev 17737)
@@ -56,7 +56,7 @@
* @param evt DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_CREATED) {
+ if
(CytoscapeDesktop.NETWORK_VIEW_CREATED.equals(evt.getPropertyName())) {
if (cMenu == null)
cMenu = new WebServiceContextMenu();
Modified: cytoscape/trunk/src/cytoscape/ding/CyGraphLOD.java
===================================================================
--- cytoscape/trunk/src/cytoscape/ding/CyGraphLOD.java 2009-08-07 10:44:55 UTC
(rev 17736)
+++ cytoscape/trunk/src/cytoscape/ding/CyGraphLOD.java 2009-08-07 16:02:37 UTC
(rev 17737)
@@ -78,7 +78,7 @@
* @param e DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent e) {
- if (e.getPropertyName() == Cytoscape.PREFERENCES_UPDATED) {
+ if (Cytoscape.PREFERENCES_UPDATED.equals(e.getPropertyName())) {
init();
java.util.Map networkViewMap =
cytoscape.Cytoscape.getNetworkViewMap();
Modified: cytoscape/trunk/src/cytoscape/util/ProxyHandler.java
===================================================================
--- cytoscape/trunk/src/cytoscape/util/ProxyHandler.java 2009-08-07
10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/util/ProxyHandler.java 2009-08-07
16:02:37 UTC (rev 17737)
@@ -119,7 +119,7 @@
* @param e DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent e) {
- if (e.getPropertyName() == Cytoscape.PREFERENCES_UPDATED) {
+ if (Cytoscape.PREFERENCES_UPDATED.equals(e.getPropertyName())) {
Proxy savedProxy = proxyServer;
loadProxyServer();
Modified: cytoscape/trunk/src/cytoscape/view/BirdsEyeViewHandler.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/BirdsEyeViewHandler.java 2009-08-07
10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/view/BirdsEyeViewHandler.java 2009-08-07
16:02:37 UTC (rev 17737)
@@ -80,16 +80,16 @@
* @param e The event triggering this method.
*/
public void propertyChange(PropertyChangeEvent e) {
- if ((e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUSED)
- || (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUS)
- || (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_DESTROYED)
- || (e.getPropertyName() ==
Cytoscape.CYTOSCAPE_INITIALIZED)) {
+ if
(CytoscapeDesktop.NETWORK_VIEW_FOCUSED.equals(e.getPropertyName())
+ ||
(CytoscapeDesktop.NETWORK_VIEW_FOCUS.equals(e.getPropertyName()))
+ ||
(CytoscapeDesktop.NETWORK_VIEW_DESTROYED.equals(e.getPropertyName()))
+ ||
(Cytoscape.CYTOSCAPE_INITIALIZED.equals(e.getPropertyName()))) {
bev.changeView((DGraphView)
Cytoscape.getCurrentNetworkView());
}
// Add the frameListener to the currently focused view if it
// doesn't already have one.
- if (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUSED)
+ if
(CytoscapeDesktop.NETWORK_VIEW_FOCUSED.equals(e.getPropertyName()))
{
JDesktopPane desktopPane =
Cytoscape.getDesktop().getNetworkViewManager().getDesktopPane();
if (desktopPane == null)
Modified: cytoscape/trunk/src/cytoscape/view/CytoscapeDesktop.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/CytoscapeDesktop.java 2009-08-07
10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/view/CytoscapeDesktop.java 2009-08-07
16:02:37 UTC (rev 17737)
@@ -600,37 +600,37 @@
* @param e DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent e) {
- if (e.getPropertyName() == NETWORK_VIEW_CREATED) {
+ if (NETWORK_VIEW_CREATED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_VIEW_CREATED " +
//
e.getSource().getClass().getName());
// add the new view to the GraphViewController
getGraphViewController().addGraphView((CyNetworkView)
e.getNewValue());
// pass on the event
pcs.firePropertyChange(e);
- } else if (e.getPropertyName() == NETWORK_VIEW_FOCUSED) {
+ } else if (NETWORK_VIEW_FOCUSED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_VIEW_FOCUSED " +
//
e.getSource().getClass().getName());
// get focus event from NetworkViewManager
updateFocus(e.getNewValue().toString());
pcs.firePropertyChange(e);
- } else if (e.getPropertyName() == NETWORK_VIEW_FOCUS) {
+ } else if (NETWORK_VIEW_FOCUS.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_VIEW_FOCUS " +
//
e.getSource().getClass().getName());
// get Focus from NetworkPanel
updateFocus(e.getNewValue().toString());
pcs.firePropertyChange(e);
- } else if (e.getPropertyName() == NETWORK_VIEWS_SELECTED) {
+ } else if (NETWORK_VIEWS_SELECTED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_VIEWS_SELECTED " +
//
e.getSource().getClass().getName());
Cytoscape.setSelectedNetworkViews(
(List<String>)(e.getNewValue()) );
Cytoscape.setSelectedNetworks(
(List<String>)(e.getNewValue()) );
pcs.firePropertyChange(e);
- } else if (e.getPropertyName() == Cytoscape.NETWORK_CREATED) {
+ } else if
(Cytoscape.NETWORK_CREATED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_CREATED " +
//
e.getSource().getClass().getName());
// fire the event so that the NetworkPanel can catch it
pcs.firePropertyChange(e);
- } else if (e.getPropertyName() == Cytoscape.NETWORK_DESTROYED) {
+ } else if
(Cytoscape.NETWORK_DESTROYED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_DESTROYED " +
//
e.getSource().getClass().getName());
// fire the event so that the NetworkPanel can catch it
@@ -648,7 +648,7 @@
if (result == JOptionPane.YES_OPTION)
Cytoscape.createNewSession();
}
- } else if (e.getPropertyName() == NETWORK_VIEW_DESTROYED) {
+ } else if (NETWORK_VIEW_DESTROYED.equals(e.getPropertyName())) {
//CyLogger.getLogger().info("CytoscapeDesktop got:
NETWORK_VIEW_DESTROYED " +
//
e.getSource().getClass().getName());
// remove the view from the GraphViewController
Modified: cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/NetworkPanel.java 2009-08-07
10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/view/NetworkPanel.java 2009-08-07
16:02:37 UTC (rev 17737)
@@ -409,14 +409,14 @@
* @param e DOCUMENT ME!
*/
public void propertyChange(PropertyChangeEvent e) {
- if (e.getPropertyName() == Cytoscape.NETWORK_CREATED) {
+ if (Cytoscape.NETWORK_CREATED.equals(e.getPropertyName())) {
addNetwork((String) e.getNewValue(), (String)
e.getOldValue());
- } else if (e.getPropertyName() == Cytoscape.NETWORK_DESTROYED) {
+ } else if
(Cytoscape.NETWORK_DESTROYED.equals(e.getPropertyName())) {
removeNetwork((String) e.getNewValue());
- } else if (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_FOCUSED) {
+ } else if
(CytoscapeDesktop.NETWORK_VIEW_FOCUSED.equals(e.getPropertyName())) {
if ( e.getSource() != this )
focusNetworkNode((String) e.getNewValue());
- } else if (e.getPropertyName() ==
Cytoscape.NETWORK_TITLE_MODIFIED) {
+ } else if
(Cytoscape.NETWORK_TITLE_MODIFIED.equals(e.getPropertyName())) {
CyNetworkTitleChange cyNetworkTitleChange =
(CyNetworkTitleChange) e.getNewValue();
String newID =
cyNetworkTitleChange.getNetworkIdentifier();
//String newTitle =
cyNetworkTitleChange.getNetworkTitle();
@@ -661,16 +661,16 @@
final String label = ((JMenuItem) ae.getSource()).getText();
// Figure out the appropriate action
- if (label == DESTROY_VIEW) {
+ if (DESTROY_VIEW.equals(label)) {
Cytoscape.destroyNetworkView(cyNetwork);
} // end of if ()
- else if (label == CREATE_VIEW) {
+ else if (CREATE_VIEW.equals(label)) {
CreateNetworkViewAction.createViewFromCurrentNetwork(cyNetwork);
} // end of if ()
- else if (label == DESTROY_NETWORK) {
+ else if (DESTROY_NETWORK.equals(label)) {
Cytoscape.destroyNetwork(cyNetwork);
} // end of if ()
- else if (label == EDIT_TITLE) {
+ else if (EDIT_TITLE.equals(label)) {
CyNetworkNaming.editNetworkTitle(cyNetwork);
Cytoscape.getDesktop().getNetworkPanel().updateTitle(cyNetwork);
} // end of if ()
Modified: cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java 2009-08-07
10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/view/NetworkViewManager.java 2009-08-07
16:02:37 UTC (rev 17737)
@@ -296,7 +296,7 @@
*/
public void propertyChange(PropertyChangeEvent e) {
// handle focus event
- if (e.getPropertyName() == CytoscapeDesktop.NETWORK_VIEW_FOCUS)
{
+ if
(CytoscapeDesktop.NETWORK_VIEW_FOCUS.equals(e.getPropertyName())) {
//logger.info("NetworkViewManager got
NETWORK_VIEW_FOCUS " + e.getSource().getClass().getName());
String network_id = (String) e.getNewValue();
e = null;
@@ -313,12 +313,12 @@
}
}
// handle putting a newly created CyNetworkView into a Container
- else if (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_CREATED) {
+ else if
(CytoscapeDesktop.NETWORK_VIEW_CREATED.equals(e.getPropertyName())) {
CyNetworkView new_view = (CyNetworkView)
e.getNewValue();
//logger.info("NetworkViewManager got
NETWORK_VIEW_CREATED " + e.getSource().getClass().getName() + ", view = " +
new_view);
createContainer(new_view);
e = null;
- } else if (e.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_DESTROYED) {
+ } else if
(CytoscapeDesktop.NETWORK_VIEW_DESTROYED.equals(e.getPropertyName())) {
//logger.info("NetworkViewManager got
NETWORK_VIEW_DEST");
CyNetworkView view = (CyNetworkView) e.getNewValue();
removeView(view);
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/VizMapBypassNetworkListener.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/VizMapBypassNetworkListener.java
2009-08-07 10:44:55 UTC (rev 17736)
+++ cytoscape/trunk/src/cytoscape/visual/ui/VizMapBypassNetworkListener.java
2009-08-07 16:02:37 UTC (rev 17737)
@@ -55,7 +55,7 @@
* @param evnt The event we're hearing.
*/
public void propertyChange(PropertyChangeEvent evnt) {
- if (evnt.getPropertyName() ==
CytoscapeDesktop.NETWORK_VIEW_CREATED) {
+ if
(CytoscapeDesktop.NETWORK_VIEW_CREATED.equals(evnt.getPropertyName())) {
NodeBypassMenuListener node_menu_listener = new
NodeBypassMenuListener();
Cytoscape.getCurrentNetworkView().addNodeContextMenuListener(node_menu_listener);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
