Author: kono
Date: 2011-07-07 14:15:19 -0700 (Thu, 07 Jul 2011)
New Revision: 26103
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskFactoryTest.java
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
Log:
fixes #91 Now correct Visual Styles are applied to network views and Vizmap GUI
will be updated.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -30,27 +30,30 @@
package org.cytoscape.task.internal.session;
+import java.io.File;
+
+import org.cytoscape.io.read.CySessionReader;
+import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.session.CySession;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
-import org.cytoscape.session.CySession;
-import org.cytoscape.session.CySessionManager;
-import org.cytoscape.io.read.CyNetworkReaderManager;
-import org.cytoscape.io.read.CySessionReader;
-import org.cytoscape.io.read.CySessionReaderManager;
-import org.cytoscape.io.read.CyTableReader;
-import org.cytoscape.io.DataCategory;
-import java.io.File;
-
/**
* Call the session reader and read everything in the zip archive.<br>
* setAcceleratorCombo(java.awt.event.KeyEvent.VK_O, ActionEvent.CTRL_MASK);
*/
public class OpenSessionTask extends AbstractTask {
- private CySessionManager sessionMgr;
- private CySessionReaderManager readerMgr;
+
+ private final CySessionManager sessionMgr;
+ private final CySessionReaderManager readerMgr;
+
+ private final CyApplicationManager appManager;
@Tunable(description="Session file to load",
params="fileCategory=session;input=true")
public File file;
@@ -59,9 +62,10 @@
* Constructor.<br>
* Add a menu item under "File" and set shortcut.
*/
- public OpenSessionTask(CySessionManager mgr, CySessionReaderManager
factory) {
+ public OpenSessionTask(final CySessionManager mgr, final
CySessionReaderManager readerManager, final CyApplicationManager appManager) {
this.sessionMgr = mgr;
- this.readerMgr = factory;
+ this.readerMgr = readerManager;
+ this.appManager = appManager;
}
/**
@@ -76,31 +80,36 @@
throw new NullPointerException("No file specified!");
CySessionReader reader =
readerMgr.getReader(file.toURI(),file.getName());
+ if (reader == null)
+ throw new NullPointerException("Failed to find
appropriate reader for file: " + file);
reader.run(taskMonitor);
if (cancelled)
return;
- if (reader == null)
- throw new NullPointerException("Failed to find
appropriate reader for file: " + file);
-
insertTasksAfterCurrentTask(new LoadSessionTask(reader));
}
- private class LoadSessionTask extends AbstractTask {
+ private final class LoadSessionTask extends AbstractTask {
CySessionReader reader;
+
LoadSessionTask(CySessionReader reader) {
this.reader = reader;
}
public void run(TaskMonitor taskMonitor) {
- CySession newSession = reader.getCySession();
- if ( newSession == null ) {
+ final CySession newSession = reader.getCySession();
+ if ( newSession == null )
throw new NullPointerException("Session could
not be read for file: " + file);
- }
sessionMgr.setCurrentSession(newSession,
file.getAbsolutePath());
+
+ // Set Current network: this is necessary to update GUI.
+ final RenderingEngine<CyNetwork> currentEngine =
appManager.getCurrentRenderingEngine();
+ if(currentEngine != null)
+
appManager.setCurrentRenderingEngine(currentEngine);
+
taskMonitor.setProgress(1.0);
taskMonitor.setStatusMessage("Session file " + file + "
successfully loaded.");
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -30,6 +30,7 @@
package org.cytoscape.task.internal.session;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.io.read.CyNetworkReaderManager;
import org.cytoscape.io.read.CySessionReaderManager;
@@ -42,13 +43,16 @@
private CySessionManager mgr;
private CySessionReaderManager rmgr;
+
+ private final CyApplicationManager appManager;
- public OpenSessionTaskFactory(CySessionManager mgr,
CySessionReaderManager rmgr) {
+ public OpenSessionTaskFactory(CySessionManager mgr,
CySessionReaderManager rmgr, final CyApplicationManager appManager) {
this.mgr = mgr;
this.rmgr = rmgr;
+ this.appManager = appManager;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new OpenSessionTask(mgr, rmgr));
+ return new TaskIterator(new OpenSessionTask(mgr, rmgr,
appManager));
}
}
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-07 21:15:19 UTC (rev 26103)
@@ -269,6 +269,7 @@
class="org.cytoscape.task.internal.session.OpenSessionTaskFactory">
<constructor-arg ref="cySessionManagerServiceRef" />
<constructor-arg ref="sessionReaderManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
</bean>
<bean id="saveSessionTaskFactory"
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskFactoryTest.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/session/OpenSessionTaskFactoryTest.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -2,8 +2,10 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+
import org.cytoscape.io.read.CySessionReaderManager;
+import org.cytoscape.session.CyApplicationManager;
import org.cytoscape.session.CySessionManager;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskIterator;
@@ -16,8 +18,9 @@
CySessionManager mgr = mock(CySessionManager.class);;
CySessionReaderManager rmgr =
mock(CySessionReaderManager.class);
+ CyApplicationManager appManager =
mock(CyApplicationManager.class);
- OpenSessionTaskFactory factory = new
OpenSessionTaskFactory(mgr, rmgr);
+ OpenSessionTaskFactory factory = new
OpenSessionTaskFactory(mgr, rmgr, appManager);
TaskIterator ti = factory.getTaskIterator();
assertNotNull(ti);
Modified:
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
===================================================================
---
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/read/session/SessionReaderImpl.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -231,26 +231,25 @@
}
}
+
private void mergeNetworkTables() {
for (Entry<String, CyNetworkView[]> entry :
networkViews.entrySet()) {
String entryName = entry.getKey();
Matcher matcher = NETWORK_PATTERN.matcher(entryName);
- if (!matcher.matches()) {
+ if (!matcher.matches())
continue;
- }
String name = matcher.group(1);
CyNetworkView view = entry.getValue()[0];
CyNetwork network = view.getModel();
Set<CyTableMetadataBuilder> builders =
networkTableMap.get(name);
- if (builders == null) {
+ if (builders == null)
continue;
- }
for (CyTableMetadataBuilder builder : builders) {
- Set<CyNetwork> networks = new
HashSet<CyNetwork>();
+ final Set<CyNetwork> networks = new
HashSet<CyNetwork>();
networks.add(network);
CyTableMetadata metadata =
builder.setNetworks(networks).build();
mergeNetworkTable(network, metadata);
@@ -273,6 +272,7 @@
}
}
+
private void deleteOriginalIdColumn(CyTable table) {
if (table.getColumn(XGMMLNetworkReader.ORIGINAL_ID_COLUMN) !=
null)
table.deleteColumn(XGMMLNetworkReader.ORIGINAL_ID_COLUMN);
@@ -513,9 +513,9 @@
}
private void processNetworks() throws Exception {
- if (cysession.getNetworkTree() == null) {
+
+ if (cysession.getNetworkTree() == null)
return;
- }
boolean isOldFormat = false;
String docVersion = cysession.getDocumentVersion();
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/SelectedVisualStyleManagerImpl.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -68,8 +68,5 @@
selectedStyle = targetStyle;
logger.debug("Presentation switch ========= Selected
Style Switched to " + selectedStyle.getTitle());
}
-
-
}
-
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-07-07 20:31:06 UTC (rev 26102)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapperMainPanel.java
2011-07-07 21:15:19 UTC (rev 26103)
@@ -162,7 +162,6 @@
}
-
private void addVisualStyleChangeAction() {
visualStyleComboBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
@@ -616,17 +615,16 @@
this.visualStyleComboBox.setSelectedItem(newStyle);
}
+
@Override
public void handleEvent(SetCurrentRenderingEngineEvent e) {
final RenderingEngine<CyNetwork> engine =
e.getRenderingEngine();
- CyNetworkView view = (CyNetworkView) engine.getViewModel();
+ final CyNetworkView view = (CyNetworkView)
engine.getViewModel();
final VisualStyle newStyle = vmm.getVisualStyle(view);
- if(visualStyleComboBox.getSelectedItem().equals(newStyle) ==
false) {
-
- logger.debug("Updating VS Combo Box to: " +
newStyle.getTitle());
- this.visualStyleComboBox.setSelectedItem(newStyle);
- visualStyleComboBox.repaint();
- }
+ this.visualStyleComboBox.setSelectedItem(newStyle);
+ visualStyleComboBox.repaint();
+
+ logger.info("$$$$$$$$$$$$ Updating VS Combo Box to: " +
newStyle.getTitle());
}
}
--
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.
