From e762bc43f1e445c6309999775cd377cb57e57ed8 Mon Sep 17 00:00:00 2001
From: esoe <igor_nikulin@mail.ru>
Date: Mon, 16 May 2022 20:57:14 +0300
Subject: [PATCH 1/2] =?UTF-8?q?=D0=B9=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/ru/egspt/ReportPane.java | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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);

From 91504400416fff67570505563d20d5c3a3418cbe Mon Sep 17 00:00:00 2001
From: esoe <igor_nikulin@mail.ru>
Date: Mon, 16 May 2022 21:43:33 +0300
Subject: [PATCH 2/2] qqq

---
 src/main/java/ru/egspt/App.java          |   2 ++
 target/classes/ru/egspt/App.class        | Bin 2606 -> 2606 bytes
 target/classes/ru/egspt/ReportPane.class | Bin 2326 -> 2378 bytes
 3 files changed, 2 insertions(+)

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/target/classes/ru/egspt/App.class b/target/classes/ru/egspt/App.class
index 8d92cca15f63bc16ecb0f5ff81d8403e09fa9b92..77627917cdb7ad95d79050a8820566a4edb8b5eb 100644
GIT binary patch
delta 91
zcmZ1{vQA`!76+>mg9?N4WPJ`dMvciII7BCRbEq@wfmtVjEE6EhhS3Vlcj8oMbO5vJ
ifh@Pl%Q*uCy%;zcycq--d>BL+d>JGd{3mm8sR00f^%lwi

delta 91
zcmZ1{vQA`!76+>Wg9?M<WPJ`dMzzTwI7BCRbEq@wfLSMiEF&PxhS37dcj8oMv;(v1
ifh?EF%Q*uCJs3C`JQ)NSyck3nycr}Id?#~osR00b*A}n<

diff --git a/target/classes/ru/egspt/ReportPane.class b/target/classes/ru/egspt/ReportPane.class
index 0c67f75d42f7955c07ddec082e4f5d90dd2fb6c0..26ff06daf9552b640c90951c0292127393e62aa6 100644
GIT binary patch
delta 968
zcmZuuOHUI~6#g!B3LPg>3k9PRo=RKLijo*pgF^9zEg(p-sK87a%fNI7r^Bm0>T}_G
z68?iLgE6hKiE-tEg>mB#@DI3kXFM~5pvJ|$IrrS}`_6aH*$iw4`0bzXKLF^%i!J_R
zReRH-xGJtk^J|KhjSf#_3|&>nL`~+=j{yO77_?qiw|a*JT*M{ob#<XwgCs-HrbWdy
zGdidn^Rkf;H}n;gM*{Uc7{&x#$2fy8FPrWc!{Jb3m*nP>q9$f#BNk58;sygZq8sLd
zO;6d?rWnG1P~v)SS=VGOZN^+3RV2rw(xRL(9fdT5H!f?YZ1AYYEdjT2hhcwKHk0DI
zl3U45C<U3JF%;hOF{I>VEwAWWtOm1IucwoVR?5>}%s{TeJh68j$8}XV1l&cIj7qAQ
zSz_?-2|3>}9&=Fap)E4h|K**?j!BhF8uBtV%3}tajnx@Wx!B)pkgOk`F7G`72J%)X
z*L!G1z$(@lcp7I)$t#jdjd()S;gq$&#k>y$Jj5gG71!r^ETCY0<Guug@Q`*L{5XOG
z2qQon4_cqRExym-Xg+{yefN$RE9g&0-r}6U!QWEGg(SrtJtf4awg^&%qjX2W)7|(V
z!6w9U5aVcrgbpkb`WPWwU3qjNL@z3Y%eX>Yl}P6*hDnv-8X03`tO&e=mr}qSm2RNZ
zY**ij+nl(9M7oTT5=J9-J}^<jq#bnxZrTwAB}`9MFq5ueF8u~l84H0Wjw>UVh;)~*
z9PyN3{@YLp0>VY|A0hAEIF25iq5C{eU=mSG<0NL$>vYuU8r<n<68o@@4f4-Wpt0J0
z00V@v+wet7xKBlkd-Ztd<1}gsY!Aql^VxC%dJ+du@YK<>_xQE8v-zw86etH;mpe&@
JXY{JV^Iv=`%pU*%

delta 853
zcmZva%TE(g6vn^H%(QfvKq;jyA}JJ*>1ad@i7^-gf=GENP;D*ZqtF2c`@m@dMX|0l
zZoP>ccm4yW#<Yn|j5`xn{ts^5n7B5c+hSN~CUbM{<9z4$oqG>GZ#?SZ?@ylr4C8r8
z{nAkMY$bP-gUP+Z;G~r?vw16*RWXWj4K29Lpy-iEIHuwPCN*5a6hkO)78Y!C-L!2p
z6<xD)>2z{6ZN@BfZ#!ofqSn62;MeE=)g7q|O>2l?hQUWdQ$Z`8&i~DwHm!}#0)wnC
zhht96kq*yD{$>@kxF&$EGj!;DNb&~iR1y|7EFsDuB~vK|qqfP<Nh?h%7#5wl%@E}8
zm7wIr9sWuVIqo6p#C=|p+oV;j@vm}M;|fe6zRrKh0q-V*!#0Hz70cKX8xMFux#-Af
z$Rfw%%23-w4YqKgl7pC)x5z$!r;IrEG(5s%{#_ZCpJ>?OosMtqUdU)BkrteU8)39k
z=e@6;LDx?xkmw>_a^1O9G(O@|6{Cq(_RBq0!B`m+Vo5IJY8A5y5xc$aU<LE@6!)Gf
zV<BFm><0AHcpe&!?f)s|!vy@)q5w>EAcGS)Kqp=h%qhy~t`lIO2%V+`gB!R>ojZVv
z7~&+)aErJZaRYDRpcP=25WMtv35uh*rxuGz8Hu<-L9Ym^SWZ;2lK6nT6{I{Hic*0!
zXPho0ZIHR`BM(JV4WW_7AX(`q+#dQuFwl!J^wG=f#|$A0XkVQH12yI`G$D@y5i;yh
zZ|kJvbViW6j52nq*#2>^)Y^tl#lpvO0l1FzC<jl;zt9tx>2mdTovj_zXa#g>^|}nt
IXx4z@A4AWeLjV8(