Merge pull request #323 from DevFactory/code-quality-fix-5
Code quality fixes
This commit is contained in:
@ -19,7 +19,7 @@ public class PartyImpl implements Party {
|
|||||||
@Override
|
@Override
|
||||||
public void act(PartyMember actor, Action action) {
|
public void act(PartyMember actor, Action action) {
|
||||||
for (PartyMember member : members) {
|
for (PartyMember member : members) {
|
||||||
if (member != actor) {
|
if (!member.equals(actor)) {
|
||||||
member.partyAction(action);
|
member.partyAction(action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,11 +140,11 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
if (e.getSource() == this.ok) {
|
if (this.ok.equals(e.getSource())) {
|
||||||
this.fileName = this.input.getText();
|
this.fileName = this.input.getText();
|
||||||
presenter.fileNameChanged();
|
presenter.fileNameChanged();
|
||||||
presenter.confirmed();
|
presenter.confirmed();
|
||||||
} else if (e.getSource() == this.cancel) {
|
} else if (this.cancel.equals(e.getSource())) {
|
||||||
presenter.cancelled();
|
presenter.cancelled();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,9 +55,9 @@ public class SimpleObjectCreate extends FixtureScript {
|
|||||||
@Override
|
@Override
|
||||||
protected void execute(final ExecutionContext ec) {
|
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
|
// also make available to UI
|
||||||
ec.addResult(this, simpleObject);
|
ec.addResult(this, simpleObject);
|
||||||
|
@ -69,10 +69,10 @@ public class RecreateSimpleObjects extends FixtureScript {
|
|||||||
protected void execute(final ExecutionContext ec) {
|
protected void execute(final ExecutionContext ec) {
|
||||||
|
|
||||||
// defaults
|
// defaults
|
||||||
final int number = defaultParam("number", ec, 3);
|
final int paramNumber = defaultParam("number", ec, 3);
|
||||||
|
|
||||||
// validate
|
// 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)",
|
throw new IllegalArgumentException(String.format("number must be in range [0,%d)",
|
||||||
names.size()));
|
names.size()));
|
||||||
}
|
}
|
||||||
@ -82,7 +82,7 @@ public class RecreateSimpleObjects extends FixtureScript {
|
|||||||
//
|
//
|
||||||
ec.executeChild(this, new SimpleObjectsTearDown());
|
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));
|
final SimpleObjectCreate fs = new SimpleObjectCreate().setName(names.get(i));
|
||||||
ec.executeChild(this, fs.getName(), fs);
|
ec.executeChild(this, fs.getName(), fs);
|
||||||
simpleObjects.add(fs.getSimpleObject());
|
simpleObjects.add(fs.getSimpleObject());
|
||||||
|
@ -23,7 +23,7 @@ public class Consumer {
|
|||||||
Message msg;
|
Message msg;
|
||||||
try {
|
try {
|
||||||
msg = queue.take();
|
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));
|
System.out.println(String.format("Consumer %s receive request to terminate.", name));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user