Skip to content

Character and Universe as abstract classes and Power as an interface. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thegusmao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Character and Universe as abstract classes and Power as an interface. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions superheroes/marvel/Hulk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import java.util.ArrayList;
import java.util.List;

import powers.Resistence;
import powers.ShockWave;
import powers.SuperStrength;
import structure.Abilities;
import structure.Character;
import structure.Power;
Expand All @@ -19,10 +22,9 @@ public Hulk() {

private List<Power> powers() {
ArrayList<Power> powers = new ArrayList<>();
powers.add(new Power("super strength"));
powers.add(new Power("leap great distances"));
powers.add(new Power("hands shock wave"));
powers.add(new Power("resistance to damage"));
powers.add(new SuperStrength());
powers.add(new ShockWave());
powers.add(new Resistence());

return powers;
}
Expand Down
9 changes: 6 additions & 3 deletions superheroes/marvel/SpiderMan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import java.util.ArrayList;
import java.util.List;

import powers.SpiderSense;
import powers.SuperAgility;
import powers.SuperStrength;
import structure.Abilities;
import structure.Character;
import structure.Power;
Expand All @@ -20,9 +23,9 @@ public SpiderMan() {

private List<Power> powers() {
ArrayList<Power> powers = new ArrayList<>();
powers.add(new Power("spider-sense"));
powers.add(new Power("agility"));
powers.add(new Power("super strength"));
powers.add(new SpiderSense());
powers.add(new SuperAgility());
powers.add(new SuperStrength());

return powers;
}
Expand Down
10 changes: 10 additions & 0 deletions superheroes/powers/Resistence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package powers;

import structure.Power;

public class Resistence implements Power {
@Override
public String power() {
return "resistance to damage";
}
}
11 changes: 11 additions & 0 deletions superheroes/powers/ShockWave.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package powers;

import structure.Power;

public class ShockWave implements Power {
@Override
public String power() {
return "shockwave";
}

}
12 changes: 12 additions & 0 deletions superheroes/powers/SpiderSense.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package powers;

import structure.Power;

public class SpiderSense implements Power {

@Override
public String power() {
return "Spider sense";
}

}
12 changes: 12 additions & 0 deletions superheroes/powers/SuperAgility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package powers;

import structure.Power;

public class SuperAgility implements Power {

@Override
public String power() {
return "super agility";
}

}
12 changes: 12 additions & 0 deletions superheroes/powers/SuperStrength.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package powers;

import structure.Power;

public class SuperStrength implements Power {

@Override
public String power() {
return "super strength";
}

}
2 changes: 1 addition & 1 deletion superheroes/structure/Character.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
*/

public class Character {
public abstract class Character {

private String name; //Spider-Man
private String realName; //Peter Benjamin Parker
Expand Down
19 changes: 2 additions & 17 deletions superheroes/structure/Power.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
package structure;

public class Power {
private String name; //spider-sense, agility, super strength

public Power() {}

public Power(String powerName) {
this.name = powerName;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public interface Power {
public String power(); //spider-sense, agility, super strength
}
2 changes: 1 addition & 1 deletion superheroes/structure/Universe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.List;
import structure.Character;

public class Universe {
public abstract class Universe {
private String name; //DC, Marvel
private List<Character> superheroes;

Expand Down