MID-2533 not fixed yet

Evolveum · Sep 2, 2015 · ce418b0 · ce418b0
1 parent 2a33754
commit ce418b0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
@@ -75,7 +75,7 @@ public class PageOrgTree extends PageAdminUsers {
     public PageOrgTree() {
         initLayout();
     }
-    
+
     private void initLayout() {
         final IModel<List<ITab>> tabModel = new LoadableModel<List<ITab>>(false) {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
@@ -140,20 +140,20 @@ public class PageOrgUnit extends PageAdminUsers implements ProgressReportingAwar
     private static final String ID_EXTENSION_LABEL = "extensionLabel";
     private static final String ID_EXTENSION = "extension";
     private static final String ID_EXTENSION_PROPERTY = "property";
-    
+
     private static final String ID_ACCOUNT_LIST = "accountList";
     private static final String ID_ACCOUNTS = "accounts";
     private static final String ID_ACCOUNT_MENU = "accountMenu";
     private static final String ID_ACCOUNT_CHECK_ALL = "accountCheckAll";
-    
+
 
     //private ContainerStatus status;
     private IModel<PrismObject<OrgType>> orgModel;
     private IModel<List<OrgType>> parentOrgUnitsModel;
     private IModel<List<PrismPropertyValue>> orgTypeModel;
     private IModel<List<PrismPropertyValue>> orgMailDomainModel;
     private IModel<ContainerWrapper> extensionModel;
-    
+
     private LoadableModel<List<UserAccountDto>> accountsModel;
     private ObjectWrapper orgWrapper;
 
@@ -304,7 +304,7 @@ private ContainerWrapper loadExtensionWrapper(){
 
         return extensionWrapper;
     }
-    
+
     private List<UserAccountDto> loadShadowWrappers() {
         List<UserAccountDto> list = new ArrayList<UserAccountDto>();
 
@@ -340,13 +340,13 @@ private List<UserAccountDto> loadShadowWrappers() {
                 description.append(WebMiscUtil.getOrigStringFromPoly(accountType.getName()));
 
                 ObjectWrapper wrapper = ObjectWrapperUtil.createObjectWrapper(resourceName, description.toString(),
-                            account, ContainerStatus.MODIFYING, true, this);
+                        account, ContainerStatus.MODIFYING, true, this);
 //                ObjectWrapper wrapper = new ObjectWrapper(resourceName, WebMiscUtil.getOrigStringFromPoly(accountType
 //                        .getName()), account, ContainerStatus.MODIFYING);
                 wrapper.setFetchResult(OperationResult.createOperationResult(fetchResult));
                 wrapper.setSelectable(true);
                 wrapper.setMinimalized(true);
-                
+
 //                PrismContainer<ShadowAssociationType> associationContainer = account.findContainer(ShadowType.F_ASSOCIATION);
 //                if (associationContainer != null && associationContainer.getValues() != null){
 //                	List<PrismProperty> associations = new ArrayList<>(associationContainer.getValues().size());
@@ -385,9 +385,9 @@ private List<UserAccountDto> loadShadowWrappers() {
 
         return list;
     }
-    
+
     private String getResourceName(String oid){
-    	String OPERATION_SEARCH_RESOURCE = PageOrgUnit.class.getName()+ ".searchAccountResource";
+        String OPERATION_SEARCH_RESOURCE = PageOrgUnit.class.getName()+ ".searchAccountResource";
         OperationResult result = new OperationResult(OPERATION_SEARCH_RESOURCE);
         Task task = createSimpleTask(OPERATION_SEARCH_RESOURCE);
 
@@ -626,7 +626,7 @@ protected void populateItem(ListItem<PropertyWrapper> item) {
         extensionProperties.setReuseItems(true);
         form.add(extensionProperties);
 
-        
+
         WebMarkupContainer accounts = new WebMarkupContainer(ID_ACCOUNTS);
         accounts.setOutputMarkupId(true);
         form.add(accounts);
@@ -742,7 +742,7 @@ private PrismObject<OrgType> buildUnitFromModel(List<ObjectReferenceType> parent
                 }
             }
 
-        //We are editing OrgUnit
+            //We are editing OrgUnit
         }else if (parentOrgUnitsModel != null && parentOrgUnitsModel.getObject() != null) {
             for (OrgType parent : parentOrgUnitsModel.getObject()) {
                 if (parent != null && WebMiscUtil.getName(parent) != null && !WebMiscUtil.getName(parent).isEmpty()) {
@@ -978,12 +978,12 @@ private List<OrgType> loadParentOrgUnits() {
 
         return parentList;
     }
-    
+
     private void initProjections(final WebMarkupContainer accounts) {
 //        InlineMenu accountMenu = new InlineMenu(ID_ACCOUNT_MENU, new Model((Serializable) createAccountsMenu()));
 //        accounts.add(accountMenu);
 
-    	//TODO: unify - rename UserAccountDto to something else, e.g. FocusShadowDto or FocusProjectionDto or something similar
+        //TODO: unify - rename UserAccountDto to something else, e.g. FocusShadowDto or FocusProjectionDto or something similar
         final ListView<UserAccountDto> accountList = new ListView<UserAccountDto>(ID_ACCOUNT_LIST, accountsModel) {
 
             @Override

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
@@ -851,7 +851,7 @@ private PrismObject<UserType> addUserPerformed(AjaxRequestTarget target, UserTyp
             }
 
             user.getParentOrgRef().add(ref.clone());
-            
+
             AssignmentType assignment = new AssignmentType();
             assignment.setTargetRef(ref);