Skip to content

Commit

Permalink
Minor optimisations
Browse files Browse the repository at this point in the history
  • Loading branch information
DMeechan committed Mar 24, 2017
1 parent 39f13fe commit b1dedfa
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
17 changes: 17 additions & 0 deletions download/Version List.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Version 1:
1.0:
- Manage tasks and display countdown timer
1.1: CURRENT STABLE BUILD
- Display instructions on first launch
- Save and load user data between launches
1.2:
- Optimisation improvemnts
- Fix bug with countdown timer display startpoint
1.3:
- Introduce custom implementation of ListView for increased flexibility
1.4:
- Add settings options
- Add themes: light and dark
- Fix colour of slider control
1.5:
-
21 changes: 2 additions & 19 deletions src/Task.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ class Task implements Serializable{

private final StringProperty name = new SimpleStringProperty(""); // name of task
private boolean isNotDone; // is the timer currently marked as done
//private Color colour;
//private ObjectProperty<Color> colour = new SimpleObjectProperty<>(Color.web("#ffffff")); // task's user-defined colour
private final ObjectProperty<java.awt.Color> colour = new SimpleObjectProperty<>();
private final ObjectProperty<java.awt.Color> colour = new SimpleObjectProperty<>(); // task's user-defined colour

private final IntegerProperty minutes = new SimpleIntegerProperty(0);
private final IntegerProperty seconds = new SimpleIntegerProperty(0);
Expand All @@ -20,7 +18,7 @@ public Task(String name, int minutes, Color colour) {
setNotDone(true);
setMinutes(minutes);
setColour(colour);
//colour.plat

}

@Override
Expand All @@ -31,7 +29,6 @@ public String toString() {

////////////////////////////


public void setNotDone(boolean notDone) {
isNotDone = notDone;
}
Expand Down Expand Up @@ -68,20 +65,6 @@ public IntegerProperty minutesProperty() {
return minutes;
}

/*
public Color getColour() {
return colour.get();
}
public void setColour(Color colour) {
this.colour.set(colour);
}
public ObjectProperty<Color> colourProperty() {
return colour;
}
*/

public java.awt.Color getColour() {
return colour.get();
}
Expand Down

0 comments on commit b1dedfa

Please sign in to comment.