Author: kono
Date: 2011-11-16 12:36:09 -0800 (Wed, 16 Nov 2011)
New Revision: 27498
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
Log:
File naming fixed.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTask.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -135,9 +135,13 @@
// Use original name if exists
String networkName =
network.getCyRow().get(CyTableEntry.NAME, String.class);
- if(networkName == null ||
networkName.trim().length() == 0)
-
network.getCyRow().set(CyTableEntry.NAME,
namingUtil.getSuggestedNetworkTitle(name));
-
+ if(networkName == null ||
networkName.trim().length() == 0) {
+ networkName = name;
+ if(networkName == null)
+ networkName = "? (Name is
missing)";
+
+
network.getCyRow().set(CyTableEntry.NAME,
namingUtil.getSuggestedNetworkTitle(networkName));
+ }
networkManager.addNetwork(network);
final int numGraphObjects =
network.getNodeCount() + network.getEdgeCount();
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -69,6 +69,7 @@
throw new NullPointerException("Failed to find
appropriate reader for file: " + file);
uri = file.toURI();
+
name = file.getName();
loadNetwork(reader);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -41,6 +41,7 @@
import org.cytoscape.view.model.CyNetworkViewManager;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
+import org.omg.CosNaming.NamingContextExtPackage.URLStringHelper;
/**
@@ -72,7 +73,9 @@
this.taskMonitor = taskMonitor;
- name = url.toString();
+ final String urlString = url.getFile();
+ final String[] parts = urlString.split("/");
+ name = parts[parts.length-1];
taskMonitor.setTitle(String.format("Loading Network from
\'%s\'", name));
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -81,7 +81,7 @@
throw new NullPointerException("url is null");
this.taskMonitor = taskMonitor;
- name = url.toString();
+ name = url.getFile();
taskMonitor.setTitle(String.format("Loading Network from
\'%s\'", name));
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/NetworkPanel.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -117,8 +117,6 @@
private static final Dimension PANEL_SIZE = new Dimension(400, 700);
- private int networkSetCounter;
-
private final JTreeTable treeTable;
private final NetworkTreeNode root;
private JPanel navigatorPanel;
@@ -148,7 +146,6 @@
final DialogTaskManager taskManager) {
super();
- networkSetCounter = 1;
this.treeNodeMap = new HashMap<Long, NetworkTreeNode>();
this.appManager = applicationManager;
this.netmgr = netmgr;
@@ -215,7 +212,7 @@
split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, scroll,
navigatorPanel);
split.setResizeWeight(1);
- split.setDividerLocation(300);
+ split.setDividerLocation(400);
add(split);
@@ -442,10 +439,8 @@
parentTreeNode =
this.treeNodeMap.get(parentNetwork.getSUID());
}
- if (parentTreeNode == null) {
+ if (parentTreeNode == null)
parentTreeNode = new NetworkTreeNode("", null);
- networkSetCounter++;
- }
// Actual tree node for this network
NetworkTreeNode dmtn = new
NetworkTreeNode(network.getCyRow().get(CyTableEntry.NAME, String.class),
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
2011-11-16 20:02:29 UTC (rev 27497)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/view/TreeCellRenderer.java
2011-11-16 20:36:09 UTC (rev 27498)
@@ -2,6 +2,7 @@
import java.awt.Color;
import java.awt.Component;
+import java.awt.Dimension;
import java.awt.Font;
import java.awt.Image;
import java.awt.Toolkit;
@@ -23,8 +24,10 @@
private static final String NETWORK_ICON = "/images/network_32.png";
private static final String NETWORK_LEAF_ICON =
"/images/network_l_32.png";
- static final Font TABLE_FONT = new Font("SansSerif", Font.PLAIN, 14);
- static final Font TABLE_FONT_SELECTED = new Font("SansSerif",
Font.BOLD, 14);
+ private static final Font TABLE_FONT = new Font("SansSerif",
Font.PLAIN, 14);
+ private static final Font TABLE_FONT_SELECTED = new Font("SansSerif",
Font.BOLD, 14);
+
+ private static final Dimension CELL_SIZE = new Dimension(1200, 40);
private final CyNetworkManager networkManager;
private final CyNetworkViewManager networkViewManager;
@@ -52,6 +55,9 @@
boolean leaf, int row, boolean hasFocus) {
super.getTreeCellRendererComponent(tree, value, sel, expanded,
leaf, row, hasFocus);
+ this.setPreferredSize(CELL_SIZE);
+ this.setSize(CELL_SIZE);
+
if (value instanceof NetworkTreeNode == false)
return this;
--
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.
