diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.html b/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.html
deleted file mode 100644
index 5184048389..0000000000
--- a/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org">
-<head>
- <title></title>
-</head>
-<body>
-<wicket:panel>
- <span wicket:id="msgCount"></span>
-</wicket:panel>
-</body>
-</html>
\ No newline at end of file
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.java
deleted file mode 100644
index 86a9ca96b2..0000000000
--- a/view/src/main/java/se/su/dsv/scipro/forum/panels/NumberOfMessagesPanel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package se.su.dsv.scipro.forum.panels;
-
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
-
-public abstract class NumberOfMessagesPanel extends Panel {
-
- private Model<String> model = Model.of("");
-
- public NumberOfMessagesPanel(final String id) {
- super(id);
- add(new Label("msgCount", model));
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- long count = getMessageCount();
-
- if (count > 0) {
- model.setObject("(" + count + ")");
- }
- }
-
- public abstract long getMessageCount();
-}
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.html b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.html
index da97aaf553..d171f8e3ba 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.html
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.html
@@ -44,7 +44,9 @@
<wicket:fragment wicket:id="readStateColumnMarkupId">
<span wicket:id="flag"></span>
- <wicket:container wicket:id="counter"></wicket:container>
+ <wicket:enclosure child="counter">
+ (<wicket:container wicket:id="counter"></wicket:container>)
+ </wicket:enclosure>
</wicket:fragment>
</wicket:panel>
</body>
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
index 4de431f9e6..423967edff 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
@@ -15,6 +15,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColu
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.LambdaColumn;
import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
@@ -257,7 +258,7 @@ public class SupervisorMyProjectsPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<Project>> item, String id, IModel<Project> projectModel) {
- // Since table cell only can contain one item, we use Wicket Fragment here. It will contains two components,
+ // Since table cell only can contain one item, we use Wicket Fragment here. It will contain two components,
// one for flag, one for unread messages counter.
Fragment fragment = new Fragment(id, "readStateColumnMarkupId", SupervisorMyProjectsPanel.this);
@@ -289,14 +290,15 @@ public class SupervisorMyProjectsPanel extends Panel {
fragment.add(readStatePanel);
- fragment.add(
- new NumberOfMessagesPanel("counter") {
- @Override
- public long getMessageCount() {
- return msgCount;
- }
+ Label counterLabel = new Label("counter", msgCount) {
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(msgCount > 0);
}
- );
+ };
+
+ fragment.add(counterLabel);
item.add(fragment);
}