Skip to content

Commit

Permalink
Merge pull request #45 from rovarga/whitespace
Browse files Browse the repository at this point in the history 
Kill trailing whitespace
  • Loading branch information
@semancik
semancik committed Sep 4, 2017
2 parents 0ef8b5c + 240c6a2 commit 914398f
Show file tree
Hide file tree
Showing 1,565 changed files with 37,880 additions and 37,881 deletions.
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
View file
Expand Up @@ -44,7 +44,7 @@ public class ComponentConstants {

public static final QName UI_FOCUS_TAB_POLICY_RULES = new QName(NS_COMPONENTS_PREFIX, "focusTabPolicyRules");
public static final String UI_FOCUS_TAB_POLICY_RULES_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_POLICY_RULES);

public static final QName UI_FOCUS_TAB_CONSENTS = new QName(NS_COMPONENTS_PREFIX, "focusTabConsents");
public static final String UI_FOCUS_TAB_CONSENTS_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_CONSENTS);

Expand All @@ -70,6 +70,6 @@ public class ComponentConstants {
public static final String UI_FOCUS_TAB_POLICY_CONSTRAINTS_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_POLICY_CONSTRAINTS);

public static final QName UI_FOCUS_TAB_MEMBERS = new QName(NS_COMPONENTS_PREFIX, "focusTabMembers");
public static final String UI_FOCUS_TAB_MEMBERS_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_MEMBERS);
public static final String UI_FOCUS_TAB_MEMBERS_URL = QNameUtil.qNameToUri(UI_FOCUS_TAB_MEMBERS);

}
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiConstants.java
View file
Expand Up @@ -21,5 +21,5 @@ public class GuiConstants {

public static final String NS_UI_PREFIX = SchemaConstants.NS_MIDPOINT_PUBLIC_PREFIX + "ui/";
public static final String NS_UI_FEATURE = NS_UI_PREFIX + "feature";

}
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiFeature.java
View file
Expand Up @@ -27,7 +27,7 @@ public enum GuiFeature {

ORGTREE_EXPAND_ALL("orgTreeExpandAll"),
ORGTREE_COLLAPSE_ALL("orgTreeCollapseAll");

private String uri;

private GuiFeature(String suffix) {
Expand All @@ -37,5 +37,5 @@ private GuiFeature(String suffix) {
public String getUri() {
return uri;
}

}
18 changes: 9 additions & 9 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Expand Up @@ -20,44 +20,44 @@
*
*/
public class GuiStyleConstants {

public static final String CLASS_BOX = "box";
public static final String CLASS_BOX_DEFAULT = "box-default";

public static final String CLASS_OBJECT_USER_ICON = "fa fa-user";
public static final String CLASS_OBJECT_USER_ICON_COLORED = CLASS_OBJECT_USER_ICON + " object-user-color";
public static final String CLASS_OBJECT_USER_BOX_CSS_CLASSES = "object-user-box";
public static final String CLASS_OBJECT_USER_BOX_THIN_CSS_CLASSES = "object-user-box-thin";

public static final String CLASS_OBJECT_ROLE_ICON = "fa fa-street-view";
public static final String CLASS_OBJECT_ROLE_BG = "object-role-bg";
public static final String CLASS_DISABLED_OBJECT_ROLE_BG = "object-disabled-bg";
public static final String CLASS_OBJECT_ROLE_ICON_COLORED = CLASS_OBJECT_ROLE_ICON + " object-role-color";
public static final String CLASS_OBJECT_ROLE_BOX_CSS_CLASSES = "object-role-box";
public static final String CLASS_OBJECT_ROLE_BOX_THIN_CSS_CLASSES = "object-role-box-thin";

public static final String CLASS_OBJECT_ORG_ICON = "fa fa-building";
public static final String CLASS_OBJECT_ORG_BG = "object-org-bg";
public static final String CLASS_OBJECT_ORG_ICON_COLORED = CLASS_OBJECT_ORG_ICON + " object-org-color";
public static final String CLASS_OBJECT_ORG_BOX_CSS_CLASSES = "object-org-box";
public static final String CLASS_OBJECT_ORG_BOX_THIN_CSS_CLASSES = "object-org-box-thin";

public static final String CLASS_OBJECT_SERVICE_ICON = "fa fa-cloud";
public static final String CLASS_OBJECT_SERVICE_BG = "object-service-bg";
public static final String CLASS_OBJECT_SERVICE_ICON_COLORED = CLASS_OBJECT_SERVICE_ICON + " object-service-color";
public static final String CLASS_OBJECT_SERVICE_BOX_CSS_CLASSES = "object-service-box";
public static final String CLASS_OBJECT_SERVICE_BOX_THIN_CSS_CLASSES = "object-service-box-thin";

public static final String CLASS_OBJECT_RESOURCE_ICON = "fa fa-database";
public static final String CLASS_OBJECT_RESOURCE_ICON_COLORED = CLASS_OBJECT_RESOURCE_ICON + " object-resource-color";
public static final String CLASS_OBJECT_RESOURCE_BOX_CSS_CLASSES = "object-resource-box";
public static final String CLASS_OBJECT_RESOURCE_BOX_THIN_CSS_CLASSES = "object-resource-box-thin";

public static final String CLASS_OBJECT_SHADOW_ICON = "fa fa-eye";
public static final String CLASS_OBJECT_SHADOW_ICON_COLORED = CLASS_OBJECT_RESOURCE_ICON + " object-shadow-color";
public static final String CLASS_OBJECT_SHADOW_BOX_CSS_CLASSES = "object-shadow-box";
public static final String CLASS_OBJECT_SHADOW_BOX_THIN_CSS_CLASSES = "object-shadow-box-thin";

public static final String CLASS_OBJECT_TASK_ICON = "fa fa-tasks";
public static final String CLASS_OBJECT_TASK_ICON_COLORED = CLASS_OBJECT_TASK_ICON + " object-task-color";
public static final String CLASS_OBJECT_TASK_BOX_CSS_CLASSES = "object-task-box";
Expand Down Expand Up @@ -85,7 +85,7 @@ public class GuiStyleConstants {
public static final String CLASS_ICON_STYLE_UP = "icon-style-up";
public static final String CLASS_ICON_STYLE_DOWN = "icon-style-down";
public static final String CLASS_ICON_STYLE_BROKEN = "icon-style-broken";

public static final String CLASS_SHADOW_ICON_ACCOUNT = "fa fa-male";
public static final String CLASS_SHADOW_ICON_ENTITLEMENT = "fa fa-group";
public static final String CLASS_SHADOW_ICON_GENERIC = "fa fa-circle-o";
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/PredefinedDashboardWidgetId.java
View file
Expand Up @@ -31,10 +31,10 @@ public enum PredefinedDashboardWidgetId {
MY_REQUESTS("myRequests"),
MY_ASSIGNMENTS("myAssignments"),
MY_ACCOUNTS("myAccounts");

private final QName qname;
private final String uri;

private PredefinedDashboardWidgetId(String localPart) {
this.qname = new QName(ComponentConstants.NS_DASHBOARD_WIDGET, localPart);
this.uri = QNameUtil.qNameToUri(qname);
Expand All @@ -47,5 +47,5 @@ public QName getQname() {
public String getUri() {
return uri;
}

}
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
View file
Expand Up @@ -31,9 +31,9 @@
* Base class for most midPoint GUI panels. It has a constructor and
* utility methods for convenient handling of the model. It also has
* other utility methods often used in reusable components.
*
*
* Almost all reusable components should extend this class.
*
*
* @author lazyman
* @author semancik
*/
Expand Down Expand Up @@ -101,7 +101,7 @@ public StringResourceModel createStringResource(Enum e, String prefix, String nu

return createStringResource(sb.toString());
}

public PageBase getPageBase() {
return WebComponentUtil.getPageBase(this);
}
Expand Down
32 changes: 16 additions & 16 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/DisplayNamePanel.java
View file
Expand Up @@ -14,19 +14,19 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

public class DisplayNamePanel<C extends Containerable> extends BasePanel<C>{

private static final long serialVersionUID = 1L;

private final static String ID_DESCRIPTION = "description";
private final static String ID_TYPE_IMAGE = "typeImage";
private final static String ID_ASSIGNMENT_NAME = "assignmentName";

public DisplayNamePanel(String id, IModel<C> model) {
super(id, model);

initLayout();
}

private void initLayout() {
WebMarkupContainer typeImage = new WebMarkupContainer(ID_TYPE_IMAGE);
typeImage.setOutputMarkupId(true);
Expand All @@ -40,35 +40,35 @@ private void initLayout() {
add(name);

add(new Label(ID_DESCRIPTION, new PropertyModel<String>(getModel(), ObjectType.F_DESCRIPTION.getLocalPart())));


}

private String createImageModel() {
if (ObjectType.class.isAssignableFrom(getModelObject().getClass())) {
return WebComponentUtil.createDefaultIcon((ObjectType) getModelObject());
}
}

return WebComponentUtil.createDefaultColoredIcon(getModelObject().asPrismContainerValue().getComplexTypeDefinition().getTypeName());

}

private IModel<String> getAdditionalNameLabelStyleClass() {
return Model.of("text-bold");
}

private IModel<String> createHeaderModel() {
if (ObjectType.class.isAssignableFrom(getModelObject().getClass())) {
return Model.of(WebComponentUtil.getEffectiveName((ObjectType) getModelObject(), AbstractRoleType.F_DISPLAY_NAME));
}
}
PrismProperty<String> name = getModelObject().asPrismContainerValue().findProperty(ObjectType.F_NAME);
if (name == null || name.isEmpty()) {
return Model.of("");
}
return Model.of(name.getRealValue());
}




}
8 changes: 4 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
View file
Expand Up @@ -218,22 +218,22 @@ public boolean isVisible(){
}
});
add(importObject);

CsvDownloadButtonPanel exportDataLink = new CsvDownloadButtonPanel(ID_EXPORT_DATA) {

private static final long serialVersionUID = 1L;

@Override
protected DataTable<?, ?> getDataTable() {
return mainObjectListPanel.getTable().getDataTable();
}

@Override
protected String getFilename() {
return mainObjectListPanel.getType().getSimpleName() +
"_" + mainObjectListPanel.createStringResource("MainObjectListPanel.exportFileName").getString();
}

};
exportDataLink.add(new VisibleEnableBehaviour(){
private static final long serialVersionUID = 1L;
Expand Down
36 changes: 18 additions & 18 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
View file
Expand Up @@ -75,7 +75,7 @@ public abstract class ObjectListPanel<O extends ObjectType> extends BasePanel<O>
private Collection<SelectorOptions<GetOperationOptions>> options;

private boolean multiselect;

private TableId tableId;

protected List<O> selectedObjects = null;
Expand Down Expand Up @@ -151,7 +151,7 @@ private void initLayout() {
mainForm.add(table);

}

private LoadableModel<Search> initSearchModel(){
return new LoadableModel<Search>(false) {

Expand All @@ -174,11 +174,11 @@ public Search load() {
}
};
}

protected Search createSearch() {
return SearchFactory.createSearch(type, parentPage);
}

private BoxedTablePanel<SelectableBean<O>> createTable() {

List<IColumn<SelectableBean<O>, String>> columns;
Expand All @@ -189,8 +189,8 @@ private BoxedTablePanel<SelectableBean<O>> createTable() {
}

BaseSortableDataProvider<SelectableBean<O>> provider = initProvider();


BoxedTablePanel<SelectableBean<O>> table = new BoxedTablePanel<SelectableBean<O>>(ID_TABLE, provider,
columns, tableId, tableId == null ? 10 : parentPage.getSessionStorage().getUserProfile().getPagingSize(tableId)) {
private static final long serialVersionUID = 1L;
Expand All @@ -216,15 +216,15 @@ protected WebMarkupContainer createButtonToolbar(String id) {
table.setOutputMarkupId(true);
String storageKey = getStorageKey();
if (StringUtils.isNotEmpty(storageKey)) {
PageStorage storage = getPageStorage(storageKey);
PageStorage storage = getPageStorage(storageKey);
if (storage != null) {
table.setCurrentPage(storage.getPaging());
}
}

return table;
}

protected List<IColumn<SelectableBean<O>, String>> initCustomColumns() {
LOGGER.trace("Start to init custom columns for table of type {}", type);
List<IColumn<SelectableBean<O>, String>> columns = new ArrayList<IColumn<SelectableBean<O>, String>>();
Expand Down Expand Up @@ -324,10 +324,10 @@ public SelectableBean<O> createDataObjectWrapper(O obj) {
}
return bean;
}

@Override
protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam) {
List<ObjectOrdering> customOrdering = createCustomOrdering(sortParam);
List<ObjectOrdering> customOrdering = createCustomOrdering(sortParam);
if (customOrdering != null) {
return customOrdering;
}
Expand All @@ -346,14 +346,14 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
provider.setOptions(options);
}
provider.setQuery(getQuery());

return provider;
}

protected List<ObjectOrdering> createCustomOrdering(SortParam<String> sortParam) {
return null;
}

private SearchFormPanel initSearch(String headerId) {
SearchFormPanel searchPanel = new SearchFormPanel(headerId, searchModel) {

Expand Down Expand Up @@ -384,15 +384,15 @@ public void setAdditionalBoxCssClasses(String boxCssClasses) {
protected WebMarkupContainer createTableButtonToolbar(String id) {
return null;
}

private String getStorageKey() {
String storageKey = WebComponentUtil.getStorageKeyForPage(parentPage.getClass());
if (storageKey == null) {
storageKey = WebComponentUtil.getStorageKeyForTableId(tableId);
}

return storageKey;

}

private PageStorage getPageStorage(String storageKey){
Expand All @@ -416,8 +416,8 @@ protected BaseSortableDataProvider<SelectableBean<O>> getDataProvider() {
protected BoxedTablePanel<SelectableBean<O>> getTable() {
return (BoxedTablePanel<SelectableBean<O>>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
}


@SuppressWarnings("deprecation")
private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {

Expand Down

0 comments on commit 914398f

Please sign in to comment.