From 1fa3fbd8b35166cdc551e5b7d759d63ad7a5c3cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Clermont=C3=A9?= Date: Tue, 7 Jun 2016 21:50:23 +0200 Subject: [PATCH] Issue#11 Replaced "!(a==null)" by "a!=null" --- src/org/dclermonte/siba/cli/SibaCLI.java | 2 +- src/org/dclermonte/siba/gui/BackupPanel.java | 6 +++--- src/org/dclermonte/siba/gui/CheckPanel.java | 4 ++-- src/org/dclermonte/siba/gui/SibaGUI.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/org/dclermonte/siba/cli/SibaCLI.java b/src/org/dclermonte/siba/cli/SibaCLI.java index 36e388a..9b242aa 100644 --- a/src/org/dclermonte/siba/cli/SibaCLI.java +++ b/src/org/dclermonte/siba/cli/SibaCLI.java @@ -183,7 +183,7 @@ public class SibaCLI { System.err.println("SibaException = " + sibaException.getMessage()); sibaException.printStackTrace(); - if (!(sibaException.getCause() == null)) + if (sibaException.getCause() != null) { logger.info("SibaException chainée = " + sibaException.getCause().getMessage()); } diff --git a/src/org/dclermonte/siba/gui/BackupPanel.java b/src/org/dclermonte/siba/gui/BackupPanel.java index 8a02bec..4f52bce 100644 --- a/src/org/dclermonte/siba/gui/BackupPanel.java +++ b/src/org/dclermonte/siba/gui/BackupPanel.java @@ -107,7 +107,7 @@ public class BackupPanel extends JPanel public void actionPerformed(final ActionEvent e) { File file = SourceDirectorySelector.showSelectorDialog(null, null); - if (!(file == null)) + if (file != null) { BackupPanel.this.sourceDirectoryField.setText(file.getPath()); } @@ -135,7 +135,7 @@ public class BackupPanel extends JPanel { File file = TargetDirectorySelector.showSelectorDialog(null, null); - if (!(file == null)) + if (file != null) { BackupPanel.this.textField_1.setText(file.getPath()); } @@ -198,7 +198,7 @@ public class BackupPanel extends JPanel catch (SibaException sibaException) { String dataMissing = sibaException.getMessage(); - if (!(sibaException.getCause() == null)) + if (sibaException.getCause() != null) { dataMissing.concat(sibaException.getCause().getMessage()); } diff --git a/src/org/dclermonte/siba/gui/CheckPanel.java b/src/org/dclermonte/siba/gui/CheckPanel.java index 7932ff0..17c3b41 100644 --- a/src/org/dclermonte/siba/gui/CheckPanel.java +++ b/src/org/dclermonte/siba/gui/CheckPanel.java @@ -116,7 +116,7 @@ public class CheckPanel extends JPanel try { - if (!(CheckPanel.choosenFile == null) && CheckPanel.choosenFile.exists()) + if ((CheckPanel.choosenFile != null) && CheckPanel.choosenFile.exists()) { boolean check = SibaManager.check(CheckPanel.choosenFile); String titre = BUNDLE.getString("CheckPanel.confirmDialogTitle.text"); @@ -156,7 +156,7 @@ public class CheckPanel extends JPanel File result; CheckPanel.choosenFile = CheckDirectorySelector.showSelectorDialog(null, null); - if (!(CheckPanel.choosenFile == null) && CheckPanel.choosenFile.exists()) + if ((CheckPanel.choosenFile != null) && CheckPanel.choosenFile.exists()) { CheckPanel.textField.setText(CheckPanel.choosenFile.getName()); result = CheckPanel.choosenFile; diff --git a/src/org/dclermonte/siba/gui/SibaGUI.java b/src/org/dclermonte/siba/gui/SibaGUI.java index 48092be..0d1d84a 100644 --- a/src/org/dclermonte/siba/gui/SibaGUI.java +++ b/src/org/dclermonte/siba/gui/SibaGUI.java @@ -207,7 +207,7 @@ public class SibaGUI { tabbedPane.setSelectedIndex(0); File file = SourceDirectorySelector.showSelectorDialog(null, null); - if (!(file == null)) + if (file != null) { ((BackupPanel) SibaGUI.this.backupPanel).setSourceDirectory(file.getPath()); } @@ -229,7 +229,7 @@ public class SibaGUI File result; CheckPanel.choosenFile = CheckDirectorySelector.showSelectorDialog(null, null); - if (!(CheckPanel.choosenFile == null) && CheckPanel.choosenFile.exists()) + if ((CheckPanel.choosenFile != null) && CheckPanel.choosenFile.exists()) { CheckPanel.textField.setText(CheckPanel.choosenFile.getName()); result = CheckPanel.choosenFile; @@ -321,7 +321,7 @@ public class SibaGUI { sibaException.printStackTrace(); String dataMissing = sibaException.getMessage(); - if (!(sibaException.getCause() == null)) + if (sibaException.getCause() != null) { logger.info("SibaException chainée = " + sibaException.getCause().getMessage()); // dataMissing.concat(sibaException.getCause().getMessage());