Author: kono
Date: 2012-03-28 15:22:52 -0700 (Wed, 28 Mar 2012)
New Revision: 28685
Added:
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_map.png
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/CyActivator.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
Log:
Map Global Table to Local Button had been added.
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-03-28 22:18:06 UTC (rev 28684)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-03-28 22:22:52 UTC (rev 28685)
@@ -66,14 +66,15 @@
import org.cytoscape.equations.EquationCompiler;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyEdge;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
import org.cytoscape.model.CyTable;
-import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.model.subnetwork.CyRootNetwork;
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.CheckBoxJList;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -108,6 +109,9 @@
private JButton selectAllAttributesButton = null;
private JButton unselectAllAttributesButton = null;
+ private JButton mapGlobalTableButton = null;
+ private final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService;
+
private final JComboBox tableChooser;
private AttributeListModel attrListModel;
@@ -123,18 +127,24 @@
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
final TableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
- final JComboBox tableChooser, final Class<? extends
CyIdentifiable> objType, final CyApplicationManager appManager) {
+ final JComboBox tableChooser, final Class<? extends
CyIdentifiable> objType,
+ final CyApplicationManager appManager,
+ final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
+
this(serviceRegistrar, compiler, deleteTableTaskFactoryService,
guiTaskManagerServiceRef, tableChooser,
- new JToggleButton(), objType, appManager);
+ new JToggleButton(), objType, appManager,
mapGlobalTableTaskFactoryService);
}
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
final TableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
- final JComboBox tableChooser, final JToggleButton
selectionModeButton, Class<? extends CyIdentifiable> objType, final
CyApplicationManager appManager) {
+ final JComboBox tableChooser, final JToggleButton
selectionModeButton,
+ Class<? extends CyIdentifiable> objType, final
CyApplicationManager appManager,
+ final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
this.compiler = compiler;
this.selectionModeButton = selectionModeButton;
this.appManager = appManager;
-
+ this.mapGlobalTableTaskFactoryService =
mapGlobalTableTaskFactoryService;
+
this.tableChooser = tableChooser;
this.deleteTableTaskFactoryService =
deleteTableTaskFactoryService;
this.guiTaskManagerServiceRef = guiTaskManagerServiceRef;
@@ -159,8 +169,10 @@
if(browserTableModel != null && objType != null) {
deleteTableButton.setEnabled(false);
+ mapGlobalTableButton.setEnabled(false);
} else {
deleteTableButton.setEnabled(browserTableModel != null);
+ mapGlobalTableButton.setEnabled(browserTableModel !=
null);
}
formulaBuilderButton.setEnabled(browserTableModel != null);
@@ -475,6 +487,8 @@
.addPreferredGap(ComponentPlacement.UNRELATED)
.addComponent(getFunctionBuilderButton())
.addPreferredGap(ComponentPlacement.UNRELATED)
+
.addComponent(getMapGlobalTableButton())
+
.addPreferredGap(ComponentPlacement.UNRELATED)
.addComponent(this.tableChooser)));
buttonBarLayout.setVerticalGroup(buttonBarLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(selectionModeButton, javax.swing.GroupLayout.Alignment.CENTER,
@@ -508,6 +522,10 @@
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.DEFAULT_SIZE,
27,
Short.MAX_VALUE)
+
.addComponent(mapGlobalTableButton,
+
javax.swing.GroupLayout.Alignment.CENTER,
+
javax.swing.GroupLayout.DEFAULT_SIZE,
+ 27,
Short.MAX_VALUE)
.addComponent(tableChooser,
javax.swing.GroupLayout.Alignment.CENTER,
javax.swing.GroupLayout.DEFAULT_SIZE,
@@ -812,8 +830,26 @@
return createNewAttributeButton;
}
+
+ private JButton getMapGlobalTableButton() {
+ if (mapGlobalTableButton == null) {
+ mapGlobalTableButton = new JButton();
+ 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.setBorder(null);
+ mapGlobalTableButton.addMouseListener(new
MouseAdapter() {
+ public void mouseClicked(MouseEvent e) {
+
guiTaskManagerServiceRef.execute(mapGlobalTableTaskFactoryService.createTaskIterator());
+ }
+ });
+ }
+ mapGlobalTableButton.setEnabled(false);
+ return mapGlobalTableButton;
+ }
private void createNewAttribute(final String type, boolean isShared) {
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-03-28 22:18:06 UTC (rev 28684)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-03-28 22:22:52 UTC (rev 28685)
@@ -20,6 +20,7 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.osgi.framework.BundleContext;
@@ -44,16 +45,17 @@
DialogTaskManager guiTaskManagerServiceRef =
getService(bc,DialogTaskManager.class);
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
CyNetworkTableManager cyNetworkTableManagerServiceRef =
getService(bc,CyNetworkTableManager.class);
+ MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryServiceRef =
getService(bc,MapGlobalToLocalTableTaskFactory.class);
CyEventHelper cyEventHelperServiceRef =
getService(bc,CyEventHelper.class);
PopupMenuHelper popupMenuHelper = new
PopupMenuHelper(guiTaskManagerServiceRef);
- AbstractTableBrowser nodeTableBrowser = new
DefaultTableBrowser("Node Table", CyNode.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef);
- AbstractTableBrowser edgeTableBrowser = new
DefaultTableBrowser("Edge Table", CyEdge.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef);
- AbstractTableBrowser networkTableBrowser = new
DefaultTableBrowser("Network Table", CyNetwork.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef);
+ AbstractTableBrowser nodeTableBrowser = new
DefaultTableBrowser("Node Table", CyNode.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
+ AbstractTableBrowser edgeTableBrowser = new
DefaultTableBrowser("Edge Table", CyEdge.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
+ AbstractTableBrowser networkTableBrowser = new
DefaultTableBrowser("Network Table", CyNetwork.class,
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef, mapGlobalTableTaskFactoryServiceRef);
- AbstractTableBrowser globalTableBrowser = new
GlobalTableBrowser("Global Table",
cyTableManagerServiceRef,cyNetworkTableManagerServiceRef,cyServiceRegistrarServiceRef,compilerServiceRef,openBrowserServiceRef,cyNetworkManagerServiceRef,deleteTableTaskFactoryService,guiTaskManagerServiceRef,popupMenuHelper,cyApplicationManagerServiceRef,
cyEventHelperServiceRef);
+ AbstractTableBrowser globalTableBrowser = new
GlobalTableBrowser("Global Table",
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/DefaultTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-03-28 22:18:06 UTC (rev 28684)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-03-28 22:22:52 UTC (rev 28685)
@@ -35,6 +35,7 @@
import org.cytoscape.model.events.NetworkAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
import org.cytoscape.model.events.TableAboutToBeDeletedEvent;
@@ -59,7 +60,7 @@
CyNetworkTableManager networkTableManager,
CyServiceRegistrar serviceRegistrar, EquationCompiler compiler,
OpenBrowser openBrowser, CyNetworkManager
networkManager, TableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
PopupMenuHelper popupMenuHelper,
- CyApplicationManager applicationManager, final
CyEventHelper eventHelper) {
+ CyApplicationManager applicationManager, final
CyEventHelper eventHelper, final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
super(tabTitle, tableManager, networkTableManager,
serviceRegistrar, compiler, openBrowser, networkManager,
deleteTableTaskFactoryService,
guiTaskManagerServiceRef, popupMenuHelper, applicationManager, eventHelper);
@@ -89,7 +90,7 @@
});
this.attributeBrowserToolBar = new
AttributeBrowserToolBar(serviceRegistrar, compiler,
- deleteTableTaskFactoryService,
guiTaskManagerServiceRef, networkChooser, selectionModeButton, objType,
applicationManager);
+ deleteTableTaskFactoryService,
guiTaskManagerServiceRef, networkChooser, selectionModeButton, objType,
applicationManager, mapGlobalTableTaskFactoryService);
add(attributeBrowserToolBar, BorderLayout.NORTH);
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-03-28 22:18:06 UTC (rev 28684)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-03-28 22:22:52 UTC (rev 28685)
@@ -20,6 +20,7 @@
import org.cytoscape.model.events.TableAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -38,7 +39,7 @@
CyServiceRegistrar serviceRegistrar, EquationCompiler
compiler, OpenBrowser openBrowser,
CyNetworkManager networkManager, TableTaskFactory
deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
PopupMenuHelper popupMenuHelper,
- CyApplicationManager applicationManager, CyEventHelper
eventHelper) {
+ CyApplicationManager applicationManager, CyEventHelper
eventHelper, final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
super(tabTitle, tableManager, networkTableManager,
serviceRegistrar, compiler, openBrowser, networkManager,
deleteTableTaskFactoryService,
guiTaskManagerServiceRef, popupMenuHelper, applicationManager, eventHelper);
@@ -54,7 +55,7 @@
tableChooser.setEnabled(false);
attributeBrowserToolBar = new
AttributeBrowserToolBar(serviceRegistrar, compiler,
- deleteTableTaskFactoryService,
guiTaskManagerServiceRef, tableChooser, null, applicationManager);
+ deleteTableTaskFactoryService,
guiTaskManagerServiceRef, tableChooser, null, applicationManager,
mapGlobalTableTaskFactoryService);
add(attributeBrowserToolBar, BorderLayout.NORTH);
}
Modified:
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
2012-03-28 22:18:06 UTC (rev 28684)
+++
core3/impl/trunk/table-browser-impl/src/main/resources/images/about_icon.txt
2012-03-28 22:22:52 UTC (rev 28685)
@@ -7,4 +7,10 @@
<primary_key.png>
Icon Pack:Wireframe Mono
Designer:Gentleface.com
-License:Creative Commons Attribution Non-commercial (by-nc)
\ No newline at end of file
+License:Creative Commons Attribution Non-commercial (by-nc)
+
+<table_map.png>
+Artist: Fatcow Web Hosting
+Iconset: Farm Fresh Icons (2000 icons)
+License: CC Attribution 3.0
+http://www.iconarchive.com/show/farm-fresh-icons-by-fatcow/table-relationship-icon.html
Added:
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_map.png
===================================================================
(Binary files differ)
Property changes on:
core3/impl/trunk/table-browser-impl/src/main/resources/images/table_map.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
--
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.
