diff --git a/src/main/java/ru/egspt/App.java b/src/main/java/ru/egspt/App.java index 353af4a..3e01ed6 100644 --- a/src/main/java/ru/egspt/App.java +++ b/src/main/java/ru/egspt/App.java @@ -29,6 +29,8 @@ public class App extends JPanel{ mainframe.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); mainframe.add(this); mainframe.setSize(640, 480); + //mainframe.setLocationByPlatform(true); + //mainframe.pack(); mainframe.setVisible(true); } /** diff --git a/src/main/java/ru/egspt/ReportPane.java b/src/main/java/ru/egspt/ReportPane.java index 4206e1c..442bc0e 100644 --- a/src/main/java/ru/egspt/ReportPane.java +++ b/src/main/java/ru/egspt/ReportPane.java @@ -2,6 +2,7 @@ package ru.egspt; import java.awt.Dimension; import java.awt.Color; +import java.awt.BorderLayout; import javax.swing.JButton; import javax.swing.JPanel; @@ -21,17 +22,27 @@ public class ReportPane extends JPanel{ public ReportPane(App app){ tableModel = new ReportTableModel(app.getData()); table = new JTable(tableModel); - table.setPreferredScrollableViewportSize(new Dimension(500, 70)); - table.setFillsViewportHeight(true); + //table.setTableHeader(tableModel.getHeader()); + //table.setPreferredScrollableViewportSize(new Dimension(500, 70)); + //table.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS); + //table.setAutoResizeMode(JTable.HEIGHT); + //table.setPreferredScrollableViewportSize(table.getPreferredSize()); + //table.setFillsViewportHeight(true); + //table.getMaximumSize(); + //table.setFillsViewportHeight(true); JScrollPane scrollPane = new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + //scrollPane.getMaximumSize(); tabPane.add(scrollPane); + } public void init(){ controlPane.add(generateXLSXButton); controlPane.add(generateTXTButton); - this.add(controlPane); - this.add(tabPane); + this.setLayout(new BorderLayout()); + this.add(controlPane, BorderLayout.NORTH); + this.add(tabPane, BorderLayout.CENTER); + tabPane.getMaximumSize(); TitledBorder border = new TitledBorder(new LineBorder(Color.black), "report", TitledBorder.CENTER, TitledBorder.CENTER); this.setBorder(border); this.setVisible(true); diff --git a/target/classes/ru/egspt/App.class b/target/classes/ru/egspt/App.class index 8d92cca..7762791 100644 Binary files a/target/classes/ru/egspt/App.class and b/target/classes/ru/egspt/App.class differ diff --git a/target/classes/ru/egspt/ReportPane.class b/target/classes/ru/egspt/ReportPane.class index 0c67f75..26ff06d 100644 Binary files a/target/classes/ru/egspt/ReportPane.class and b/target/classes/ru/egspt/ReportPane.class differ