oysteikt-skolearbeid/IT1901
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename all instances/methods of FlashcardProvider

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2021-10-20 20:47:58 +02:00
parent 86116cb694
commit 2c5c19bd65
7 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flashy/core/src/main/java/it1901/groups2021/gr2141/core/domainlogic/FlashcardProvider.java
+1 -1
View File
@@ -8,7 +8,7 @@ import it1901.groups2021.gr2141.core.models.CardContent;
import it1901.groups2021.gr2141.core.models.CardDeck;
import it1901.groups2021.gr2141.core.state.Observable;
public class FlashCardProvider extends Observable<FlashCardProvider> {
public class FlashcardProvider extends Observable<FlashcardProvider> {
private static final Preferences prefs = Preferences.userRoot().node(FlashcardProvider.class.getName());
flashy/core/src/test/java/it1901/groups2021/gr2141/core/domainlogic/FlashcardProviderTest.java
+42 -42
View File
@@ -18,7 +18,7 @@ import it1901.groups2021.gr2141.core.models.Flashcard;
public class FlashcardProviderTest {
private FlashcardProvider exampleFlashCardProvider;
private FlashcardProvider example;
private CardDeck exampleDeck1;
private CardDeck exampleDeck2;
@@ -40,9 +40,9 @@ public class FlashcardProviderTest {
FlashcardProvider.clearPreferences();
exampleFlashCardProvider = new FlashcardProvider();
exampleFlashCardProvider.toggleFirstLastWrapAroundMode();
exampleFlashCardProvider.setCardDeck(exampleDeck1);
example = new FlashcardProvider();
example.toggleFirstLastWrapAroundMode();
example.setCardDeck(exampleDeck1);
}
@Test
@@ -52,44 +52,44 @@ public class FlashcardProviderTest {
@Test
public void testCardDeckSetGetters() {
assertEquals(exampleDeck1, exampleFlashCardProvider.getCardDeck());
assertEquals(exampleDeck1, example.getCardDeck());
assertThrows(IllegalArgumentException.class, () -> exampleFlashCardProvider.setCardDeck(null));
assertThrows(IllegalArgumentException.class, () -> example.setCardDeck(null));
exampleFlashCardProvider.setCardDeck(exampleDeck2);
assertEquals(exampleDeck2, exampleFlashCardProvider.getCardDeck());
example.setCardDeck(exampleDeck2);
assertEquals(exampleDeck2, example.getCardDeck());
}
@Test
public void testTurnToCard() {
assertThrows(IllegalArgumentException.class, () -> exampleFlashCardProvider.turnToCard(-1));
assertThrows(IllegalArgumentException.class, () -> exampleFlashCardProvider.turnToCard(exampleDeck1.getNumberOfCards() + 1));
assertThrows(IllegalArgumentException.class, () -> example.turnToCard(-1));
assertThrows(IllegalArgumentException.class, () -> example.turnToCard(exampleDeck1.getNumberOfCards() + 1));
exampleFlashCardProvider.turnToCard(1);
assertEquals(exampleDeck1.getFlashcards().get(1).getFront(), exampleFlashCardProvider.getCard());
example.turnToCard(1);
assertEquals(exampleDeck1.getFlashcards().get(1).getFront(), example.getCard());
exampleFlashCardProvider.flipCard();
exampleFlashCardProvider.turnToCard(0);
assertEquals(exampleDeck1.getFlashcards().get(0).getFront(), exampleFlashCardProvider.getCard());
example.flipCard();
example.turnToCard(0);
assertEquals(exampleDeck1.getFlashcards().get(0).getFront(), example.getCard());
}
@Test
public void testTurnToNextPreviousCard() {
exampleFlashCardProvider.turnToNextCard();
assertEquals(1, exampleFlashCardProvider.getCardIndex());
example.turnToNextCard();
assertEquals(1, example.getCardIndex());
exampleFlashCardProvider.turnToPreviousCard();
assertEquals(0, exampleFlashCardProvider.getCardIndex());
example.turnToPreviousCard();
assertEquals(0, example.getCardIndex());
}
@Test
public void testTurnToCardWithRandomMode () {
exampleFlashCardProvider.toggleCardOrderIsRandomMode();
example.toggleCardOrderIsRandomMode();
boolean hasTurnedToAnotherCard = false;
for (int i=0; i<9999; i++) {
exampleFlashCardProvider.turnToCard(0);
if (!hasTurnedToAnotherCard && exampleFlashCardProvider.getCardIndex() != 0)
example.turnToCard(0);
if (!hasTurnedToAnotherCard && example.getCardIndex() != 0)
hasTurnedToAnotherCard = true;
}
@@ -98,13 +98,13 @@ public class FlashcardProviderTest {
@Test
public void testTurnToCardWithRandomModeWithDeckSize1 () {
exampleFlashCardProvider.toggleCardOrderIsRandomMode();
exampleFlashCardProvider.setCardDeck(exampleDeck2);
example.toggleCardOrderIsRandomMode();
example.setCardDeck(exampleDeck2);
boolean hasTurnedToAnotherCard = false;
for (int i=0; i<9999; i++) {
exampleFlashCardProvider.turnToCard(0);
if (!hasTurnedToAnotherCard && exampleFlashCardProvider.getCardIndex() != 0)
example.turnToCard(0);
if (!hasTurnedToAnotherCard && example.getCardIndex() != 0)
hasTurnedToAnotherCard = true;
}
@@ -113,41 +113,41 @@ public class FlashcardProviderTest {
@Test
public void testTurnToCardWithWrapAroundMode() {
exampleFlashCardProvider.toggleFirstLastWrapAroundMode();
example.toggleFirstLastWrapAroundMode();
int maxIndex = exampleDeck1.getNumberOfCards() - 1;
int minIndex = 0;
exampleFlashCardProvider.turnToCard(maxIndex + 1);
assertEquals(minIndex, exampleFlashCardProvider.getCardIndex());
example.turnToCard(maxIndex + 1);
assertEquals(minIndex, example.getCardIndex());
exampleFlashCardProvider.turnToCard(minIndex - 1);
assertEquals(maxIndex, exampleFlashCardProvider.getCardIndex());
example.turnToCard(minIndex - 1);
assertEquals(maxIndex, example.getCardIndex());
}
@Test
public void testFlipCard(){
CardContent front = exampleFlashCardProvider.getCard();
exampleFlashCardProvider.flipCard();
CardContent back = exampleFlashCardProvider.getCard();
exampleFlashCardProvider.flipCard();
CardContent front2 = exampleFlashCardProvider.getCard();
CardContent front = example.getCard();
example.flipCard();
CardContent back = example.getCard();
example.flipCard();
CardContent front2 = example.getCard();
assertNotEquals(front, back);
assertEquals(front, front2);
}
private void toggleAllModes() {
exampleFlashCardProvider.toggleShowOrderIsFlippedMode();
exampleFlashCardProvider.toggleCardOrderIsRandomMode();
exampleFlashCardProvider.toggleFirstLastWrapAroundMode();
example.toggleShowOrderIsFlippedMode();
example.toggleCardOrderIsRandomMode();
example.toggleFirstLastWrapAroundMode();
}
@Test
public void testModeTogglers() {
List<BooleanSupplier> modes = List.of(
() -> exampleFlashCardProvider.isShowOrderIsFlippedMode(),
() -> exampleFlashCardProvider.isCardOrderIsRandomMode(),
() -> exampleFlashCardProvider.isFirstLastWrapAroundMode()
() -> example.isShowOrderIsFlippedMode(),
() -> example.isCardOrderIsRandomMode(),
() -> example.isFirstLastWrapAroundMode()
);
modes.forEach((b) -> assertFalse(b));
flashy/fxui/src/main/java/it1901/groups2021/gr2141/ui/FlashyModel.java
+6 -6
View File
@@ -1,22 +1,22 @@
package it1901.groups2021.gr2141.ui;
import it1901.groups2021.gr2141.core.domainlogic.FlashCardProvider;
import it1901.groups2021.gr2141.core.domainlogic.FlashcardProvider;
public class FlashyModel {
private FlashCardProvider flashCardProvider;
private FlashcardProvider flashCardProvider;
public FlashyModel() {
this.flashCardProvider = new FlashCardProvider();
this.flashCardProvider = new FlashcardProvider();
}
public FlashCardProvider getFlashCardProvider() {
public FlashcardProvider get() {
return this.flashCardProvider;
}
public void setFlashCardProvider(FlashCardProvider flashCardProvider) {
public void set(FlashcardProvider flashCardProvider) {
if (flashCardProvider == null) {
throw new IllegalArgumentException("FlashCardProvider can not be null");
throw new IllegalArgumentException(" can not be null");
}
this.flashCardProvider = flashCardProvider;
}
flashy/fxui/src/main/java/it1901/groups2021/gr2141/ui/controllers/FlashyCardAreaController.java
+5 -5
View File
@@ -6,7 +6,7 @@ import java.util.List;
import java.util.ResourceBundle;
import javafx.fxml.Initializable;
import it1901.groups2021.gr2141.core.domainlogic.FlashCardProvider;
import it1901.groups2021.gr2141.core.domainlogic.FlashcardProvider;
import it1901.groups2021.gr2141.core.models.CardDeck;
import it1901.groups2021.gr2141.core.models.Flashcard;
import it1901.groups2021.gr2141.core.storage.CardDeckStorage;
@@ -34,17 +34,17 @@ public class FlashyCardAreaController implements Initializable {
public void initialize(URL url, ResourceBundle resourceBundle) {
try {
getFlashcardProvider().setCardDeck(CardDeckStorage.readDeck(0));
getFlashcardProvider().setCardDeck(CardDeckStorage.readDeck(0));
} catch (IOException e) {
getFlashcardProvider().setCardDeck(new CardDeck(List.of(Flashcard.of("Welcome to Flashy", "E N J O Y !"))));
getFlashcardProvider().setCardDeck(new CardDeck(List.of(Flashcard.of("Welcome to Flashy", "E N J O Y !"))));
}
showCurrentCardContent();
getFlashcardProvider().subscribe((newFlashCardModel) -> showCurrentCardContent());
}
private FlashCardProvider getFlashcardProvider() {
return Flashy.applicationState.getFlashCardProvider();
private FlashcardProvider getFlashcardProvider() {
return Flashy.applicationState.get();
}
public void showCurrentCardContent() {
flashy/fxui/src/main/java/it1901/groups2021/gr2141/ui/controllers/FlashyCardNavigationController.java
+5 -5
View File
@@ -1,6 +1,6 @@
package it1901.groups2021.gr2141.ui.controllers;
import it1901.groups2021.gr2141.core.domainlogic.FlashCardProvider;
import it1901.groups2021.gr2141.core.domainlogic.FlashcardProvider;
import it1901.groups2021.gr2141.ui.Flashy;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
@@ -8,8 +8,8 @@ import javafx.fxml.FXML;
public class FlashyCardNavigationController {
private FlashCardProvider getFlashcardProvider() {
return Flashy.applicationState.getFlashCardProvider();
private FlashcardProvider getFlashcardProvider() {
return Flashy.applicationState.get();
}
@FXML
@@ -19,11 +19,11 @@ public class FlashyCardNavigationController {
@FXML
public void handleTurnToNextCard(ActionEvent event) {
getFlashcardProvider().turnToNextCard(getFlashcardProvider().getCardIndex());
getFlashcardProvider().turnToNextCard();
}
@FXML
public void handleTurnToPreviousCard(ActionEvent event) {
getFlashcardProvider().turnToPreviousCard(getFlashcardProvider().getCardIndex());
getFlashcardProvider().turnToPreviousCard();
}
}
flashy/fxui/src/main/java/it1901/groups2021/gr2141/ui/controllers/FlashyMenuController.java
+3 -3
View File
@@ -1,7 +1,7 @@
package it1901.groups2021.gr2141.ui.controllers;
import it1901.groups2021.gr2141.core.domainlogic.FlashCardProvider;
import it1901.groups2021.gr2141.core.domainlogic.FlashcardProvider;
import it1901.groups2021.gr2141.core.models.Flashcard;
import it1901.groups2021.gr2141.core.storage.CardDeckStorage;
import it1901.groups2021.gr2141.ui.Flashy;
@@ -22,8 +22,8 @@ public class FlashyMenuController {
private TextField writeBack;
private FlashCardProvider getFlashcardProvider() {
return Flashy.applicationState.getFlashCardProvider();
private FlashcardProvider getFlashcardProvider() {
return Flashy.applicationState.get();
}
/**
flashy/fxui/src/main/java/it1901/groups2021/gr2141/ui/controllers/FlashyNavbarController.java
+6 -6
View File
@@ -3,7 +3,7 @@ package it1901.groups2021.gr2141.ui.controllers;
import java.net.URL;
import java.util.ResourceBundle;
import it1901.groups2021.gr2141.core.domainlogic.FlashCardProvider;
import it1901.groups2021.gr2141.core.domainlogic.FlashcardProvider;
import it1901.groups2021.gr2141.ui.Flashy;
import javafx.fxml.Initializable;
@@ -36,14 +36,14 @@ public class FlashyNavbarController implements Initializable {
setToggleButtonValues();
}
private FlashCardProvider getFlashcardProvider() {
return Flashy.applicationState.getFlashCardProvider();
private FlashcardProvider getFlashcardProvider() {
return Flashy.applicationState.get();
}
private void setToggleButtonValues() {
btnToggleRandomMode.setSelected(getFlashcardProvider().getCardOrderIsRandomMode());
btnToggleShowOtherSide.setSelected(getFlashcardProvider().getShowOrderIsFlippedMode());
btnToggleFirstLastWrapAroundMode.setSelected(getFlashcardProvider().getFirstLastWrapAroundMode());
btnToggleRandomMode.setSelected(getFlashcardProvider().isCardOrderIsRandomMode());
btnToggleShowOtherSide.setSelected(getFlashcardProvider().isShowOrderIsFlippedMode());
btnToggleFirstLastWrapAroundMode.setSelected(getFlashcardProvider().isFirstLastWrapAroundMode());
}
@FXML