Skip to content

Commit

Permalink
small cleanup -resource pages..
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed May 2, 2016
1 parent 831d17f commit 6d6ea6c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 166 deletions.
139 changes: 2 additions & 137 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
View file
Expand Up @@ -302,36 +302,6 @@ public boolean isVisible() {
}
});

// List<IColumn> columns = initColumns();
// ObjectListPanel<ShadowType> table = new
// ObjectListPanel<ShadowType>(ID_TABLE, ShadowType.class,
// getPageBase()){
// @Override
// protected List<IColumn<SelectableBean<ShadowType>, String>>
// initColumns() {
// return (List) ResourceContentPanel.this.initColumns();
// }
// };
// final BoxedTablePanel<SelectableBean<ShadowType>> table = new
// BoxedTablePanel(ID_TABLE, provider, columns,
// UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL, 10) {
//
// @Override
// protected WebMarkupContainer createHeader(String headerId) {
// return new SearchFormPanel(headerId, searchModel) {
//
// @Override
// protected void searchPerformed(ObjectQuery query, AjaxRequestTarget
// target) {
// ResourceContentPanel.this.searchPerformed(query, target);
// }
// };
// }
// }; //
// parentPage.getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCE_ACCOUNTS_PANEL)
// table.setOutputMarkupId(true);
// add(table);

OperationResult result = new OperationResult(OPERATION_SEARCH_TASKS_FOR_RESOURCE);

List<PrismObject<TaskType>> tasks = WebModelServiceUtils
Expand Down Expand Up @@ -474,72 +444,20 @@ public SelectableBean<ShadowType> createDataObjectWrapper(ShadowType obj) {
}
};

// try {
//
ObjectQuery query = createQuery();
// provider.setQuery(query);

if (query == null) {
// Label label = new Label(ID_TABLE, "Nothing to show. Select intent
// to search");
// add(label);
initCustomLayout();
return provider;

}

// } catch (SchemaException e) {
// Label label = new Label(ID_TABLE, "Nothing to show. Select intent to
// search");
// add(label);
// initCustomLayout();
// return provider;
// }

provider.setEmptyListOnNullQuery(true);
provider.setSort(null);
createSearchOptions(provider);
return provider;
}

// private void searchPerformed(ObjectQuery query, AjaxRequestTarget target)
// {
// BoxedTablePanel<SelectableBean<ShadowType>> table = getTable();
// ObjectDataProvider2<SelectableBean<ShadowType>, ShadowType> provider =
// (ObjectDataProvider2<SelectableBean<ShadowType>, ShadowType>) table
// .getDataTable().getDataProvider();
//// BaseSortableDataProvider<SelectableBean<T>> provider =
// getDataProvider();
// ObjectQuery baseQuery;
//// try {
// baseQuery = createQuery();
// if (baseQuery == null){
// warn("Could not search objects if either kind/intet or object class is
// set.");
// return;
// }
//// } catch (SchemaException e) {
//// warn("Could not create query.");
//// return;
//// }
//
//
// ObjectQuery customQuery =
// ObjectQuery.createObjectQuery(AndFilter.createAnd(baseQuery.getFilter(),
// query.getFilter()));
// provider.setQuery(customQuery);
//
// // RolesStorage storage = getSessionStorage().getRoles();
// // storage.setRolesSearch(searchModel.getObject());
// // storage.setRolesPaging(null);
//
// table = getTable();
// table.setCurrentPage(null);
// target.add((Component) table);
// target.add(getPageBase().getFeedbackPanel());

// }

protected void initCustomLayout() {
// Nothing to do, for subclass extension
};
Expand Down Expand Up @@ -569,8 +487,6 @@ protected ObjectQuery createQuery() {
}
}
} catch (SchemaException ex) {
// LOGGER.error("Could not crate query for shadows: " +
// ex.getMessage(), e);
LoggingUtils.logException(LOGGER, "Could not crate query for shadows: " + ex.getMessage(), ex);
}
return baseQuery;
Expand All @@ -584,13 +500,10 @@ private void createSearchOptions(SelectableBeanObjectDataProvider provider) {
ShadowType.F_ASSOCIATION, GetOperationOptions.createRetrieve(RetrieveOption.EXCLUDE));

if (addAdditionalOptions() != null) {
opts.add(addAdditionalOptions()); // new
// SelectorOptions<GetOperationOptions>(GetOperationOptions.createNoFetch()));
opts.add(addAdditionalOptions());
}
provider.setUseObjectCounting(isUseObjectCounting());
provider.setOptions(opts);
// return opts;

}

private StringResourceModel createStringResource(String key) {
Expand All @@ -607,26 +520,6 @@ private List<IColumn<SelectableBean<ShadowType>, String>> initColumns() {
ShadowType.F_INTENT.getLocalPart()));

List<IColumn<SelectableBean<ShadowType>, String>> columns = new ArrayList<>();
// IColumn column = new CheckBoxColumn(new Model<String>(),
// SelectableBean.F_SELECTED);
// columns.add(column);

// columns.add(ColumnUtils.getShadowIconColumn());
//
// column = new
// LinkColumn<SelectableBean<ShadowType>>(createStringResource("pageContentAccounts.name"),
// SelectableBean.F_VALUE + ".name") {
//
// @Override
// public void onClick(AjaxRequestTarget target,
// IModel<SelectableBean<ShadowType>> rowModel) {
// SelectableBean<ShadowType> shadow = rowModel.getObject();
// ShadowType shadowType = shadow.getValue();
// shadowDetailsPerformed(target, WebComponentUtil.getName(shadowType),
// shadowType.getOid());
// }
// };
// columns.add(column);

IColumn column = new AbstractColumn<SelectableBean<ShadowType>, String>(
createStringResource("pageContentAccounts.identifiers")) {
Expand Down Expand Up @@ -900,29 +793,6 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
}
}));

// items.add(new
// InlineMenuItem(createStringResource("pageContentAccounts.menu.changeOwner"),
// true,
// new HeaderMenuAction(this) {
//
// @Override
// public void onSubmit(AjaxRequestTarget target, Form<?> form) {
//
// FocusBrowserPanel<UserType> browser = new
// FocusBrowserPanel<UserType>(
// pageBase.getMainPopupBodyId(), UserType.class,
// WebComponentUtil.createFocusTypeList(), false, pageBase) {
// protected void onClick(AjaxRequestTarget target, UserType focus) {
// changeOwner(null, target, focus, Operation.MODIFY);
// }
// };
//
// pageBase.showMainPopup(browser, new Model<String>("ChangeOwner"),
// target, 900, 500);
//
// }
// }));

return items;
}

Expand Down Expand Up @@ -1010,8 +880,6 @@ protected void onSelectPerformed(AjaxRequestTarget target, UserType focus) {
}

protected void importResourceObject(ShadowType selected, AjaxRequestTarget target) {
// List<SelectableBean<ShadowType>> selectedShadow =
// WebComponentUtil.getSelectedData(getTable());
List<ShadowType> selectedShadow = null;
if (selected != null) {
selectedShadow = new ArrayList<>();
Expand Down Expand Up @@ -1049,8 +917,6 @@ protected void importResourceObject(ShadowType selected, AjaxRequestTarget targe

// TODO: as a task?
protected void deleteResourceObjectPerformed(ShadowType selected, AjaxRequestTarget target) {
// List<SelectableBean<ShadowType>> selectedShadow =
// WebComponentUtil.getSelectedData(getTable());
List<ShadowType> selectedShadow = null;
if (selected != null) {
selectedShadow = new ArrayList<>();
Expand Down Expand Up @@ -1157,8 +1023,7 @@ private MainObjectListPanel<ShadowType> getTable() {

private void changeOwner(ShadowType selected, AjaxRequestTarget target, FocusType ownerToChange,
Operation operation) {
// List<SelectableBean<ShadowType>> selectedShadow =
// WebComponentUtil.getSelectedData(getTable());

List<ShadowType> selectedShadow = null;
if (selected != null) {
selectedShadow = new ArrayList<>();
Expand Down
30 changes: 1 addition & 29 deletions ...ain/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
View file
Expand Up @@ -64,35 +64,9 @@ protected boolean isUseObjectCounting() {
protected Search createSearch() {
Map<ItemPath, ItemDefinition> availableDefs = new HashMap<>();
availableDefs.putAll(createAttributeDefinitionList());

Search search = new Search(ShadowType.class, availableDefs);
// search.setShowAdvanced(true);

// SchemaRegistry registry = ctx.getSchemaRegistry();
// PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(Sh.class);
// PrismPropertyDefinition def = objDef.findPropertyDefinition(ObjectType.F_NAME);
//
// search.addItem(def);

return search;
return new Search(ShadowType.class, availableDefs);
}

// private <T extends ObjectType> Search createSearch() {
// Map<ItemPath, ItemDefinition> availableDefs = new HashMap<>();
// availableDefs.putAll(createAttributeDefinitionList());
//
// Search search = new Search(ShadowType.class, availableDefs);
// search.setShowAdvanced(true);
//
//// SchemaRegistry registry = ctx.getSchemaRegistry();
//// PrismObjectDefinition objDef = registry.findObjectDefinitionByCompileTimeClass(Sh.class);
//// PrismPropertyDefinition def = objDef.findPropertyDefinition(ObjectType.F_NAME);
////
//// search.addItem(def);
//
// return search;
// }

private <T extends ObjectType> Map<ItemPath, ItemDefinition> createAttributeDefinitionList() {

Map<ItemPath, ItemDefinition> map = new HashMap<>();
Expand All @@ -113,10 +87,8 @@ private <T extends ObjectType> Map<ItemPath, ItemDefinition> createAttributeDefi
return map;
}


ItemPath attributePath = new ItemPath(ShadowType.F_ATTRIBUTES);

// PrismContainerDefinition attrs = objDef.findContainerDefinition(ShadowType.F_ATTRIBUTES);
for (ItemDefinition def : (List<ItemDefinition>) ocDef.getDefinitions()) {
if (!(def instanceof PrismPropertyDefinition) && !(def instanceof PrismReferenceDefinition)) {
continue;
Expand Down

0 comments on commit 6d6ea6c

Please sign in to comment.