From fe38e9ec6df7d06188acaee76cd647bbbfee0244 Mon Sep 17 00:00:00 2001 From: Erik Suta Date: Wed, 22 Oct 2014 14:30:12 +0200 Subject: [PATCH] MID-2060 fix. --- .../component/LoggingConfigPanel.java | 23 +++++++++++++++---- .../dto/LoggerConfiguration.java | 2 +- .../admin/configuration/dto/LoggingDto.java | 8 +++---- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java index c0eda5b04da..db42dbd41df 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java @@ -42,6 +42,7 @@ import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.form.OnChangeAjaxBehavior; import org.apache.wicket.behavior.AttributeAppender; +import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider; import org.apache.wicket.markup.html.basic.Label; @@ -132,7 +133,7 @@ private void initLoggers() { new PropertyModel>(getModel(), "loggers")); TablePanel table = new TablePanel<>(ID_LOGGERS_TABLE, provider, initLoggerColumns()); table.setOutputMarkupId(true); - table.setShowPaging(false); + table.setShowPaging(true); add(table); AjaxButton addStandardLogger = new AjaxButton(ID_BUTTON_ADD_STANDARD_LOGGER, @@ -174,8 +175,6 @@ public void onClick(AjaxRequestTarget target) { } }; add(deleteLogger); - - //initProfiling(); } private void initRoot() { @@ -259,6 +258,8 @@ private void addStandardLoggerPerformed(AjaxRequestTarget target){ logger.setEditing(true); dto.getLoggers().add(logger); + TablePanel loggersTable = getLoggersTable(); + adjustLoggersTablePage(loggersTable, dto); target.add(getLoggersTable()); } @@ -268,7 +269,9 @@ private void addComponentLoggerPerformed(AjaxRequestTarget target) { logger.setEditing(true); dto.getLoggers().add(logger); - target.add(getLoggersTable()); + TablePanel loggersTable = getLoggersTable(); + adjustLoggersTablePage(loggersTable, dto); + target.add(loggersTable); } private void addClassLoggerPerformed(AjaxRequestTarget target) { @@ -277,9 +280,21 @@ private void addClassLoggerPerformed(AjaxRequestTarget target) { logger.setEditing(true); dto.getLoggers().add(logger); + TablePanel loggersTable = getLoggersTable(); + adjustLoggersTablePage(loggersTable, dto); target.add(getLoggersTable()); } + private void adjustLoggersTablePage(TablePanel loggersTable, LoggingDto dto){ + if(loggersTable != null && dto.getLoggers().size() % 10 == 1 && dto.getLoggers().size() != 1){ + DataTable table = loggersTable.getDataTable(); + + if(table != null){ + table.setCurrentPage((long)(dto.getLoggers().size()/10)); + } + } + } + private TablePanel getLoggersTable() { return (TablePanel) get(ID_LOGGERS_TABLE); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerConfiguration.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerConfiguration.java index c3ff3c5cdea..fdb34d2756c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerConfiguration.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggerConfiguration.java @@ -30,7 +30,7 @@ public abstract class LoggerConfiguration extends Selectable implements Editable private boolean editing; private LoggingLevelType level; - private List appenders = new ArrayList(); + private List appenders = new ArrayList<>(); public abstract String getName(); public abstract void setName(String name); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java index ee71347b401..0a2af3d6de1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/LoggingDto.java @@ -32,7 +32,7 @@ public class LoggingDto implements Serializable { public static String F_APPENDERS = "appenders"; public static final String LOGGER_PROFILING = "PROFILING"; - public static final Map componentMap = new HashMap(); + public static final Map componentMap = new HashMap<>(); static { componentMap.put("com.evolveum.midpoint", LoggingComponentType.ALL); @@ -51,13 +51,13 @@ public class LoggingDto implements Serializable { private LoggingLevelType rootLevel; private String rootAppender; - private List loggers = new ArrayList(); - private List filters = new ArrayList(); + private List loggers = new ArrayList<>(); + private List filters = new ArrayList<>(); private ProfilingLevel profilingLevel; private String profilingAppender; - private List appenders = new ArrayList(); + private List appenders = new ArrayList<>(); private boolean auditLog = false; private boolean auditDetails;