Skip to content

Refactor hardcoded strings in MainController #102

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
G30RG3-GJ wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor hardcoded strings in MainController #102

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
27 changes: 18 additions & 9 deletions src/library/assistant/ui/main/MainController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@

public class MainController implements Initializable, BookReturnCallback {

private static final String BOOK_NOT_AVAILABLE = "Not Available";
private static final String NO_SUCH_BOOK_AVAILABLE = "No Such Book Available";
private static final String NO_SUCH_MEMBER_AVAILABLE = "No Such Member Available";
private static final String BOOK_AVAILABLE = "Available";
private String bookAvailable = "Available";
private String bookNotAvailable = "Not Available";
private String noSuchBookAvailable = "No Such Book Available";
private String noSuchMemberAvailable = "No Such Member Available";

private Boolean isReadyForSubmission = false;
private DatabaseHandler databaseHandler;
Expand Down Expand Up @@ -124,6 +124,15 @@ public class MainController implements Initializable, BookReturnCallback {

@Override
public void initialize(URL url, ResourceBundle rb) {
try {
ResourceBundle bundle = ResourceBundle.getBundle("resources.strings");
bookAvailable = bundle.getString("book.available");
bookNotAvailable = bundle.getString("book.not.available");
noSuchBookAvailable = bundle.getString("no.such.book.available");
noSuchMemberAvailable = bundle.getString("no.such.member.available");
} catch (Exception e) {
Logger.getLogger(MainController.class.getName()).log(Level.SEVERE, null, e);
}
databaseHandler = DatabaseHandler.getInstance();

initDrawer();
Expand All @@ -148,7 +157,7 @@ private void loadBookInfo(ActionEvent event) {

bookName.setText(bName);
bookAuthor.setText(bAuthor);
String status = (bStatus) ? BOOK_AVAILABLE : String.format("Issued on %s", LibraryAssistantUtil.getDateString(new Date(issuedOn.getTime())));
String status = (bStatus) ? bookAvailable : String.format("Issued on %s", LibraryAssistantUtil.getDateString(new Date(issuedOn.getTime())));
if (!bStatus) {
bookStatus.getStyleClass().add("not-available");
} else {
Expand All @@ -160,7 +169,7 @@ private void loadBookInfo(ActionEvent event) {
}

if (!flag) {
bookName.setText(NO_SUCH_BOOK_AVAILABLE);
bookName.setText(noSuchBookAvailable);
} else {
memberIDInput.requestFocus();
}
Expand Down Expand Up @@ -202,7 +211,7 @@ private void loadMemberInfo(ActionEvent event) {
}

if (!flag) {
memberName.setText(NO_SUCH_MEMBER_AVAILABLE);
memberName.setText(noSuchMemberAvailable);
} else {
btnIssue.requestFocus();
}
Expand All @@ -218,7 +227,7 @@ private void loadIssueOperation(ActionEvent event) {
AlertMaker.showMaterialDialog(rootPane, rootAnchorPane, Arrays.asList(btn), "Invalid Input", null);
return;
}
if (bookStatus.getText().equals(BOOK_NOT_AVAILABLE)) {
if (bookStatus.getText().equals(bookNotAvailable)) {
JFXButton btn = new JFXButton("Okay!");
JFXButton viewDetails = new JFXButton("View Details");
viewDetails.addEventHandler(MouseEvent.MOUSE_CLICKED, (MouseEvent e) -> {
Expand Down Expand Up @@ -537,7 +546,7 @@ private boolean checkForIssueValidity() {
memberIDInput.fireEvent(new ActionEvent());
return bookIDInput.getText().isEmpty() || memberIDInput.getText().isEmpty()
|| memberName.getText().isEmpty() || bookName.getText().isEmpty()
|| bookName.getText().equals(NO_SUCH_BOOK_AVAILABLE) || memberName.getText().equals(NO_SUCH_MEMBER_AVAILABLE);
|| bookName.getText().equals(noSuchBookAvailable) || memberName.getText().equals(noSuchMemberAvailable);
}

@Override
Expand Down
4 changes: 4 additions & 0 deletions src/resources/strings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
book.not.available=Not Available
book.available=Available
no.such.book.available=No Such Book Available
no.such.member.available=No Such Member Available