Fixes #443

devgateway · May 24, 2022 · 0723ada · 0723ada
1 parent 7525067
commit 0723ada
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 85 deletions.
diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ComponentUtil.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/components/ComponentUtil.java
diff --git a/...src/main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapAddButton.java b/...src/main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapAddButton.java
@@ -21,7 +21,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.model.IModel;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 
 /**
  * @author mpostelnicu

diff --git a/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapCancelButton.java b/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapCancelButton.java
@@ -19,7 +19,7 @@
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.spinner.SpinnerAjaxButton;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.model.IModel;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 
 /**
  * @author mpostelnicu

diff --git a/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapDeleteButton.java b/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapDeleteButton.java
@@ -24,7 +24,7 @@
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnEventHeaderItem;
 import org.apache.wicket.model.IModel;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 import org.devgateway.toolkit.forms.wicket.events.EditingDisabledEvent;
 
 /**

diff --git a/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapSubmitButton.java b/.../main/java/org/devgateway/toolkit/forms/wicket/components/form/BootstrapSubmitButton.java
@@ -21,7 +21,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 
 /**
  * @author mpostelnicu

diff --git a/.../org/devgateway/toolkit/forms/wicket/components/form/FileInputBootstrapFormComponent.java b/.../org/devgateway/toolkit/forms/wicket/components/form/FileInputBootstrapFormComponent.java
@@ -15,7 +15,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.model.IModel;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 import org.devgateway.toolkit.persistence.dao.FileMetadata;
 import org.devgateway.toolkit.persistence.dao.GenericPersistable;
 

diff --git a/...vgateway/toolkit/forms/wicket/components/form/FileInputBootstrapFormComponentWrapper.java b/...vgateway/toolkit/forms/wicket/components/form/FileInputBootstrapFormComponentWrapper.java
@@ -46,7 +46,7 @@
 import org.apache.wicket.util.resource.AbstractResourceStreamWriter;
 import org.devgateway.toolkit.forms.security.SecurityConstants;
 import org.devgateway.toolkit.forms.util.FileTypeUtil;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 import org.devgateway.toolkit.forms.wicket.components.util.CustomDownloadLink;
 import org.devgateway.toolkit.forms.wicket.events.EditingDisabledEvent;
 import org.devgateway.toolkit.forms.wicket.events.EditingEnabledEvent;

diff --git a/...org/devgateway/toolkit/forms/wicket/components/form/SummernoteBootstrapFormComponent.java b/...org/devgateway/toolkit/forms/wicket/components/form/SummernoteBootstrapFormComponent.java
@@ -31,7 +31,7 @@
 import org.apache.wicket.validation.ValidationError;
 import org.apache.wicket.validation.validator.StringValidator;
 import org.devgateway.toolkit.forms.WebConstants;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 
 /**
  * @author mpostelnicu

diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/page/edit/AbstractEditPage.java
@@ -35,12 +35,12 @@
 import org.devgateway.toolkit.forms.exceptions.NullJpaServiceException;
 import org.devgateway.toolkit.forms.exceptions.NullListPageClassException;
 import org.devgateway.toolkit.forms.util.MarkupCacheService;
-import org.devgateway.toolkit.forms.wicket.components.ComponentUtil;
 import org.devgateway.toolkit.forms.wicket.components.form.BootstrapCancelButton;
 import org.devgateway.toolkit.forms.wicket.components.form.BootstrapDeleteButton;
 import org.devgateway.toolkit.forms.wicket.components.form.BootstrapSubmitButton;
 import org.devgateway.toolkit.forms.wicket.components.form.GenericBootstrapFormComponent;
 import org.devgateway.toolkit.forms.wicket.components.form.visitors.GenericBootstrapValidationVisitor;
+import org.devgateway.toolkit.forms.wicket.components.util.ComponentUtil;
 import org.devgateway.toolkit.forms.wicket.page.BasePage;
 import org.devgateway.toolkit.persistence.dao.GenericPersistable;
 import org.devgateway.toolkit.persistence.service.AdminSettingsService;