Skip to content

Commit 214f102

Browse files
committed
removed get and setters, using class project as result
1 parent f29c292 commit 214f102

File tree

4 files changed

+15
-49
lines changed

4 files changed

+15
-49
lines changed

src/main/java/de/doubleslash/keeptime/controller/Controller.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public void changeProject(final Project newProject, final long minusSeconds) {
9292
}
9393

9494
public void addNewProject(final Project project) {
95+
LOG.info("Creating new project '{}'.", project);
9596
model.getAllProjects().add(project);
9697
model.getAvailableProjects().add(project);
9798

src/main/java/de/doubleslash/keeptime/view/ManageProjectController.java

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import javafx.scene.control.TextArea;
1414
import javafx.scene.control.TextField;
1515
import javafx.scene.layout.GridPane;
16-
import javafx.scene.paint.Color;
1716

1817
public class ManageProjectController {
1918

@@ -39,35 +38,20 @@ public class ManageProjectController {
3938
@FXML
4039
private Spinner<Integer> sortIndexSpinner;
4140

42-
public String getProjectName() {
43-
return nameTextField.getText();
44-
}
45-
46-
public String getProjectDescription() {
47-
return descriptionTextArea.getText();
48-
}
49-
50-
public Color getProjectColor() {
51-
return textFillColorPicker.getValue();
52-
}
53-
54-
public boolean isWork() {
55-
return isWorkCheckBox.isSelected();
56-
}
57-
58-
public int getIndex() {
59-
return sortIndexSpinner.getValue();
60-
}
61-
6241
public void setModel(final Model model) {
6342
this.model = model;
6443
}
6544

66-
public Project getValues() {
67-
return new Project(getProjectName(), getProjectDescription(), getProjectColor(), isWork(), getIndex());
45+
public void secondInitialize() {
46+
if (model != null) {
47+
final int availableProjectAmount = model.getAllProjects().size();
48+
sortIndexSpinner
49+
.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
50+
sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
51+
}
6852
}
6953

70-
public void setValues(final Project project) {
54+
public void initializeWith(final Project project) {
7155
LOG.info("Setting values.");
7256
nameTextField.setText(project.getName());
7357
descriptionTextArea.setText(project.getDescription());
@@ -76,13 +60,9 @@ public void setValues(final Project project) {
7660
sortIndexSpinner.getValueFactory().setValue(project.getIndex());
7761
}
7862

79-
public void secondInitialize() {
80-
if (model != null) {
81-
final int availableProjectAmount = model.getAllProjects().size();
82-
sortIndexSpinner
83-
.setValueFactory(new IntegerSpinnerValueFactory(0, availableProjectAmount, availableProjectAmount));
84-
sortIndexSpinner.getValueFactory().setValue(model.getAvailableProjects().size());
85-
}
63+
public Project getProjectFromUserInput() {
64+
return new Project(nameTextField.getText(), descriptionTextArea.getText(), textFillColorPicker.getValue(),
65+
isWorkCheckBox.isSelected(), sortIndexSpinner.getValue());
8666
}
8767

8868
}

src/main/java/de/doubleslash/keeptime/view/ProjectsListViewController.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -324,16 +324,11 @@ private GridPane setUpEditProjectGridPane(final Project p, final Dialog<Project>
324324
final ManageProjectController manageProjectController = loader.getController();
325325
manageProjectController.setModel(model);
326326
manageProjectController.secondInitialize();
327-
manageProjectController.setValues(p);
327+
manageProjectController.initializeWith(p);
328328

329329
dialog.setResultConverter(dialogButton -> {
330330
if (dialogButton == ButtonType.OK) {
331-
final String projectName = manageProjectController.getProjectName();
332-
final String projectDescription = manageProjectController.getProjectDescription();
333-
final Color projectColor = manageProjectController.getProjectColor();
334-
final boolean isWork = manageProjectController.isWork();
335-
final int index = manageProjectController.getIndex();
336-
return new Project(projectName, projectDescription, projectColor, isWork, index);
331+
return manageProjectController.getProjectFromUserInput();
337332
}
338333
// TODO: Do you really want to return null?
339334
return null;

src/main/java/de/doubleslash/keeptime/view/ViewController.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -306,17 +306,7 @@ private Dialog<Project> dialogResultConverter(final Dialog<Project> dialog,
306306
final ManageProjectController manageProjectController) {
307307
dialog.setResultConverter(dialogButton -> {
308308
if (dialogButton == ButtonType.OK) {
309-
final String projectName = manageProjectController.getProjectName();
310-
final String projectDescription = manageProjectController.getProjectDescription();
311-
final Color projectColor = manageProjectController.getProjectColor();
312-
final boolean isWork = manageProjectController.isWork();
313-
final int index = manageProjectController.getIndex();
314-
return new Project(projectName, projectDescription, projectColor, isWork, index); // temporary
315-
// (misused)
316-
// transfer
317-
// object
318-
// for
319-
// project
309+
return manageProjectController.getProjectFromUserInput();
320310
}
321311
// TODO: Do you really want to return null?
322312
return null;

0 commit comments

Comments
 (0)