Author: pwang
Date: 2012-07-27 16:45:23 -0700 (Fri, 27 Jul 2012)
New Revision: 30028
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/PreviewTablePanel.java
Log:
Fixed bug# 1294
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
2012-07-27 21:38:45 UTC (rev 30027)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/AttributeTypeDialog.java
2012-07-27 23:45:23 UTC (rev 30028)
@@ -39,13 +39,12 @@
import org.cytoscape.tableimport.internal.util.AttributeTypes;
import static org.cytoscape.tableimport.internal.reader.TextFileDelimiters.*;
-import java.awt.Frame;
import java.awt.event.ActionEvent;
import javax.swing.DefaultComboBoxModel;
//import com.sun.xml.internal.bind.v2.schemagen.xmlschema.List;
-import java.util.List;
+import java.awt.Dialog;
/**
*
@@ -63,7 +62,7 @@
/** Creates new form AttributeTypeDialog
* @param delimiter TODO*/
- public AttributeTypeDialog(Frame parent, boolean modal, final String
name, final byte dataType,
+ public AttributeTypeDialog(Dialog parent, boolean modal, final String
name, final byte dataType,
int index, String delimiter) {
super(parent, true);
Modified:
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/PreviewTablePanel.java
===================================================================
---
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/PreviewTablePanel.java
2012-07-27 21:38:45 UTC (rev 30027)
+++
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/PreviewTablePanel.java
2012-07-27 23:45:23 UTC (rev 30028)
@@ -101,6 +101,8 @@
import org.jdesktop.layout.GroupLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.JDialog;
+import java.awt.Container;
/**
* General purpose preview table panel.
@@ -1127,15 +1129,27 @@
e.getX());
if (SwingUtilities.isRightMouseButton(e)) {
+ // determine the parent of AttributeTypeDialog,
should be a TunableDialog
+ Object parent = null;
+
+ Container cnt =
PreviewTablePanel.this.getParent();
+ while(true){
+ cnt = cnt.getParent();
+ if (cnt instanceof JDialog){
+ parent = cnt;
+ break;
+ }
+ }
+
/*
* Right click: This action pops up an dialog
to edit the
* attribute type and name.
*/
- AttributeTypeDialog atd = new
AttributeTypeDialog(CytoscapeServices.cySwingApplication.getJFrame(),
+ AttributeTypeDialog atd = new
AttributeTypeDialog((java.awt.Dialog)parent,
true,
targetTable.getColumnModel()
.getColumn(column).getHeaderValue().toString(),
- dataTypes[column], column,
listDelimiter);
-
+ dataTypes[column], column,
listDelimiter);
+
atd.setLocationRelativeTo(targetTable.getParent());
atd.setVisible(true);
--
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.
