Author: rozagh
Date: 2012-05-16 16:01:23 -0700 (Wed, 16 May 2012)
New Revision: 29278
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapTableToNetworkTablesTaskFactory.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributes.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/TableChooser.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
Log:
Changes in the mapping tasks before removing the global table tab in the table
browser. Includes fixes for bug #960.
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapGlobalToLocalTableTaskFactory.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -1,7 +1,9 @@
package org.cytoscape.task.edit;
+import java.util.Collection;
+
import org.cytoscape.model.CyTable;
-import org.cytoscape.work.TaskFactory;
+import org.cytoscape.task.TableTaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -9,7 +11,7 @@
* This interface provides a task iterator for mapping a global to a local
table.
* @CyAPI.Api.Interface
*/
-public interface MapGlobalToLocalTableTaskFactory extends TaskFactory{
+public interface MapGlobalToLocalTableTaskFactory extends TableTaskFactory{
/**
* Creates a task iterator for mapping a selected global table to a
selected local table.
@@ -19,5 +21,6 @@
* @param localTable The local table to map to.
* @return A task iterator of type {@link TaskIterator}.
*/
- TaskIterator createTaskIterator(final CyTable globalTable, final
CyTable localTable);
+ TaskIterator createTaskIterator(final CyTable globalTable, final
Collection<CyTable> localTables);
+
}
Modified:
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapTableToNetworkTablesTaskFactory.java
===================================================================
---
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapTableToNetworkTablesTaskFactory.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/api/trunk/core-task-api/src/main/java/org/cytoscape/task/edit/MapTableToNetworkTablesTaskFactory.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -1,11 +1,14 @@
package org.cytoscape.task.edit;
+import java.util.List;
+
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyTable;
import org.cytoscape.task.TableTaskFactory;
import org.cytoscape.work.TaskIterator;
public interface MapTableToNetworkTablesTaskFactory extends TableTaskFactory{
- TaskIterator createTaskIterator(final CyTable globalTable, String
tableType);
+ TaskIterator createTaskIterator(final CyTable globalTable,
List<CyNetwork> networkList, String tableType);
}
\ No newline at end of file
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/CyActivator.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -282,6 +282,7 @@
MapGlobalToLocalTableTaskFactoryImpl mapGlobal = new
MapGlobalToLocalTableTaskFactoryImpl(cyTableManagerServiceRef,
cyNetworkManagerServiceRef, tunableSetterServiceRef);
+
// Apply Visual Style Task
ApplyVisualStyleTaskFactoryimpl applyVisualStyleTaskFactory =
new ApplyVisualStyleTaskFactoryimpl(visualMappingManagerServiceRef);
Properties applyVisualStyleProps = new Properties();
@@ -300,13 +301,13 @@
mapGlobalProps.setProperty(ID,"mapGlobalToLocalTableTaskFactory");
mapGlobalProps.setProperty(PREFERRED_MENU,"Tools");
mapGlobalProps.setProperty(ACCELERATOR,"cmd m");
- mapGlobalProps.setProperty(TITLE, "Map Global Table to Local
Table");
+ mapGlobalProps.setProperty(TITLE, "Map Table to Attributes");
mapGlobalProps.setProperty(MENU_GRAVITY,"1.0");
mapGlobalProps.setProperty(TOOL_BAR_GRAVITY,"3.0");
mapGlobalProps.setProperty(IN_TOOL_BAR,"false");
mapGlobalProps.setProperty(COMMAND,"map-global-to-local");
mapGlobalProps.setProperty(COMMAND_NAMESPACE,"table");
- registerService(bc, mapGlobal, TaskFactory.class,
mapGlobalProps);
+ registerService(bc, mapGlobal, TableTaskFactory.class,
mapGlobalProps);
registerService(bc, mapGlobal,
MapGlobalToLocalTableTaskFactory.class, mapGlobalProps);
Properties loadNetworkFileTaskFactoryProps = new Properties();
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTask.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -14,6 +14,7 @@
import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.util.ListMultipleSelection;
import org.cytoscape.work.util.ListSingleSelection;
/**
@@ -23,25 +24,28 @@
*/
public final class MapGlobalToLocalTableTask extends AbstractTask {
- @Tunable(description = "Select a Table:")
- public ListSingleSelection<String> globalTables;
+ private final CyTable globalTable;
@Tunable(description = "Link Selected Table to:")
- public ListSingleSelection<String> localTables;
+ public ListMultipleSelection<String> localTables;
private final Map<String, CyTable> name2tableMap;
- MapGlobalToLocalTableTask(final CyTableManager tableManager, final
CyNetworkManager networkManager) {
+ MapGlobalToLocalTableTask(final CyTable globalTable, final
CyTableManager tableManager, final CyNetworkManager networkManager) {
final Set<CyNetwork> allNetworks =
networkManager.getNetworkSet();
+ if (globalTable == null)
+ throw new IllegalStateException("No Global Table is
selected!");
+
if (allNetworks.size() == 0)
throw new IllegalStateException("No network in current
session. You need at least one network.");
this.name2tableMap = new HashMap<String, CyTable>();
+ this.globalTable = globalTable;
+
final List<String> locals = new ArrayList<String>();
- final List<String> globals = new ArrayList<String>();
-
+
for (final CyNetwork network : allNetworks) {
locals.add(network.getDefaultNodeTable().getTitle());
name2tableMap.put(network.getDefaultNodeTable().getTitle(),
network.getDefaultNodeTable());
@@ -52,28 +56,17 @@
locals.add(network.getDefaultNetworkTable().getTitle());
name2tableMap.put(network.getDefaultNetworkTable().getTitle(),
network.getDefaultNetworkTable());
}
-
- final Set<CyTable> globalTableSet =
tableManager.getGlobalTables();
- for (final CyTable table : globalTableSet){
- globals.add(table.getTitle());
- name2tableMap.put(table.getTitle(), table);
- }
+ name2tableMap.put(this.globalTable.getTitle(),
this.globalTable);
- if (globals.size() == 0)
- throw new IllegalStateException("No Global Table in
current session!");
-
- this.localTables = new ListSingleSelection<String>(locals);
- this.globalTables = new ListSingleSelection<String>(globals);
-
- this.localTables.setSelectedValue(locals.get(0));
- this.globalTables.setSelectedValue(globals.get(0));
+ this.localTables = new ListMultipleSelection<String>(locals);
}
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
- final CyTable globalTable =
name2tableMap.get(globalTables.getSelectedValue());
- final CyTable localTable =
name2tableMap.get(localTables.getSelectedValue());
- mapTable(localTable, globalTable);
+ for(String selected : localTables.getSelectedValues()){
+ final CyTable localTable = name2tableMap.get(selected);
+ mapTable(localTable, globalTable);
+ }
}
private void mapTable(final CyTable localTable, final CyTable
globalTable) {
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapGlobalToLocalTableTaskFactoryImpl.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -1,18 +1,23 @@
package org.cytoscape.task.internal.table;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableManager;
+import org.cytoscape.task.AbstractTableTaskFactory;
import org.cytoscape.task.edit.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.work.AbstractTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
+import org.cytoscape.work.util.ListMultipleSelection;
import org.cytoscape.work.util.ListSingleSelection;
-public final class MapGlobalToLocalTableTaskFactoryImpl extends
AbstractTaskFactory implements MapGlobalToLocalTableTaskFactory {
+public final class MapGlobalToLocalTableTaskFactoryImpl extends
AbstractTableTaskFactory implements MapGlobalToLocalTableTaskFactory {
private final CyTableManager tableManager;
private final CyNetworkManager networkManager;
@@ -26,27 +31,28 @@
this.tunableSetter = tunableSetter;
}
+
@Override
- public TaskIterator createTaskIterator() {
- return new TaskIterator(new
MapGlobalToLocalTableTask(tableManager, networkManager));
+ public TaskIterator createTaskIterator(CyTable globalTable) {
+ return new TaskIterator(new
MapGlobalToLocalTableTask(globalTable, tableManager, networkManager) );
}
@Override
public TaskIterator createTaskIterator(CyTable globalTable,
- CyTable localTable) {
-
+ Collection<CyTable> localTables) {
final Map<String, Object> m = new HashMap<String, Object>();
- ListSingleSelection<String> globalTables = new
ListSingleSelection<String>(globalTable.getTitle());
- globalTables.setSelectedValue(globalTable.getTitle());
+ List<String> localTableTitles = new ArrayList<String>();
+ for(CyTable local: localTables){
+ localTableTitles.add(local.getTitle());
+ }
+
+ ListMultipleSelection<String> localTablesTunable = new
ListMultipleSelection<String>(localTableTitles);
+ localTablesTunable.setSelectedValues(localTableTitles);
- ListSingleSelection<String> localTables = new
ListSingleSelection<String>(localTable.getTitle());
- localTables.setSelectedValue(localTable.getTitle());
+ m.put("localTables", localTablesTunable);
- m.put("globalTables", globalTables);
- m.put("localTables", localTables);
+ return
tunableSetter.createTaskIterator(this.createTaskIterator(globalTable), m);
- return
tunableSetter.createTaskIterator(this.createTaskIterator(), m);
}
-
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTask.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -1,7 +1,9 @@
package org.cytoscape.task.internal.table;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.cytoscape.event.CyEventHelper;
import org.cytoscape.io.read.CyTableReader;
@@ -16,13 +18,15 @@
import org.cytoscape.work.ProvidesTitle;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.util.ListMultipleSelection;
import org.cytoscape.work.util.ListSingleSelection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class MapTableToNetworkTablesTask extends AbstractTask {
+
private static enum TableType {
- NODE_ATTR("Node Attributes", CyNode.class), EDGE_ATTR("Edge
Attributes", CyEdge.class), NETWORK_ATTR("Network Attributes",
CyNetwork.class), GLOBAL("Tables", CyTable.class);
+ NODE_ATTR("Node Attributes", CyNode.class), EDGE_ATTR("Edge
Attributes", CyEdge.class), NETWORK_ATTR("Network Attributes",
CyNetwork.class), GLOBAL("Other Tables", CyTable.class);
private final String name;
private final Class<? extends CyIdentifiable> type;
@@ -41,21 +45,26 @@
}
};
-
private static Logger logger =
LoggerFactory.getLogger(MapTableToNetworkTablesTask.class);
private final CyNetworkManager networkManager;
private final CyTable globalTable;
private final CyTableReader reader;
private final boolean byReader;
+ private Map<String, CyNetwork> name2NetworkMap;
+ @Tunable(description = "Apply to Selected Networks Only",groups="Select
Tables")
+ public boolean selectedNetworksOnly = false;
+ @Tunable(description = "Network List",groups="Select
Tables",dependsOn="selectedNetworksOnly=true")
+ public ListMultipleSelection<String> networkList;
+
@Tunable(description = "Import Data To:")
public ListSingleSelection<TableType> dataTypeOptions;
@ProvidesTitle
public String getTitle() {
- return "Import Data";
+ return "Import Data ";
}
public MapTableToNetworkTablesTask(final CyNetworkManager
networkManager, final CyTableReader reader){
@@ -63,7 +72,8 @@
globalTable = null;
this.byReader = true;
this.networkManager = networkManager;
- initTunable();
+ this.name2NetworkMap = new HashMap<String, CyNetwork>();
+ initTunable(networkManager);
}
public MapTableToNetworkTablesTask(final CyNetworkManager
networkManager, final CyTable globalTable){
@@ -71,30 +81,41 @@
this.globalTable = globalTable;
this.byReader = false;
this.reader = null;
- initTunable();
+ this.name2NetworkMap = new HashMap<String, CyNetwork>();
+ initTunable(networkManager);
}
- private void initTunable(){
+ private void initTunable(CyNetworkManager networkManage){
final List<TableType> options = new ArrayList<TableType>();
for(TableType type: TableType.values())
options.add(type);
-
- options.add(TableType.GLOBAL);
-
dataTypeOptions = new ListSingleSelection<TableType>(options);
dataTypeOptions.setSelectedValue(TableType.NODE_ATTR);
+
+ for(CyNetwork net: networkManage.getNetworkSet()){
+ String netName = net.getRow(net).get(CyNetwork.NAME,
String.class);
+ name2NetworkMap.put(netName, net);
+ }
+ List<String> names = new ArrayList<String>();
+ names.addAll(name2NetworkMap.keySet());
+ networkList = new ListMultipleSelection<String>(names);
+
}
public void run(TaskMonitor taskMonitor) throws Exception {
-
TableType tableType = dataTypeOptions.getSelectedValue();
if (tableType != tableType.GLOBAL ){ //The table has already
been added to the global tables
- boolean isEverMapped = false;
- for (CyNetwork network: networkManager.getNetworkSet()){
+ List<CyNetwork> networks = new ArrayList<CyNetwork>();
+ if (!selectedNetworksOnly)
+ networks.addAll(networkManager.getNetworkSet());
+ else
+ for(String netName:
networkList.getSelectedValues())
+
networks.add(name2NetworkMap.get(netName));
+
+ for (CyNetwork network: networks){
CyTable targetTable = getTable(network,
tableType);
if (targetTable != null){
- isEverMapped = true;
if(byReader){
if (reader.getTables() != null
&& reader.getTables().length >0){
for(CyTable sourceTable
: reader.getTables())
@@ -103,7 +124,6 @@
}else{
mapTable(targetTable,
globalTable);
}
-
}
}
//add each mapped table to the list for mapping to
networks going to be added later
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/MapTableToNetworkTablesTaskFactoryImpl.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -1,15 +1,19 @@
package org.cytoscape.task.internal.table;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkManager;
import org.cytoscape.model.CyTable;
import org.cytoscape.task.AbstractTableTaskFactory;
import org.cytoscape.task.edit.MapTableToNetworkTablesTaskFactory;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableSetter;
+import org.cytoscape.work.util.ListMultipleSelection;
import org.cytoscape.work.util.ListSingleSelection;
public final class MapTableToNetworkTablesTaskFactoryImpl extends
AbstractTableTaskFactory implements MapTableToNetworkTablesTaskFactory{
@@ -30,13 +34,25 @@
}
@Override
- public TaskIterator createTaskIterator(CyTable globalTable, String
tableType) {
+ public TaskIterator createTaskIterator(CyTable globalTable,
List<CyNetwork> networksList, String tableType) {
ListSingleSelection<String> tableTypes = new
ListSingleSelection<String>(tableType);
tableTypes.setSelectedValue(tableType);
+ List<String> networkNames = new ArrayList<String>();
+ for(CyNetwork net: networksList){
+ networkNames.add(net.getRow(net).get(CyNetwork.NAME,
String.class));
+ }
+
+ ListMultipleSelection<String> networksListTunable = new
ListMultipleSelection<String>(networkNames);
+ networksListTunable.setSelectedValues(networkNames);
+
+ boolean selectedNetworksOnly = true;
+
final Map<String, Object> m = new HashMap<String, Object>();
m.put("dataTypeOptions", tableTypes);
+ m.put("selectedNetworksOnly", selectedNetworksOnly);
+ m.put("networkList", networksListTunable);
return
tunableSetter.createTaskIterator(createTaskIterator(globalTable), m);
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributes.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributes.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/UpdateAddedNetworkAttributes.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -42,7 +42,9 @@
public void handleEvent(NetworkAddedEvent e) {
for (CyTable mappedTable: tableMappings.keySet()){
for( Class<? extends CyIdentifiable> tableType:
tableMappings.get(mappedTable)){
-
syncTaskManager.execute(mappingTF.createTaskIterator(mappedTable,
getTable(e.getNetwork(),tableType)));
+ List<CyTable> targetTables = new
ArrayList<CyTable>();
+ targetTables.add(
getTable(e.getNetwork(),tableType));
+
syncTaskManager.execute(mappingTF.createTaskIterator(mappedTable,
targetTables));
}
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -836,13 +836,13 @@
mapGlobalTableButton.setBorder(null);
mapGlobalTableButton.setMargin(new java.awt.Insets(0,
0, 0, 0));
mapGlobalTableButton.setIcon(new
ImageIcon(getClass().getClassLoader().getResource("images/table_map.png")));
- mapGlobalTableButton.setToolTipText("Map Global Table
to Networks");
+ mapGlobalTableButton.setToolTipText("Link Table to
Attributes");
mapGlobalTableButton.setBorder(null);
mapGlobalTableButton.addMouseListener(new
MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (mapGlobalTableButton.isEnabled())
-
guiTaskManagerServiceRef.execute(mapGlobalTableTaskFactoryService.createTaskIterator());
+
guiTaskManagerServiceRef.execute(mapGlobalTableTaskFactoryService.createTaskIterator(
browserTableModel.getAttributes() ));
}
});
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -56,7 +56,7 @@
AbstractTableBrowser edgeTableBrowser = new
DefaultTableBrowser("Edge Attributes", CyEdge.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
AbstractTableBrowser networkTableBrowser = new
DefaultTableBrowser("Network Attributes", CyNetwork.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
- AbstractTableBrowser globalTableBrowser = new
GlobalTableBrowser("Tables",
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
+ AbstractTableBrowser globalTableBrowser = new
GlobalTableBrowser("Other Tables",
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
registerAllServices(bc,nodeTableBrowser, new Properties());
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/TableChooser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/TableChooser.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/TableChooser.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -55,7 +55,7 @@
private void updateTableToStringMap() {
tableToStringMap.clear();
for (final CyTable table : tables)
- tableToStringMap.put(table, "Global Table: " +
table.getTitle());
+ tableToStringMap.put(table, table.getTitle());
}
@Override
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2012-05-16 23:01:17 UTC (rev 29277)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/tunables/ListMultipleHandler.java
2012-05-16 23:01:23 UTC (rev 29278)
@@ -10,6 +10,7 @@
import java.util.List;
import java.util.Arrays;
+import javax.swing.BorderFactory;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -74,6 +75,7 @@
JTextArea jta = new JTextArea(getDescription());
jta.setLineWrap(true);
jta.setWrapStyleWord(true);
+ jta.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
panel.add(jta,BorderLayout.BEFORE_LINE_BEGINS);
jta.setBackground(null);
jta.setEditable(false);
--
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.
