use PqXxx instead of BeqXxx in StartupGifDisplay, remove IBeqXxx

hazard157 · Jul 5, 2023 · 6c173b1 · 6c173b1
1 parent ee55f67
commit 6c173b1
Show file tree

Hide file tree

Showing 66 changed files with 151 additions and 449 deletions.
diff --git a/com.hazard157.prisex24/dev-docs/devel-explorer.txt b/com.hazard157.prisex24/dev-docs/devel-explorer.txt
@@ -1,5 +1,5 @@
 
 +++ use ISvinSeq instead of PqResultSet
---- use PqXxx instead of BeqXxx in StartupGifDisplay, remove IBeqXxx
++++ use PqXxx instead of BeqXxx in StartupGifDisplay, remove IBeqXxx
 --- UipartSingleInquiry: Uipart for one inquiry (may be saved to explorer or not)
 --- Managed part stack of UipartSingleInquiry, all of them are saved to be restored 
diff --git a/com.hazard157.prisex24/src/com/hazard157/prisex24/utils/StartupGifDisplay.java b/com.hazard157.prisex24/src/com/hazard157/prisex24/utils/StartupGifDisplay.java
@@ -18,13 +18,13 @@
 import com.hazard157.common.quants.ankind.*;
 import com.hazard157.common.quants.secint.*;
 import com.hazard157.prisex24.*;
+import com.hazard157.prisex24.explorer.filters.*;
+import com.hazard157.prisex24.explorer.pdu.*;
+import com.hazard157.prisex24.explorer.pq.*;
 import com.hazard157.prisex24.utils.frasel.*;
 import com.hazard157.psx.common.*;
 import com.hazard157.psx.common.stuff.frame.*;
 import com.hazard157.psx.common.stuff.svin.*;
-import com.hazard157.psx.proj3.bricks.beq.*;
-import com.hazard157.psx.proj3.bricks.beq.filters.*;
-import com.hazard157.psx.proj3.bricks.beq.impl.*;
 import com.hazard157.psx.proj3.episodes.*;
 
 /**
@@ -67,18 +67,19 @@ public StartupGifDisplay( ITsGuiContext aContext ) {
     if( episode == null ) {
       return;
     }
-    BeqFilter bf = new BeqFilter();
-    ITsSingleFilterParams sfp = BeqSingleFilterEpisodeIds.makeFilterParams( new SingleStringList( episode.id() ) );
-    bf.fpMap().put( EBeqSingleFilterKind.EPISODE_IDS, sfp );
+
+    InquiryItem ii = new InquiryItem();
+    ITsSingleFilterParams sfp = PqFilterEpisodeIds.makeFilterParams( new SingleStringList( episode.id() ) );
+    ii.fpMap().put( EPqSingleFilterKind.EPISODE_IDS, sfp );
     // selection criteria by tags
-    sfp = BeqSingleFilterTagIds.makeFilterParams( SELECTION_TAG_IDS, true );
-    bf.fpMap().put( EBeqSingleFilterKind.TAG_IDS, sfp );
+    sfp = PqFilterTagIds.makeFilterParams( SELECTION_TAG_IDS, true );
+    ii.fpMap().put( EPqSingleFilterKind.TAG_IDS, sfp );
     // select intervals
-    IBeqResult inAll = BeqUtils.createFull( unitEpisodes() );
-    IBeqProcessor p = new BeqProcessor( inAll, unitEpisodes() );
-    ITsCombiFilterParams cfp = bf.makeFilterParams();
-    IBeqResult out = p.queryData( cfp );
-    IList<Svin> svins = out.epinsMap().findByKey( episode.id() );
+    ISvinSeq inAll = PqQueryProcessor.createFull( unitEpisodes() );
+    PqQueryProcessor p = new PqQueryProcessor( inAll, unitEpisodes() );
+    ITsCombiFilterParams cfp = ii.getFilterParams();
+    ISvinSeq out = p.queryData( cfp );
+    IList<Svin> svins = out.listByEpisode( episode.id() );
     if( svins == null || svins.isEmpty() ) {
       return;
     }

diff --git a/com.hazard157.psx.proj3/.classpath b/com.hazard157.psx.proj3/.classpath
@@ -6,6 +6,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry excluding="com/hazard157/psx/proj3/excl_done/pfq/" kind="src" path="src"/>
+	<classpathentry excluding="com/hazard157/psx/proj3/excl_done/" kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/com.hazard157.psx.proj3/META-INF/MANIFEST.MF b/com.hazard157.psx.proj3/META-INF/MANIFEST.MF
@@ -26,9 +26,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.hazard157.psx.proj3
 Bundle-ActivationPolicy: lazy
 Export-Package: com.hazard157.psx.proj3,
- com.hazard157.psx.proj3.bricks.beq,
- com.hazard157.psx.proj3.bricks.beq.filters,
- com.hazard157.psx.proj3.bricks.beq.impl,
  com.hazard157.psx.proj3.cameras,
  com.hazard157.psx.proj3.episodes,
  com.hazard157.psx.proj3.episodes.impl,

diff --git a/...d157/psx/proj3/bricks/beq/IBeqFilter.java → ...7/psx/proj3/excl_done/beq/IBeqFilter.java b/...d157/psx/proj3/bricks/beq/IBeqFilter.java → ...7/psx/proj3/excl_done/beq/IBeqFilter.java
@@ -1,9 +1,9 @@
-package com.hazard157.psx.proj3.bricks.beq;
+package com.hazard157.psx.proj3.excl_done.beq;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.coll.*;
 
-import com.hazard157.psx.proj3.bricks.beq.filters.*;
+import com.hazard157.psx.proj3.excl_done.beq.filters.*;
 
 /**
  * Фильтр, точнее, параметры для отбора интервалов эпизода.

diff --git a/...157/psx/proj3/bricks/beq/IBeqInquiry.java → .../psx/proj3/excl_done/beq/IBeqInquiry.java b/...157/psx/proj3/bricks/beq/IBeqInquiry.java → .../psx/proj3/excl_done/beq/IBeqInquiry.java
@@ -1,10 +1,10 @@
-package com.hazard157.psx.proj3.bricks.beq;
+package com.hazard157.psx.proj3.excl_done.beq;
 
 import org.toxsoft.core.tslib.bricks.events.change.*;
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.coll.*;
 
-import com.hazard157.psx.proj3.bricks.beq.filters.*;
+import com.hazard157.psx.proj3.excl_done.beq.filters.*;
 
 /**
  * Выборка - последовательность применения фильтров {@link IBeqFilter}.

diff --git a/...7/psx/proj3/bricks/beq/IBeqProcessor.java → ...sx/proj3/excl_done/beq/IBeqProcessor.java b/...7/psx/proj3/bricks/beq/IBeqProcessor.java → ...sx/proj3/excl_done/beq/IBeqProcessor.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq;
+package com.hazard157.psx.proj3.excl_done.beq;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.utils.errors.*;

diff --git a/...d157/psx/proj3/bricks/beq/IBeqResult.java → ...7/psx/proj3/excl_done/beq/IBeqResult.java b/...d157/psx/proj3/bricks/beq/IBeqResult.java → ...7/psx/proj3/excl_done/beq/IBeqResult.java
@@ -1,11 +1,11 @@
-package com.hazard157.psx.proj3.bricks.beq;
+package com.hazard157.psx.proj3.excl_done.beq;
 
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.coll.primtypes.*;
 
 import com.hazard157.psx.common.stuff.svin.*;
-import com.hazard157.psx.proj3.bricks.beq.impl.*;
 import com.hazard157.psx.proj3.episodes.*;
+import com.hazard157.psx.proj3.excl_done.beq.impl.*;
 
 /**
  * Набор результатов запроса.

diff --git a/...s/beq/filters/BeqSingleFilterAnyText.java → ...e/beq/filters/BeqSingleFilterAnyText.java b/...s/beq/filters/BeqSingleFilterAnyText.java → ...e/beq/filters/BeqSingleFilterAnyText.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.filters;
+package com.hazard157.psx.proj3.excl_done.beq.filters;
 
 import org.toxsoft.core.tslib.av.opset.*;
 import org.toxsoft.core.tslib.av.opset.impl.*;

diff --git a/...eq/filters/BeqSingleFilterEpisodeIds.java → ...eq/filters/BeqSingleFilterEpisodeIds.java b/...eq/filters/BeqSingleFilterEpisodeIds.java → ...eq/filters/BeqSingleFilterEpisodeIds.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.filters;
+package com.hazard157.psx.proj3.excl_done.beq.filters;
 
 import org.toxsoft.core.tslib.av.opset.*;
 import org.toxsoft.core.tslib.av.opset.impl.*;

diff --git a/...ks/beq/filters/BeqSingleFilterTagIds.java → ...ne/beq/filters/BeqSingleFilterTagIds.java b/...ks/beq/filters/BeqSingleFilterTagIds.java → ...ne/beq/filters/BeqSingleFilterTagIds.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.filters;
+package com.hazard157.psx.proj3.excl_done.beq.filters;
 
 import org.toxsoft.core.tslib.av.opset.*;
 import org.toxsoft.core.tslib.av.opset.impl.*;

diff --git a/...cks/beq/filters/EBeqSingleFilterKind.java → ...one/beq/filters/EBeqSingleFilterKind.java b/...cks/beq/filters/EBeqSingleFilterKind.java → ...one/beq/filters/EBeqSingleFilterKind.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx.proj3.bricks.beq.filters;
+package com.hazard157.psx.proj3.excl_done.beq.filters;
 
-import static com.hazard157.psx.proj3.bricks.beq.filters.IPsxResources.*;
+import static com.hazard157.psx.proj3.excl_done.beq.filters.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.bricks.keeper.*;

diff --git a/...oj3/bricks/beq/filters/IPsxResources.java → .../excl_done/beq/filters/IPsxResources.java b/...oj3/bricks/beq/filters/IPsxResources.java → .../excl_done/beq/filters/IPsxResources.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.filters;
+package com.hazard157.psx.proj3.excl_done.beq.filters;
 
 /**
  * Localizable resources.

diff --git a/.../psx/proj3/bricks/beq/impl/BeqFilter.java → ...x/proj3/excl_done/beq/impl/BeqFilter.java b/.../psx/proj3/bricks/beq/impl/BeqFilter.java → ...x/proj3/excl_done/beq/impl/BeqFilter.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
-import static com.hazard157.psx.proj3.bricks.beq.impl.IPsxResources.*;
+import static com.hazard157.psx.proj3.excl_done.beq.impl.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.bricks.filter.impl.*;
@@ -10,8 +10,8 @@
 import org.toxsoft.core.tslib.utils.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.psx.proj3.bricks.beq.*;
-import com.hazard157.psx.proj3.bricks.beq.filters.*;
+import com.hazard157.psx.proj3.excl_done.beq.*;
+import com.hazard157.psx.proj3.excl_done.beq.filters.*;
 
 /**
  * Реализация {@link IBeqFilter}.

diff --git a/...psx/proj3/bricks/beq/impl/BeqInquiry.java → .../proj3/excl_done/beq/impl/BeqInquiry.java b/...psx/proj3/bricks/beq/impl/BeqInquiry.java → .../proj3/excl_done/beq/impl/BeqInquiry.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
-import static com.hazard157.psx.proj3.bricks.beq.impl.IPsxResources.*;
+import static com.hazard157.psx.proj3.excl_done.beq.impl.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.events.change.*;
 import org.toxsoft.core.tslib.bricks.filter.*;
@@ -12,7 +12,7 @@
 import org.toxsoft.core.tslib.coll.notifier.impl.*;
 import org.toxsoft.core.tslib.math.logicop.*;
 
-import com.hazard157.psx.proj3.bricks.beq.*;
+import com.hazard157.psx.proj3.excl_done.beq.*;
 
 /**
  * Выборка обозревателя - последовательность фильтров, применяемых к эпизодам.

diff --git a/...x/proj3/bricks/beq/impl/BeqProcessor.java → ...roj3/excl_done/beq/impl/BeqProcessor.java b/...x/proj3/bricks/beq/impl/BeqProcessor.java → ...roj3/excl_done/beq/impl/BeqProcessor.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
-import static com.hazard157.psx.proj3.bricks.beq.impl.IPsxResources.*;
+import static com.hazard157.psx.proj3.excl_done.beq.impl.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.bricks.filter.impl.*;
@@ -13,9 +13,9 @@
 
 import com.hazard157.common.quants.secint.*;
 import com.hazard157.psx.common.stuff.svin.*;
-import com.hazard157.psx.proj3.bricks.beq.*;
-import com.hazard157.psx.proj3.bricks.beq.filters.*;
 import com.hazard157.psx.proj3.episodes.*;
+import com.hazard157.psx.proj3.excl_done.beq.*;
+import com.hazard157.psx.proj3.excl_done.beq.filters.*;
 
 /**
  * Процессор (исполнитель) запросов.

diff --git a/.../psx/proj3/bricks/beq/impl/BeqResult.java → ...x/proj3/excl_done/beq/impl/BeqResult.java b/.../psx/proj3/bricks/beq/impl/BeqResult.java → ...x/proj3/excl_done/beq/impl/BeqResult.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.coll.impl.*;
@@ -8,8 +8,8 @@
 
 import com.hazard157.common.quants.secint.*;
 import com.hazard157.psx.common.stuff.svin.*;
-import com.hazard157.psx.proj3.bricks.beq.*;
 import com.hazard157.psx.proj3.episodes.*;
+import com.hazard157.psx.proj3.excl_done.beq.*;
 
 /**
  * Реализация {@link IBeqResult}.

diff --git a/...7/psx/proj3/bricks/beq/impl/BeqUtils.java → ...sx/proj3/excl_done/beq/impl/BeqUtils.java b/...7/psx/proj3/bricks/beq/impl/BeqUtils.java → ...sx/proj3/excl_done/beq/impl/BeqUtils.java
@@ -1,13 +1,13 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
 import org.toxsoft.core.tslib.coll.*;
 import org.toxsoft.core.tslib.coll.impl.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
 import com.hazard157.common.quants.secint.*;
 import com.hazard157.psx.common.stuff.svin.*;
-import com.hazard157.psx.proj3.bricks.beq.*;
 import com.hazard157.psx.proj3.episodes.*;
+import com.hazard157.psx.proj3.excl_done.beq.*;
 
 /**
  * Методы работы с подсистемой BEQ.

diff --git a/.../proj3/bricks/beq/impl/IPsxResources.java → ...oj3/excl_done/beq/impl/IPsxResources.java b/.../proj3/bricks/beq/impl/IPsxResources.java → ...oj3/excl_done/beq/impl/IPsxResources.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx.proj3.bricks.beq.impl;
+package com.hazard157.psx.proj3.excl_done.beq.impl;
 
 /**
  * Localizable resources.

diff --git a/com.hazard157.psx.proj3export/META-INF/MANIFEST.MF b/com.hazard157.psx.proj3export/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Require-Bundle: javax.annotation,
  com.hazard157.psx.common,
  com.hazard157.psx.proj3,
  com.hazard157.psx24.catnote,
+ com.hazard157.psx24.core,
  com.hazard157.psx24.explorer
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.hazard157.psx.proj3export

diff --git a/com.hazard157.psx.proj3export/src/com/hazard157/psx/proj3export/Proj3ExporterMain.java b/com.hazard157.psx.proj3export/src/com/hazard157/psx/proj3export/Proj3ExporterMain.java
@@ -56,10 +56,10 @@
 import com.hazard157.psx24.catnote.e4.addons.*;
 import com.hazard157.psx24.catnote.main.*;
 import com.hazard157.psx24.catnote.main.impl.*;
+import com.hazard157.psx24.core.bricks.pq.filters.*;
+import com.hazard157.psx24.core.bricks.unit.*;
+import com.hazard157.psx24.core.bricks.unit.impl.*;
 import com.hazard157.psx24.explorer.e4.addons.*;
-import com.hazard157.psx24.explorer.filters.*;
-import com.hazard157.psx24.explorer.unit.*;
-import com.hazard157.psx24.explorer.unit.impl.*;
 
 /**
  * Exporter CLI runner.

diff --git a/com.hazard157.psx24.core/META-INF/MANIFEST.MF b/com.hazard157.psx24.core/META-INF/MANIFEST.MF
@@ -29,8 +29,13 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: com.hazard157.psx24.core
 Bundle-ActivationPolicy: lazy
 Export-Package: com.hazard157.psx24.core,
+ com.hazard157.psx24.core.bricks.pq,
+ com.hazard157.psx24.core.bricks.pq.filters,
+ com.hazard157.psx24.core.bricks.pq.resview,
  com.hazard157.psx24.core.bricks.projtree,
  com.hazard157.psx24.core.bricks.projtree.nodes,
+ com.hazard157.psx24.core.bricks.unit,
+ com.hazard157.psx24.core.bricks.unit.impl,
  com.hazard157.psx24.core.e4.addons,
  com.hazard157.psx24.core.e4.handlers,
  com.hazard157.psx24.core.e4.services.currep,

diff --git a/...d157/psx24/explorer/pq/IPsxResources.java → ...7/psx24/core/bricks/pq/IPsxResources.java b/...d157/psx24/explorer/pq/IPsxResources.java → ...7/psx24/core/bricks/pq/IPsxResources.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.explorer.pq;
+package com.hazard157.psx24.core.bricks.pq;
 
 /**
  * Localizable resources.

diff --git a/...7/psx24/explorer/pq/PqQueryProcessor.java → ...sx24/core/bricks/pq/PqQueryProcessor.java b/...7/psx24/explorer/pq/PqQueryProcessor.java → ...sx24/core/bricks/pq/PqQueryProcessor.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx24.explorer.pq;
+package com.hazard157.psx24.core.bricks.pq;
 
-import static com.hazard157.psx24.explorer.pq.IPsxResources.*;
+import static com.hazard157.psx24.core.bricks.pq.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.bricks.filter.impl.*;
@@ -15,7 +15,7 @@
 import com.hazard157.common.quants.secint.*;
 import com.hazard157.psx.common.stuff.svin.*;
 import com.hazard157.psx.proj3.episodes.*;
-import com.hazard157.psx24.explorer.filters.*;
+import com.hazard157.psx24.core.bricks.pq.filters.*;
 
 /**
  * Процессор (исполнитель) запросов.

diff --git a/...orer/gui/filters/AbstractFilterPanel.java → ...ricks/pq/filters/AbstractFilterPanel.java b/...orer/gui/filters/AbstractFilterPanel.java → ...ricks/pq/filters/AbstractFilterPanel.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.explorer.gui.filters;
+package com.hazard157.psx24.core.bricks.pq.filters;
 
 import org.eclipse.swt.widgets.*;
 import org.toxsoft.core.tsgui.bricks.ctx.*;

diff --git a/...explorer/filters/EPqSingleFilterKind.java → ...ricks/pq/filters/EPqSingleFilterKind.java b/...explorer/filters/EPqSingleFilterKind.java → ...ricks/pq/filters/EPqSingleFilterKind.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx24.explorer.filters;
+package com.hazard157.psx24.core.bricks.pq.filters;
 
-import static com.hazard157.psx24.explorer.filters.IPsxResources.*;
+import static com.hazard157.psx24.core.bricks.pq.filters.IPsxResources.*;
 
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.bricks.keeper.*;

diff --git a/...psx24/explorer/filters/IPsxResources.java → ...core/bricks/pq/filters/IPsxResources.java b/...psx24/explorer/filters/IPsxResources.java → ...core/bricks/pq/filters/IPsxResources.java
@@ -1,4 +1,4 @@
-package com.hazard157.psx24.explorer.filters;
+package com.hazard157.psx24.core.bricks.pq.filters;
 
 /**
  * Localizable resources.
@@ -18,6 +18,21 @@ interface IPsxResources {
   String STR_N_EPISODE_IDS = "Выбор эпизодов";
   String STR_D_EPISODE_IDS = "Отбор эпизодов для выборки";
 
+  /**
+   * {@link PanelAllFiltersSet}, {@link PanelAllFiltersSetLadder}
+   */
+  String STR_N_FILTER_EP_IDS          = "Выборка по эпизодам";
+  String STR_N_FILTER_ANY_TEXT        = "Выборка любого текста";
+  String STR_N_FILTER_TAG_IDS         = "Выборка по ярлыкам";
+  String STR_N_CLEAR_FILTER           = "Сброс";
+  String STR_D_CLEAR_FILTER           = "Сбросить фильтра на начения по умолчанию";
+  String STR_N_INVERT_FILTER          = "НЕТ";
+  String STR_D_INVERT_FILTER          = "Применить оператор НЕТ к фильтру";
+  String STR_ALL_FP                   = "Всё";
+  String STR_N_TAB_FILTER_EPISODE_IDS = "Эпизоды";
+  String STR_N_TAB_FILTER_ANY_TEXT    = "Текст";
+  String STR_N_TAB_FILTER_TAG_IDS     = "Ярлыки";
+
   /**
    * {@link PqFilterAnyTextPanel}
    */

diff --git a/...lorer/gui/filters/PanelAllFiltersSet.java → ...bricks/pq/filters/PanelAllFiltersSet.java b/...lorer/gui/filters/PanelAllFiltersSet.java → ...bricks/pq/filters/PanelAllFiltersSet.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx24.explorer.gui.filters;
+package com.hazard157.psx24.core.bricks.pq.filters;
 
-import static com.hazard157.psx24.explorer.gui.filters.IPsxResources.*;
+import static com.hazard157.psx24.core.bricks.pq.filters.IPsxResources.*;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.*;
@@ -17,8 +17,7 @@
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.psx24.explorer.filters.*;
-import com.hazard157.psx24.explorer.unit.*;
+import com.hazard157.psx24.core.bricks.unit.*;
 
 /**
  * Панель фильтров по одному всех типов, которые генерируют один {@link ITsCombiFilterParams}.

diff --git a/...gui/filters/PanelAllFiltersSetLadder.java → .../pq/filters/PanelAllFiltersSetLadder.java b/...gui/filters/PanelAllFiltersSetLadder.java → .../pq/filters/PanelAllFiltersSetLadder.java
@@ -1,6 +1,6 @@
-package com.hazard157.psx24.explorer.gui.filters;
+package com.hazard157.psx24.core.bricks.pq.filters;
 
-import static com.hazard157.psx24.explorer.gui.filters.IPsxResources.*;
+import static com.hazard157.psx24.core.bricks.pq.filters.IPsxResources.*;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.events.*;
@@ -17,8 +17,7 @@
 import org.toxsoft.core.tslib.bricks.filter.*;
 import org.toxsoft.core.tslib.utils.errors.*;
 
-import com.hazard157.psx24.explorer.filters.*;
-import com.hazard157.psx24.explorer.unit.*;
+import com.hazard157.psx24.core.bricks.unit.*;
 
 /**
  * Панель фильтров по одному всех типов, которые генерируют один {@link ITsCombiFilterParams}.