Author: rozagh
Date: 2012-06-29 17:37:03 -0700 (Fri, 29 Jun 2012)
New Revision: 29732

Modified:
   
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/AttributeMappingParametersHandler.java
   
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
   
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
Log:
fixes #1182 setting the layout for panel and adding component in center. Also 
packing the importtanbelpanel each time the expanding panels appear or 
disappear.

Modified: 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/AttributeMappingParametersHandler.java
===================================================================
--- 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/AttributeMappingParametersHandler.java
  2012-06-29 22:35:58 UTC (rev 29731)
+++ 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/AttributeMappingParametersHandler.java
  2012-06-30 00:37:03 UTC (rev 29732)
@@ -1,5 +1,6 @@
 package org.cytoscape.tableimport.internal.tunable;
 
+import java.awt.BorderLayout;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -7,6 +8,9 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+
 import org.cytoscape.model.CyTable;
 import org.cytoscape.model.CyTableManager;
 import org.cytoscape.tableimport.internal.reader.AttributeMappingParameters;
@@ -70,8 +74,10 @@
                        throw new IllegalStateException("Could not initialize 
ImportTablePanel.", e);
                }
                
-               panel.add(importTablePanel);
+               panel = new JPanel(new BorderLayout(10,10));
+               panel.add(importTablePanel, BorderLayout.CENTER);
                
+               
        }
        @Override
        public void handle(){ 

Modified: 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
===================================================================
--- 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
       2012-06-29 22:35:58 UTC (rev 29731)
+++ 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/tunable/NetworkTableMappingParametersHandler.java
       2012-06-30 00:37:03 UTC (rev 29732)
@@ -1,9 +1,16 @@
 package org.cytoscape.tableimport.internal.tunable;
 
+import java.awt.BorderLayout;
+import java.awt.LayoutManager;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.GroupLayout.Alignment;
+import javax.swing.LayoutStyle;
+
 import org.cytoscape.model.CyTableManager;
 import org.cytoscape.tableimport.internal.reader.AttributeMappingParameters;
 import org.cytoscape.tableimport.internal.reader.NetworkTableMappingParameters;
@@ -58,8 +65,8 @@
                } catch (Exception e) {
                        throw new IllegalStateException("Could not initialize 
ImportTablePanel.", e);
                }
-               
-               panel.add(importTablePanel);
+               panel = new JPanel(new BorderLayout(10, 10));
+               panel.add(importTablePanel, BorderLayout.CENTER);
        }
        
        @Override

Modified: 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
===================================================================
--- 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
        2012-06-29 22:35:58 UTC (rev 29731)
+++ 
core3/impl/trunk/table-import-impl/src/main/java/org/cytoscape/tableimport/internal/ui/ImportTablePanel.java
        2012-06-30 00:37:03 UTC (rev 29732)
@@ -1589,7 +1589,9 @@
                        textImportOptionPanel.setVisible(false);
                }
 
-               
//((JDialog)this.getParent().getParent().getParent().getParent().getParent().getParent()).pack();
+               JDialog dlg = (JDialog)SwingUtilities.getWindowAncestor(this);
+               dlg.pack();
+               
        }
 
 

-- 
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.

Reply via email to