Explorar el Código

Fixing equality for removal of Domain

Sam Jaffe hace 8 años
padre
commit
344be1bc9f

+ 2 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/DomainFeature.java

@@ -11,11 +11,12 @@ import org.leumasjaffe.collections.Tree;
 import org.leumasjaffe.observer.ObserverDispatch;
 
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Delegate;
 
-@AllArgsConstructor @Getter @Setter
+@AllArgsConstructor @Data
 public class DomainFeature implements DDProperty {
 	private static interface IFaceHelper {
 		void setName(String name);

+ 2 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/Flat.java

@@ -6,9 +6,10 @@ import org.leumasjaffe.charsheet.model.features.GroupedBonus;
 import org.leumasjaffe.collections.Tree;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-@AllArgsConstructor
+@AllArgsConstructor @EqualsAndHashCode
 public class Flat implements DDProperty {
 	@Getter String name, description;
 	DDFeaturePredicate applies;

+ 2 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/PerSpellLevel.java

@@ -8,9 +8,10 @@ import org.leumasjaffe.charsheet.model.magic.DDSpell;
 import org.leumasjaffe.collections.Tree;
 
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
-@AllArgsConstructor
+@AllArgsConstructor @EqualsAndHashCode
 public class PerSpellLevel implements DDProperty {
 	@Getter String name, description;
 	DDFeaturePredicate applies;

+ 2 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/Simple.java

@@ -6,11 +6,12 @@ import org.leumasjaffe.charsheet.model.features.GroupedBonus;
 import org.leumasjaffe.collections.Tree;
 
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Delegate;
 
-@AllArgsConstructor @Getter @Setter
+@AllArgsConstructor @Data
 public class Simple implements DDProperty {
 	private static interface IFaceHelper {
 		void setName(String name);

+ 1 - 1
src/main/lombok/org/leumasjaffe/charsheet/model/magic/impl/Domain.java

@@ -102,6 +102,6 @@ public class Domain extends Prepared implements DDSpellbook.Secondary {
 	}
 
 	public void removeDomain(String forSelection) {
-		this.domains.removeIf(s -> s.getImplName().equals(forSelection));
+		this.domains.remove(SpellBookImpl.create(forSelection));
 	}
 }