refactoring

Evolveum · Mar 13, 2024 · 3960e70 · 3960e70
1 parent d40e93f
commit 3960e70
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/.../evolveum/midpoint/gui/impl/factory/panel/ResourceAttributesSearchFilterPanelFactory.java b/.../evolveum/midpoint/gui/impl/factory/panel/ResourceAttributesSearchFilterPanelFactory.java
@@ -14,7 +14,7 @@
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.page.admin.reports.component.SearchFilterConfigurationPanel;
+import com.evolveum.midpoint.web.component.query.SearchFilterConfigurationPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterPanelFactory.java b/.../src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/SearchFilterPanelFactory.java
@@ -19,7 +19,7 @@
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
 import com.evolveum.midpoint.web.page.admin.reports.component.AceEditorPanel;
-import com.evolveum.midpoint.web.page.admin.reports.component.SearchFilterConfigurationPanel;
+import com.evolveum.midpoint.web.component.query.SearchFilterConfigurationPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 

diff --git a/...onent/SearchFilterConfigurationPanel.html → ...query/SearchFilterConfigurationPanel.html b/...onent/SearchFilterConfigurationPanel.html → ...query/SearchFilterConfigurationPanel.html
diff --git a/...onent/SearchFilterConfigurationPanel.java → ...query/SearchFilterConfigurationPanel.java b/...onent/SearchFilterConfigurationPanel.java → ...query/SearchFilterConfigurationPanel.java
@@ -4,12 +4,14 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.web.page.admin.reports.component;
+package com.evolveum.midpoint.web.component.query;
 
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismPropertyWrapper;
 
+import com.evolveum.midpoint.web.page.admin.reports.component.AceEditorPanel;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -31,7 +33,6 @@
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.input.TextPanel;
 import com.evolveum.midpoint.web.component.search.BasicSearchFilterModel;
-import com.evolveum.midpoint.web.component.search.SearchPropertiesConfigPanel;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;

diff --git a/...t/search/SearchPropertiesConfigPanel.html → ...nt/query/SearchPropertiesConfigPanel.html b/...t/search/SearchPropertiesConfigPanel.html → ...nt/query/SearchPropertiesConfigPanel.html
diff --git a/...t/search/SearchPropertiesConfigPanel.java → ...nt/query/SearchPropertiesConfigPanel.java b/...t/search/SearchPropertiesConfigPanel.java → ...nt/query/SearchPropertiesConfigPanel.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.web.component.search;
+package com.evolveum.midpoint.web.component.query;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -17,6 +17,9 @@
 import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.ItemDefinition;
 
+import com.evolveum.midpoint.web.component.search.AbstractSearchConfigurationPanel;
+import com.evolveum.midpoint.web.component.search.Property;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Component;

diff --git a/.../search/SwitchablePropertyValuePanel.html → ...t/query/SwitchablePropertyValuePanel.html b/.../search/SwitchablePropertyValuePanel.html → ...t/query/SwitchablePropertyValuePanel.html
diff --git a/.../search/SwitchablePropertyValuePanel.java → ...t/query/SwitchablePropertyValuePanel.java b/.../search/SwitchablePropertyValuePanel.java → ...t/query/SwitchablePropertyValuePanel.java
@@ -4,7 +4,7 @@
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
  */
-package com.evolveum.midpoint.web.component.search;
+package com.evolveum.midpoint.web.component.query;
 
 import java.util.ArrayList;
 import java.util.Iterator;