small fixes after merge

Evolveum · Sep 20, 2017 · 4ee5193 · 4ee5193
1 parent 0c65e7b
commit 4ee5193
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 115 deletions.
diff --git a/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java b/...n/java/com/evolveum/midpoint/web/component/assignment/AbstractAssignmentDetailsPanel.java
@@ -62,19 +62,6 @@ public abstract class AbstractAssignmentDetailsPanel<F extends FocusType> extend
     private final static String ID_DISPLAY_NAME = "displayName";
     private final static String ID_ACTIVATION_PANEL = "activationPanel";
     private final static String ID_CONTAINERS = "otherContainers";
-//    private final static String ID_DONE_BUTTON = "doneButton";
-
-//    private static final String ID_RELATION_CONTAINER = "relationContainer";
-//    private static final String ID_RELATION = "relation";
-//
-//	private static final String ID_TENANT_CONTAINER = "tenantContainer";
-//	private static final String ID_TENANT = "tenant";
-//	private static final String ID_PROJECT_CONTAINER = "projectContainer";
-//	private static final String ID_PROJECT = "project";
-//	private static final String ID_POLICY_SITUATIONS = "policySituations";
-//	private static final String ID_POLICY_SITUATION = "policySituation";
-
-//	private static final String ID_POLICY_RULE = "policyRule";
 
     public AbstractAssignmentDetailsPanel(String id, Form<?> form, IModel<AssignmentDto> assignmentModel){
         super(id, assignmentModel);
@@ -176,7 +163,6 @@ private boolean getAssignmentBasicTabVisibity(ItemWrapper itemWrapper, ItemPath
     	return PropertyOrReferenceWrapper.class.isAssignableFrom(itemWrapper.getClass()) && !WebComponentUtil.isItemVisible(pathsToHide, itemWrapper.getPath()); 
     }
 
-    protected abstract boolean getVisibilityModel(ItemPath pathToBeFound, ItemPath parentPath);
 
     private boolean getActivationVisibileItems(ItemPath pathToCheck, ItemPath assignmentPath) {
     	if (assignmentPath.subPath(new ItemPath(AssignmentType.F_ACTIVATION, ActivationType.F_LOCKOUT_EXPIRATION_TIMESTAMP)).equivalent(pathToCheck)){
@@ -195,12 +181,6 @@ protected IModel<String> getAdditionalNameLabelStyleClass(){
         return Model.of("");
     }
 
-    protected boolean isVisible(Object path) {
-    	return !getHiddenItems().contains(path);
-    }
-
-    protected abstract List getHiddenItems();
-
-//    protected abstract void initPropertiesPanel(WebMarkupContainer propertiesPanel);
+
 
 }
diff --git a/...va/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java b/...va/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentDetailsPanel.java
@@ -36,10 +36,6 @@ public AbstractRoleAssignmentDetailsPanel(String id, Form<?> form, IModel<Assign
 		super(id, form, assignmentModel);
 	}
 
-	@Override
-	protected List getHiddenItems() {
-		return hiddenItems;
-	}
 
 	@Override
 	protected List<ItemPath> collectContainersToShow() {

diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.html b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.html
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRuleDetailsPanel.java
@@ -47,16 +47,5 @@ protected List<ItemPath> collectContainersToShow() {
 		return containersToShow;
 	}
 
-	@Override
-	protected boolean getVisibilityModel(ItemPath pathToBeFound, ItemPath parentPath) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	protected List getHiddenItems() {
-		// TODO Auto-generated method stub
-		return null;
-	}
 
 }