Resource wizard tooltips. Removing redundant kindDefault.

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010-2013 Evolveum
+# Copyright (c) 2010-2014 Evolveum
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,24 +17,23 @@
 WizardStep.title=
 SchemaHandlingStep.message.validationError=Inserted objectClass value: '{0}' is not valid. Please provide valid objectClass value.
 
-SchemaStep.tooltip.kind=TODO: SchemaStep.tooltip.kind
-SchemaStep.tooltip.intent=TODO: SchemaStep.tooltip.intent
-SchemaStep.tooltip.nativeObjectClass=TODO: SchemaStep.tooltip.nativeObjectClass
-SchemaStep.tooltip.isDefault=TODO: SchemaStep.tooltip.isDefault
-SchemaStep.tooltip.isKindDefault=TODO: SchemaStep.tooltip.isKindDefault
-
-SchemaHandlingStep.tooltip.kind=TODO: SchemaHandlingStep.tooltip.kind
-SchemaHandlingStep.tooltip.intent=TODO: SchemaHandlingStep.tooltip.intent
-SchemaHandlingStep.tooltip.default=TODO: SchemaHandlingStep.tooltip.default
-SchemaHandlingStep.tooltip.dependency=TODO: SchemaHandlingStep.tooltip.dependency
-SchemaHandlingStep.tooltip.objectClass=TODO: SchemaHandlingStep.tooltip.objectClass
-SchemaHandlingStep.tooltip.attributes=TODO: SchemaHandlingStep.tooltip.attributes
-SchemaHandlingStep.tooltip.associations=TODO: SchemaHandlingStep.tooltip.associations
-SchemaHandlingStep.tooltip.assignmentPolicyRef=TODO: SchemaHandlingStep.tooltip.assignmentPolicyRef
-SchemaHandlingStep.tooltip.iteration=TODO: SchemaHandlingStep.tooltip.iteration
-SchemaHandlingStep.tooltip.protected=TODO: SchemaHandlingStep.tooltip.protected
-SchemaHandlingStep.tooltip.activation=TODO: SchemaHandlingStep.tooltip.activation
-SchemaHandlingStep.tooltip.credentials=TODO: SchemaHandlingStep.tooltip.credentials
+SchemaStep.tooltip.kind=Kind specified what this object is, whether it is account, entitlement or something else.
+SchemaStep.tooltip.intent=Intent specifies what midPoint should do with the object. Intent sorts objects of the same kind into several categories. Objects with different intents may be handled differently by midPoint.
+SchemaStep.tooltip.nativeObjectClass=Object class name how it is natively known by the resource (or the connector).
+SchemaStep.tooltip.isDefault=If set to true then this definition is the default for its kind. I.e. if no intent is explicitly specified then this definition will be used.
+
+SchemaHandlingStep.tooltip.kind=Kind specified what this object is, whether it is account, entitlement or something else.
+SchemaHandlingStep.tooltip.intent=Intent specifies what midPoint should do with the object. Intent sorts objects of the same kind into several categories. Objects with different intents may be handled differently by midPoint.
+SchemaHandlingStep.tooltip.default=If set to true then this definition is the default for its kind. I.e. if no intent is explicitly specified then this definition will be used.
+SchemaHandlingStep.tooltip.dependency=Dependencies are object types that has to be processed before this object types is processed. I.e. this object type depends on them. The object types on which this object type depends will be provisioned before this object type. Dependencies are used to impose ordering into provisioning operations.
+SchemaHandlingStep.tooltip.objectClass=Object class from the schema that will be used to construct instances of this object type.
+SchemaHandlingStep.tooltip.attributes=Definitions how individual attributes are to be handled. Each definition may contain inbound/outbound mappings, attribute limitations, etc.
+SchemaHandlingStep.tooltip.associations=Definitions how entitlement associations are to be handled.
+SchemaHandlingStep.tooltip.assignmentPolicyRef=Assignment policy specifies how strictly are the assignments enforced. None: the assignments are not enforced at all; Positive: assignments only add values (never substract); Relative: only changes are propagated, existing values are left as they are; Full: everything is strictly enforced (both changed and existing values).
+SchemaHandlingStep.tooltip.iteration=Iteratively find values for unique attributes such as identifiers. MidPoint will try several times to find a unique value for such attributes. 
+SchemaHandlingStep.tooltip.protected=Specification of protected instances of this object type. MidPoint can see protected instances but they cannot be touched. Any attempt to modify them will fail. This is used to protect emergency administration accounts such as "root" or "administrator".
+SchemaHandlingStep.tooltip.activation=Definition how to map activation states (enabled/disabled/archived) and dates (validity from and to).
+SchemaHandlingStep.tooltip.credentials=Definition how to handle credentials such as passwords.
 
 SchemaHandlingStep.dependency.tooltip.order=TODO: SchemaHandlingStep.dependency.tooltip.order
 SchemaHandlingStep.dependency.tooltip.strictness=TODO: SchemaHandlingStep.dependency.tooltip.strictness

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html

@@ -113,15 +113,6 @@ <h3><wicket:message key="SchemaListPanel.details"/></h3>
                         </dd>
                     </dl>
 
-                    <dl class="dl-horizontal">
-                        <dt>
-                            <label><wicket:message key="SchemaListPanel.details.kindDefault" /></label>
-                            <i wicket:id="isKindDefaultTooltip" wicket:message="title:SchemaStep.tooltip.isKindDefault"/>
-                        </dt>
-                        <dd>
-                            <input wicket:id="isKindDefault" type="checkbox" />
-                        </dd>
-                    </dl>
                 </div>
             </div>
 

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java

@@ -86,12 +86,10 @@ public class SchemaListPanel extends SimplePanel<PrismObject<ResourceType>> {
     private static final String ID_DETAILS_INTENT = "intent";
     private static final String ID_DETAILS_NATIVE_OBJECT_CLASS = "nativeObjectClass";
     private static final String ID_DETAILS_DEFAULT = "isDefault";
-    private static final String ID_DETAILS_KIND_DEFAULT = "isKindDefault";
     private static final String ID_T_KIND = "kindTooltip";
     private static final String ID_T_INTENT = "intentTooltip";
     private static final String ID_T_NATIVE_OBJECT_CLASS = "nativeObjectClassTooltip";
     private static final String ID_T_DEFAULT = "isDefaultTooltip";
-    private static final String ID_T_KIND_DEFAULT = "isKindDefaultTooltip";
 
     private IModel<List<ObjectClassDto>> allClasses;
     private LoadableModel<ObjectClassDetailsDto> detailsModel;
@@ -228,10 +226,6 @@ private void initDetailsPanel(){
         isDefault.setEnabled(false);
         detailsContainer.add(isDefault);
 
-        CheckBox idKindDefault = new CheckBox(ID_DETAILS_KIND_DEFAULT, new PropertyModel<Boolean>(detailsModel, ObjectClassDetailsDto.F_IS_KIND_DEFAULT));
-        idKindDefault.setEnabled(false);
-        detailsContainer.add(idKindDefault);
-
         Label kindTooltip = new Label(ID_T_KIND);
         kindTooltip.add(new InfoTooltipBehavior());
         detailsContainer.add(kindTooltip);
@@ -247,10 +241,6 @@ private void initDetailsPanel(){
         Label defaultTooltip = new Label(ID_T_DEFAULT);
         defaultTooltip.add(new InfoTooltipBehavior());
         detailsContainer.add(defaultTooltip);
-
-        Label kindDefaultTooltip = new Label(ID_T_KIND_DEFAULT);
-        kindDefaultTooltip.add(new InfoTooltipBehavior());
-        detailsContainer.add(kindDefaultTooltip);
     }
 
     private List<IColumn> initColumns() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.properties

@@ -29,5 +29,4 @@ SchemaListPanel.details.description=Description
 SchemaListPanel.details.kind=Kind
 SchemaListPanel.details.intent=Intent
 SchemaListPanel.details.nativeObjectClass=Native obj. class
-SchemaListPanel.details.default=Default
-SchemaListPanel.details.kindDefault=Kind default
+SchemaListPanel.details.default=Default

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDetailsDto.java

@@ -41,7 +41,6 @@ public class ObjectClassDetailsDto implements Serializable{
     private String intent = VALUE_NOT_SPECIFIED;
     private String nativeObjectClass = VALUE_NOT_SPECIFIED;
     private boolean isDefault;
-    private boolean isKindDefault;
 
     public ObjectClassDetailsDto(RefinedObjectClassDefinition definition){
         if(definition != null){
@@ -54,8 +53,7 @@ public ObjectClassDetailsDto(RefinedObjectClassDefinition definition){
 
             intent = definition.getIntent() != null ? definition.getIntent() : VALUE_NOT_SPECIFIED;
             nativeObjectClass = definition.getNativeObjectClass() != null ? definition.getNativeObjectClass() : VALUE_NOT_SPECIFIED;
-            isDefault = definition.isDefault();
-            isKindDefault = definition.isDefaultInAKind();
+            isDefault = definition.isDefaultInAKind();
         }
     }
 
@@ -83,10 +81,6 @@ public boolean isDefault() {
         return isDefault;
     }
 
-    public boolean isKindDefault() {
-        return isKindDefault;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -95,7 +89,6 @@ public boolean equals(Object o) {
         ObjectClassDetailsDto that = (ObjectClassDetailsDto) o;
 
         if (isDefault != that.isDefault) return false;
-        if (isKindDefault != that.isKindDefault) return false;
         if (description != null ? !description.equals(that.description) : that.description != null) return false;
         if (displayName != null ? !displayName.equals(that.displayName) : that.displayName != null) return false;
         if (intent != null ? !intent.equals(that.intent) : that.intent != null) return false;
@@ -114,7 +107,6 @@ public int hashCode() {
         result = 31 * result + (intent != null ? intent.hashCode() : 0);
         result = 31 * result + (nativeObjectClass != null ? nativeObjectClass.hashCode() : 0);
         result = 31 * result + (isDefault ? 1 : 0);
-        result = 31 * result + (isKindDefault ? 1 : 0);
         return result;
     }
 }