Author: kono
Date: 2012-03-29 15:22:49 -0700 (Thu, 29 Mar 2012)
New Revision: 28699
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
Log:
fixes #837 Correct task factory will be injected (DeleteTableTaskFactory).
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-29 22:04:36 UTC (rev 28698)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/AttributeBrowserToolBar.java
2012-03-29 22:22:49 UTC (rev 28699)
@@ -74,6 +74,7 @@
import org.cytoscape.model.subnetwork.CySubNetwork;
import org.cytoscape.service.util.CyServiceRegistrar;
import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.table.DeleteTableTaskFactory;
import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.CheckBoxJList;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -116,7 +117,7 @@
private AttributeListModel attrListModel;
private final EquationCompiler compiler;
- private final TableTaskFactory deleteTableTaskFactoryService;
+ private final DeleteTableTaskFactory deleteTableTaskFactoryService;
private final DialogTaskManager guiTaskManagerServiceRef;
private final JToggleButton selectionModeButton;
@@ -126,7 +127,7 @@
private final CyApplicationManager appManager;
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
- final TableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
+ final DeleteTableTaskFactory
deleteTableTaskFactoryService, DialogTaskManager guiTaskManagerServiceRef,
final JComboBox tableChooser, final Class<? extends
CyIdentifiable> objType,
final CyApplicationManager appManager,
final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
@@ -136,7 +137,7 @@
}
public AttributeBrowserToolBar(final CyServiceRegistrar
serviceRegistrar, final EquationCompiler compiler,
- final TableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
+ final DeleteTableTaskFactory
deleteTableTaskFactoryService, DialogTaskManager guiTaskManagerServiceRef,
final JComboBox tableChooser, final JToggleButton
selectionModeButton,
Class<? extends CyIdentifiable> objType, final
CyApplicationManager appManager,
final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
@@ -741,27 +742,21 @@
private void removeTable(final MouseEvent e) {
final CyTable table = browserTableModel.getAttributes();
-
- if (table.getMutability() == CyTable.Mutability.MUTABLE){
+
+ if (table.getMutability() == CyTable.Mutability.MUTABLE) {
String title = "Please confirm this action";
- String msg = "Are yoy sure you want to delete this
table?";
- int _confirmValue = JOptionPane.showConfirmDialog(this,
msg, title, JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
-
+ String msg = "Are you sure you want to delete this
table?";
+ int _confirmValue = JOptionPane.showConfirmDialog(this,
msg, title, JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+
// if user selects yes delete the table
if (_confirmValue == JOptionPane.OK_OPTION)
- {
guiTaskManagerServiceRef.execute(deleteTableTaskFactoryService.createTaskIterator(table));
-
-
//this.tableManager.deleteTable(table.getSUID());
- }
- }
- else if (table.getMutability() ==
CyTable.Mutability.PERMANENTLY_IMMUTABLE){
+ } else if (table.getMutability() ==
CyTable.Mutability.PERMANENTLY_IMMUTABLE) {
String title = "Error";
String msg = "Can not delete this table, it is
PERMANENTLY_IMMUTABLE";
JOptionPane.showMessageDialog(this, msg, title,
JOptionPane.ERROR_MESSAGE);
- }
- else if(table.getMutability() ==
CyTable.Mutability.IMMUTABLE_DUE_TO_VIRT_COLUMN_REFERENCES){
+ } else if (table.getMutability() ==
CyTable.Mutability.IMMUTABLE_DUE_TO_VIRT_COLUMN_REFERENCES) {
String title = "Error";
String msg = "Can not delete this table, it is
IMMUTABLE_DUE_TO_VIRT_COLUMN_REFERENCES";
JOptionPane.showMessageDialog(this, msg, title,
JOptionPane.ERROR_MESSAGE);
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-29 22:04:36 UTC (rev 28698)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/CyActivator.java
2012-03-29 22:22:49 UTC (rev 28699)
@@ -20,6 +20,7 @@
import org.cytoscape.task.TableCellTaskFactory;
import org.cytoscape.task.TableColumnTaskFactory;
+import org.cytoscape.task.table.DeleteTableTaskFactory;
import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.osgi.framework.BundleContext;
@@ -41,7 +42,7 @@
EquationCompiler compilerServiceRef =
getService(bc,EquationCompiler.class);
OpenBrowser openBrowserServiceRef =
getService(bc,OpenBrowser.class);
CyNetworkManager cyNetworkManagerServiceRef =
getService(bc,CyNetworkManager.class);
- TableTaskFactory deleteTableTaskFactoryService =
getService(bc,TableTaskFactory.class);
+ DeleteTableTaskFactory deleteTableTaskFactoryService =
getService(bc, DeleteTableTaskFactory.class);
DialogTaskManager guiTaskManagerServiceRef =
getService(bc,DialogTaskManager.class);
CyApplicationManager cyApplicationManagerServiceRef =
getService(bc,CyApplicationManager.class);
CyNetworkTableManager cyNetworkTableManagerServiceRef =
getService(bc,CyNetworkTableManager.class);
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-29 22:04:36 UTC (rev 28698)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/DefaultTableBrowser.java
2012-03-29 22:22:49 UTC (rev 28699)
@@ -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.DeleteTableTaskFactory;
import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -58,7 +59,7 @@
public DefaultTableBrowser(String tabTitle, Class<? extends
CyIdentifiable> objType, CyTableManager tableManager,
CyNetworkTableManager networkTableManager,
CyServiceRegistrar serviceRegistrar, EquationCompiler compiler,
- OpenBrowser openBrowser, CyNetworkManager
networkManager, TableTaskFactory deleteTableTaskFactoryService,
+ OpenBrowser openBrowser, CyNetworkManager
networkManager, DeleteTableTaskFactory deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
PopupMenuHelper popupMenuHelper,
CyApplicationManager applicationManager, final
CyEventHelper eventHelper, final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
super(tabTitle, tableManager, networkTableManager,
serviceRegistrar, compiler, openBrowser, networkManager,
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-29 22:04:36 UTC (rev 28698)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/GlobalTableBrowser.java
2012-03-29 22:22:49 UTC (rev 28699)
@@ -19,7 +19,7 @@
import org.cytoscape.model.events.TableAddedEvent;
import org.cytoscape.model.events.TableAddedListener;
import org.cytoscape.service.util.CyServiceRegistrar;
-import org.cytoscape.task.TableTaskFactory;
+import org.cytoscape.task.table.DeleteTableTaskFactory;
import org.cytoscape.task.table.MapGlobalToLocalTableTaskFactory;
import org.cytoscape.util.swing.OpenBrowser;
import org.cytoscape.work.swing.DialogTaskManager;
@@ -37,7 +37,7 @@
public GlobalTableBrowser(String tabTitle, CyTableManager tableManager,
CyNetworkTableManager networkTableManager,
CyServiceRegistrar serviceRegistrar, EquationCompiler
compiler, OpenBrowser openBrowser,
- CyNetworkManager networkManager, TableTaskFactory
deleteTableTaskFactoryService,
+ CyNetworkManager networkManager, DeleteTableTaskFactory
deleteTableTaskFactoryService,
DialogTaskManager guiTaskManagerServiceRef,
PopupMenuHelper popupMenuHelper,
CyApplicationManager applicationManager, CyEventHelper
eventHelper, final MapGlobalToLocalTableTaskFactory
mapGlobalTableTaskFactoryService) {
super(tabTitle, tableManager, networkTableManager,
serviceRegistrar, compiler, openBrowser, networkManager,
--
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.
