Author: kono
Date: 2009-05-28 13:50:40 -0700 (Thu, 28 May 2009)
New Revision: 16837
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/actions/DeleteEdit.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/NetworkManager.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectEdgeViewUpdater.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectNodeViewUpdater.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
Log:
VizMap GUI activated.
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/actions/DeleteEdit.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/actions/DeleteEdit.java
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/actions/DeleteEdit.java
2009-05-28 20:50:40 UTC (rev 16837)
@@ -6,7 +6,7 @@
import cytoscape.util.undo.CyAbstractEdit;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.model.View;
-import static org.cytoscape.view.presentation.twod.TwoDVisualLexicon.*;
+import static org.cytoscape.view.presentation.property.TwoDVisualLexicon.*;
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyEdge;
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/NetworkManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/NetworkManager.java
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/NetworkManager.java
2009-05-28 20:50:40 UTC (rev 16837)
@@ -51,6 +51,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.presentation.NetworkRenderer;
+import org.cytoscape.view.presentation.PresentationFactory;
import cytoscape.CyNetworkManager;
import cytoscape.events.NetworkAboutToBeDestroyedEvent;
@@ -87,14 +88,17 @@
private CyNetwork currentNetwork;
private CyNetworkView currentNetworkView;
+
+ private PresentationFactory presentationFactory;
- NetworkManager(final CyEventHelper eh) {
+ public NetworkManager(final CyEventHelper eh, final PresentationFactory
presentationFactory) {
networkMap = new HashMap<Long,CyNetwork>();
networkViewMap = new HashMap<Long,CyNetworkView>();
selectedNetworkViews = new LinkedList<CyNetworkView>();
selectedNetworks = new LinkedList<CyNetwork>();
currentNetwork = null;
currentNetworkView = null;
+ this.presentationFactory = presentationFactory;
this.eh = eh;
}
@@ -371,7 +375,6 @@
}
public NetworkRenderer getPresentation(CyNetworkView view) {
- // TODO Auto-generated method stub
- return null;
+ return presentationFactory.getPresentation(view);
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectEdgeViewUpdater.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectEdgeViewUpdater.java
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectEdgeViewUpdater.java
2009-05-28 20:50:40 UTC (rev 16837)
@@ -36,10 +36,11 @@
*/
package cytoscape.internal.select;
-import org.cytoscape.view.model.VisualProperty;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.EDGE_SELECTED;
+
+import org.cytoscape.model.CyEdge;
import org.cytoscape.view.model.View;
-import org.cytoscape.model.CyEdge;
-import static org.cytoscape.view.presentation.twod.TwoDVisualLexicon.*;
+
import cytoscape.view.ViewUpdater;
public class SelectEdgeViewUpdater extends ViewUpdater<CyEdge,Boolean> {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectNodeViewUpdater.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectNodeViewUpdater.java
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/select/SelectNodeViewUpdater.java
2009-05-28 20:50:40 UTC (rev 16837)
@@ -36,10 +36,11 @@
*/
package cytoscape.internal.select;
-import org.cytoscape.view.model.VisualProperty;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_SELECTED;
+
+import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.View;
-import org.cytoscape.model.CyNode;
-import static org.cytoscape.view.presentation.twod.TwoDVisualLexicon.*;
+
import cytoscape.view.ViewUpdater;
public class SelectNodeViewUpdater extends ViewUpdater<CyNode,Boolean> {
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/view/NetworkViewManager.java
2009-05-28 20:50:40 UTC (rev 16837)
@@ -36,35 +36,35 @@
*/
package cytoscape.internal.view;
-import cytoscape.CyNetworkManager;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NETWORK_TITLE;
-import cytoscape.view.CyHelpBroker;
+import java.beans.PropertyVetoException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
+import javax.swing.event.InternalFrameListener;
+
import org.cytoscape.model.CyNetwork;
import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.presentation.PresentationFactory;
+import cytoscape.CyNetworkManager;
+import cytoscape.events.NetworkViewAboutToBeDestroyedEvent;
+import cytoscape.events.NetworkViewAboutToBeDestroyedListener;
import cytoscape.events.NetworkViewAddedEvent;
import cytoscape.events.NetworkViewAddedListener;
-import cytoscape.events.NetworkViewAboutToBeDestroyedEvent;
-import cytoscape.events.NetworkViewAboutToBeDestroyedListener;
+import cytoscape.events.SetCurrentNetworkEvent;
+import cytoscape.events.SetCurrentNetworkListener;
import cytoscape.events.SetCurrentNetworkViewEvent;
import cytoscape.events.SetCurrentNetworkViewListener;
-import cytoscape.events.SetCurrentNetworkEvent;
-import cytoscape.events.SetCurrentNetworkListener;
+import cytoscape.view.CyHelpBroker;
-import javax.swing.*;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.InternalFrameListener;
-import java.beans.PropertyVetoException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import org.cytoscape.view.presentation.PresentationFactory;
-import static org.cytoscape.view.presentation.twod.TwoDVisualLexicon.*;
-
-
/**
*
*/
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2009-05-28 20:50:05 UTC (rev 16836)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2009-05-28 20:50:40 UTC (rev 16837)
@@ -74,6 +74,7 @@
<!-- Network Manager -->
<bean name="networkManager" class="cytoscape.internal.NetworkManager">
<constructor-arg ref="cyEventHelperServiceRef" />
+ <constructor-arg ref="presentationFactoryServiceRef" />
</bean>
<!-- Task Factories -->
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
