Changeset 225

Show
Ignore:
Timestamp:
06-03-12 13:21:17 (2 years ago)
Author:
tim.te.beek@…
Message:

Rename AttrAssiPanel? to InteractionPanel?
Provide alternate default size for PreviewTable?
Do not allow DropDown? boxes to resize

Location:
trunk/piqc-plugin/src/main/java/nl/nbic/brs/piqc/tableimport/views
Files:
2 modified
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/piqc-plugin/src/main/java/nl/nbic/brs/piqc/tableimport/views/InteractionPanel.java

    r219 r225  
    2222 * Panel to assign columns from data table as attributes on either source node, target node or edges. 
    2323 */ 
    24 public class AttributeAssignmentPanel extends JPanel { 
     24public class InteractionPanel extends JPanel { 
    2525        private ParsingTableModel       tableModel; 
    2626 
     
    3232        private JComboBox                       targetCB; 
    3333 
    34         public AttributeAssignmentPanel(final ParsingTableModel tableModel) { 
     34        public InteractionPanel(final ParsingTableModel tableModel) { 
    3535                this.tableModel = tableModel; 
    3636 
     
    123123                verticalLabelGroup.addComponent(targetLbl); 
    124124                ParallelGroup verticalComboBoxGroup = layout.createParallelGroup(); 
    125                 verticalComboBoxGroup.addComponent(sourceCB); 
    126                 verticalComboBoxGroup.addComponent(edgeCB); 
    127                 verticalComboBoxGroup.addComponent(targetCB); 
     125                // Do not resize these dropdowns in height when user changes dimensions of our dialog 
     126                verticalComboBoxGroup.addComponent(sourceCB, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE); 
     127                verticalComboBoxGroup.addComponent(edgeCB, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE); 
     128                verticalComboBoxGroup.addComponent(targetCB, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE, GroupLayout.PREFERRED_SIZE); 
    128129                SequentialGroup verticalGroup = layout.createSequentialGroup(); 
    129130                verticalGroup.addGroup(verticalLabelGroup).addPreferredGap(ComponentPlacement.RELATED); 
  • trunk/piqc-plugin/src/main/java/nl/nbic/brs/piqc/tableimport/views/PreviewPanel.java

    r207 r225  
    148148                verticalSeqGrp.addGroup(verticalParGrp); 
    149149                verticalSeqGrp.addPreferredGap(ComponentPlacement.RELATED); 
    150                 verticalSeqGrp.addComponent(scrollPane); 
     150                verticalSeqGrp.addComponent(scrollPane, 50, 250, Short.MAX_VALUE); 
    151151 
    152152                layout.setVerticalGroup(verticalSeqGrp); 
  • trunk/piqc-plugin/src/main/java/nl/nbic/brs/piqc/tableimport/views/TableImportDialog.java

    r205 r225  
    1818public class TableImportDialog extends JDialog { 
    1919        // Model 
    20         private ParsingTableModel                       tableModel; 
     20        private ParsingTableModel       tableModel; 
    2121 
    2222        // Panels 
    23         private ParseOptionsPanel                       parseOptionsPanel; 
    24         private AttributeAssignmentPanel        attributeAssignmentPanel; 
    25         private PreviewPanel                            previewPanel; 
    26         private ButtonPanel                                     buttonPanel; 
     23        private ParseOptionsPanel       parseOptionsPanel; 
     24        private InteractionPanel        attributeAssignmentPanel; 
     25        private PreviewPanel            previewPanel; 
     26        private ButtonPanel                     buttonPanel; 
    2727 
    2828        /** 
     
    4141                // Create panels 
    4242                parseOptionsPanel = new ParseOptionsPanel(tableModel); 
    43                 attributeAssignmentPanel = new AttributeAssignmentPanel(tableModel); 
     43                attributeAssignmentPanel = new InteractionPanel(tableModel); 
    4444                previewPanel = new PreviewPanel(this, tableModel); 
    4545                buttonPanel = new ButtonPanel(this, tableModel);