Merge pull request iluwatar#323 from DevFactory/code-quality-fix-5

iluwatar · iluwatar · commit 7c6e1fc3d84d · 2015-12-30T19:47:19.000+02:00
Code quality fixes
diff --git 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 PartyImpl() {
   @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
@@ -140,11 +140,11 @@ public FileSelectorJFrame() {
 
   @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
@@ -55,9 +55,9 @@ public SimpleObject getSimpleObject() {
   @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
@@ -69,10 +69,10 @@ public List<SimpleObject> getSimpleObjects() {
   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 @@ protected void execute(final ExecutionContext ec) {
     //
     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
@@ -23,7 +23,7 @@ public void consume() {
       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;
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public PartyImpl() {`
`19`	`19`	`@Override`
`20`	`20`	`public void act(PartyMember actor, Action action) {`
`21`	`21`	`for (PartyMember member : members) {`
`22`		`- if (member != actor) {`
	`22`	`+ if (!member.equals(actor)) {`
`23`	`23`	`member.partyAction(action);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,11 @@ public FileSelectorJFrame() {`
`140`	`140`
`141`	`141`	`@Override`
`142`	`142`	`public void actionPerformed(ActionEvent e) {`
`143`		`- if (e.getSource() == this.ok) {`
	`143`	`+ if (this.ok.equals(e.getSource())) {`
`144`	`144`	`this.fileName = this.input.getText();`
`145`	`145`	`presenter.fileNameChanged();`
`146`	`146`	`presenter.confirmed();`
`147`		`- } else if (e.getSource() == this.cancel) {`
	`147`	`+ } else if (this.cancel.equals(e.getSource())) {`
`148`	`148`	`presenter.cancelled();`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public void consume() {`
`23`	`23`	`Message msg;`
`24`	`24`	`try {`
`25`	`25`	`msg = queue.take();`
`26`		`- if (msg == Message.POISON_PILL) {`
	`26`	`+ if (Message.POISON_PILL.equals(msg)) {`
`27`	`27`	`System.out.println(String.format("Consumer %s receive request to terminate.", name));`
`28`	`28`	`break;`
`29`	`29`	`}`