Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
smal improvements for refresh behaviour, change archetype and livesyn…
…c token management.
- Loading branch information
Showing
17 changed files
with
2,153 additions
and
2,252 deletions.
There are no files selected for viewing
319 changes: 157 additions & 162 deletions
319
gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,162 +1,157 @@ | ||
| /* | ||
| * Copyright (c) 2010-2017 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.api.component; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.page.PageBase; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.prism.PrismContext; | ||
| import com.evolveum.midpoint.schema.SchemaHelper; | ||
| import com.evolveum.midpoint.prism.polystring.PolyString; | ||
| import com.evolveum.midpoint.web.security.MidPointApplication; | ||
| import com.evolveum.midpoint.web.security.MidPointAuthWebSession; | ||
| import com.evolveum.midpoint.web.security.WebApplicationConfiguration; | ||
| import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.apache.wicket.markup.html.panel.Panel; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.StringResourceModel; | ||
| import org.jetbrains.annotations.Contract; | ||
|
|
||
| /** | ||
| * Base class for most midPoint GUI panels. It has a constructor and | ||
| * utility methods for convenient handling of the model. It also has | ||
| * other utility methods often used in reusable components. | ||
| * <p> | ||
| * Almost all reusable components should extend this class. | ||
| * | ||
| * @author lazyman | ||
| * @author semancik | ||
| */ | ||
| public class BasePanel<T> extends Panel { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private IModel<T> model; | ||
|
|
||
| public BasePanel(String id) { | ||
| super(id); | ||
| } | ||
|
|
||
| // public BasePanel(String id, T object) { | ||
| // super(id); | ||
| // this.model = Model.of(object); | ||
| // } | ||
|
|
||
| public BasePanel(String id, IModel<T> model) { | ||
| super(id); | ||
| this.model = model == null ? createModel() : model; | ||
| } | ||
|
|
||
| public IModel<T> createModel() { | ||
| return null; | ||
| } | ||
|
|
||
| public IModel<T> getModel() { | ||
| return model; | ||
| } | ||
|
|
||
| public T getModelObject() { | ||
| return model != null ? model.getObject() : null; | ||
| } | ||
|
|
||
| public String getString(String resourceKey, Object... objects) { | ||
| return createStringResource(resourceKey, objects).getString(); | ||
| } | ||
|
|
||
| public String getString(Enum<?> e) { | ||
| return createStringResource(e).getString(); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(String resourceKey, IModel<?> model, Object... objects) { | ||
| return new StringResourceModel(resourceKey, this).setModel(model) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(String resourceKey, Object... objects) { | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(PolyString polystringKey, Object... objects) { | ||
| String resourceKey = null; | ||
| if (polystringKey != null) { | ||
| // TODO later: use polystringKey.getKey() | ||
| resourceKey = polystringKey.getOrig(); | ||
| } | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(PolyStringType polystringKey, Object... objects) { | ||
| String resourceKey = null; | ||
| if (polystringKey != null) { | ||
| // TODO later: use polystringKey.getKey() | ||
| resourceKey = polystringKey.getOrig(); | ||
| } | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e) { | ||
| return createStringResource(e, null); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e, String prefix) { | ||
| return createStringResource(e, prefix, null); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e, String prefix, String nullKey) { | ||
| StringBuilder sb = new StringBuilder(); | ||
| if (StringUtils.isNotEmpty(prefix)) { | ||
| sb.append(prefix).append('.'); | ||
| } | ||
|
|
||
| if (e == null) { | ||
| if (StringUtils.isNotEmpty(nullKey)) { | ||
| sb.append(nullKey); | ||
| } else { | ||
| sb = new StringBuilder(); | ||
| } | ||
| } else { | ||
| sb.append(e.getDeclaringClass().getSimpleName()).append('.'); | ||
| sb.append(e.name()); | ||
| } | ||
|
|
||
| return createStringResource(sb.toString()); | ||
| } | ||
|
|
||
| @Contract(pure = true) | ||
| public PageBase getPageBase() { | ||
| return WebComponentUtil.getPageBase(this); | ||
| } | ||
|
|
||
| public PrismContext getPrismContext() { | ||
| return getPageBase().getPrismContext(); | ||
| } | ||
|
|
||
| public SchemaHelper getSchemaHelper() { | ||
| return getPageBase().getSchemaHelper(); | ||
| } | ||
|
|
||
| protected String createComponentPath(String... components) { | ||
| return StringUtils.join(components, ":"); | ||
| } | ||
|
|
||
| public WebApplicationConfiguration getWebApplicationConfiguration() { | ||
| MidPointApplication application = MidPointApplication.get(); | ||
| return application.getWebApplicationConfiguration(); | ||
| } | ||
|
|
||
| @Override | ||
| public MidPointAuthWebSession getSession() { | ||
| return (MidPointAuthWebSession) super.getSession(); | ||
| } | ||
| } | ||
| /* | ||
| * Copyright (c) 2010-2017 Evolveum and contributors | ||
| * | ||
| * This work is dual-licensed under the Apache License 2.0 | ||
| * and European Union Public License. See LICENSE file for details. | ||
| */ | ||
| package com.evolveum.midpoint.gui.api.component; | ||
|
|
||
| import com.evolveum.midpoint.gui.api.page.PageBase; | ||
| import com.evolveum.midpoint.gui.api.util.WebComponentUtil; | ||
| import com.evolveum.midpoint.prism.PrismContext; | ||
| import com.evolveum.midpoint.schema.SchemaHelper; | ||
| import com.evolveum.midpoint.prism.polystring.PolyString; | ||
| import com.evolveum.midpoint.web.security.MidPointApplication; | ||
| import com.evolveum.midpoint.web.security.MidPointAuthWebSession; | ||
| import com.evolveum.midpoint.web.security.WebApplicationConfiguration; | ||
| import com.evolveum.prism.xml.ns._public.types_3.PolyStringType; | ||
|
|
||
| import org.apache.commons.lang.StringUtils; | ||
| import org.apache.wicket.markup.html.panel.Panel; | ||
| import org.apache.wicket.model.IModel; | ||
| import org.apache.wicket.model.StringResourceModel; | ||
| import org.jetbrains.annotations.Contract; | ||
|
|
||
| /** | ||
| * Base class for most midPoint GUI panels. It has a constructor and | ||
| * utility methods for convenient handling of the model. It also has | ||
| * other utility methods often used in reusable components. | ||
| * <p> | ||
| * Almost all reusable components should extend this class. | ||
| * | ||
| * @author lazyman | ||
| * @author semancik | ||
| */ | ||
| public class BasePanel<T> extends Panel { | ||
| private static final long serialVersionUID = 1L; | ||
|
|
||
| private IModel<T> model; | ||
|
|
||
| public BasePanel(String id) { | ||
| super(id); | ||
| } | ||
|
|
||
| public BasePanel(String id, IModel<T> model) { | ||
| super(id); | ||
| this.model = model == null ? createModel() : model; | ||
| } | ||
|
|
||
| public IModel<T> createModel() { | ||
| return null; | ||
| } | ||
|
|
||
| public IModel<T> getModel() { | ||
| return model; | ||
| } | ||
|
|
||
| public T getModelObject() { | ||
| return model != null ? model.getObject() : null; | ||
| } | ||
|
|
||
| public String getString(String resourceKey, Object... objects) { | ||
| return createStringResource(resourceKey, objects).getString(); | ||
| } | ||
|
|
||
| public String getString(Enum<?> e) { | ||
| return createStringResource(e).getString(); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(String resourceKey, IModel<?> model, Object... objects) { | ||
| return new StringResourceModel(resourceKey, this).setModel(model) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(String resourceKey, Object... objects) { | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(PolyString polystringKey, Object... objects) { | ||
| String resourceKey = null; | ||
| if (polystringKey != null) { | ||
| // TODO later: use polystringKey.getKey() | ||
| resourceKey = polystringKey.getOrig(); | ||
| } | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(PolyStringType polystringKey, Object... objects) { | ||
| String resourceKey = null; | ||
| if (polystringKey != null) { | ||
| // TODO later: use polystringKey.getKey() | ||
| resourceKey = polystringKey.getOrig(); | ||
| } | ||
| return new StringResourceModel(resourceKey, this).setModel(null) | ||
| .setDefaultValue(resourceKey) | ||
| .setParameters(objects); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e) { | ||
| return createStringResource(e, null); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e, String prefix) { | ||
| return createStringResource(e, prefix, null); | ||
| } | ||
|
|
||
| public StringResourceModel createStringResource(Enum<?> e, String prefix, String nullKey) { | ||
| StringBuilder sb = new StringBuilder(); | ||
| if (StringUtils.isNotEmpty(prefix)) { | ||
| sb.append(prefix).append('.'); | ||
| } | ||
|
|
||
| if (e == null) { | ||
| if (StringUtils.isNotEmpty(nullKey)) { | ||
| sb.append(nullKey); | ||
| } else { | ||
| sb = new StringBuilder(); | ||
| } | ||
| } else { | ||
| sb.append(e.getDeclaringClass().getSimpleName()).append('.'); | ||
| sb.append(e.name()); | ||
| } | ||
|
|
||
| return createStringResource(sb.toString()); | ||
| } | ||
|
|
||
| @Contract(pure = true) | ||
| public PageBase getPageBase() { | ||
| return WebComponentUtil.getPageBase(this); | ||
| } | ||
|
|
||
| public PrismContext getPrismContext() { | ||
| return getPageBase().getPrismContext(); | ||
| } | ||
|
|
||
| public SchemaHelper getSchemaHelper() { | ||
| return getPageBase().getSchemaHelper(); | ||
| } | ||
|
|
||
| protected String createComponentPath(String... components) { | ||
| return StringUtils.join(components, ":"); | ||
| } | ||
|
|
||
| public WebApplicationConfiguration getWebApplicationConfiguration() { | ||
| MidPointApplication application = MidPointApplication.get(); | ||
| return application.getWebApplicationConfiguration(); | ||
| } | ||
|
|
||
| @Override | ||
| public MidPointAuthWebSession getSession() { | ||
| return (MidPointAuthWebSession) super.getSession(); | ||
| } | ||
| } |
Oops, something went wrong.