Author: pwang
Date: 2011-03-11 15:42:43 -0800 (Fri, 11 Mar 2011)
New Revision: 24414
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableTask.java
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportNetworkTableTask.java
Log:
Use @ProvidesGUI
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableTask.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableTask.java
2011-03-11 23:41:32 UTC (rev 24413)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportAttributeTableTask.java
2011-03-11 23:42:43 UTC (rev 24414)
@@ -1,26 +1,29 @@
package org.cytoscape.tableimport.internal;
import java.io.IOException;
+import javax.swing.JPanel;
import javax.xml.bind.JAXBException;
import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
-import org.cytoscape.tableimport.internal.util.CytoscapeServices;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ProvidesGUI;
import org.cytoscape.work.TaskMonitor;
public class ImportAttributeTableTask extends AbstractTask {
+ private ImportTextTableDialog importDialog = null;
+
public ImportAttributeTableTask(){
}
-
- public void run(TaskMonitor e) {
- ImportTextTableDialog iad;
+ @ProvidesGUI
+ public JPanel getGUI() {
+
+ JPanel myPanel = new JPanel();
+
try {
- iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.SIMPLE_ATTRIBUTE_IMPORT);
- iad.pack();
-
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
- iad.setVisible(true);
+ this.importDialog = new ImportTextTableDialog(true,
ImportTextTableDialog.SIMPLE_ATTRIBUTE_IMPORT);
+
} catch (JAXBException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
@@ -28,5 +31,24 @@
// TODO Auto-generated catch block
e1.printStackTrace();
}
+
+ if (importDialog != null){
+ myPanel.add(importDialog);
+ }
+
+ return myPanel;
}
+
+
+ public void run(TaskMonitor e) {
+
+ try {
+ this.importDialog.importButtonActionPerformed();
+ if (this.importDialog.getLoadTask() != null){
+
insertTasksAfterCurrentTask(this.importDialog.getLoadTask());
+ }
+ }
+ catch (Exception ex){
+ }
+ }
}
Modified:
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportNetworkTableTask.java
===================================================================
---
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportNetworkTableTask.java
2011-03-11 23:41:32 UTC (rev 24413)
+++
core3/table-import-impl/trunk/src/main/java/org/cytoscape/tableimport/internal/ImportNetworkTableTask.java
2011-03-11 23:42:43 UTC (rev 24414)
@@ -1,26 +1,27 @@
package org.cytoscape.tableimport.internal;
import java.io.IOException;
+import javax.swing.JPanel;
import javax.xml.bind.JAXBException;
import org.cytoscape.tableimport.internal.ui.ImportTextTableDialog;
-import org.cytoscape.tableimport.internal.util.CytoscapeServices;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.ProvidesGUI;
import org.cytoscape.work.TaskMonitor;
public class ImportNetworkTableTask extends AbstractTask {
- public ImportNetworkTableTask(){
-
+ private ImportTextTableDialog importDialog = null;
+
+ public ImportNetworkTableTask(){
}
-
- public void run(TaskMonitor e) {
- ImportTextTableDialog iad;
+
+ @ProvidesGUI
+ public JPanel getGUI() {
+ JPanel myPanel = new JPanel();
+
try {
- iad = new
ImportTextTableDialog(CytoscapeServices.desktop.getJFrame(), true,
ImportTextTableDialog.NETWORK_IMPORT);
- iad.pack();
-
iad.setLocationRelativeTo(CytoscapeServices.desktop.getJFrame());
- iad.setVisible(true);
+ importDialog = new ImportTextTableDialog(true,
ImportTextTableDialog.NETWORK_IMPORT);
} catch (JAXBException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
@@ -28,5 +29,24 @@
// TODO Auto-generated catch block
e1.printStackTrace();
}
+
+ if (importDialog != null){
+ myPanel.add(importDialog);
+ }
+
+ return myPanel;
}
+
+
+ public void run(TaskMonitor e) {
+
+ try {
+ this.importDialog.importButtonActionPerformed();
+ if (this.importDialog.getLoadTask() != null){
+
insertTasksAfterCurrentTask(this.importDialog.getLoadTask());
+ }
+ }
+ catch (Exception ex){
+ }
+ }
}
--
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.
