4652 fix presence of scroll bar on top explorer view showing datasources

This commit is contained in:
William Schaefer 2019-01-23 16:58:29 -05:00
parent 40700ea74d
commit dc4d7051a2
4 changed files with 5 additions and 21 deletions

View File

@ -15,15 +15,4 @@
</AuxValues> </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="dataSourcesScrollPane">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Center"/>
</Constraint>
</Constraints>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
</Container>
</SubComponents>
</Form> </Form>

View File

@ -69,7 +69,6 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
initComponents(); initComponents();
explorerManager = new ExplorerManager(); explorerManager = new ExplorerManager();
outlineView = new org.openide.explorer.view.OutlineView(); outlineView = new org.openide.explorer.view.OutlineView();
dataSourcesScrollPane.setViewportView(outlineView);
this.setVisible(true); this.setVisible(true);
outlineView.setPropertyColumns( outlineView.setPropertyColumns(
Bundle.DataSourceSummaryNode_column_type_header(), Bundle.DataSourceSummaryNode_column_type_header(), Bundle.DataSourceSummaryNode_column_type_header(), Bundle.DataSourceSummaryNode_column_type_header(),
@ -81,7 +80,7 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
outline.setRootVisible(false); outline.setRootVisible(false);
dataSourceSummaryList = getDataSourceSummaryList(); dataSourceSummaryList = getDataSourceSummaryList();
((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.DataSourceSummaryNode_column_dataSourceName_header()); ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(Bundle.DataSourceSummaryNode_column_dataSourceName_header());
dataSourcesScrollPane.setViewportView(outlineView); add(outlineView, java.awt.BorderLayout.CENTER);
explorerManager.setRootContext(new DataSourceSummaryNode(dataSourceSummaryList)); explorerManager.setRootContext(new DataSourceSummaryNode(dataSourceSummaryList));
this.setVisible(true); this.setVisible(true);
} }
@ -300,10 +299,7 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
dataSourcesScrollPane = new javax.swing.JScrollPane();
setLayout(new java.awt.BorderLayout()); setLayout(new java.awt.BorderLayout());
add(dataSourcesScrollPane, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@Override @Override
@ -313,7 +309,6 @@ final class DataSourceBrowser extends javax.swing.JPanel implements ExplorerMana
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JScrollPane dataSourcesScrollPane;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
/** /**

View File

@ -36,7 +36,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="dataSourceSummarySplitPane" pref="353" max="32767" attributes="0"/> <Component id="dataSourceSummarySplitPane" pref="362" max="32767" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="closeButton" min="-2" max="-2" attributes="0"/> <Component id="closeButton" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" max="-2" attributes="0"/> <EmptySpace min="-2" max="-2" attributes="0"/>
@ -57,7 +57,7 @@
</Component> </Component>
<Container class="javax.swing.JSplitPane" name="dataSourceSummarySplitPane"> <Container class="javax.swing.JSplitPane" name="dataSourceSummarySplitPane">
<Properties> <Properties>
<Property name="dividerLocation" type="int" value="100"/> <Property name="dividerLocation" type="int" value="140"/>
<Property name="orientation" type="int" value="0"/> <Property name="orientation" type="int" value="0"/>
</Properties> </Properties>
<AuxValues> <AuxValues>

View File

@ -96,7 +96,7 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
} }
}); });
dataSourceSummarySplitPane.setDividerLocation(100); dataSourceSummarySplitPane.setDividerLocation(140);
dataSourceSummarySplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); dataSourceSummarySplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
dataSourceSummarySplitPane.setRightComponent(dataSourceTabbedPane); dataSourceSummarySplitPane.setRightComponent(dataSourceTabbedPane);
@ -119,7 +119,7 @@ final class DataSourceSummaryDialog extends javax.swing.JDialog implements Obser
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
.addComponent(dataSourceSummarySplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE) .addComponent(dataSourceSummarySplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(closeButton) .addComponent(closeButton)
.addContainerGap()) .addContainerGap())