🔨 Move components into sub packages

TobseF · TobseF · commit dc84680efa01 · 2020-01-10T11:11:10.000+01:00
diff --git a/src/main/java/org/cleancode/journal/component/achievement/AchievementComponent.java b/src/main/java/org/cleancode/journal/component/achievement/AchievementComponent.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.achievement;
 
 import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.dependency.JsModule;
diff --git a/src/main/java/org/cleancode/journal/component/achievement/AchievementModel.java b/src/main/java/org/cleancode/journal/component/achievement/AchievementModel.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.achievement;
 
 import com.vaadin.flow.templatemodel.TemplateModel;
 
diff --git a/src/main/java/org/cleancode/journal/component/logentry/LogEntryComponent.java b/src/main/java/org/cleancode/journal/component/logentry/LogEntryComponent.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.logentry;
 
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
diff --git a/src/main/java/org/cleancode/journal/component/logentry/LogEntryModel.java b/src/main/java/org/cleancode/journal/component/logentry/LogEntryModel.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.logentry;
 
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.icon.VaadinIcon;
diff --git a/src/main/java/org/cleancode/journal/component/progressbar/GradeProgressBar.java b/src/main/java/org/cleancode/journal/component/progressbar/GradeProgressBar.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.progressbar;
 
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Span;
diff --git a/src/main/java/org/cleancode/journal/component/progressbar/PercentProgressBarComponent.java b/src/main/java/org/cleancode/journal/component/progressbar/PercentProgressBarComponent.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.progressbar;
 
 public class PercentProgressBarComponent extends ProgressBarComponent {
 
diff --git a/src/main/java/org/cleancode/journal/component/progressbar/ProgressBarComponent.java b/src/main/java/org/cleancode/journal/component/progressbar/ProgressBarComponent.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.progressbar;
 
 import com.vaadin.flow.component.Tag;
 import com.vaadin.flow.component.dependency.JsModule;
diff --git a/src/main/java/org/cleancode/journal/component/progressbar/ProgressBarModel.java b/src/main/java/org/cleancode/journal/component/progressbar/ProgressBarModel.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.progressbar;
 
 import com.vaadin.flow.templatemodel.TemplateModel;
 
diff --git a/src/main/java/org/cleancode/journal/component/speeddial/AddSpeedDial.java b/src/main/java/org/cleancode/journal/component/speeddial/AddSpeedDial.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.speeddial;
 
 import org.cleancode.journal.domain.LogEntry;
 import org.cleancode.journal.domain.Profile;
diff --git a/src/main/java/org/cleancode/journal/component/speeddial/SpeedDial.java b/src/main/java/org/cleancode/journal/component/speeddial/SpeedDial.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.speeddial;
 
 import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.dependency.JsModule;
diff --git a/src/main/java/org/cleancode/journal/component/speeddial/SpeedDialAction.java b/src/main/java/org/cleancode/journal/component/speeddial/SpeedDialAction.java
@@ -1,4 +1,4 @@
-package org.cleancode.journal.component;
+package org.cleancode.journal.component.speeddial;
 
 import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.dependency.JsModule;
diff --git a/src/main/java/org/cleancode/journal/view/AboutView.java b/src/main/java/org/cleancode/journal/view/AboutView.java
@@ -4,7 +4,7 @@
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
-import org.cleancode.journal.component.AddSpeedDial;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.service.IAchievementService;
 import org.cleancode.journal.service.IGradeService;
diff --git a/src/main/java/org/cleancode/journal/view/AchievementDialog.java b/src/main/java/org/cleancode/journal/view/AchievementDialog.java
@@ -12,7 +12,7 @@
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.select.Select;
 import com.vaadin.flow.component.textfield.TextArea;
-import org.cleancode.journal.component.AddSpeedDial;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Achievement;
 import org.cleancode.journal.domain.LogEntry;
 import org.cleancode.journal.domain.Profile;
diff --git a/src/main/java/org/cleancode/journal/view/AchievementsView.java b/src/main/java/org/cleancode/journal/view/AchievementsView.java
@@ -5,9 +5,9 @@
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
-import org.cleancode.journal.component.AchievementComponent;
-import org.cleancode.journal.component.AchievementComponent.ClickEvent;
-import org.cleancode.journal.component.AddSpeedDial;
+import org.cleancode.journal.component.achievement.AchievementComponent;
+import org.cleancode.journal.component.achievement.AchievementComponent.ClickEvent;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Achievement;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.Score;
diff --git a/src/main/java/org/cleancode/journal/view/CompendiumView.java b/src/main/java/org/cleancode/journal/view/CompendiumView.java
@@ -14,7 +14,7 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouterLink;
-import org.cleancode.journal.component.AddSpeedDial;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.grade.Grade;
 import org.cleancode.journal.domain.grade.GradeTopic;
@@ -52,7 +52,7 @@ public CompendiumView(Profile profile, IGradeService gradeService, IAchievementS
         controls.add(createFilter(gradeService));
 
         Collection<GradeTopic> gradeTopics = gradeService.loadAllTopics(getLocale());
-        table = creteTable(gradeTopics);
+        table = createTable(gradeTopics);
         add(table);
         tree = createTree(gradeTopics);
         add(tree);
@@ -101,7 +101,7 @@ private Accordion createTree(Collection<GradeTopic> gradeTopics) {
         return tree;
     }
 
-    private Grid<GradeTopic> creteTable(Collection<GradeTopic> gradeTopics) {
+    private Grid<GradeTopic> createTable(Collection<GradeTopic> gradeTopics) {
         Grid<GradeTopic> table = new Grid<>();
         table.setItems(gradeTopics);
 
diff --git a/src/main/java/org/cleancode/journal/view/GradeView.java b/src/main/java/org/cleancode/journal/view/GradeView.java
@@ -9,9 +9,9 @@
 import com.vaadin.flow.router.HasUrlParameter;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
-import org.cleancode.journal.component.AddSpeedDial;
 import org.cleancode.journal.component.BackNavigation;
 import org.cleancode.journal.component.StarRating;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.grade.GradeRating;
 import org.cleancode.journal.domain.grade.GradeRating.Rating;
diff --git a/src/main/java/org/cleancode/journal/view/JournalView.java b/src/main/java/org/cleancode/journal/view/JournalView.java
@@ -13,8 +13,12 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.router.RouteAlias;
-import org.cleancode.journal.component.*;
-import org.cleancode.journal.component.GradeProgressBar.ProgressDay;
+import org.cleancode.journal.component.StarRating;
+import org.cleancode.journal.component.logentry.LogEntryComponent;
+import org.cleancode.journal.component.logentry.LogEntryModel;
+import org.cleancode.journal.component.progressbar.GradeProgressBar;
+import org.cleancode.journal.component.progressbar.GradeProgressBar.ProgressDay;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.*;
 import org.cleancode.journal.domain.grade.Grade;
 import org.cleancode.journal.domain.grade.GradeColor;
diff --git a/src/main/java/org/cleancode/journal/view/LogDialog.java b/src/main/java/org/cleancode/journal/view/LogDialog.java
@@ -15,7 +15,7 @@
 import com.vaadin.flow.component.select.Select;
 import com.vaadin.flow.component.textfield.TextArea;
 import com.vaadin.flow.data.renderer.TextRenderer;
-import org.cleancode.journal.component.AddSpeedDial;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.LogEntry;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.grade.GradeTopic;
diff --git a/src/main/java/org/cleancode/journal/view/ProfileView.java b/src/main/java/org/cleancode/journal/view/ProfileView.java
@@ -11,8 +11,8 @@
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
-import org.cleancode.journal.component.AddSpeedDial;
-import org.cleancode.journal.component.PercentProgressBarComponent;
+import org.cleancode.journal.component.progressbar.PercentProgressBarComponent;
+import org.cleancode.journal.component.speeddial.AddSpeedDial;
 import org.cleancode.journal.domain.Profile;
 import org.cleancode.journal.domain.Score;
 import org.cleancode.journal.domain.grade.GradeColor;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.cleancode.journal.component;`
	`1`	`+package org.cleancode.journal.component.achievement;`
`2`	`2`
`3`	`3`	`import com.vaadin.flow.component.*;`
`4`	`4`	`import com.vaadin.flow.component.dependency.JsModule;`