Author: kono
Date: 2011-05-09 17:09:48 -0700 (Mon, 09 May 2011)
New Revision: 24987
Modified:
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
Log:
Broken formats are fixed.
Modified:
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2011-05-10 00:02:32 UTC (rev 24986)
+++
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/CyNetworkViewManagerImpl.java
2011-05-10 00:09:48 UTC (rev 24987)
@@ -50,90 +50,90 @@
* An implementation of CyNetworkViewManager.
*/
public class CyNetworkViewManagerImpl implements CyNetworkViewManager,
NetworkAboutToBeDestroyedListener {
-
- private static final Logger logger =
LoggerFactory.getLogger(CyNetworkViewManagerImpl.class);
-
- private final Map<Long, CyNetworkView> networkViewMap;
- private final CyEventHelper cyEventHelper;
- /**
- *
- * @param cyEventHelper
- */
- public CyNetworkViewManagerImpl(final CyEventHelper cyEventHelper) {
- networkViewMap = new HashMap<Long, CyNetworkView>();
- this.cyEventHelper = cyEventHelper;
- }
+ private static final Logger logger =
LoggerFactory.getLogger(CyNetworkViewManagerImpl.class);
- @Override
- public synchronized void reset() {
- networkViewMap.clear();
- }
+ private final Map<Long, CyNetworkView> networkViewMap;
+ private final CyEventHelper cyEventHelper;
- @Override
- public synchronized void handleEvent(final NetworkAboutToBeDestroyedEvent
event) {
- final long networkId = event.getNetwork().getSUID();
- if (viewExists(networkId))
- destroyNetworkView(networkViewMap.get(networkId));
- }
+ /**
+ *
+ * @param cyEventHelper
+ */
+ public CyNetworkViewManagerImpl(final CyEventHelper cyEventHelper) {
+ networkViewMap = new HashMap<Long, CyNetworkView>();
+ this.cyEventHelper = cyEventHelper;
+ }
- @Override
- public synchronized Set<CyNetworkView> getNetworkViewSet() {
- return new HashSet<CyNetworkView>(networkViewMap.values());
- }
+ @Override
+ public synchronized void reset() {
+ networkViewMap.clear();
+ }
- @Override
- public synchronized CyNetworkView getNetworkView(long networkId) {
- return networkViewMap.get(networkId);
- }
+ @Override
+ public synchronized void handleEvent(final
NetworkAboutToBeDestroyedEvent event) {
+ final long networkId = event.getNetwork().getSUID();
+ if (viewExists(networkId))
+ destroyNetworkView(networkViewMap.get(networkId));
+ }
- @Override
- public synchronized boolean viewExists(long networkId) {
- return networkViewMap.containsKey(networkId);
- }
+ @Override
+ public synchronized Set<CyNetworkView> getNetworkViewSet() {
+ return new HashSet<CyNetworkView>(networkViewMap.values());
+ }
- @Override
- public void destroyNetworkView(CyNetworkView view) {
- if (view == null)
- throw new NullPointerException("view is null");
+ @Override
+ public synchronized CyNetworkView getNetworkView(long networkId) {
+ return networkViewMap.get(networkId);
+ }
- final Long viewID = view.getModel().getSUID();
+ @Override
+ public synchronized boolean viewExists(long networkId) {
+ return networkViewMap.containsKey(networkId);
+ }
- // do this outside of the lock to fail early
- if (!networkViewMap.containsKey(viewID))
- throw new IllegalArgumentException("network view is not recognized
by this NetworkManager");
+ @Override
+ public void destroyNetworkView(CyNetworkView view) {
+ if (view == null)
+ throw new NullPointerException("view is null");
- // let everyone know!
- cyEventHelper.fireSynchronousEvent(new
NetworkViewAboutToBeDestroyedEvent(this, view));
+ final Long viewID = view.getModel().getSUID();
- synchronized (this) {
- // do this again within the lock to be safe
- if (!networkViewMap.containsKey(viewID))
- throw new IllegalArgumentException("network view is not
recognized by this NetworkManager");
+ // do this outside of the lock to fail early
+ if (!networkViewMap.containsKey(viewID))
+ throw new IllegalArgumentException("network view is not
recognized by this NetworkManager");
- networkViewMap.remove(viewID);
+ // let everyone know!
+ cyEventHelper.fireSynchronousEvent(new
NetworkViewAboutToBeDestroyedEvent(this, view));
+
+ synchronized (this) {
+ // do this again within the lock to be safe
+ if (!networkViewMap.containsKey(viewID))
+ throw new IllegalArgumentException("network
view is not recognized by this NetworkManager");
+
+ networkViewMap.remove(viewID);
+ }
+
+ cyEventHelper.fireSynchronousEvent(new
NetworkViewDestroyedEvent(this));
+ view = null;
+ logger.debug("######### Network View deleted: " + viewID);
}
- cyEventHelper.fireSynchronousEvent(new NetworkViewDestroyedEvent(this));
- view = null;
- logger.debug("######### Network View deleted: " + viewID);
- }
+ @Override
+ public void addNetworkView(final CyNetworkView view) {
+ if (view == null)
+ throw new NullPointerException("CyNetworkView is null");
- @Override
- public void addNetworkView(final CyNetworkView view) {
- if (view == null)
- throw new NullPointerException("CyNetworkView is null");
+ final CyNetwork network = view.getModel();
+ long networkId = network.getSUID();
- final CyNetwork network = view.getModel();
- long networkId = network.getSUID();
+ synchronized (this) {
+ logger.debug("Adding new Network View Model: Model ID =
" + networkId);
+ networkViewMap.put(networkId, view);
+ }
- synchronized (this) {
- logger.debug("Adding new Network View Model: Model ID = " +
networkId);
- networkViewMap.put(networkId, view);
+ logger.debug("Firing event: NetworkViewAddedEvent");
+ cyEventHelper.fireSynchronousEvent(new
NetworkViewAddedEvent(this, view));
+ logger.debug("Done event: NetworkViewAddedEvent");
}
-
- logger.debug("Firing event: NetworkViewAddedEvent");
- cyEventHelper.fireSynchronousEvent(new NetworkViewAddedEvent(this,
view));
- logger.debug("Done event: NetworkViewAddedEvent");
- }
}
--
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.
