Interim commit.

Evolveum · Jun 12, 2014 · e4e5db4 · e4e5db4
1 parent dbb9db8
commit e4e5db4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 30 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
@@ -94,22 +94,22 @@ public class ObjectWrapper implements Serializable {
     private PrismContainerDefinition editedDefinition;
     private RefinedObjectClassDefinition refinedObjectClassDefinition;
 
-
     public ObjectWrapper(String displayName, String description, PrismObject object, PrismContainerDefinition editedDefinition, ContainerStatus status) {
-		Validate.notNull(object, "Object must not be null.");
-		Validate.notNull(status, "Container status must not be null.");
-
-		this.displayName = displayName;
-		this.description = description;
-		this.object = object;
-		this.status = status;
-		this.editedDefinition = editedDefinition;
-
-        createContainers();
+        this(displayName, description, object, editedDefinition, null, status);
 	}
+
     public ObjectWrapper(String displayName, String description, PrismObject object, PrismContainerDefinition editedDefinition, RefinedObjectClassDefinition refinedObjectClassDefinition, ContainerStatus status) {
-		this(displayName, description, object, editedDefinition, status);
+        Validate.notNull(object, "Object must not be null.");
+        Validate.notNull(status, "Container status must not be null.");
+
+        this.displayName = displayName;
+        this.description = description;
+        this.object = object;
+        this.status = status;
+        this.editedDefinition = editedDefinition;
         this.refinedObjectClassDefinition = refinedObjectClassDefinition;
+
+        createContainers();
 	}
 
     public List<PrismProperty> getAssociations() {
@@ -235,7 +235,6 @@ private List<ContainerWrapper> createCustomContainerWrapper(PrismObject object,
 		List<ContainerWrapper> list = new ArrayList<ContainerWrapper>();
 		if (container == null) {
 			PrismContainerDefinition definition = getDefinition().findContainerDefinition(name);
-//			PrismContainerDefinition definition = object.getDefinition().findContainerDefinition(name);
 			container = definition.instantiate();
 		}
 
@@ -255,14 +254,6 @@ private void addSubresult(OperationResult subResult) {
         result.addSubresult(subResult);
     }
 
-//    private PrismObjectDefinition determineObjectDefinition(){
-//    	if (editedDefinition != null){
-//    		return editedDefinition;
-//    	}
-//    	
-//    	return object.getDefinition();
-//    }
-
 	private List<ContainerWrapper> createContainers() {
         result = new OperationResult(CREATE_CONTAINERS);
 
@@ -276,14 +267,6 @@ private List<ContainerWrapper> createContainers() {
 				if (attributes == null) {
 					PrismContainerDefinition definition = object.getDefinition().findContainerDefinition(
 							ShadowType.F_ATTRIBUTES);
-//					if (editedDefinition != null){
-//						definition = editedDefinition.findContainerDefinition(
-//								ShadowType.F_ATTRIBUTES);
-//					} else {
-//						definition = object.getDefinition().findContainerDefinition(
-//								ShadowType.F_ATTRIBUTES);
-//					}	
-//					
 					attributes = definition.instantiate();
 				}
 
@@ -294,7 +277,7 @@ private List<ContainerWrapper> createContainers() {
 				container.setMain(true);
 				containers.add(container);
 
-				if (hasResourceCapability(((ShadowType) object.asObjectable()).getResource(), ActivationCapabilityType.class)){
+				if (hasResourceCapability(((ShadowType) object.asObjectable()).getResource(), ActivationCapabilityType.class)) {
 					containers.addAll(createCustomContainerWrapper(object, ShadowType.F_ACTIVATION));
 				}
 				if (ShadowType.class.isAssignableFrom(clazz) &&

diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -830,6 +830,8 @@ public RefinedObjectClassDefinition getEditObjectClassDefinition(PrismObject<Sha
 				rAttrDef.setOverrideCanModify(false);
 			}
 		}
+
+        // TODO what about associations, activation, and credentials?
 
     	return rOCDef;
 	}