@@ -173,11 +173,11 @@ private void initComponents() {
173173 rdoByteHex = new javax .swing .JRadioButton ();
174174 rdoByteOct = new javax .swing .JRadioButton ();
175175 rdoUnicodeHex = new javax .swing .JRadioButton ();
176- rdoUTF7 = new javax .swing .JRadioButton ();
177176 pnlCompress = new javax .swing .JPanel ();
178177 rdoGzip = new javax .swing .JRadioButton ();
179178 rdoZLIB = new javax .swing .JRadioButton ();
180179 pnlILLUTF8 = new javax .swing .JPanel ();
180+ rdoUTF7 = new javax .swing .JRadioButton ();
181181 rdoILLUTF8 = new javax .swing .JRadioButton ();
182182 cmbIILUTF8 = new javax .swing .JComboBox ();
183183 pnlLang = new javax .swing .JPanel ();
@@ -329,7 +329,7 @@ private void initComponents() {
329329 pnlTransButton .setLayout (new javax .swing .BoxLayout (pnlTransButton , javax .swing .BoxLayout .PAGE_AXIS ));
330330
331331 pnlEncodeDecode .setBorder (javax .swing .BorderFactory .createTitledBorder ("Encode/Decode" ));
332- pnlEncodeDecode .setLayout (new java .awt .GridLayout (13 , 0 ));
332+ pnlEncodeDecode .setLayout (new java .awt .GridLayout (12 , 0 ));
333333
334334 btnSmartDecode .setText ("Smart Decode" );
335335 btnSmartDecode .addActionListener (new java .awt .event .ActionListener () {
@@ -485,10 +485,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
485485
486486 pnlEncodeDecode .add (pnlJSHexEnc );
487487
488- rdoEncodeDecodeGrp .add (rdoUTF7 );
489- rdoUTF7 .setText ("UTF-7" );
490- pnlEncodeDecode .add (rdoUTF7 );
491-
492488 pnlCompress .setLayout (new java .awt .GridLayout (1 , 2 ));
493489
494490 rdoEncodeDecodeGrp .add (rdoGzip );
@@ -501,7 +497,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
501497
502498 pnlEncodeDecode .add (pnlCompress );
503499
504- pnlILLUTF8 .setLayout (new java .awt .GridLayout (1 , 2 ));
500+ pnlILLUTF8 .setLayout (new java .awt .GridLayout (1 , 3 ));
501+
502+ rdoEncodeDecodeGrp .add (rdoUTF7 );
503+ rdoUTF7 .setText ("UTF-7" );
504+ pnlILLUTF8 .add (rdoUTF7 );
505505
506506 rdoEncodeDecodeGrp .add (rdoILLUTF8 );
507507 rdoILLUTF8 .setText ("UTF-8(URL)" );
@@ -819,22 +819,22 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
819819 .addGroup (pnlEncodingLayout .createSequentialGroup ()
820820 .addContainerGap ()
821821 .addGroup (pnlEncodingLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .LEADING )
822- .addComponent (chkGuess )
823- .addComponent (chkRawMode ))
824- .addPreferredGap (javax .swing .LayoutStyle .ComponentPlacement .UNRELATED )
825- .addComponent (cmbEncoding , 0 , 113 , Short .MAX_VALUE )
826- .addGap (7 , 7 , 7 ))
822+ .addGroup (pnlEncodingLayout .createSequentialGroup ()
823+ .addComponent (chkRawMode )
824+ .addPreferredGap (javax .swing .LayoutStyle .ComponentPlacement .UNRELATED )
825+ .addComponent (chkGuess ))
826+ .addComponent (cmbEncoding , javax .swing .GroupLayout .Alignment .TRAILING , javax .swing .GroupLayout .PREFERRED_SIZE , 170 , javax .swing .GroupLayout .PREFERRED_SIZE ))
827+ .addContainerGap ())
827828 );
828829 pnlEncodingLayout .setVerticalGroup (
829830 pnlEncodingLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .LEADING )
830831 .addGroup (pnlEncodingLayout .createSequentialGroup ()
831- .addComponent (chkRawMode )
832+ .addGroup (pnlEncodingLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .BASELINE )
833+ .addComponent (chkRawMode )
834+ .addComponent (chkGuess ))
832835 .addPreferredGap (javax .swing .LayoutStyle .ComponentPlacement .RELATED , javax .swing .GroupLayout .DEFAULT_SIZE , Short .MAX_VALUE )
833- .addComponent (chkGuess ))
834- .addGroup (pnlEncodingLayout .createSequentialGroup ()
835- .addContainerGap ()
836836 .addComponent (cmbEncoding , javax .swing .GroupLayout .PREFERRED_SIZE , javax .swing .GroupLayout .DEFAULT_SIZE , javax .swing .GroupLayout .PREFERRED_SIZE )
837- .addContainerGap (javax . swing . GroupLayout . DEFAULT_SIZE , Short . MAX_VALUE ))
837+ .addContainerGap ())
838838 );
839839
840840 pnlInputOutput .add (pnlEncoding , java .awt .BorderLayout .CENTER );
@@ -866,11 +866,11 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
866866 pnlOutputToInputLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .LEADING )
867867 .addGroup (pnlOutputToInputLayout .createSequentialGroup ()
868868 .addContainerGap ()
869- .addGroup (pnlOutputToInputLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .LEADING )
870- .addComponent (btnClear , javax .swing .GroupLayout .PREFERRED_SIZE , 213 , javax .swing .GroupLayout .PREFERRED_SIZE )
871- .addComponent (btnOutputToInput , javax .swing .GroupLayout .PREFERRED_SIZE , 213 , javax .swing .GroupLayout .PREFERRED_SIZE )
872- .addComponent (btnOutputCopy , javax .swing .GroupLayout .PREFERRED_SIZE , 213 , javax .swing .GroupLayout .PREFERRED_SIZE ))
873- .addContainerGap (24 , Short .MAX_VALUE ))
869+ .addGroup (pnlOutputToInputLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .TRAILING , false )
870+ .addComponent (btnOutputToInput , javax .swing .GroupLayout .Alignment . LEADING , javax .swing .GroupLayout .DEFAULT_SIZE , 176 , Short . MAX_VALUE )
871+ .addComponent (btnClear , javax .swing .GroupLayout .Alignment . LEADING , javax . swing . GroupLayout . DEFAULT_SIZE , javax .swing .GroupLayout .DEFAULT_SIZE , Short . MAX_VALUE )
872+ .addComponent (btnOutputCopy , javax .swing .GroupLayout .DEFAULT_SIZE , javax .swing .GroupLayout .DEFAULT_SIZE , Short . MAX_VALUE ))
873+ .addContainerGap (javax . swing . GroupLayout . DEFAULT_SIZE , Short .MAX_VALUE ))
874874 );
875875 pnlOutputToInputLayout .setVerticalGroup (
876876 pnlOutputToInputLayout .createParallelGroup (javax .swing .GroupLayout .Alignment .LEADING )
@@ -1687,6 +1687,8 @@ private void btnDecodeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
16871687 encodePattern = TransUtil .EncodePattern .BYTE_HTML ;
16881688 } else if (this .rdoHtmlHex .isSelected ()) {
16891689 encodePattern = TransUtil .EncodePattern .HTML ;
1690+ } else if (this .rdoGzip .isSelected ()) {
1691+ encodePattern = TransUtil .EncodePattern .GZIP ;
16901692 } else if (this .rdoZLIB .isSelected ()) {
16911693 encodePattern = TransUtil .EncodePattern .ZLIB ;
16921694 } else if (this .rdoUTF7 .isSelected ()) {
0 commit comments