diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/api/ActivityRepositoryApi.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/api/ActivityRepositoryApi.java index c4cea41..18fcb68 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/api/ActivityRepositoryApi.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/api/ActivityRepositoryApi.java @@ -20,7 +20,7 @@ public interface ActivityRepositoryApi { Activity read(String id); - void delete(String id); + boolean delete(String id); List getYears(); diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/impl/sqlite/ActivityRepositorySQLiteImpl.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/impl/sqlite/ActivityRepositorySQLiteImpl.java index b22dcd7..2f144fd 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/impl/sqlite/ActivityRepositorySQLiteImpl.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/persistence/impl/sqlite/ActivityRepositorySQLiteImpl.java @@ -68,11 +68,11 @@ public class ActivityRepositorySQLiteImpl implements ActivityRepositoryApi { } @Override - public void delete(String id) { + public boolean delete(String id) { System.out.println("Going to delete: " + id); Activity activityToBeDeleted = read(id); if(!Utils.askYesNo(null, "Do you really want to delete this activity? " + read(id), "Deletion of activity")) { - return; + return false; } StringBuilder sb = new StringBuilder(); @@ -99,7 +99,7 @@ public class ActivityRepositorySQLiteImpl implements ActivityRepositoryApi { ex.printStackTrace(); throw new TimeCalcException(ex); } - + return true; } diff --git a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java index 18455b4..00737dd 100644 --- a/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java +++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/swing/common/ActivityPanel.java @@ -220,9 +220,12 @@ public class ActivityPanel extends JPanel implements Comparable { // //dayPanel.moveMarkedActivityBeforeThisActivity(getActivity()); // }); deleteButton.addActionListener(e -> { - activityRepository.delete(this.activity.getId()); - this.setVisible(false); - deleted = true; + boolean deleted = activityRepository.delete(this.activity.getId()); + if(deleted) { + this.setVisible(false); + deleted = true; + } + }); copyButton.addActionListener(e -> { activityRepository.putToClipboard(this.activity);