diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/dialog/TaskDialog.java b/src/main/java/cz/muni/fi/pv168/project/ui/dialog/TaskDialog.java
index 31c99faba15eacc3fbf1137ab93b1a1077c24df0..e380c1a2810b3d37b7a18a400087bd2400890f90 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/dialog/TaskDialog.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/dialog/TaskDialog.java
@@ -49,7 +49,8 @@ public class TaskDialog extends AbstractLaidOutDialog<Task> {
protected void addFields() {
addLabeledField(I18N.getString("labelTitle"), titleField, labelGbc, componentGbc, getRowThenIncrement());
- addLabeledField(I18N.getString("labelDescription"), new JScrollPane(descriptionField), labelGbc, componentGbc, getRowThenIncrement());
+ addLabeledField(I18N.getString("labelDescription"),
+ new JScrollPane(descriptionField), labelGbc, componentGbc, getRowThenIncrement());
addLabeledField(I18N.getString("labelEstTime"), createEstimatedTimePanel(), labelGbc, componentGbc, getRowThenIncrement());
addLabeledField(I18N.getString("labelDueTime"), datePicker, labelGbc, componentGbc, getRowThenIncrement());
}
@@ -103,7 +104,8 @@ public class TaskDialog extends AbstractLaidOutDialog<Task> {
private final Pattern pattern = Pattern.compile("\\d*");
@Override
- public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet attrs) throws BadLocationException {
+ public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet attrs)
+ throws BadLocationException {
if (!pattern.matcher(text).matches()) {
return;
}
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/i18n/I18N.java b/src/main/java/cz/muni/fi/pv168/project/ui/i18n/I18N.java
index fd79fb98e1775286cea3a3994a171078cb1bd222..007e6a274516fe18c31d584184f65b804d686a87 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/i18n/I18N.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/i18n/I18N.java
@@ -15,14 +15,14 @@ public final class I18N {
prefix = clazz.getSimpleName() + ".";
}
- public String getString(String key) {
- return bundle.getString(prefix + key);
- }
-
public String getFormattedMessage(String key, Object... arguments) {
return MessageFormat.format(getString(key), arguments);
}
+ public String getString(String key) {
+ return bundle.getString(prefix + key);
+ }
+
public <E extends Enum<E>> String getString(E key) {
return bundle.getString(key.getClass().getSimpleName() + "." + key.name());
}
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
index 19cf68449baaf03d7ede4a49b74637f68693ee93..fa90c39523ee810c9b978b50172a9c6a9f6b4a49 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/main/panel/listholder/CategoryHolderPanel.java
@@ -31,9 +31,12 @@ public class CategoryHolderPanel extends AbstractHolderPanel<Category> {
factory = new ExistingCategoryDialogFactory(parentDao);
PopupMenuFactory.builder()
- .addMenuItem(new AddAction<>(this, Icons.ADD_CATEGORY_ICON, I18N.getString("addCategoryOption")).addUpdatable(this))
- .addMenuItem(new EditAction<>(this, Icons.EDIT_CATEGORY_ICON, I18N.getString("editCategoryOption")).addUpdatable(this))
- .addMenuItem(new DeleteAction<>(this, Icons.REMOVE_CATEGORY_BIN_ICON, I18N.getString("removeCategoryOption")).addUpdatable(this))
+ .addMenuItem(new AddAction<>(this, Icons.ADD_CATEGORY_ICON,
+ I18N.getString("addCategoryOption")).addUpdatable(this))
+ .addMenuItem(new EditAction<>(this, Icons.EDIT_CATEGORY_ICON,
+ I18N.getString("editCategoryOption")).addUpdatable(this))
+ .addMenuItem(new DeleteAction<>(this, Icons.REMOVE_CATEGORY_BIN_ICON,
+ I18N.getString("removeCategoryOption")).addUpdatable(this))
.buildFor(this.getList());
}
diff --git a/src/main/java/cz/muni/fi/pv168/project/ui/renderer/list/TaskListRenderer.java b/src/main/java/cz/muni/fi/pv168/project/ui/renderer/list/TaskListRenderer.java
index 3dd79dc829662c583f51bddcb939a697a0e01b48..5417bddced79d37783ce3fea093bfb617f50782a 100644
--- a/src/main/java/cz/muni/fi/pv168/project/ui/renderer/list/TaskListRenderer.java
+++ b/src/main/java/cz/muni/fi/pv168/project/ui/renderer/list/TaskListRenderer.java
@@ -2,24 +2,13 @@ package cz.muni.fi.pv168.project.ui.renderer.list;
import cz.muni.fi.pv168.project.data.task.Task;
import cz.muni.fi.pv168.project.data.task.TaskStatus;
-import cz.muni.fi.pv168.project.ui.dialog.TaskDialog;
import cz.muni.fi.pv168.project.ui.i18n.I18N;
import cz.muni.fi.pv168.project.ui.main.panel.TaskStatusPanel;
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.ListCellRenderer;
+import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.border.EtchedBorder;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
+import java.awt.*;
public class TaskListRenderer implements ListCellRenderer<Task> {
diff --git a/src/main/resources/cz/muni/fi/pv168/project/model/i18n.properties b/src/main/resources/cz/muni/fi/pv168/project/model/i18n.properties
index 047e78c411f0659ade8031e871df0708331c5ff6..3c2bde7289387934996cbdffc1ce6d831d0002ca 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/model/i18n.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/model/i18n.properties
@@ -1,2 +1,2 @@
CategoryStatisticsTableModel.columnNameTitle=Category name
-CategoryStatisticsTableModel.columnTimeTitle=Time spent
\ No newline at end of file
+CategoryStatisticsTableModel.columnTimeTitle=Time spent
diff --git a/src/main/resources/cz/muni/fi/pv168/project/model/i18n_cs.properties b/src/main/resources/cz/muni/fi/pv168/project/model/i18n_cs.properties
index 4062662d9bed417ad594774c55b0b8f6e07a6ca1..fb37c6f47a10ef8a4ccbd8021376d72d14c8a062 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/model/i18n_cs.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/model/i18n_cs.properties
@@ -1,2 +1,2 @@
CategoryStatisticsTableModel.columnNameTitle=Jm\u00E9no kategorie
-CategoryStatisticsTableModel.columnTimeTitle=Str\u00E1ven\u00FD \u010Das
\ No newline at end of file
+CategoryStatisticsTableModel.columnTimeTitle=Str\u00E1ven\u00FD \u010Das
diff --git a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n.properties b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n.properties
index d2b790f0927446474a8aa127ef252dbc9e4baf0a..7497608f1e56ab064d4871a2cc6752c4666172f1 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n.properties
@@ -1,4 +1,4 @@
WelcomePanel.welcomeMessage=Welcome to to:do, your daily task reminder.\n\n\
You can use the toolbar buttons above to add, edit, or delete tasks and categories.\n\
Switch between tasks and categories using the tabs.\n\
- Click on a task in the list on the left to see details.
\ No newline at end of file
+ Click on a task in the list on the left to see details.
diff --git a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n_cs.properties b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n_cs.properties
index 0b9d2838ebe46f237410a9e68aac5584a786961e..bcec9d1d40ab38be746b47fbd892dc211fd1c09e 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n_cs.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/i18n_cs.properties
@@ -1,4 +1,5 @@
WelcomePanel.welcomeMessage=V\u00EDtejte v to:do, va\u0161em denn\u00EDm pl\u00E1nova\u010Di \u00FAloh.\n\n\
- M\u016F\u017Eete pou\u017E\u00EDt horn\u00ED tla\u010D\u00EDtka pro p\u0159id\u00E1n\u00ED, editaci, nebo odstran\u011Bn\u00ED \u00FAloh a kategori\u00ED.\n\
+ M\u016F\u017Eete pou\u017E\u00EDt horn\u00ED tla\u010D\u00EDtka pro p\u0159id\u00E1n\u00ED, editaci,\
+ nebo odstran\u011Bn\u00ED \u00FAloh a kategori\u00ED.\n\
P\u0159ep\u00EDnat mezi plohami a kategoriemi m\u016F\u017Eete pomoc\u00ED z\u00E1lo\u017Eek.\n\
- Klikn\u011Bte na \u00FAlohu nalevo pro zobrazen\u00ED jej\u00EDch detail\u016F.
\ No newline at end of file
+ Klikn\u011Bte na \u00FAlohu nalevo pro zobrazen\u00ED jej\u00EDch detail\u016F.
diff --git a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n.properties b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n.properties
index 62fd6d5284824213d30b314619f6d0ef2a8777b7..e3be4064f415aaea9f777bd619eaffb8c2b8c3f2 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n.properties
@@ -12,4 +12,4 @@ SubTaskHolderPanel.panelName=Sub tasks
SubTaskHolderPanel.completionToggle=Toggle completion
SubTaskHolderPanel.addAction=Add subtask
SubTaskHolderPanel.editAction=Edit subtask
-SubTaskHolderPanel.removeAction=Remove subtask
\ No newline at end of file
+SubTaskHolderPanel.removeAction=Remove subtask
diff --git a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n_cs.properties b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n_cs.properties
index 733a5132c02aa22ecd1f43ab452b6d00aafcc816..03aac3227b14ee704945d3bf7f91f13449ec7b1e 100644
--- a/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n_cs.properties
+++ b/src/main/resources/cz/muni/fi/pv168/project/ui/main/panel/listholder/i18n_cs.properties
@@ -12,4 +12,4 @@ SubTaskHolderPanel.panelName=Pod\u00FAlohy
SubTaskHolderPanel.completionToggle=P\u0159epnout spln\u011Bn\u00ED
SubTaskHolderPanel.addAction=P\u0159idat pod\u00FAlohu
SubTaskHolderPanel.editAction=Upravit pod\u00FAlohu
-SubTaskHolderPanel.removeAction=Smazat pod\u00FAlohu
\ No newline at end of file
+SubTaskHolderPanel.removeAction=Smazat pod\u00FAlohu