Prepare 0.1.22-RELEASE

README.md

@@ -21,10 +21,10 @@ Features:
 
 Usage
 -----
-Java 8 or later is recommended to run JPass. Most platforms have a mechanism to execute `.jar` files (e.g. double click the `jpass-0.1.22-SNAPSHOT.jar`).
+Java 8 or later is recommended to run JPass. Most platforms have a mechanism to execute `.jar` files (e.g. double click the `jpass-0.1.22-RELEASE.jar`).
 You can also run the application from the command line by typing (the password file is optional):
 
-    java -jar jpass-0.1.22-SNAPSHOT.jar [password_file]
+    java -jar jpass-0.1.22-RELEASE.jar [password_file]
 
 Download
 --------

build.gradle

@@ -11,15 +11,15 @@ repositories {
 
 dependencies {
     compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: '2.9.3'
-    compile group: 'com.formdev', name: 'flatlaf', version: '0.43'
-    compile group: 'com.formdev', name: 'svgSalamander', version: '1.1.2.3'
+    compile group: 'com.formdev', name: 'flatlaf', version: '1.0'
+    compile group: 'com.formdev', name: 'svgSalamander', version: '1.1.2.4'
 
     testCompile 'junit:junit:4.13.1'
 }
 
 jar {
     baseName = 'jpass'
-    version = '0.1.22-SNAPSHOT'
+    version = '0.1.22-RELEASE'
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     manifest {
         attributes('Main-Class': 'jpass.JPass')

build.sbt

@@ -2,13 +2,13 @@ organization:= "jpass.id"
 
 name := "JPass"
 
-version := "0.1.22-SNAPSHOT"
+version := "0.1.22-RELEASE"
 
 libraryDependencies += "com.fasterxml.jackson.dataformat" % "jackson-dataformat-xml" % "2.9.3"
 
-libraryDependencies += "com.formdev" % "flatlaf" % "0.43"
+libraryDependencies += "com.formdev" % "flatlaf" % "1.0"
 
-libraryDependencies += "com.formdev" % "svgSalamander" % "1.1.2.3"
+libraryDependencies += "com.formdev" % "svgSalamander" % "1.1.2.4"
 
 libraryDependencies += "junit" % "junit" % "4.13.1" % "test"
 

pom.xml

@@ -4,7 +4,7 @@
     <groupId>jpass</groupId>
     <artifactId>jpass</artifactId>
     <packaging>jar</packaging>
-    <version>0.1.22-SNAPSHOT</version>
+    <version>0.1.22-RELEASE</version>
     <name>JPass</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf</artifactId>
-            <version>0.43</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>svgSalamander</artifactId>
-            <version>1.1.2.3</version>
+            <version>1.1.2.4</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/dist/jpass.bat

@@ -1,2 +1,2 @@
 @echo off
-start /B javaw -jar jpass-0.1.22-SNAPSHOT.jar %*
+start /B javaw -jar jpass-0.1.22-RELEASE.jar %*

src/main/dist/jpass.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar jpass-0.1.22-SNAPSHOT.jar "$@"
+java -jar jpass-0.1.22-RELEASE.jar "$@"

src/main/dist/readme.txt

@@ -1,4 +1,4 @@
-# JPass - Password Manager 0.1.22-SNAPSHOT
+# JPass - Password Manager 0.1.22-RELEASE
 
 Overview
 --------
@@ -17,11 +17,11 @@ Features:
 Usage
 -----
 Java 8 or later is recommended to run JPass. Most platforms have a mechanism
-to execute `.jar` files (e.g. double click the `jpass-0.1.22-SNAPSHOT.jar`).
+to execute `.jar` files (e.g. double click the `jpass-0.1.22-RELEASE.jar`).
 You can also run the application from the command line by typing (the password
 file is optional):
 
-    java -jar jpass-0.1.22-SNAPSHOT.jar [password_file]
+    java -jar jpass-0.1.22-RELEASE.jar [password_file]
 
 Configuration
 -------------

src/main/java/jpass/ui/EntryDialog.java

@@ -103,80 +103,79 @@ public class EntryDialog extends JDialog implements ActionListener {
     public EntryDialog(JPassFrame parent, String title, Entry entry, boolean newEntry) {
         super(parent, title, true);
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        this.newEntry = newEntry;
 
+        this.newEntry = newEntry;
         this.modifiedEntry = null;
 
-        this.fieldPanel = new JPanel();
-
-        this.fieldPanel.add(new JLabel("Title:"));
         this.titleField = TextComponentFactory.newTextField();
-        this.fieldPanel.add(this.titleField);
-
-        this.fieldPanel.add(new JLabel("URL:"));
         this.urlField = TextComponentFactory.newTextField();
-        this.fieldPanel.add(this.urlField);
-
-        this.fieldPanel.add(new JLabel("User name:"));
         this.userField = TextComponentFactory.newTextField();
-        this.fieldPanel.add(this.userField);
-
-        this.fieldPanel.add(new JLabel("Password:"));
         this.passwordField = TextComponentFactory.newPasswordField(true);
         this.ORIGINAL_ECHO = this.passwordField.getEchoChar();
-        this.fieldPanel.add(this.passwordField);
-
-        this.fieldPanel.add(new JLabel("Repeat:"));
         this.repeatField = TextComponentFactory.newPasswordField(true);
-        this.fieldPanel.add(this.repeatField);
 
-        this.fieldPanel.add(new JLabel(""));
-        this.passwordButtonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 5, 0));
         this.showButton = new JToggleButton("Show", MessageDialog.getIcon("show"));
         this.showButton.setActionCommand("show_button");
         this.showButton.setMnemonic(KeyEvent.VK_S);
         this.showButton.addActionListener(this);
-        this.passwordButtonPanel.add(this.showButton);
         this.generateButton = new JButton("Generate", MessageDialog.getIcon("generate"));
         this.generateButton.setActionCommand("generate_button");
         this.generateButton.setMnemonic(KeyEvent.VK_G);
         this.generateButton.addActionListener(this);
-        this.passwordButtonPanel.add(this.generateButton);
         this.copyButton = new JButton("Copy", MessageDialog.getIcon("keyring"));
         this.copyButton.setActionCommand("copy_button");
         this.copyButton.setMnemonic(KeyEvent.VK_P);
         this.copyButton.addActionListener(this);
+
+        this.passwordButtonPanel = new JPanel(new SpringLayout());
+        this.passwordButtonPanel.add(this.showButton);
+        this.passwordButtonPanel.add(this.generateButton);
         this.passwordButtonPanel.add(this.copyButton);
-        this.fieldPanel.add(this.passwordButtonPanel);
+        SpringUtilities.makeCompactGrid(this.passwordButtonPanel,
+                1, 3,  // rows, columns
+                0, 0,  // initX, initY
+                5, 0); // xPad, yPad
 
-        this.fieldPanel.setLayout(new SpringLayout());
+        this.fieldPanel = new JPanel(new SpringLayout());
+        this.fieldPanel.add(new JLabel("Title:"));
+        this.fieldPanel.add(this.titleField);
+        this.fieldPanel.add(new JLabel("URL:"));
+        this.fieldPanel.add(this.urlField);
+        this.fieldPanel.add(new JLabel("User name:"));
+        this.fieldPanel.add(this.userField);
+        this.fieldPanel.add(new JLabel("Password:"));
+        this.fieldPanel.add(this.passwordField);
+        this.fieldPanel.add(new JLabel("Repeat:"));
+        this.fieldPanel.add(this.repeatField);
+        this.fieldPanel.add(new JLabel(""));
+        this.fieldPanel.add(this.passwordButtonPanel);
         SpringUtilities.makeCompactGrid(this.fieldPanel,
                 6, 2,  // rows, columns
                 5, 5,  // initX, initY
                 5, 5); // xPad, yPad
 
-        this.notesPanel = new JPanel(new BorderLayout(5, 5));
-        this.notesPanel.setBorder(new EmptyBorder(0, 5, 0, 5));
-        this.notesPanel.add(new JLabel("Notes:"), BorderLayout.NORTH);
-
         this.notesField = TextComponentFactory.newTextArea();
         this.notesField.setFont(TextComponentFactory.newTextField().getFont());
         this.notesField.setLineWrap(true);
         this.notesField.setWrapStyleWord(true);
-        this.notesPanel.add(new JScrollPane(this.notesField), BorderLayout.CENTER);
 
-        this.buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        this.notesPanel = new JPanel(new BorderLayout(5, 5));
+        this.notesPanel.setBorder(new EmptyBorder(0, 5, 0, 5));
+        this.notesPanel.add(new JLabel("Notes:"), BorderLayout.NORTH);
+        this.notesPanel.add(new JScrollPane(this.notesField), BorderLayout.CENTER);
 
         this.okButton = new JButton("OK", MessageDialog.getIcon("accept"));
         this.okButton.setActionCommand("ok_button");
         this.okButton.setMnemonic(KeyEvent.VK_O);
         this.okButton.addActionListener(this);
-        this.buttonPanel.add(this.okButton);
 
         this.cancelButton = new JButton("Cancel", MessageDialog.getIcon("cancel"));
         this.cancelButton.setActionCommand("cancel_button");
         this.cancelButton.setMnemonic(KeyEvent.VK_C);
         this.cancelButton.addActionListener(this);
+
+        this.buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        this.buttonPanel.add(this.okButton);
         this.buttonPanel.add(this.cancelButton);
 
         getContentPane().add(this.fieldPanel, BorderLayout.NORTH);

src/main/java/jpass/ui/JPassFrame.java

@@ -75,7 +75,7 @@ public final class JPassFrame extends JFrame {
     private static JPassFrame INSTANCE;
 
     public static final String PROGRAM_NAME = "JPass Password Manager";
-    public static final String PROGRAM_VERSION = "0.1.22-SNAPSHOT";
+    public static final String PROGRAM_VERSION = "0.1.22-RELEASE";
 
     private final JPopupMenu popup;
     private final JPanel topContainerPanel;