Code cleanup (#1461)
* Code cleanup * Fix flux tests * Fix checkstyle errors * Fix compile error
This commit is contained in:
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class ElfBeast extends Beast {
|
||||
|
||||
private String helpType;
|
||||
private final String helpType;
|
||||
|
||||
public ElfBeast(String helpType) {
|
||||
this.helpType = helpType;
|
||||
|
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class ElfMage extends Mage {
|
||||
|
||||
private String helpType;
|
||||
private final String helpType;
|
||||
|
||||
public ElfMage(String helpType) {
|
||||
this.helpType = helpType;
|
||||
|
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class ElfWarlord extends Warlord {
|
||||
|
||||
private String helpType;
|
||||
private final String helpType;
|
||||
|
||||
public ElfWarlord(String helpType) {
|
||||
this.helpType = helpType;
|
||||
|
@ -1,65 +1,65 @@
|
||||
/*
|
||||
* The MIT License
|
||||
* Copyright © 2014-2019 Ilkka Seppälä
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package com.iluwatar.prototype;
|
||||
|
||||
/**
|
||||
* Concrete factory class.
|
||||
*/
|
||||
public class HeroFactoryImpl implements HeroFactory {
|
||||
|
||||
private Mage mage;
|
||||
private Warlord warlord;
|
||||
private Beast beast;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) {
|
||||
this.mage = mage;
|
||||
this.warlord = warlord;
|
||||
this.beast = beast;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create mage.
|
||||
*/
|
||||
public Mage createMage() {
|
||||
return mage.copy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create warlord.
|
||||
*/
|
||||
public Warlord createWarlord() {
|
||||
return warlord.copy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create beast.
|
||||
*/
|
||||
public Beast createBeast() {
|
||||
return beast.copy();
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
* The MIT License
|
||||
* Copyright © 2014-2019 Ilkka Seppälä
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
package com.iluwatar.prototype;
|
||||
|
||||
/**
|
||||
* Concrete factory class.
|
||||
*/
|
||||
public class HeroFactoryImpl implements HeroFactory {
|
||||
|
||||
private final Mage mage;
|
||||
private final Warlord warlord;
|
||||
private final Beast beast;
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
*/
|
||||
public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) {
|
||||
this.mage = mage;
|
||||
this.warlord = warlord;
|
||||
this.beast = beast;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create mage.
|
||||
*/
|
||||
public Mage createMage() {
|
||||
return mage.copy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create warlord.
|
||||
*/
|
||||
public Warlord createWarlord() {
|
||||
return warlord.copy();
|
||||
}
|
||||
|
||||
/**
|
||||
* Create beast.
|
||||
*/
|
||||
public Beast createBeast() {
|
||||
return beast.copy();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class OrcBeast extends Beast {
|
||||
|
||||
private String weapon;
|
||||
private final String weapon;
|
||||
|
||||
public OrcBeast(String weapon) {
|
||||
this.weapon = weapon;
|
||||
|
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class OrcMage extends Mage {
|
||||
|
||||
private String weapon;
|
||||
private final String weapon;
|
||||
|
||||
public OrcMage(String weapon) {
|
||||
this.weapon = weapon;
|
||||
|
@ -28,7 +28,7 @@ package com.iluwatar.prototype;
|
||||
*/
|
||||
public class OrcWarlord extends Warlord {
|
||||
|
||||
private String weapon;
|
||||
private final String weapon;
|
||||
|
||||
public OrcWarlord(String weapon) {
|
||||
this.weapon = weapon;
|
||||
|
Reference in New Issue
Block a user