Skip to content

Commit

Permalink
Remove Guava dependency (se-edu#972)
Browse files Browse the repository at this point in the history
Remove Guava dependency to make application maintenance easier.

  [1/3] PersonCard: display tags in sorted order
  [2/3] build.gradle: remove Guava dependency
  [3/3] README: fix typo: TextFX -> TestFX
  • Loading branch information
pyokagan committed Feb 24, 2019
2 parents 921e61f + 4fbf55b commit 3a8f0b7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ endif::[]

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* Libraries used: https://github.com/TestFX/TestFX[TestFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ dependencies {

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
implementation group: 'com.google.guava', name: 'guava', version: '19.0'

testImplementation group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/seedu/address/ui/PersonCard.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package seedu.address.ui;

import java.util.Comparator;

import javafx.fxml.FXML;
import javafx.scene.control.Label;
import javafx.scene.layout.FlowPane;
Expand Down Expand Up @@ -47,7 +49,9 @@ public PersonCard(Person person, int displayedIndex) {
phone.setText(person.getPhone().value);
address.setText(person.getAddress().value);
email.setText(person.getEmail().value);
person.getTags().forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
person.getTags().stream()
.sorted(Comparator.comparing(tag -> tag.tagName))
.forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions src/test/java/guitests/guihandles/PersonCardHandle.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import java.util.List;
import java.util.stream.Collectors;

import com.google.common.collect.ImmutableMultiset;

import javafx.scene.Node;
import javafx.scene.control.Label;
import javafx.scene.layout.Region;
Expand Down Expand Up @@ -80,8 +78,9 @@ public boolean equals(Person person) {
&& getAddress().equals(person.getAddress().value)
&& getPhone().equals(person.getPhone().value)
&& getEmail().equals(person.getEmail().value)
&& ImmutableMultiset.copyOf(getTags()).equals(ImmutableMultiset.copyOf(person.getTags().stream()
&& getTags().equals(person.getTags().stream()
.map(tag -> tag.tagName)
.collect(Collectors.toList())));
.sorted()
.collect(Collectors.toList()));
}
}
2 changes: 1 addition & 1 deletion src/test/java/seedu/address/ui/testutil/GuiTestAssert.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void assertCardDisplaysPerson(Person expectedPerson, PersonCardHan
assertEquals(expectedPerson.getPhone().value, actualCard.getPhone());
assertEquals(expectedPerson.getEmail().value, actualCard.getEmail());
assertEquals(expectedPerson.getAddress().value, actualCard.getAddress());
assertEquals(expectedPerson.getTags().stream().map(tag -> tag.tagName).collect(Collectors.toList()),
assertEquals(expectedPerson.getTags().stream().map(tag -> tag.tagName).sorted().collect(Collectors.toList()),
actualCard.getTags());
}

Expand Down

0 comments on commit 3a8f0b7

Please sign in to comment.