diff --git a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java index ee2ee0dd27..633acaab17 100644 --- a/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java +++ b/app/src/main/java/org/jboss/hal/client/runtime/subsystem/batch/BatchPreview.java @@ -33,7 +33,17 @@ import static org.jboss.gwt.elemento.core.Elements.h; import static org.jboss.gwt.elemento.core.Elements.section; import static org.jboss.hal.client.runtime.subsystem.batch.AddressTemplates.BATCH_SUBSYSTEM_TEMPLATE; -import static org.jboss.hal.dmr.ModelDescriptionConstants.*; +import static org.jboss.hal.dmr.ModelDescriptionConstants.ACTIVE_COUNT; +import static org.jboss.hal.dmr.ModelDescriptionConstants.CURRENT_THREAD_COUNT; +import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_JOB_REPOSITORY; +import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT_THREAD_POOL; +import static org.jboss.hal.dmr.ModelDescriptionConstants.INCLUDE_RUNTIME; +import static org.jboss.hal.dmr.ModelDescriptionConstants.LARGEST_THREAD_COUNT; +import static org.jboss.hal.dmr.ModelDescriptionConstants.MAX_THREADS; +import static org.jboss.hal.dmr.ModelDescriptionConstants.READ_RESOURCE_OPERATION; +import static org.jboss.hal.dmr.ModelDescriptionConstants.RECURSIVE; +import static org.jboss.hal.dmr.ModelDescriptionConstants.RESTART_JOBS_ON_RESUME; +import static org.jboss.hal.dmr.ModelDescriptionConstants.THREAD_POOL; import static org.jboss.hal.dmr.ModelNodeHelper.failSafeGet; public class BatchPreview extends PreviewContent { @@ -41,6 +51,7 @@ public class BatchPreview extends PreviewContent { private final Dispatcher dispatcher; private final StatementContext statementContext; private final PreviewAttributes attributes; + private final Utilization activeCount; private final Utilization currentThreadCount; private final Utilization largestThreadCount; private final HTMLElement details; @@ -55,8 +66,10 @@ public BatchPreview(Dispatcher dispatcher, StatementContext statementContext, Re details = section() .add(h(2, Names.THREADS)) - .add(currentThreadCount = new Utilization( + .add(activeCount = new Utilization( resources.constants().active(), Names.THREADS, false, true)) + .add(currentThreadCount = new Utilization( + resources.constants().current(), Names.THREADS, false, true)) .add(largestThreadCount = new Utilization( resources.constants().largest(), Names.THREADS, false, true)).element(); @@ -82,8 +95,10 @@ public void update(SubsystemMetadata item) { if (threadPool.isDefined()) { Elements.setVisible(details, true); int max = threadPool.get(MAX_THREADS).asInt(); + int active = threadPool.get(ACTIVE_COUNT).asInt(); int current = threadPool.get(CURRENT_THREAD_COUNT).asInt(); int largest = threadPool.get(LARGEST_THREAD_COUNT).asInt(); + activeCount.update(active, max); currentThreadCount.update(current, max); largestThreadCount.update(largest, max); } diff --git a/resources/src/main/java/org/jboss/hal/resources/Constants.java b/resources/src/main/java/org/jboss/hal/resources/Constants.java index 370b675b7a..5ffbabd885 100644 --- a/resources/src/main/java/org/jboss/hal/resources/Constants.java +++ b/resources/src/main/java/org/jboss/hal/resources/Constants.java @@ -105,6 +105,7 @@ public interface Constants extends com.google.gwt.i18n.client.Constants { String create(); String createAccount(); String creationTime(); + String current(); String currentPage(); String data(); String day(); diff --git a/resources/src/main/resources/org/jboss/hal/resources/Constants.properties b/resources/src/main/resources/org/jboss/hal/resources/Constants.properties index d4e646453a..db4c50d0db 100644 --- a/resources/src/main/resources/org/jboss/hal/resources/Constants.properties +++ b/resources/src/main/resources/org/jboss/hal/resources/Constants.properties @@ -89,6 +89,7 @@ counter=Counter create=Create createAccount=Create Account creationTime=Creation Time +current=Current currentPage=Current Page custom=Custom data=Data diff --git a/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties b/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties index 552aefbe91..de4b1120f6 100644 --- a/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties +++ b/resources/src/main/resources/org/jboss/hal/resources/Constants_de.properties @@ -89,6 +89,7 @@ counter=Zähler create=Erstellen createAccount=Konto erstellen creationTime=Erstellungszeit +current=Aktuell currentPage=Aktuelle Seite custom=Benutzerdefiniert data=Daten