Author: kono
Date: 2011-05-03 10:48:38 -0700 (Tue, 03 May 2011)
New Revision: 24899
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReader.java
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReaderTest.java
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkViewReaderTest.java
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NullCyNetworkView.java
Log:
Method names and JavaDocs are updated.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -120,7 +120,7 @@
networkManager.addNetwork(cyNetwork);
// Do the following only for non-null views.
- if (view.isNullView() == false) {
+ if (view.isEmptyView() == false) {
networkViewManager.addNetworkView(view);
view.fitContent();
} else {
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/gml/GMLNetworkViewReader.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -221,7 +221,7 @@
private void createView() {
view = cyNetworkViewFactory.getNetworkView(network);
- if(view.isNullView())
+ if(view.isEmptyView())
return;
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReader.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReader.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReader.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -170,7 +170,7 @@
final CyNetworkView view = cyNetworkViewFactory.getNetworkView(network);
this.cyNetworkViews = new CyNetworkView[]{view};
- if(view.isNullView())
+ if(view.isEmptyView())
return view;
final CyLayoutAlgorithm layout = layouts.getDefaultLayout();
Modified:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReaderTest.java
===================================================================
---
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReaderTest.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/sif/SIFNetworkViewReaderTest.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -33,7 +33,7 @@
this.viewThreshold = 5;
CyNetworkView[] nullViews = getViews("sample.sif");
assertNotNull(nullViews);
- assertTrue(nullViews[0].isNullView());
+ assertTrue(nullViews[0].isEmptyView());
this.viewThreshold = this.DEF_THRESHOLD;
}
Modified:
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkViewReaderTest.java
===================================================================
---
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkViewReaderTest.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/io-impl/trunk/src/test/java/org/cytoscape/io/internal/read/xgmml/XGMMLNetworkViewReaderTest.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -70,7 +70,7 @@
CyNetworkView[] nullViews = getViews("galFiltered.xgmml");
assertNotNull(nullViews);
assertEquals(1, nullViews.length);
- assertTrue(nullViews[0].isNullView());
+ assertTrue(nullViews[0].isEmptyView());
this.viewThreshold = this.DEF_THRESHOLD;
}
Modified:
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
===================================================================
---
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NetworkViewImpl.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -195,7 +195,7 @@
@Override
- public Boolean isNullView() {
+ public Boolean isEmptyView() {
return false;
}
Modified:
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NullCyNetworkView.java
===================================================================
---
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NullCyNetworkView.java
2011-05-03 17:32:33 UTC (rev 24898)
+++
core3/viewmodel-impl/trunk/impl/src/main/java/org/cytoscape/view/model/internal/NullCyNetworkView.java
2011-05-03 17:48:38 UTC (rev 24899)
@@ -105,7 +105,7 @@
}
@Override
- public Boolean isNullView() {
+ public Boolean isEmptyView() {
return true;
}
--
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.
