Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions NotesEditor.iml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

</module>
37 changes: 21 additions & 16 deletions src/notes/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,36 +52,41 @@ public Stage getPrimaryStage() {

public void showAuthorizationOverview() {
try {
FXMLLoader loader = new FXMLLoader();
loader.setLocation(MainApp.class.getResource("view/AuthorizationOverview.fxml"));
AnchorPane authorizationOverview = loader.load();
//Можно вынести в отдельный метод
FXMLLoader loader = new FXMLLoader();
loader.setLocation(MainApp.class.getResource("view/AuthorizationOverview.fxml"));
AnchorPane authorizationOverview = loader.load();

AuthorizationOverviewController controller = loader.getController();
controller.setMainApp(this);
AuthorizationOverviewController controller = loader.getController();
controller.setMainApp(this);


Scene scene = new Scene(authorizationOverview);
primaryStage.setScene(scene);
primaryStage.show();
Scene scene = new Scene(authorizationOverview);
primaryStage.setScene(scene);
primaryStage.show();

} catch (IOException e) {
e.printStackTrace();
}
}

// Можно вынести в класс где используется, т.к. этот метод больше подходит под логику AuthorizationOverviewController
public void showNoteListOverview(User user) {
try {
FXMLLoader loader = new FXMLLoader();
loader.setLocation(MainApp.class.getResource("view/NoteListOverview.fxml"));
//Можно вынести в отдельный метод
FXMLLoader loader = new FXMLLoader();
loader.setLocation(MainApp.class.getResource("view/NoteListOverview.fxml"));

AnchorPane noteListOverview = loader.load();

AnchorPane noteListOverview = loader.load();
NoteListOverviewController controller = loader.getController();
controller.setMainApp(this);

NoteListOverviewController controller = loader.getController();
controller.setUser(user);
controller.setMainApp(this);

Scene scene = new Scene(noteListOverview);
primaryStage.setScene(scene);
primaryStage.show();
Scene scene = new Scene(noteListOverview);
primaryStage.setScene(scene);
primaryStage.show();
} catch (IOException e) {
e.printStackTrace();
}
Expand Down
2 changes: 2 additions & 0 deletions src/notes/Utils/InputCheckUtil.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package notes.Utils;

public class InputCheckUtil {

//ApacheCommons - StringUtils.isEmpty() - когда подключишь Maven
public static boolean isInputValid(String string) {
return string != null && string.length() > 0;
}
Expand Down
4 changes: 4 additions & 0 deletions src/notes/view/NoteListOverviewController.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ public class NoteListOverviewController {
private void initialize() {
noteColumn.setCellValueFactory(cellData -> cellData.getValue().titleProperty());

//А что было, если не вызывать этот метод?
showUserNote(null);

//Если сделать Ctrl+LeftClick на методе "addListener" - можно глянуть его описание,
//Там сказано, что если не убирать регистрацию Listener-а при удалении элемента, на пример, то
//Со временем будет заметна утечка памяти. Надо применить .removeListener() после удаления элемента.
noteTable.getSelectionModel().selectedItemProperty().addListener(
(observable, oldValue, newValue) -> showUserNote(newValue)
);
Expand Down