Code quality improvements

* Method extractions
* Factorization of icon loading logic

Author: gbaudic

src/main/java/net/sourceforge/dionysus/gui/AboutDialog.java

@@ -24,7 +24,6 @@
 import java.awt.Insets;
 
 import javax.swing.Box;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -47,90 +46,88 @@ public AboutDialog() {
 		setModal(true);
 		setSize(400, 420);
 		setLocationRelativeTo(null);
-		GridBagLayout gridBagLayout = new GridBagLayout();
+		final GridBagLayout gridBagLayout = new GridBagLayout();
 		gridBagLayout.columnWidths = new int[] { 444, 0 };
 		gridBagLayout.rowHeights = new int[] { 249, 23, 0 };
 		gridBagLayout.columnWeights = new double[] { 1.0, Double.MIN_VALUE };
 		gridBagLayout.rowWeights = new double[] { 1.0, 0.0, Double.MIN_VALUE };
 		getContentPane().setLayout(gridBagLayout);
 
-		JPanel panel = new JPanel();
-		GridBagConstraints gbc_panel = new GridBagConstraints();
+		final JPanel panel = new JPanel();
+		final GridBagConstraints gbc_panel = new GridBagConstraints();
 		gbc_panel.insets = new Insets(0, 0, 5, 0);
 		gbc_panel.fill = GridBagConstraints.BOTH;
 		gbc_panel.gridx = 0;
 		gbc_panel.gridy = 0;
 		getContentPane().add(panel, gbc_panel);
-		GridBagLayout gbl_panel = new GridBagLayout();
+		final GridBagLayout gbl_panel = new GridBagLayout();
 		gbl_panel.columnWidths = new int[] { 0, 0, 0 };
 		gbl_panel.rowHeights = new int[] { 0, 0, 0, 0, 0, 0, 0 };
 		gbl_panel.columnWeights = new double[] { 0.0, 1.0, Double.MIN_VALUE };
 		gbl_panel.rowWeights = new double[] { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Double.MIN_VALUE };
 		panel.setLayout(gbl_panel);
 
-		JLabel lblLogo = new JLabel(Messages.getString("AboutDialog.1")); //$NON-NLS-1$
-		GridBagConstraints gbc_lblLogo = new GridBagConstraints();
+		final JLabel lblLogo = new JLabel(Messages.getString("AboutDialog.1")); //$NON-NLS-1$
+		final GridBagConstraints gbc_lblLogo = new GridBagConstraints();
 		gbc_lblLogo.insets = new Insets(0, 0, 5, 5);
 		gbc_lblLogo.gridx = 0;
 		gbc_lblLogo.gridy = 0;
 		panel.add(lblLogo, gbc_lblLogo);
 
-		JLabel lblSoftwareName = new JLabel(Constants.SOFTWARE_NAME + Messages.getString("AboutDialog.2") //$NON-NLS-1$
+		final JLabel lblSoftwareName = new JLabel(Constants.SOFTWARE_NAME + Messages.getString("AboutDialog.2") //$NON-NLS-1$
 				+ Constants.SOFTWARE_VERSION + Messages.getString("AboutDialog.3") + Constants.SOFTWARE_VERSION_NICK); //$NON-NLS-1$
 		lblSoftwareName.setHorizontalAlignment(SwingConstants.LEFT);
 		lblSoftwareName.setFont(new Font(Messages.getString("AboutDialog.4"), Font.BOLD, 20)); //$NON-NLS-1$
-		GridBagConstraints gbc_lblSoftwareName = new GridBagConstraints();
+		final GridBagConstraints gbc_lblSoftwareName = new GridBagConstraints();
 		gbc_lblSoftwareName.anchor = GridBagConstraints.WEST;
 		gbc_lblSoftwareName.insets = new Insets(0, 0, 5, 0);
 		gbc_lblSoftwareName.gridx = 1;
 		gbc_lblSoftwareName.gridy = 0;
 		panel.add(lblSoftwareName, gbc_lblSoftwareName);
 
-		JLabel lblDesc = new JLabel(Messages.getString("AboutDialog.5")); //$NON-NLS-1$
-		GridBagConstraints gbc_lblDesc = new GridBagConstraints();
+		final JLabel lblDesc = new JLabel(Messages.getString("AboutDialog.5")); //$NON-NLS-1$
+		final GridBagConstraints gbc_lblDesc = new GridBagConstraints();
 		gbc_lblDesc.anchor = GridBagConstraints.WEST;
 		gbc_lblDesc.insets = new Insets(0, 0, 5, 0);
 		gbc_lblDesc.gridx = 1;
 		gbc_lblDesc.gridy = 1;
 		panel.add(lblDesc, gbc_lblDesc);
 
-		JLabel lblCopyright = new JLabel(Messages.getString("AboutDialog.6") //$NON-NLS-1$
+		final JLabel lblCopyright = new JLabel(Messages.getString("AboutDialog.6") //$NON-NLS-1$
 				+ Messages.getString("AboutDialog.7")); //$NON-NLS-1$
 		lblCopyright.setHorizontalAlignment(SwingConstants.LEFT);
-		GridBagConstraints gbc_lblCopyright = new GridBagConstraints();
+		final GridBagConstraints gbc_lblCopyright = new GridBagConstraints();
 		gbc_lblCopyright.insets = new Insets(0, 0, 5, 0);
 		gbc_lblCopyright.anchor = GridBagConstraints.WEST;
 		gbc_lblCopyright.gridx = 1;
 		gbc_lblCopyright.gridy = 2;
 		panel.add(lblCopyright, gbc_lblCopyright);
 
-		JLabel lblIconCopyright = new JLabel(Messages.getString("AboutDialog.8")); //$NON-NLS-1$
+		final JLabel lblIconCopyright = new JLabel(Messages.getString("AboutDialog.8")); //$NON-NLS-1$
 		lblIconCopyright.setHorizontalAlignment(SwingConstants.LEFT);
-		GridBagConstraints gbc_lblIconCopyright = new GridBagConstraints();
+		final GridBagConstraints gbc_lblIconCopyright = new GridBagConstraints();
 		gbc_lblIconCopyright.anchor = GridBagConstraints.WEST;
 		gbc_lblIconCopyright.insets = new Insets(0, 0, 5, 0);
 		gbc_lblIconCopyright.gridx = 1;
 		gbc_lblIconCopyright.gridy = 3;
 		panel.add(lblIconCopyright, gbc_lblIconCopyright);
 
-		Component verticalStrut = Box.createVerticalStrut(20);
-		GridBagConstraints gbc_verticalStrut = new GridBagConstraints();
+		final Component verticalStrut = Box.createVerticalStrut(20);
+		final GridBagConstraints gbc_verticalStrut = new GridBagConstraints();
 		gbc_verticalStrut.insets = new Insets(0, 0, 5, 0);
 		gbc_verticalStrut.gridx = 1;
 		gbc_verticalStrut.gridy = 4;
 		panel.add(verticalStrut, gbc_verticalStrut);
 
-		JLabel lblLicenseInfo = new JLabel(Messages.getString("AboutDialog.9")); //$NON-NLS-1$
-		GridBagConstraints gbc_lblLicenseInfo = new GridBagConstraints();
+		final JLabel lblLicenseInfo = new JLabel(Messages.getString("AboutDialog.9")); //$NON-NLS-1$
+		final GridBagConstraints gbc_lblLicenseInfo = new GridBagConstraints();
 		gbc_lblLicenseInfo.fill = GridBagConstraints.HORIZONTAL;
 		gbc_lblLicenseInfo.gridx = 1;
 		gbc_lblLicenseInfo.gridy = 5;
 		panel.add(lblLicenseInfo, gbc_lblLicenseInfo);
 
-		ImageIcon ok = new ImageIcon(getClass().getResource(Messages.getString("AboutDialog.10"))); //$NON-NLS-1$
-
-		JButton btnOK = new JButton(Messages.getString("AboutDialog.11"), ok); //$NON-NLS-1$
-		GridBagConstraints gbc_btnOK = new GridBagConstraints();
+		final JButton btnOK = new JButton(Messages.getString("AboutDialog.11"), Constants.ok); //$NON-NLS-1$
+		final GridBagConstraints gbc_btnOK = new GridBagConstraints();
 		gbc_btnOK.anchor = GridBagConstraints.NORTH;
 		gbc_btnOK.gridx = 0;
 		gbc_btnOK.gridy = 1;

src/main/java/net/sourceforge/dionysus/gui/Constants.java

@@ -16,6 +16,8 @@
 */
 package net.sourceforge.dionysus.gui;
 
+import javax.swing.ImageIcon;
+
 /**
  * Some constants for use across the software
  */
@@ -28,11 +30,20 @@ public final class Constants {
 	/** Version nickname */
 	public static final String SOFTWARE_VERSION_NICK = "\"Riesling\"";
 
+	// IMAGES
+	public static final ImageIcon plus = new ImageIcon(Constants.class.getResource("/list-add.png"));
+	public static final ImageIcon minus = new ImageIcon(Constants.class.getResource("/list-remove.png"));
+	public static final ImageIcon edit = new ImageIcon(Constants.class.getResource("/gtk-edit.png"));
+	public static final ImageIcon ok = new ImageIcon(Constants.class.getResource("/gtk-ok.png"));
+	public static final ImageIcon cancel = new ImageIcon(Constants.class.getResource("/gtk-cancel.png"));
+	public static final ImageIcon exit = new ImageIcon(Constants.class.getResource("/application-exit.png"));
+	public static final ImageIcon convert = new ImageIcon(Constants.class.getResource("/gtk-convert.png"));
+	public static final ImageIcon about = new ImageIcon(Constants.class.getResource("/dialog-information.png"));
+
 	/**
 	 * Private constructor
 	 */
 	private Constants() {
-		super();
 	}
 
 }