Author: kono
Date: 2009-03-30 17:16:28 -0700 (Mon, 30 Mar 2009)
New Revision: 16362
Modified:
cytoscape3/trunk/application/pom.xml
cytoscape3/trunk/application/src/main/java/cytoscape/CyMain.java
cytoscape3/trunk/application/src/main/java/cytoscape/Cytoscape.java
cytoscape3/trunk/application/src/main/java/cytoscape/actions/NewWindowSelectedNodesOnlyAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/dialogs/internal/PreferencesDialogImpl.java
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
Old vizmap module removed from application.
Modified: cytoscape3/trunk/application/pom.xml
===================================================================
--- cytoscape3/trunk/application/pom.xml 2009-03-30 23:50:55 UTC (rev
16361)
+++ cytoscape3/trunk/application/pom.xml 2009-03-31 00:16:28 UTC (rev
16362)
@@ -244,13 +244,6 @@
<version>1.0.0</version>
</dependency>
- <!-- look and feel -->
- <dependency>
- <groupId>com.jgoodies</groupId>
- <artifactId>looks</artifactId>
- <version>2.1.2</version>
- </dependency>
-
<!-- our custom version of CLI -->
<dependency>
<groupId>org.apache</groupId>
@@ -280,12 +273,8 @@
<artifactId>view</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
- <groupId>org.cytoscape.webservice</groupId>
- <artifactId>ws-client</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.cytoscape</groupId>
<artifactId>splash</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: cytoscape3/trunk/application/src/main/java/cytoscape/CyMain.java
===================================================================
--- cytoscape3/trunk/application/src/main/java/cytoscape/CyMain.java
2009-03-30 23:50:55 UTC (rev 16361)
+++ cytoscape3/trunk/application/src/main/java/cytoscape/CyMain.java
2009-03-31 00:16:28 UTC (rev 16362)
@@ -36,9 +36,6 @@
*/
package cytoscape;
-import com.jgoodies.looks.LookUtils;
-import com.jgoodies.looks.Options;
-import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
import cytoscape.view.CySwingApplication;
import cytoscape.util.FileUtil;
import org.apache.commons.cli.*;
@@ -78,35 +75,35 @@
protected FileUtil fileUtil;
protected static void setupLookAndFeel() {
- try {
- if (LookUtils.IS_OS_WINDOWS) {
- /*
- * For Windows: just use platform default look
& feel.
- */
- UIManager
-
.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
- } else if (LookUtils.IS_OS_MAC) {
- /*
- * For Mac: move menue bar to OS X default bar
(next to Apple
- * icon)
- */
-
System.setProperty("apple.laf.useScreenMenuBar", "true");
- } else {
- /*
- * For Unix platforms, use JGoodies Looks
- */
- final Properties props = System.getProperties();
- String JVMVersion =
props.getProperty("java.version");
- System.out.println("JVM Version = " +
JVMVersion);
- if (JVMVersion.startsWith("1.6")) {
- System.out.println("SE6 found. Use
Nimbus...");
- UIManager
-
.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
- }
- }
- } catch (Exception e) {
- System.err.println("Can't set look & feel:" + e);
- }
+// try {
+// if (LookUtils.IS_OS_WINDOWS) {
+// /*
+// * For Windows: just use platform default look
& feel.
+// */
+// UIManager
+//
.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");
+// } else if (LookUtils.IS_OS_MAC) {
+// /*
+// * For Mac: move menue bar to OS X default bar
(next to Apple
+// * icon)
+// */
+//
System.setProperty("apple.laf.useScreenMenuBar", "true");
+// } else {
+// /*
+// * For Unix platforms, use JGoodies Looks
+// */
+// final Properties props = System.getProperties();
+// String JVMVersion =
props.getProperty("java.version");
+// System.out.println("JVM Version = " +
JVMVersion);
+// if (JVMVersion.startsWith("1.6")) {
+// System.out.println("SE6 found. Use
Nimbus...");
+// UIManager
+//
.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+// }
+// }
+// } catch (Exception e) {
+// System.err.println("Can't set look & feel:" + e);
+// }
}
Modified: cytoscape3/trunk/application/src/main/java/cytoscape/Cytoscape.java
===================================================================
--- cytoscape3/trunk/application/src/main/java/cytoscape/Cytoscape.java
2009-03-30 23:50:55 UTC (rev 16361)
+++ cytoscape3/trunk/application/src/main/java/cytoscape/Cytoscape.java
2009-03-31 00:16:28 UTC (rev 16362)
@@ -40,19 +40,11 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
import javax.swing.JOptionPane;
import javax.swing.event.SwingPropertyChangeSupport;
-import org.cytoscape.model.CyEdge;
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyNode;
import org.cytoscape.view.GraphView;
-import org.cytoscape.vizmap.VMMFactory;
-import org.cytoscape.vizmap.VisualMappingManager;
import cytoscape.view.CySwingApplication;
@@ -282,8 +274,8 @@
if(view == null)
return;
- VMMFactory.getVisualMappingManager().setNetworkView(view);
- VMMFactory.getVisualMappingManager().applyAppearances();
+// VMMFactory.getVisualMappingManager().setNetworkView(view);
+// VMMFactory.getVisualMappingManager().applyAppearances();
view.updateView();
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/actions/NewWindowSelectedNodesOnlyAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/actions/NewWindowSelectedNodesOnlyAction.java
2009-03-30 23:50:55 UTC (rev 16361)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/actions/NewWindowSelectedNodesOnlyAction.java
2009-03-31 00:16:28 UTC (rev 16362)
@@ -57,9 +57,6 @@
import org.cytoscape.view.GraphView;
import org.cytoscape.view.GraphViewFactory;
-import org.cytoscape.vizmap.VisualMappingManager;
-import org.cytoscape.vizmap.VisualStyle;
-
import java.awt.event.ActionEvent;
import java.util.ArrayList;
@@ -78,7 +75,8 @@
private final CyRootNetworkFactory cyroot;
private final GraphViewFactory gvf;
- private VisualMappingManager vmm;
+ // TODO: use new VMM
+// private VisualMappingManager vmm;
private CyNetworkNaming cyNetworkNaming;
@@ -150,15 +148,15 @@
new_view.fitContent();
// Set visual style
- VisualStyle newVS =
vmm.getVisualStyleForView(current_network_view);
-
- if (newVS != null) {
- vsName = newVS.getName();
- vmm.setVisualStyleForView(new_view, newVS);
- }
+// VisualStyle newVS =
vmm.getVisualStyleForView(current_network_view);
+//
+// if (newVS != null) {
+// vsName = newVS.getName();
+// vmm.setVisualStyleForView(new_view, newVS);
+// }
}
- vmm.setVisualStyle(vsName);
+ //vmm.setVisualStyle(vsName);
}
/**
@@ -188,7 +186,7 @@
*
* @param vmm DOCUMENT ME!
*/
- public void setVmm(VisualMappingManager vmm) {
- this.vmm = vmm;
- }
+// public void setVmm(VisualMappingManager vmm) {
+// this.vmm = vmm;
+// }
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/dialogs/internal/PreferencesDialogImpl.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/dialogs/internal/PreferencesDialogImpl.java
2009-03-30 23:50:55 UTC (rev 16361)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/dialogs/internal/PreferencesDialogImpl.java
2009-03-31 00:16:28 UTC (rev 16362)
@@ -38,9 +38,6 @@
import org.cytoscape.event.CyEventHelper;
-import org.cytoscape.vizmap.event.SaveVizmapPropsEvent;
-import org.cytoscape.vizmap.event.SaveVizmapPropsListener;
-
import cytoscape.events.PreferencesUpdatedEvent;
import cytoscape.events.PreferencesUpdatedListener;
import cytoscape.dialogs.PreferencesDialog;
@@ -389,11 +386,12 @@
callerRef.setVisible(false);
if (saveVizmapAsDefault) {
- eh.fireSynchronousEvent( new
SaveVizmapPropsEvent() {
- public Object getSource() { return
PreferencesDialogImpl.this; }
- }, SaveVizmapPropsListener.class );
- saveVizmapAsDefault = false;
- saveVizmapBtn.setSelected(false);
+ // TODO: Use new VizMap
+// eh.fireSynchronousEvent( new
SaveVizmapPropsEvent() {
+// public Object getSource() { return
PreferencesDialogImpl.this; }
+// }, SaveVizmapPropsListener.class );
+// saveVizmapAsDefault = false;
+// saveVizmapBtn.setSelected(false);
}
if (saveCyPropsAsDefault) {
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-30 23:50:55 UTC (rev 16361)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-03-31 00:16:28 UTC (rev 16362)
@@ -26,8 +26,7 @@
<osgi:reference id="cyRootNetworkFactoryServiceRef"
interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory"
/>
- <osgi:reference id="vmmServiceRef"
- interface="org.cytoscape.vizmap.VisualMappingManager" />
+
<osgi:reference id="graphViewFactoryServiceRef"
interface="org.cytoscape.view.GraphViewFactory">
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
