소스 검색

Fixing build errors from merge

Sam Jaffe 8 년 전
부모
커밋
318312a1d4
1개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 6 3
      src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/Skill.java

+ 6 - 3
src/main/lombok/org/leumasjaffe/charsheet/model/features/impl/Skill.java

@@ -40,15 +40,18 @@ public class Skill implements DDProperty, DDPropertyChooser {
 	@Override
 	@Override
 	public boolean applySideEffects(DDCharacter to, DDCharacterClass toClass, int selectedIndex) {
 	public boolean applySideEffects(DDCharacter to, DDCharacterClass toClass, int selectedIndex) {
 		toClass.addFeature(get(selectedIndex));
 		toClass.addFeature(get(selectedIndex));
-		ObserverDispatch.notifySubscribers(to.getSkills());
-		to.getSkills().getSkill(getName()).ifPresent(ObserverDispatch::notifySubscribers);
+		doNotify(to);
 		return true;
 		return true;
 	}
 	}
 	
 	
 	@Override
 	@Override
 	public void undoSideEffects(DDCharacter to, DDCharacterClass toClass, int selectedIndex) {
 	public void undoSideEffects(DDCharacter to, DDCharacterClass toClass, int selectedIndex) {
 		toClass.removeFeature(get(selectedIndex));
 		toClass.removeFeature(get(selectedIndex));
+		doNotify(to);
+	}
+
+	private void doNotify(DDCharacter to) {
 		ObserverDispatch.notifySubscribers(to.getSkills());
 		ObserverDispatch.notifySubscribers(to.getSkills());
-		to.getSkills().getSkill(getName()).ifPresent(ObserverDispatch::notifySubscribers);
+		ObserverDispatch.notifySubscribers(to.getSkills().getSkill(getName()));
 	}
 	}
 }
 }