Skip to content

Commit

Permalink
version without commented code
Browse files Browse the repository at this point in the history
  • Loading branch information
@skublik
skublik committed Aug 7, 2018
1 parent 250ed2b commit 70c0cc2
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 115 deletions.
1 change: 0 additions & 1 deletion .../src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
View file
Expand Up @@ -77,7 +77,6 @@ public abstract class MultivalueContainerListPanel<C extends Containerable> exte
private static final long serialVersionUID = 1L;

public static final String ID_ITEMS = "items";
private static final String ID_NEW_ITEM_BUTTON = "newItemButton";
private static final String ID_ITEMS_TABLE = "itemsTable";
public static final String ID_SEARCH_ITEM_PANEL = "search";

Expand Down
2 changes: 0 additions & 2 deletions ...olveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.html
View file
Expand Up @@ -19,7 +19,5 @@
<wicket:panel>
<div wicket:id="globalPolicyRule">
</div>
<wicket:fragment wicket:id="searchFragment">
</wicket:fragment>
</wicket:panel>
</html>
66 changes: 0 additions & 66 deletions ...olveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java
View file
Expand Up @@ -112,7 +112,6 @@ public class GlobalPolicyRuleTabPanel extends BasePanel<ContainerWrapper<GlobalP
private static final Trace LOGGER = TraceManager.getTrace(GlobalPolicyRuleTabPanel.class);

private static final String ID_GLOBAL_POLICY_RULE = "globalPolicyRule";
private static final String ID_SEARCH_FRAGMENT = "searchFragment";

private List<ContainerValueWrapper<GlobalPolicyRuleType>> detailsPanelObjectPoliciesList = new ArrayList<>();

Expand Down Expand Up @@ -154,11 +153,6 @@ protected void initPaging() {
GlobalPolicyRuleTabPanel.this.initPaging();
}

@Override
protected Fragment getSearchPanel(String contentAreaId) {
return new Fragment(contentAreaId, ID_SEARCH_FRAGMENT, GlobalPolicyRuleTabPanel.this);
}

@Override
protected boolean enableActionNewObject() {
return true;
Expand Down Expand Up @@ -321,65 +315,5 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<GlobalPolicyR

return columns;
}

// protected Fragment getSearchPanel(String contentAreaId){
// Fragment searchContainer = new Fragment(contentAreaId, ID_SEARCH_FRAGMENT, this);
//
// WebMarkupContainer typeContainer = new WebMarkupContainer(ID_TYPE_CONTAINER);
//
// typeContainer.setOutputMarkupId(true);
// typeContainer.add(new VisibleEnableBehaviour() {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public boolean isVisible() {
// return ObjectPolicyConfigurationTabPanel.this.isTypeVisible();
// }
//
// });
// searchContainer.addOrReplace(typeContainer);
//
// this.model.getObject().findContainerWrapper(new ItemPath(ObjectPolicyConfigurationType.F_TYPE));
// DropDownChoicePanel<QName> type = new DropDownChoicePanel(ID_TYPE,
// new IModel<QName>() {
// @Override
// public QName getObject() {
// return objectTypeValue;
// }
//
// @Override
// public void setObject(QName objectType) {
// objectTypeValue = objectType;
// }
//
// @Override
// public void detach() {
//
// }
// },
// new AbstractReadOnlyModel<List<QName>>() {
//
// private static final long serialVersionUID = 1L;
//
// @Override
// public List<QName> getObject() {
// return WebComponentUtil.createFocusTypeList();
// }
// });
// type.getBaseFormComponent().add(new AjaxFormComponentUpdatingBehavior("change") {
// private static final long serialVersionUID = 1L;
//
// @Override
// protected void onUpdate(AjaxRequestTarget target) {
//// refreshTable(target);
// }
// });
// type.setOutputMarkupId(true);
// type.setOutputMarkupPlaceholderTag(true);
// typeContainer.addOrReplace(type);
//
// return searchContainer;
// }
}

2 changes: 0 additions & 2 deletions ...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.html
View file
Expand Up @@ -23,7 +23,5 @@
<div wicket:id="appendersHeader"/>
<div wicket:id="appenders"/>
<div wicket:id="audit"/>
<wicket:fragment wicket:id="appenderSearchFragment"/>
<wicket:fragment wicket:id="loggerSearchFragment"/>
</wicket:panel>
</html>
16 changes: 0 additions & 16 deletions ...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java
View file
Expand Up @@ -108,12 +108,6 @@ public class LoggingConfigurationTabPanel extends BasePanel<ContainerWrapper<Log
private static final String ID_LOGGERS_HEADER = "loggersHeader";
private static final String ID_LOGGERS = "loggers";
private static final String ID_AUDITING = "audit";
private static final String ID_APPENDER_SEARCH_FRAGMENT = "appenderSearchFragment";
private static final String ID_LOGGER_SEARCH_FRAGMENT = "appenderSearchFragment";
// protected static final String ID_SPECIFIC_CONTAINERS_FRAGMENT = "specificContainersFragment";
// protected static final String ID_SPECIFIC_CONTAINER = "specificContainers";

// private static final String TASK_CREATE_APPENDER = "createAppender";


IModel<ContainerWrapper<AppenderConfigurationType>> appenderModel = null;
Expand Down Expand Up @@ -192,11 +186,6 @@ protected void initPaging() {
initAppenderPaging();
}

@Override
protected Fragment getSearchPanel(String contentAreaId) {
return new Fragment(contentAreaId, ID_LOGGER_SEARCH_FRAGMENT, LoggingConfigurationTabPanel.this);
}

@Override
protected boolean enableActionNewObject() {
return true;
Expand Down Expand Up @@ -273,11 +262,6 @@ protected void initPaging() {
initAppenderPaging();
}

@Override
protected Fragment getSearchPanel(String contentAreaId) {
return new Fragment(contentAreaId, ID_APPENDER_SEARCH_FRAGMENT, LoggingConfigurationTabPanel.this);
}

@Override
protected boolean enableActionNewObject() {
return true;
Expand Down
2 changes: 0 additions & 2 deletions ...dpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.html
View file
Expand Up @@ -19,7 +19,5 @@
<wicket:panel>
<div wicket:id="objectsPolicy">
</div>
<wicket:fragment wicket:id="searchFragment">
</wicket:fragment>
</wicket:panel>
</html>
6 changes: 0 additions & 6 deletions ...dpoint/gui/impl/page/admin/configuration/component/ObjectPolicyConfigurationTabPanel.java
View file
Expand Up @@ -111,7 +111,6 @@ public class ObjectPolicyConfigurationTabPanel extends BasePanel<ContainerWrappe
private static final Trace LOGGER = TraceManager.getTrace(ObjectPolicyConfigurationTabPanel.class);

private static final String ID_OBJECTS_POLICY = "objectsPolicy";
private static final String ID_SEARCH_FRAGMENT = "searchFragment";

private List<ContainerValueWrapper<ObjectPolicyConfigurationType>> detailsPanelObjectPoliciesList = new ArrayList<>();

Expand Down Expand Up @@ -152,11 +151,6 @@ protected void initPaging() {
ObjectPolicyConfigurationTabPanel.this.initPaging();
}

@Override
protected Fragment getSearchPanel(String contentAreaId) {
return new Fragment(contentAreaId, ID_SEARCH_FRAGMENT, ObjectPolicyConfigurationTabPanel.this);
}

@Override
protected boolean enableActionNewObject() {
return true;
Expand Down
3 changes: 0 additions & 3 deletions ...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
View file
Expand Up @@ -348,10 +348,7 @@ private IModel<String> getOrgRefLabelModel(ContainerValueWrapper<AssignmentType>
return Model.of("");
}
PropertyOrReferenceWrapper policyRuleWrapper = (PropertyOrReferenceWrapper)assignmentContainer.findPropertyWrapper(new ItemPath(assignmentContainer.getPath(), AssignmentType.F_ORG_REF));
LOGGER.info("XXXXXXXXXXXXXXX " + policyRuleWrapper.getItem().getRealValue().getClass().getName());
return Model.of(WebComponentUtil.getReferencedObjectDisplayNamesAndNames((DefaultReferencableImpl)((ValueWrapper<DefaultReferencableImpl>)policyRuleWrapper.getValues().get(0)).getValue().getRealValue(), false));
// AssignmentType assignment = assignmentContainer.getContainerValue().asContainerable();
// return Model.of(WebComponentUtil.getReferencedObjectDisplayNamesAndNames(Arrays.asList(assignment.getOrgRef()), false));

}

Expand Down
9 changes: 3 additions & 6 deletions ...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentPanel.java
View file
Expand Up @@ -147,11 +147,6 @@ protected List<ContainerValueWrapper<AssignmentType>> postSearch(
return customPostSearch(assignments);
}

@Override
protected Fragment getSearchPanel(String contentAreaId) {
return getCustomSearchPanel(contentAreaId);
}

@Override
protected MultivalueContainerDetailsPanel<AssignmentType> getMultivalueContainerDetailsPanel(
ListItem<ContainerValueWrapper<AssignmentType>> item) {
Expand Down Expand Up @@ -238,7 +233,9 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp

protected abstract void newAssignmentClickPerformed(AjaxRequestTarget target);

protected abstract Fragment getCustomSearchPanel(String contentAreaId);
protected WebMarkupContainer getCustomSearchPanel(String contentAreaId) {
return new WebMarkupContainer(contentAreaId);
}

private MultivalueContainerDetailsPanel<AssignmentType> createMultivalueContainerDetailsPanel(
ListItem<ContainerValueWrapper<AssignmentType>> item) {
Expand Down
2 changes: 0 additions & 2 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.html
View file
Expand Up @@ -18,8 +18,6 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div wicket:id="assignments"/>
<wicket:fragment wicket:id="searchFragment">
</wicket:fragment>
<wicket:fragment wicket:id="specificContainersFragment">
<div wicket:id="specificContainers" />
<div class="container-fluid prism-object" wicket:id="activationPanel" />
Expand Down
9 changes: 0 additions & 9 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/PolicyRulesPanel.java
View file
Expand Up @@ -105,9 +105,7 @@ public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentTyp
final IModel<ContainerValueWrapper<AssignmentType>> rowModel) {
ContainerWrapper<PolicyRuleType> policyRuleWrapper = rowModel.getObject().findContainerWrapper(new ItemPath(rowModel.getObject().getPath(), AssignmentType.F_POLICY_RULE));
ContainerWrapper<PolicyActionsType> wrapper = policyRuleWrapper.getValues().get(0).findContainerWrapper(new ItemPath(policyRuleWrapper.getValues().get(0).getPath(), PolicyRuleType.F_POLICY_ACTIONS));
// LOGGER.info("XXXXXXXXXXXXXXXXXXX propertyModel " + wrapper.getValues().get(0).getContainerValue());
String action = PolicyRuleTypeUtil.toShortString(wrapper.getValues().get(0).getContainerValue().getValue(), new ArrayList<>());
// LOGGER.info("XXXXXXXXXXXXXXXXXXX action " + action);
cellItem.add(new MultiLineLabel(componentId, Model.of(action != null && !action.equals("null") ? action : "")));
}

Expand Down Expand Up @@ -168,13 +166,6 @@ protected ObjectQuery createObjectQuery() {
.build();
}

@Override
protected Fragment getCustomSearchPanel(String contentAreaId){
Fragment searchContainer = new Fragment(contentAreaId, AssignmentPanel.ID_SEARCH_FRAGMENT, this);
searchContainer.setVisible(false);
return searchContainer;
}

@Override
protected Fragment getCustomSpecificContainers(String contentAreaId, ContainerValueWrapper<AssignmentType> modelObject) {
Fragment specificContainers = new Fragment(contentAreaId, AssignmentPanel.ID_SPECIFIC_CONTAINERS_FRAGMENT, this);
Expand Down

0 comments on commit 70c0cc2

Please sign in to comment.