Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Dec 17, 2015 · f0b2619 · f0b2619
2 parents 2810ae0 + cf312cd
commit f0b2619
Show file tree

Hide file tree

Showing 42 changed files with 1,759 additions and 776 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributePanel.java
@@ -18,7 +18,7 @@
 
 import com.evolveum.midpoint.common.refinery.RefinedAttributeDefinition;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;
-import com.evolveum.midpoint.web.component.util.BasePanel;
+import com.evolveum.midpoint.web.component.util.BaseDeprecatedPanel;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -33,7 +33,7 @@
 /**
  * @author lazyman
  */
-public class ACAttributePanel extends BasePanel<ACAttributeDto> {
+public class ACAttributePanel extends BaseDeprecatedPanel<ACAttributeDto> {
 
     private static final String ID_ATTRIBUTE_LABEL = "attributeLabel";
     private static final String ID_VALUES = "values";

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ResourceListPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ResourceListPanel.java
@@ -19,7 +19,7 @@
 import com.evolveum.midpoint.web.component.data.ObjectDataProvider;
 import com.evolveum.midpoint.web.component.data.TablePanel;
 import com.evolveum.midpoint.web.component.data.column.LinkColumn;
-import com.evolveum.midpoint.web.component.util.BasePanel;
+import com.evolveum.midpoint.web.component.util.BaseDeprecatedPanel;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.page.PageBase;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
@@ -34,7 +34,7 @@
 /**
  * @author lazyman
  */
-public class ResourceListPanel extends BasePanel {
+public class ResourceListPanel extends BaseDeprecatedPanel {
 
     public ResourceListPanel(String id) {
         super(id, null);