Some minor changes

This commit is contained in:
Didier Clermonté 2016-07-26 17:01:58 +02:00
parent 38b4d4fbab
commit b4b545be4b
8 changed files with 27 additions and 28 deletions

View File

@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*/ */
public class Siba public class Siba
{ {
public static final Logger logger = LoggerFactory.getLogger(Siba.class); private static final Logger logger = LoggerFactory.getLogger(Siba.class);
public static void main(final String[] args) public static void main(final String[] args)
{ {

View File

@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
*/ */
public class SibaCLI public class SibaCLI
{ {
public static final Logger logger = LoggerFactory.getLogger(SibaCLI.class); private static final Logger logger = LoggerFactory.getLogger(SibaCLI.class);
private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.cli.messages"); //$NON-NLS-1$ private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.cli.messages"); //$NON-NLS-1$
public static void backup(final File directoryToSave) throws SibaException public static void backup(final File directoryToSave) throws SibaException

View File

@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
public class AboutDialog extends JDialog public class AboutDialog extends JDialog
{ {
private static final long serialVersionUID = 8868109575782482455L; private static final long serialVersionUID = 8868109575782482455L;
public static final Logger logger = LoggerFactory.getLogger(AboutDialog.class); private static final Logger logger = LoggerFactory.getLogger(AboutDialog.class);
/** /**
* This is the constructor for the dialog. * This is the constructor for the dialog.

View File

@ -70,8 +70,8 @@ public class BackupPanel extends JPanel
JPanel helpPanel = new JPanel(); JPanel helpPanel = new JPanel();
add(helpPanel, BorderLayout.NORTH); add(helpPanel, BorderLayout.NORTH);
JLabel HelpLabel = new JLabel(BUNDLE.getString("BackupPanel.lblNewLabel_2.text")); //$NON-NLS-1$ JLabel lblHelp = new JLabel(BUNDLE.getString("BackupPanel.lblNewLabel_2.text")); //$NON-NLS-1$
helpPanel.add(HelpLabel); helpPanel.add(lblHelp);
JPanel choosePanel = new JPanel(); JPanel choosePanel = new JPanel();
add(choosePanel); add(choosePanel);
@ -92,9 +92,9 @@ public class BackupPanel extends JPanel
choosePanel.add(this.sourceDirectoryField, "4, 2"); choosePanel.add(this.sourceDirectoryField, "4, 2");
this.sourceDirectoryField.setColumns(10); this.sourceDirectoryField.setColumns(10);
JButton btnNewButton = new JButton(BUNDLE.getString("BackupPanel.btnNewButton.text")); //$NON-NLS-1$ JButton btnSourceDirectory = new JButton(BUNDLE.getString("BackupPanel.btnNewButton.text")); //$NON-NLS-1$
btnNewButton.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); btnSourceDirectory.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
btnNewButton.addActionListener(new ActionListener() btnSourceDirectory.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed(final ActionEvent e) public void actionPerformed(final ActionEvent e)
@ -108,7 +108,7 @@ public class BackupPanel extends JPanel
} }
}); });
choosePanel.add(btnNewButton, "6, 2"); choosePanel.add(btnSourceDirectory, "6, 2");
JLabel lblTargetDirectory = new JLabel(BUNDLE.getString("BackupPanel.lblTargetDirectory.text")); //$NON-NLS-1$ JLabel lblTargetDirectory = new JLabel(BUNDLE.getString("BackupPanel.lblTargetDirectory.text")); //$NON-NLS-1$
choosePanel.add(lblTargetDirectory, "2, 4"); choosePanel.add(lblTargetDirectory, "2, 4");
@ -119,9 +119,9 @@ public class BackupPanel extends JPanel
choosePanel.add(this.targetDirectoryField, "4, 4"); choosePanel.add(this.targetDirectoryField, "4, 4");
this.targetDirectoryField.setColumns(10); this.targetDirectoryField.setColumns(10);
JButton ButtonTarget = new JButton(BUNDLE.getString("BackupPanel.btnNewButton_1.text")); //$NON-NLS-1$ JButton btnTarget = new JButton(BUNDLE.getString("BackupPanel.btnNewButton_1.text")); //$NON-NLS-1$
ButtonTarget.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); btnTarget.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
ButtonTarget.addActionListener(new ActionListener() btnTarget.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed(final ActionEvent e) public void actionPerformed(final ActionEvent e)
@ -135,9 +135,9 @@ public class BackupPanel extends JPanel
} }
}); });
choosePanel.add(ButtonTarget, "6, 4"); choosePanel.add(btnTarget, "6, 4");
ButtonTarget.setHorizontalAlignment(SwingConstants.RIGHT); btnTarget.setHorizontalAlignment(SwingConstants.RIGHT);
JPanel actionPanel = new JPanel(); JPanel actionPanel = new JPanel();
@ -154,16 +154,16 @@ public class BackupPanel extends JPanel
Component horizontalGlue = Box.createHorizontalGlue(); Component horizontalGlue = Box.createHorizontalGlue();
buttonActionPanel.add(horizontalGlue); buttonActionPanel.add(horizontalGlue);
JButton ButtonBackup = new JButton(BUNDLE.getString("BackupPanel.btnNewButton_2.text")); //$NON-NLS-1$ JButton btnBackup = new JButton(BUNDLE.getString("BackupPanel.btnNewButton_2.text")); //$NON-NLS-1$
ButtonBackup.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); btnBackup.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
buttonActionPanel.add(ButtonBackup); buttonActionPanel.add(btnBackup);
Component horizontalGlue1 = Box.createHorizontalGlue(); Component horizontalGlue1 = Box.createHorizontalGlue();
buttonActionPanel.add(horizontalGlue1); buttonActionPanel.add(horizontalGlue1);
Component verticalStrut = Box.createVerticalStrut(20); Component verticalStrut = Box.createVerticalStrut(20);
actionPanel.add(verticalStrut); actionPanel.add(verticalStrut);
ButtonBackup.addActionListener(new ActionListener() btnBackup.addActionListener(new ActionListener()
{ {
@Override @Override
public void actionPerformed(final ActionEvent e) public void actionPerformed(final ActionEvent e)

View File

@ -21,7 +21,7 @@ public class CheckDirectorySelector extends JFileChooser
{ {
private static final long serialVersionUID = 3782597353602048214L; private static final long serialVersionUID = 3782597353602048214L;
private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$ private static final ResourceBundle BUNDLE = ResourceBundle.getBundle("org.dclermonte.siba.gui.messages"); //$NON-NLS-1$
public static final Logger logger = LoggerFactory.getLogger(CheckDirectorySelector.class); private static final Logger logger = LoggerFactory.getLogger(CheckDirectorySelector.class);
/** /**
* *
@ -88,7 +88,7 @@ public class CheckDirectorySelector extends JFileChooser
// //
super.setSelectedFile(file); super.setSelectedFile(file);
logger.debug("==== SET SELECTED FILE================="); logger.debug("==== SET SELECTED FILE=================");
logger.debug("SELECED FILE " + file); logger.debug("SELECED FILE {}", file);
} }
/** /**

View File

@ -114,10 +114,10 @@ public class SibaGUI
UIManager.put("swing.boldMetal", Boolean.FALSE); UIManager.put("swing.boldMetal", Boolean.FALSE);
// Set LookAndFeel. // Set LookAndFeel.
logger.debug("System lookAndFeel property:" + System.getProperty("swing.defaultlaf")); logger.debug("System lookAndFeel property: {}", System.getProperty("swing.defaultlaf"));
logger.debug("Available lookAndFeel: " + GUIToolBox.availableLookAndFeels().toString()); logger.debug("Available lookAndFeel: {} ", GUIToolBox.availableLookAndFeels().toString());
logger.debug("System lookAndFeel: " + UIManager.getSystemLookAndFeelClassName()); logger.debug("System lookAndFeel: {} ", UIManager.getSystemLookAndFeelClassName());
logger.debug("Current lookAndFeel: " + UIManager.getLookAndFeel().getName()); logger.debug("Current lookAndFeel: {} ", UIManager.getLookAndFeel().getName());
if (!StringUtils.equals(UIManager.getSystemLookAndFeelClassName(), "javax.swing.plaf.metal.MetalLookAndFeel")) if (!StringUtils.equals(UIManager.getSystemLookAndFeelClassName(), "javax.swing.plaf.metal.MetalLookAndFeel"))
{ {
@ -144,13 +144,12 @@ public class SibaGUI
} }
} }
/* UIManager.setLookAndFeel("com.sun.java.swing.plaf.metal.MetalLookAndFeel"); */ /* UIManager.setLookAndFeel("com.sun.java.swing.plaf.metal.MetalLookAndFeel"); */
logger.debug("Activated lookAndFeel: " + UIManager.getLookAndFeel().getName()); logger.debug("Activated lookAndFeel: {} ", UIManager.getLookAndFeel().getName());
// Set default locale. // Set default locale.
this.locale = Locale.getDefault(); this.locale = Locale.getDefault();
updateLanguage(this.locale); updateLanguage(this.locale);
logger.debug(this.locale.getDisplayLanguage()); logger.debug(this.locale.getDisplayLanguage());
// System.out.println(this.locale.getDisplayLanguage());
initialize(); initialize();
} }

View File

@ -84,7 +84,7 @@ public class SourceDirectorySelector extends JFileChooser
// //
super.setSelectedFile(file); super.setSelectedFile(file);
logger.debug("==== SET SELECTED FILE================="); logger.debug("==== SET SELECTED FILE=================");
logger.debug("SELECED FILE " + file); logger.debug("SELECED FILE {} ", file);
} }
/** /**

View File

@ -86,7 +86,7 @@ public class TargetDirectorySelector extends JFileChooser
super.setSelectedFile(file); super.setSelectedFile(file);
logger.debug("==== SET SELECTED FILE================="); logger.debug("==== SET SELECTED FILE=================");
logger.debug("SELECED FILE " + file); logger.debug("SELECED FILE {} ", file);
} }
/** /**