Skip to content

Commit

Permalink
clean up (member panels)
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Apr 21, 2016
1 parent 45c9734 commit 169a5c0
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 1,136 deletions.
39 changes: 2 additions & 37 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
View file
Expand Up @@ -72,9 +72,7 @@
public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T> {
private static final long serialVersionUID = 1L;

// private static final String ID_SEARCH_FORM = "searchForm";
private static final String ID_MAIN_FORM = "mainForm";
private static final String ID_BUTTON_CANCEL = "cancelButton";

private static final String ID_TABLE = "table";

Expand Down Expand Up @@ -108,8 +106,6 @@ public Class<T> getType() {
storageMap.put(PageReports.class, SessionStorage.KEY_REPORTS);
storageMap.put(PageRoles.class, SessionStorage.KEY_ROLES);
storageMap.put(PageServices.class, SessionStorage.KEY_SERVICES);
// storageMap.put(ObjectType.class, SessionStorage.KEY_CONFIGURATION);
// storageMap.put(FocusType.class, SessionStorage.KEY_ROLE_MEMBERS);

}

Expand Down Expand Up @@ -187,7 +183,6 @@ public Search load() {
BoxedTablePanel<SelectableBean<T>> table = createTable();
mainForm.add(table);

// saveSearch();
}

protected BaseSortableDataProvider<SelectableBean<T>> getProvider() {
Expand Down Expand Up @@ -237,23 +232,6 @@ private BoxedTablePanel<SelectableBean<T>> createTable() {
@Override
protected WebMarkupContainer createHeader(String headerId) {
return initSearch(headerId);
// SearchFormPanel searchPanel = new SearchFormPanel(headerId, searchModel) {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
// ObjectListPanel.this.searchPerformed(query, target);
// }
//
// };
//// searchPanel.add(new VisibleEnableBehaviour() {
//// @Override
//// public boolean isVisible() {
//// return !type.equals(ObjectType.class);
//// }
//// });
// return searchPanel;
}

@Override
Expand All @@ -269,7 +247,7 @@ protected WebMarkupContainer createButtonToolbar(String id) {
}
};
table.setOutputMarkupId(true);
String storageKey = getStorageKey();//storageMap.get(type);
String storageKey = getStorageKey();
if (StringUtils.isNotEmpty(storageKey)) {
PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
if (storage != null) {
Expand Down Expand Up @@ -365,12 +343,7 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
}

};
// searchPanel.add(new VisibleEnableBehaviour() {
// @Override
// public boolean isVisible() {
// return !type.equals(ObjectType.class);
// }
// });

return searchPanel;
}

Expand Down Expand Up @@ -420,8 +393,6 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
protected abstract List<IColumn<SelectableBean<T>, String>> createColumns();
protected abstract List<InlineMenuItem> createInlineMenu();

// protected abstract void saveSearch(ObjectPaging paging);

protected List<IColumn<SelectableBean<T>, String>> initColumns() {
List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<IColumn<SelectableBean<T>, String>>();

Expand All @@ -442,12 +413,6 @@ protected List<IColumn<SelectableBean<T>, String>> initColumns() {
return columns;
}

// private void clearSearchPerformed(AjaxRequestTarget target) {
// BaseSortableDataProvider<SelectableBean<T>> provider = getDataProvider();
// provider.setQuery(null);
//
// target.add(getTable());
// }

public void addPerformed(AjaxRequestTarget target, List<T> selected) {
parentPage.hideMainPopup(target);
Expand Down
4 changes: 1 addition & 3 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
View file
Expand Up @@ -178,9 +178,7 @@ public W createDataObjectWrapper(T obj) {
selectable.setSelected(true);
}
}
// if (selected.contains(obj)){
// selectable.setSelected(true);
// }

return (W) selectable;
}

Expand Down
138 changes: 1 addition & 137 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.java
View file
Expand Up @@ -286,138 +286,7 @@ protected List<InlineMenuItem> createTreeChildrenMenu() {
protected void selectTreeItemPerformed(SelectableBean<OrgType> selected, AjaxRequestTarget target) {

}
// private List<InlineMenuItem> createTreeMenu() {
// List<InlineMenuItem> items = new ArrayList<>();
//
// InlineMenuItem item = new
// InlineMenuItem(createStringResource("TreeTablePanel.collapseAll"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// collapseAllPerformed(target);
// }
// });
// items.add(item);
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.expandAll"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// expandAllPerformed(target);
// }
// });
// items.add(item);
// items.add(new InlineMenuItem());
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.moveRoot"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// moveRootPerformed(null, target);
// }
// });
// items.add(item);
//
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.deleteRoot"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// deleteRootPerformed(null, target);
// }
// });
// items.add(item);
//
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.recomputeRoot"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// recomputeRootPerformed(null, target);
// }
// });
// items.add(item);
//
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.editRoot"),
// new InlineMenuItemAction() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// editRootPerformed(null, target);
// }
// });
// items.add(item);
//
// return items;
// }

// private List<InlineMenuItem> createTreeChildrenMenu() {
// List<InlineMenuItem> items = new ArrayList<>();
//
// InlineMenuItem item = new
// InlineMenuItem(createStringResource("TreeTablePanel.move"),
// new ColumnMenuAction<SelectableBean<OrgType>>() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// moveRootPerformed(getRowModel().getObject(), target);
// }
// });
// items.add(item);
//
// item = new InlineMenuItem(createStringResource("TreeTablePanel.delete"),
// new ColumnMenuAction<SelectableBean<OrgType>>() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// deleteRootPerformed(getRowModel().getObject(), target);
// }
// });
// items.add(item);
//
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.recompute"),
// new ColumnMenuAction<SelectableBean<OrgType>>() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// recomputeRootPerformed(getRowModel().getObject(), target);
// }
// });
// items.add(item);
//
// item = new InlineMenuItem(createStringResource("TreeTablePanel.edit"),
// new ColumnMenuAction<SelectableBean<OrgType>>() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// editRootPerformed(getRowModel().getObject(), target);
// }
// });
// items.add(item);
//
// item = new
// InlineMenuItem(createStringResource("TreeTablePanel.createChild"),
// new ColumnMenuAction<OrgTreeDto>() {
//
// @Override
// public void onClick(AjaxRequestTarget target) {
// initObjectForAdd(
// ObjectTypeUtil.createObjectRef(getRowModel().getObject().getObject()),
// OrgType.COMPLEX_TYPE, null, target);
// }
// });
// items.add(item);
//
// return items;
// }


private void collapseAllPerformed(AjaxRequestTarget target) {
TableTree<SelectableBean<OrgType>, String> tree = getTree();
TreeStateModel model = (TreeStateModel) tree.getDefaultModel();
Expand All @@ -434,10 +303,5 @@ private void expandAllPerformed(AjaxRequestTarget target) {
target.add(tree);
}

// @Override
// protected void refreshTable(AjaxRequestTarget target) {
// // TODO Auto-generated method stub
//
// }

}

0 comments on commit 169a5c0

Please sign in to comment.