small improvements for GUI expression validator

Evolveum · Aug 8, 2018 · 888c955 · 888c955
1 parent c372877
commit 888c955
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 86 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/togglebutton/ToggleIconButton.java b/.../src/main/java/com/evolveum/midpoint/gui/api/component/togglebutton/ToggleIconButton.java
@@ -16,7 +16,6 @@
 package com.evolveum.midpoint.gui.api.component.togglebutton;
 
 import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
@@ -26,7 +25,7 @@
  *
  * @author semancik
  */
-public abstract class ToggleIconButton<T> extends AjaxButton{
+public abstract class ToggleIconButton<T> extends AjaxLink<T> {
 	private static final long serialVersionUID = 1L;
 
 	private String cssClassOff;
@@ -44,12 +43,12 @@ public ToggleIconButton(String id, String cssClassOff, String cssClassOn) {
 		initLayout();
 	}
 
-	public ToggleIconButton(String id, IModel model) {
+	public ToggleIconButton(String id, IModel<T> model) {
 		super(id, model);
 		initLayout();
 	}
 
-	public ToggleIconButton(String id, IModel model, String cssClassOff, String cssClassOn) {
+	public ToggleIconButton(String id, IModel<T> model, String cssClassOff, String cssClassOn) {
 		super(id, model);
 		this.cssClassOff = cssClassOff;
 		this.cssClassOn = cssClassOn;
@@ -58,18 +57,18 @@ public ToggleIconButton(String id, IModel model, String cssClassOff, String cssC
 
 	private void initLayout() {
 		setEscapeModelStrings(false);
-//		setBody(new Model<String>(){
-//			private static final long serialVersionUID = 1L;
-//
-//			@Override
-//			public String getObject() {
-//				if (isOn()) {
-//					return "<i class=\""+cssClassOn+"\"></i>";
-//				} else {
-//					return "<i class=\""+cssClassOff+"\"></i>";
-//				}
-//			}
-//        });
+		setBody(new Model<String>(){
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public String getObject() {
+				if (isOn()) {
+					return "<i class=\""+cssClassOn+"\"></i>";
+				} else {
+					return "<i class=\""+cssClassOff+"\"></i>";
+				}
+			}
+        });
 	}
 
 	public abstract boolean isOn();

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -277,21 +277,20 @@ public boolean isVisible() {
 				GuiStyleConstants.CLASS_ICON_COLLAPSE) {
 			private static final long serialVersionUID = 1L;
 
-				@Override
-			protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			@Override
+			public void onClick(AjaxRequestTarget target) {
 				nameClickPerformed(target);
 			}
-
-			@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
+
 			@Override
 			public boolean isOn() {
 				return !AssignmentEditorPanel.this.getModelObject().isMinimized();
 			}
 		};
 		expandButton.add(new VisibleEnableBehaviour(){
+
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			public boolean isVisible(){
 				return !getModel().getObject().isSimpleView();

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/assignment/AssociationDetailsPanel.java b/...src/main/java/com/evolveum/midpoint/web/component/assignment/AssociationDetailsPanel.java
@@ -78,16 +78,11 @@ protected AttributeAppender getSpecificLabelStyleAppender() {
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-//                isChildContainersSelectorPanelVisible = true;
-//                target.add(PrismContainerValueHeaderPanel.this);
+            public void onClick(AjaxRequestTarget target) {
+//              isChildContainersSelectorPanelVisible = true;
+//              target.add(PrismContainerValueHeaderPanel.this);            			
             }
-
 
-        	@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
             @Override
             public boolean isOn() {
                 return true;

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
@@ -200,14 +200,10 @@ public void onClick(AjaxRequestTarget target) {
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-                nameClickPerformed(target);
+            public void onClick(AjaxRequestTarget target) {
+            	nameClickPerformed(target);
             }
-
-        	@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
+
             @Override
             public boolean isOn() {
                 return !DelegationEditorPanel.this.getModelObject().isMinimized();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
@@ -156,16 +156,11 @@ public String getObject() {
         ToggleIconButton expandButton = new ToggleIconButton(ID_EXPAND,
         		GuiStyleConstants.CLASS_ICON_EXPAND, GuiStyleConstants.CLASS_ICON_COLLAPSE) {
         	private static final long serialVersionUID = 1L;
-
-        	@Override
-            protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-        		onClickPerformed(target);
-            }
 
         	@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
+        	public void onClick(AjaxRequestTarget target) {
+        		onClickPerformed(target);
+        	}
 
         	@Override
 			public boolean isOn() {

diff --git a/...c/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java b/...c/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerValueHeaderPanel.java
@@ -63,19 +63,13 @@ public boolean isVisible() {
 				GuiStyleConstants.CLASS_ICON_SHOW_METADATA, GuiStyleConstants.CLASS_ICON_SHOW_METADATA) {
 			private static final long serialVersionUID = 1L;
 
-
 			@Override
-					protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onClick(AjaxRequestTarget target) {
 				ContainerValueWrapper<C> wrapper = PrismContainerValueHeaderPanel.this.getModelObject();
 				wrapper.setShowMetadata(!wrapper.isShowMetadata());
 				onButtonClick(target);
-					}
+			}
 
-			@Override
-					protected void onError(AjaxRequestTarget target, Form<?> form) {
-						target.add(getPageBase().getFeedbackPanel());
-					}
-
 			@Override
 			public boolean isOn() {
 				return PrismContainerValueHeaderPanel.this.getModelObject().isShowMetadata();
@@ -92,6 +86,8 @@ public Object getObject() {
 		}));
 		showMetadataButton.add(new VisibleEnableBehaviour() {
 
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			public boolean isVisible() {
 				for (ItemWrapper wrapper : getModelObject().getItems()) {
@@ -110,16 +106,10 @@ public boolean isVisible() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-					protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onClick(AjaxRequestTarget target) {
 				onShowEmptyClick(target);
-					}
-
-@Override
-		protected void onError(AjaxRequestTarget target, Form<?> form) {
-	target.add(getPageBase().getFeedbackPanel());
-		}
-
-
+			}
+
 			@Override
 			public boolean isOn() {
 				return PrismContainerValueHeaderPanel.this.getModelObject().isShowEmpty();
@@ -135,15 +125,15 @@ public boolean isOn() {
         	private static final long serialVersionUID = 1L;
 
         	@Override
-        	protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-	        		ContainerValueWrapper<C> containerValueWrapper = PrismContainerValueHeaderPanel.this.getModelObject();
-	        		containerValueWrapper.setSorted(!containerValueWrapper.isSorted());
-	        		containerValueWrapper.sort();
-	        		containerValueWrapper.computeStripes();
-
-                onButtonClick(target);
-            }
-
+        	public void onClick(AjaxRequestTarget target) {
+        		ContainerValueWrapper<C> containerValueWrapper = PrismContainerValueHeaderPanel.this.getModelObject();
+        		containerValueWrapper.setSorted(!containerValueWrapper.isSorted());
+        		containerValueWrapper.sort();
+        		containerValueWrapper.computeStripes();
+
+        		onButtonClick(target);
+        	}
+        	
         	@Override
 			public boolean isOn() {
 				return PrismContainerValueHeaderPanel.this.getModelObject().isSorted();
@@ -157,16 +147,11 @@ public boolean isOn() {
         	private static final long serialVersionUID = 1L;
 
         	@Override
-        	protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-				isChildContainersSelectorPanelVisible = true;
+        	public void onClick(AjaxRequestTarget target) {
+        		isChildContainersSelectorPanelVisible = true;
 				target.add(PrismContainerValueHeaderPanel.this);
-            }
+        	}
 
-        	@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
-
         	@Override
 			public boolean isOn() {
 				return true;
@@ -233,18 +218,13 @@ public void onClick(AjaxRequestTarget ajaxRequestTarget) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onClick(AjaxRequestTarget target) {
 				ContainerValueWrapper containerValueWrapper = PrismContainerValueHeaderPanel.this.getModelObject();
 				containerValueWrapper.setStatus(ValueStatus.DELETED);
 				target.add(PrismContainerValueHeaderPanel.this);
 				PrismContainerValueHeaderPanel.this.reloadParentContainerPanel(target);
 			}
 
-			@Override
-    		protected void onError(AjaxRequestTarget target, Form<?> form) {
-    	target.add(getPageBase().getFeedbackPanel());
-    		}
-
 			@Override
 			public boolean isOn() {
 				return true;