Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of x:\midpoint
- Loading branch information
Showing
18 changed files
with
357 additions
and
112 deletions.
There are no files selected for viewing
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
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
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
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
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
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
34 changes: 34 additions & 0 deletions
34
...-gui/src/main/java/com/evolveum/midpoint/web/model/ContainerableFromPrismObjectModel.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 |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.evolveum.midpoint.web.model; | ||
|
|
||
| import com.evolveum.midpoint.prism.PrismObject; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; | ||
| import org.apache.commons.lang3.Validate; | ||
| import org.apache.wicket.model.IModel; | ||
|
|
||
| /** | ||
| * @author mederly | ||
| */ | ||
| public class ContainerableFromPrismObjectModel<O extends ObjectType> implements IModel<O> { | ||
|
|
||
| private IModel<PrismObject<O>> prismObjectModel; | ||
|
|
||
| public ContainerableFromPrismObjectModel(IModel<PrismObject<O>> prismObjectModel) { | ||
| Validate.notNull(prismObjectModel); | ||
| this.prismObjectModel = prismObjectModel; | ||
| } | ||
|
|
||
| @Override | ||
| public O getObject() { | ||
| PrismObject<O> object = prismObjectModel.getObject(); | ||
| return object != null ? object.asObjectable() : null; | ||
| } | ||
|
|
||
| @Override | ||
| public void setObject(O o) { | ||
| throw new UnsupportedOperationException("Not supported yet."); | ||
| } | ||
|
|
||
| @Override | ||
| public void detach() { | ||
| } | ||
| } |
110 changes: 110 additions & 0 deletions
110
...in/java/com/evolveum/midpoint/web/model/PrismPropertyRealValueFromContainerableModel.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 |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| * Copyright (c) 2010-2016 Evolveum | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.evolveum.midpoint.web.model; | ||
|
|
||
| import com.evolveum.midpoint.prism.*; | ||
| import com.evolveum.midpoint.prism.path.ItemPath; | ||
| import com.evolveum.midpoint.prism.polystring.PolyString; | ||
| import com.evolveum.midpoint.util.exception.SchemaException; | ||
| import com.evolveum.midpoint.util.logging.LoggingUtils; | ||
| import com.evolveum.midpoint.util.logging.Trace; | ||
| import com.evolveum.midpoint.util.logging.TraceManager; | ||
| import com.evolveum.midpoint.web.page.error.PageError; | ||
| import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; | ||
| import org.apache.commons.lang.Validate; | ||
| import org.apache.wicket.RestartResponseException; | ||
| import org.apache.wicket.model.IModel; | ||
|
|
||
| import javax.xml.namespace.QName; | ||
|
|
||
| /** | ||
| * Model that returns property real values. This implementation works on containerable models (not wrappers). | ||
| * | ||
| * Simple implementation, now it can't handle multivalue properties. | ||
| * | ||
| * @author lazyman | ||
| * @author semancik | ||
| * @author mederly | ||
| */ | ||
| public class PrismPropertyRealValueFromContainerableModel<T, C extends Containerable> implements IModel<T> { | ||
|
|
||
| private static final Trace LOGGER = TraceManager.getTrace(PrismPropertyRealValueFromContainerableModel.class); | ||
|
|
||
| private IModel<C> model; | ||
| private ItemPath path; | ||
|
|
||
| public PrismPropertyRealValueFromContainerableModel(IModel<C> model, QName item) { | ||
| this(model, new ItemPath(item)); | ||
| } | ||
|
|
||
| public PrismPropertyRealValueFromContainerableModel(IModel<C> model, ItemPath path) { | ||
| Validate.notNull(model, "Containerable model must not be null."); | ||
| Validate.notNull(path, "Item path must not be null."); | ||
|
|
||
| this.model = model; | ||
| this.path = path; | ||
| } | ||
|
|
||
| @Override | ||
| public T getObject() { | ||
| C object = model.getObject(); | ||
| PrismProperty<T> property; | ||
| try { | ||
| property = object.asPrismContainerValue().findOrCreateProperty(path); | ||
| } catch (SchemaException ex) { | ||
| LoggingUtils.logException(LOGGER, "Couldn't create property in path {}", ex, path); | ||
| //todo show message in page error [lazyman] | ||
| throw new RestartResponseException(PageError.class); | ||
| } | ||
|
|
||
| return getRealValue(property != null ? property.getRealValue() : null); | ||
| } | ||
|
|
||
| @Override | ||
| public void setObject(T object) { | ||
| try { | ||
| C obj = model.getObject(); | ||
| PrismProperty<T> property = obj.asPrismContainerValue().findOrCreateProperty(path); | ||
|
|
||
| if (object != null) { | ||
| PrismPropertyDefinition<T> def = property.getDefinition(); | ||
| if (PolyString.class.equals(def.getTypeClass())) { | ||
| object = (T) new PolyString((String) object); | ||
| } | ||
|
|
||
| property.setValue(new PrismPropertyValue<T>(object, OriginType.USER_ACTION, null)); | ||
| } else { | ||
| PrismContainerValue parent = (PrismContainerValue) property.getParent(); | ||
| parent.remove(property); | ||
| } | ||
| } catch (Exception ex) { | ||
| LoggingUtils.logException(LOGGER, "Couldn't update prism property model", ex); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void detach() { | ||
| } | ||
|
|
||
| private T getRealValue(T value) { | ||
| if (value instanceof PolyString) { | ||
| value = (T) ((PolyString) value).getOrig(); | ||
| } | ||
|
|
||
| return value; | ||
| } | ||
| } |
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
Oops, something went wrong.