From 191078735f5a13edc79a26793be8f6e817efe01a Mon Sep 17 00:00:00 2001
From: Kirill Vlasov <kirill.vlasov@devfactory.com>
Date: Tue, 22 Dec 2015 15:10:09 +0500
Subject: [PATCH] Fixing squid:S1698 - Objects should be compared with equals()
 and squid:HiddenFieldCheck - Local variables should not shadow class fields

---
 mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java | 2 +-
 .../iluwatar/model/view/presenter/FileSelectorJFrame.java   | 4 ++--
 .../fixture/modules/simple/SimpleObjectCreate.java          | 4 ++--
 .../domainapp/fixture/scenarios/RecreateSimpleObjects.java  | 6 +++---
 .../src/main/java/com/iluwatar/poison/pill/Consumer.java    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
index acc70a0e6..ab15c26da 100644
--- a/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
@@ -19,7 +19,7 @@ public class PartyImpl implements Party {
   @Override
   public void act(PartyMember actor, Action action) {
     for (PartyMember member : members) {
-      if (member != actor) {
+      if (!member.equals(actor)) {
         member.partyAction(action);
       }
     }
diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java
index 6f220cffb..db08d525b 100644
--- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java
+++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java
@@ -140,11 +140,11 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti
 
   @Override
   public void actionPerformed(ActionEvent e) {
-    if (e.getSource() == this.ok) {
+    if (this.ok.equals(e.getSource())) {
       this.fileName = this.input.getText();
       presenter.fileNameChanged();
       presenter.confirmed();
-    } else if (e.getSource() == this.cancel) {
+    } else if (this.cancel.equals(e.getSource())) {
       presenter.cancelled();
     }
   }
diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
index 266529c74..9a922a7be 100644
--- a/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
+++ b/naked-objects/fixture/src/main/java/domainapp/fixture/modules/simple/SimpleObjectCreate.java
@@ -55,9 +55,9 @@ public class SimpleObjectCreate extends FixtureScript {
   @Override
   protected void execute(final ExecutionContext ec) {
 
-    String name = checkParam("name", ec, String.class);
+    String paramName = checkParam("name", ec, String.class);
 
-    this.simpleObject = wrap(simpleObjects).create(name);
+    this.simpleObject = wrap(simpleObjects).create(paramName);
 
     // also make available to UI
     ec.addResult(this, simpleObject);
diff --git a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
index c82ef8498..6d17d9b63 100644
--- a/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
+++ b/naked-objects/fixture/src/main/java/domainapp/fixture/scenarios/RecreateSimpleObjects.java
@@ -69,10 +69,10 @@ public class RecreateSimpleObjects extends FixtureScript {
   protected void execute(final ExecutionContext ec) {
 
     // defaults
-    final int number = defaultParam("number", ec, 3);
+    final int paramNumber = defaultParam("number", ec, 3);
 
     // validate
-    if (number < 0 || number > names.size()) {
+    if (paramNumber < 0 || paramNumber > names.size()) {
       throw new IllegalArgumentException(String.format("number must be in range [0,%d)",
           names.size()));
     }
@@ -82,7 +82,7 @@ public class RecreateSimpleObjects extends FixtureScript {
     //
     ec.executeChild(this, new SimpleObjectsTearDown());
 
-    for (int i = 0; i < number; i++) {
+    for (int i = 0; i < paramNumber; i++) {
       final SimpleObjectCreate fs = new SimpleObjectCreate().setName(names.get(i));
       ec.executeChild(this, fs.getName(), fs);
       simpleObjects.add(fs.getSimpleObject());
diff --git a/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java
index a305c010c..4530ef953 100644
--- a/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java
+++ b/poison-pill/src/main/java/com/iluwatar/poison/pill/Consumer.java
@@ -23,7 +23,7 @@ public class Consumer {
       Message msg;
       try {
         msg = queue.take();
-        if (msg == Message.POISON_PILL) {
+        if (Message.POISON_PILL.equals(msg)) {
           System.out.println(String.format("Consumer %s receive request to terminate.", name));
           break;
         }