resource details page rewrite

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnTypeDto.java

@@ -0,0 +1,59 @@
+package com.evolveum.midpoint.web.component.data.column;
+
+import java.io.Serializable;
+
+public class ColumnTypeDto<T> implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+
+	private String columnName;
+	private String columnValue;
+	private String sortableColumn;
+
+	private boolean multivalue = false;
+
+	public ColumnTypeDto(String columnName, String columnValue, String sortableColumn) {
+		super();
+		this.columnName = columnName;
+		this.columnValue = columnValue;
+		this.sortableColumn = sortableColumn;
+	}
+
+	public ColumnTypeDto(String columnName, String columnValue, String sortableColumn, boolean multivalue) {
+		super();
+		this.columnName = columnName;
+		this.columnValue = columnValue;
+		this.sortableColumn = sortableColumn;
+		this.multivalue = multivalue;
+	}
+
+	public String getColumnName() {
+		return columnName;
+	}
+	public void setColumnName(String columnName) {
+		this.columnName = columnName;
+	}
+	public String getColumnValue() {
+		return columnValue;
+	}
+	public void setColumnValue(String columnValue) {
+		this.columnValue = columnValue;
+	}
+	public String getSortableColumn() {
+		return sortableColumn;
+	}
+	public void setSortableColumn(String sortableColumn) {
+		this.sortableColumn = sortableColumn;
+	}
+
+	public boolean isMultivalue() {
+		return multivalue;
+	}
+
+	public void setMultivalue(boolean multivalue) {
+		this.multivalue = multivalue;
+	}
+
+
+
+}

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java

@@ -0,0 +1,37 @@
+package com.evolveum.midpoint.web.component.data.column;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
+
+import com.evolveum.midpoint.web.page.admin.resources.dto.ResourceConfigurationDto;
+
+public class ColumnUtils {
+
+	public static List<IColumn> createColumns(List<ColumnTypeDto> columns){
+		List<IColumn> tableColumns = new ArrayList<IColumn>();
+		for (ColumnTypeDto column : columns) {
+			// if (column.isMultivalue()) {
+			// PropertyColumn tableColumn = new PropertyColumn(displayModel,
+			// propertyExpression)
+			// } else {
+			PropertyColumn tableColumn = new PropertyColumn(createStringResource(column.getColumnName()),
+					column.getSortableColumn(), column.getColumnValue());
+			tableColumns.add(tableColumn);
+			// }
+		}
+		return tableColumns;
+	}
+
+	public static StringResourceModel createStringResource(String resourceKey, Object... objects) {
+    	return new StringResourceModel(resourceKey).setModel(new Model<String>())
+    			.setDefaultValue(resourceKey)
+    			.setParameters(objects);
+
+//return StringResourceModelMigration.of(resourceKey, this, new Model<String>(), resourceKey, objects);
+}
+}

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java

@@ -353,9 +353,9 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
     	return new StringResourceModel(resourceKey, this).setModel(new Model<String>())
     			.setDefaultValue(resourceKey)
     			.setParameters(objects);
-
-//    	return StringResourceModelMigration.of(resourceKey, this, new Model<String>(), resourceKey, objects);
     }
+
+
 
     public StringResourceModel createStringResource(Enum e) {
         String resourceKey = e.getDeclaringClass().getSimpleName() + "." + e.name();
@@ -388,15 +388,23 @@ public void showResult(OperationResult result) {
         }
     }
 
-    public void showResultInSession(OperationResult result, String errorMessageKey, boolean showInSession) {
-    	showResult(result, errorMessageKey, true);
+    public void showResultInSession(OperationResult result, String errorMessageKey) {
+    	showResult(result, errorMessageKey, true, true);
+    }
+
+    public void showResultInSession(OperationResult result, String errorMessageKey, boolean showSuccess) {
+    	showResult(result, errorMessageKey, true, showSuccess);
+    }
+
+    public void showResult(OperationResult result, String errorMessageKey, boolean showSuccess) {
+    	showResult(result, errorMessageKey, false, showSuccess);
     }
 
     public void showResult(OperationResult result, String errorMessageKey) {
-    	showResult(result, errorMessageKey, false);
+    	showResult(result, errorMessageKey, false, true);
     }
 
-    private void showResult(OperationResult result, String errorMessageKey, boolean showInSession) {
+    private void showResult(OperationResult result, String errorMessageKey, boolean showInSession, boolean showSuccess) {
     	Validate.notNull(result, "Operation result must not be null.");
         Validate.notNull(result.getStatus(), "Operation result status must not be null.");
 
@@ -419,6 +427,9 @@ private void showResult(OperationResult result, String errorMessageKey, boolean
                 }
                 break;
             case SUCCESS:
+            	if (!showSuccess){
+            		break;
+            	}
                 if (showInSession) {
                     getSession().success(opResult);
                 } else {

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.html

@@ -19,6 +19,11 @@
 	xmlns:wicket="http://wicket.apache.org">
 <body>
 	<wicket:extend>
+
+	<form wicket:id="details">
+	<div>
+	<div wicket:id="testConnectionResults"/>
+	</div>
 		<div class="row">
 			<div wicket:id="lastStatus" />
 			<div wicket:id="sourceTarget" />
@@ -33,6 +38,14 @@
 		<div>
 			<div wicket:id="resourceConfig" />
 		</div>
+
+		<div class="main-button-bar">
+            <span class="button-group">
+                <a class="btn btn-default" wicket:id="testConnection" />
+            </span>
+        </div>
+        </form>
+
 	</wicket:extend>
 </body>
 </html>