diff --git a/com.hazard157.prisex24/dev-docs/devel-explorer.txt b/com.hazard157.prisex24/dev-docs/devel-explorer.txt index e9e811e..3ead415 100644 --- 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 index eb679be..7f7d3aa 100644 --- 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 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 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 index fdd24ff..55a6a11 100644 --- a/com.hazard157.psx.proj3/.classpath +++ b/com.hazard157.psx.proj3/.classpath @@ -6,6 +6,6 @@ - + diff --git a/com.hazard157.psx.proj3/META-INF/MANIFEST.MF b/com.hazard157.psx.proj3/META-INF/MANIFEST.MF index 2c4a52a..94e2544 100644 --- 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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqFilter.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqFilter.java similarity index 95% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqFilter.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqFilter.java index 11c9e43..c1b43d0 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqFilter.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqInquiry.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqInquiry.java similarity index 96% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqInquiry.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqInquiry.java index e2ab888..4e8a6af 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqInquiry.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqProcessor.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqProcessor.java similarity index 96% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqProcessor.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqProcessor.java index 91c0209..9831376 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqProcessor.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqResult.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqResult.java similarity index 96% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqResult.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/IBeqResult.java index 9a05fd1..b096904 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/IBeqResult.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterAnyText.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterAnyText.java similarity index 99% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterAnyText.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterAnyText.java index 095d851..b85eeaa 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterAnyText.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterEpisodeIds.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterEpisodeIds.java similarity index 98% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterEpisodeIds.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterEpisodeIds.java index 4cffb8c..6b415b0 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterEpisodeIds.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterTagIds.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterTagIds.java similarity index 98% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterTagIds.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/BeqSingleFilterTagIds.java index 09536ce..e3f2832 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/BeqSingleFilterTagIds.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/EBeqSingleFilterKind.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/EBeqSingleFilterKind.java similarity index 98% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/EBeqSingleFilterKind.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/EBeqSingleFilterKind.java index 2a723f2..ff5851d 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/EBeqSingleFilterKind.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/IPsxResources.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/IPsxResources.java similarity index 92% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/IPsxResources.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/filters/IPsxResources.java index 6d7609c..7cb048c 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/filters/IPsxResources.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqFilter.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqFilter.java similarity index 93% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqFilter.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqFilter.java index bc86184..f0103db 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqFilter.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqInquiry.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqInquiry.java similarity index 93% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqInquiry.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqInquiry.java index e359e48..1f4627c 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqInquiry.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqProcessor.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqProcessor.java similarity index 96% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqProcessor.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqProcessor.java index 31b33a6..1135a35 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqProcessor.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqResult.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqResult.java similarity index 97% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqResult.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqResult.java index c7a73f0..904fe0a 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqResult.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/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/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqUtils.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqUtils.java similarity index 92% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqUtils.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqUtils.java index 94e06f1..06e4c61 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/BeqUtils.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/BeqUtils.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.*; @@ -6,8 +6,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.*; /** * Методы работы с подсистемой BEQ. diff --git a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/IPsxResources.java b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/IPsxResources.java similarity index 89% rename from com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/IPsxResources.java rename to com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/excl_done/beq/impl/IPsxResources.java index ab5e00e..c6d32d6 100644 --- a/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/bricks/beq/impl/IPsxResources.java +++ b/com.hazard157.psx.proj3/src/com/hazard157/psx/proj3/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 index 32d2d72..133301b 100644 --- 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 index 9cdc78a..c607751 100644 --- 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 index 14fcc92..3acb5a2 100644 --- 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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/IPsxResources.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/IPsxResources.java similarity index 86% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/IPsxResources.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/IPsxResources.java index 354db87..992a0ca 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/IPsxResources.java +++ b/com.hazard157.psx24.core/src/com/hazard157/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/PqQueryProcessor.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/PqQueryProcessor.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/PqQueryProcessor.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/PqQueryProcessor.java index ac401bb..6dcf6c7 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq/PqQueryProcessor.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/AbstractFilterPanel.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/AbstractFilterPanel.java similarity index 98% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/AbstractFilterPanel.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/AbstractFilterPanel.java index bcc8e04..00dec38 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/AbstractFilterPanel.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/EPqSingleFilterKind.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/EPqSingleFilterKind.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/EPqSingleFilterKind.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/EPqSingleFilterKind.java index 13393ce..d10d42c 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/EPqSingleFilterKind.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/IPsxResources.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/IPsxResources.java similarity index 71% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/IPsxResources.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/IPsxResources.java index 621723f..2ce8588 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/IPsxResources.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSet.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PanelAllFiltersSet.java similarity index 98% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSet.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PanelAllFiltersSet.java index 79d9304..919bc2b 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSet.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/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/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSetLadder.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PanelAllFiltersSetLadder.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSetLadder.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PanelAllFiltersSetLadder.java index c0bfd7a..9d9f3e6 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/PanelAllFiltersSetLadder.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/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}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyText.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyText.java similarity index 98% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyText.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyText.java index 618f278..8355cca 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyText.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyText.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.filters; +package com.hazard157.psx24.core.bricks.pq.filters; import org.toxsoft.core.tslib.av.opset.*; import org.toxsoft.core.tslib.av.opset.impl.*; @@ -15,7 +15,8 @@ * * @author hazard157 */ -class PqFilterAnyText +@SuppressWarnings( "javadoc" ) +public class PqFilterAnyText implements ITsFilter { /** diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyTextPanel.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyTextPanel.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyTextPanel.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyTextPanel.java index 7fb8493..5d7e7db 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterAnyTextPanel.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterAnyTextPanel.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 static org.toxsoft.core.tsgui.valed.api.IValedControlConstants.*; import static org.toxsoft.core.tslib.av.impl.AvUtils.*; @@ -19,8 +19,6 @@ import org.toxsoft.core.tslib.utils.errors.*; import org.toxsoft.core.tslib.utils.txtmatch.*; -import com.hazard157.psx24.explorer.gui.filters.*; - /** * Панель настройки фильтра {@link PqFilterAnyText}. * diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIds.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIds.java similarity index 96% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIds.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIds.java index 29ee601..a961683 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIds.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIds.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.filters; +package com.hazard157.psx24.core.bricks.pq.filters; import org.toxsoft.core.tslib.av.opset.*; import org.toxsoft.core.tslib.av.opset.impl.*; @@ -16,7 +16,8 @@ * * @author hazard157 */ -class PqFilterEpisodeIds +@SuppressWarnings( "javadoc" ) +public class PqFilterEpisodeIds implements ITsFilter { /** diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIdsPanel.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIdsPanel.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIdsPanel.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIdsPanel.java index 1ddea5d..83b40fc 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterEpisodeIdsPanel.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterEpisodeIdsPanel.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 static org.toxsoft.core.tsgui.valed.api.IValedControlConstants.*; import static org.toxsoft.core.tslib.av.impl.AvUtils.*; @@ -19,7 +19,6 @@ import org.toxsoft.core.tslib.utils.errors.*; import com.hazard157.psx24.core.glib.dialogs.epsel.*; -import com.hazard157.psx24.explorer.gui.filters.*; /** * Панель настройки фильтра {@link PqFilterAnyText}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIds.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIds.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIds.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIds.java index 2667ff3..d138c97 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIds.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIds.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.filters; +package com.hazard157.psx24.core.bricks.pq.filters; import org.toxsoft.core.tslib.av.opset.*; import org.toxsoft.core.tslib.av.opset.impl.*; @@ -17,7 +17,8 @@ * * @author hazard157 */ -class PqFilterTagIds +@SuppressWarnings( "javadoc" ) +public class PqFilterTagIds implements ITsFilter { /** diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIdsPanel.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIdsPanel.java similarity index 97% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIdsPanel.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIdsPanel.java index 367dbf6..b091213 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/filters/PqFilterTagIdsPanel.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/filters/PqFilterTagIdsPanel.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 static org.toxsoft.core.tsgui.m5.gui.mpc.IMultiPaneComponentConstants.*; import static org.toxsoft.core.tslib.av.impl.AvUtils.*; @@ -21,7 +21,6 @@ import com.hazard157.psx.proj3.tags.*; import com.hazard157.psx24.core.m5.*; -import com.hazard157.psx24.explorer.gui.filters.*; /** * Панель настройки фильтра {@link PqFilterTagIds}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/AbstractResultsPanel.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/AbstractResultsPanel.java similarity index 98% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/AbstractResultsPanel.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/AbstractResultsPanel.java index 14b5d2e..6db8006 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/AbstractResultsPanel.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/AbstractResultsPanel.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.gui.resview; +package com.hazard157.psx24.core.bricks.pq.resview; import org.eclipse.swt.widgets.*; import org.toxsoft.core.tsgui.bricks.ctx.*; diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/IPsxResources.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/IPsxResources.java similarity index 91% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/IPsxResources.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/IPsxResources.java index 1ae450b..47a14eb 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/IPsxResources.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/IPsxResources.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.gui.resview; +package com.hazard157.psx24.core.bricks.pq.resview; /** * Лолкализуемые ресурсы. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/ResultsPanelAsSimpleList.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/ResultsPanelAsSimpleList.java similarity index 98% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/ResultsPanelAsSimpleList.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/ResultsPanelAsSimpleList.java index 61676a9..3a392c3 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/resview/ResultsPanelAsSimpleList.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/pq/resview/ResultsPanelAsSimpleList.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.gui.resview; +package com.hazard157.psx24.core.bricks.pq.resview; import static com.hazard157.psx24.core.m5.IPsxM5Constants.*; import static org.toxsoft.core.tsgui.m5.gui.mpc.IMultiPaneComponentConstants.*; diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IPsxResources.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IPsxResources.java similarity index 81% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IPsxResources.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IPsxResources.java index 20010d6..8d39a3b 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IPsxResources.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IPsxResources.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.unit; +package com.hazard157.psx24.core.bricks.unit; /** * Localizable resources. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IUnitExplorer.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IUnitExplorer.java similarity index 81% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IUnitExplorer.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IUnitExplorer.java index f50a9c0..ba1d5fc 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/IUnitExplorer.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/IUnitExplorer.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.unit; +package com.hazard157.psx24.core.bricks.unit; import org.toxsoft.core.txtproj.lib.sinent.*; diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/Inquiry.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/Inquiry.java similarity index 95% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/Inquiry.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/Inquiry.java index 9d1e18f..999f039 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/Inquiry.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/Inquiry.java @@ -1,6 +1,6 @@ -package com.hazard157.psx24.explorer.unit; +package com.hazard157.psx24.core.bricks.unit; -import static com.hazard157.psx24.explorer.unit.IPsxResources.*; +import static com.hazard157.psx24.core.bricks.unit.IPsxResources.*; import org.toxsoft.core.tslib.bricks.validator.impl.*; import org.toxsoft.core.tslib.coll.impl.*; diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryInfo.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryInfo.java similarity index 95% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryInfo.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryInfo.java index 464b1d9..b3316a1 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryInfo.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryInfo.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.unit; +package com.hazard157.psx24.core.bricks.unit; import org.toxsoft.core.tslib.utils.errors.*; diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryItem.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryItem.java similarity index 96% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryItem.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryItem.java index c704b48..a8fc167 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/InquiryItem.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/InquiryItem.java @@ -1,6 +1,6 @@ -package com.hazard157.psx24.explorer.unit; +package com.hazard157.psx24.core.bricks.unit; -import static com.hazard157.psx24.explorer.unit.IPsxResources.*; +import static com.hazard157.psx24.core.bricks.unit.IPsxResources.*; import org.toxsoft.core.tslib.bricks.filter.*; import org.toxsoft.core.tslib.bricks.filter.impl.*; @@ -10,7 +10,7 @@ import org.toxsoft.core.tslib.utils.*; import org.toxsoft.core.tslib.utils.errors.*; -import com.hazard157.psx24.explorer.filters.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; /** * Filter selection from episodes. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryInfoKeeper.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryInfoKeeper.java similarity index 93% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryInfoKeeper.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryInfoKeeper.java index f0fda8f..c6f9367 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryInfoKeeper.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryInfoKeeper.java @@ -1,11 +1,11 @@ -package com.hazard157.psx24.explorer.unit.impl; +package com.hazard157.psx24.core.bricks.unit.impl; import static org.toxsoft.core.tslib.bricks.strio.IStrioHardConstants.*; import org.toxsoft.core.tslib.bricks.keeper.*; import org.toxsoft.core.tslib.bricks.strio.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Keeper of the {@link InquiryInfo}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryItemKeeper.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryItemKeeper.java similarity index 93% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryItemKeeper.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryItemKeeper.java index 5a47a03..2426245 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryItemKeeper.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryItemKeeper.java @@ -1,4 +1,4 @@ -package com.hazard157.psx24.explorer.unit.impl; +package com.hazard157.psx24.core.bricks.unit.impl; import static org.toxsoft.core.tslib.bricks.strio.IStrioHardConstants.*; @@ -7,8 +7,8 @@ import org.toxsoft.core.tslib.bricks.keeper.*; import org.toxsoft.core.tslib.bricks.strio.*; -import com.hazard157.psx24.explorer.filters.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Keeper of the {@link InquiryItem}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryKeeper.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryKeeper.java similarity index 94% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryKeeper.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryKeeper.java index 7131a61..815f716 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/InquiryKeeper.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/InquiryKeeper.java @@ -1,11 +1,11 @@ -package com.hazard157.psx24.explorer.unit.impl; +package com.hazard157.psx24.core.bricks.unit.impl; import org.toxsoft.core.tslib.bricks.keeper.*; import org.toxsoft.core.tslib.bricks.strio.*; import org.toxsoft.core.tslib.bricks.strio.impl.*; import org.toxsoft.core.tslib.coll.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Keeper of the {@link Inquiry}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/UnitExplorer.java b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/UnitExplorer.java similarity index 88% rename from com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/UnitExplorer.java rename to com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/UnitExplorer.java index 348983f..6e9664e 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/unit/impl/UnitExplorer.java +++ b/com.hazard157.psx24.core/src/com/hazard157/psx24/core/bricks/unit/impl/UnitExplorer.java @@ -1,9 +1,9 @@ -package com.hazard157.psx24.explorer.unit.impl; +package com.hazard157.psx24.core.bricks.unit.impl; import org.toxsoft.core.tslib.utils.*; import org.toxsoft.core.txtproj.lib.sinent.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * {@link IUnitExplorer} implementation. diff --git a/com.hazard157.psx24.exe/bin/.gitignore b/com.hazard157.psx24.exe/bin/.gitignore deleted file mode 100644 index c2d9872..0000000 --- a/com.hazard157.psx24.exe/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/com/ diff --git a/com.hazard157.psx24.explorer/.classpath b/com.hazard157.psx24.explorer/.classpath index 5c4623a..3628e33 100644 --- a/com.hazard157.psx24.explorer/.classpath +++ b/com.hazard157.psx24.explorer/.classpath @@ -6,6 +6,6 @@ - + diff --git a/com.hazard157.psx24.explorer/META-INF/MANIFEST.MF b/com.hazard157.psx24.explorer/META-INF/MANIFEST.MF index 17a9012..6e7beea 100644 --- a/com.hazard157.psx24.explorer/META-INF/MANIFEST.MF +++ b/com.hazard157.psx24.explorer/META-INF/MANIFEST.MF @@ -32,10 +32,4 @@ Export-Package: com.hazard157.psx24.explorer, com.hazard157.psx24.explorer.e4.addons, com.hazard157.psx24.explorer.e4.services, com.hazard157.psx24.explorer.e4.uiparts, - com.hazard157.psx24.explorer.filters, - com.hazard157.psx24.explorer.gui.filters, - com.hazard157.psx24.explorer.gui.resview, - com.hazard157.psx24.explorer.m5, - com.hazard157.psx24.explorer.pq, - com.hazard157.psx24.explorer.unit, - com.hazard157.psx24.explorer.unit.impl + com.hazard157.psx24.explorer.m5 diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/addons/AddonPsx24Explorer.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/addons/AddonPsx24Explorer.java index 0bc0db9..e7b1d9c 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/addons/AddonPsx24Explorer.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/addons/AddonPsx24Explorer.java @@ -5,11 +5,11 @@ import org.toxsoft.core.tsgui.mws.bases.*; import org.toxsoft.core.txtproj.lib.*; +import com.hazard157.psx24.core.bricks.unit.*; +import com.hazard157.psx24.core.bricks.unit.impl.*; import com.hazard157.psx24.explorer.*; import com.hazard157.psx24.explorer.e4.services.*; import com.hazard157.psx24.explorer.m5.*; -import com.hazard157.psx24.explorer.unit.*; -import com.hazard157.psx24.explorer.unit.impl.*; /** * Адон плагина. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartEpisodeExplorer.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartEpisodeExplorer.java index 2dbc23b..daafa29 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartEpisodeExplorer.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartEpisodeExplorer.java @@ -5,7 +5,7 @@ import org.eclipse.swt.widgets.*; import org.toxsoft.core.tsgui.mws.bases.*; -import com.hazard157.psx24.explorer.gui.resview.*; +import com.hazard157.psx24.core.bricks.pq.resview.*; /** * Выборки для конкретного эпизода. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartPqResultsViewer.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartPqResultsViewer.java index 185d459..58af3d0 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartPqResultsViewer.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartPqResultsViewer.java @@ -22,13 +22,13 @@ import com.hazard157.psx.proj3.episodes.*; import com.hazard157.psx.proj3.episodes.story.*; import com.hazard157.psx.proj3.sourcevids.*; +import com.hazard157.psx24.core.bricks.pq.*; +import com.hazard157.psx24.core.bricks.pq.resview.*; import com.hazard157.psx24.core.e4.services.currep.*; import com.hazard157.psx24.core.e4.services.currframeslist.*; import com.hazard157.psx24.core.e4.services.filesys.*; import com.hazard157.psx24.core.e4.services.selsvins.*; import com.hazard157.psx24.explorer.e4.services.*; -import com.hazard157.psx24.explorer.gui.resview.*; -import com.hazard157.psx24.explorer.pq.*; /** * Вью отображения результатов выборки. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsInquiries.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsInquiries.java index 651cd9b..82087ef 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsInquiries.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsInquiries.java @@ -20,11 +20,11 @@ import com.hazard157.psx.common.stuff.svin.*; import com.hazard157.psx.proj3.episodes.*; +import com.hazard157.psx24.core.bricks.pq.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; +import com.hazard157.psx24.core.bricks.unit.*; import com.hazard157.psx24.explorer.e4.services.*; -import com.hazard157.psx24.explorer.gui.filters.*; import com.hazard157.psx24.explorer.m5.*; -import com.hazard157.psx24.explorer.pq.*; -import com.hazard157.psx24.explorer.unit.*; /** * Вью просмотра и редакттирования выборок обозревателя. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsSimpleQuery.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsSimpleQuery.java index 892f42c..ed88986 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsSimpleQuery.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/e4/uiparts/UipartsSimpleQuery.java @@ -12,9 +12,9 @@ import com.hazard157.psx.common.stuff.svin.*; import com.hazard157.psx.proj3.episodes.*; +import com.hazard157.psx24.core.bricks.pq.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; import com.hazard157.psx24.explorer.e4.services.*; -import com.hazard157.psx24.explorer.gui.filters.*; -import com.hazard157.psx24.explorer.pq.*; /** * Вью простого запроса, содержит фильтры по И, изменение любого немедленно отображает результат. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/IPsxResources.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/IPsxResources.java deleted file mode 100644 index 5f617f8..0000000 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/gui/filters/IPsxResources.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hazard157.psx24.explorer.gui.filters; - -/** - * Localizable resources. - * - * @author hazard157 - */ -@SuppressWarnings( "nls" ) -interface IPsxResources { - - /** - * {@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 = "Ярлыки"; - -} diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemEntityPanel.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemEntityPanel.java index ce6fd86..154d35e 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemEntityPanel.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemEntityPanel.java @@ -6,8 +6,8 @@ import org.toxsoft.core.tsgui.m5.gui.panels.impl.*; import org.toxsoft.core.tslib.bricks.validator.*; -import com.hazard157.psx24.explorer.gui.filters.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; +import com.hazard157.psx24.core.bricks.unit.*; class InquiryItemEntityPanel extends M5AbstractEntityPanel { diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemLifecycleManager.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemLifecycleManager.java index ca4b51c..70953f8 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemLifecycleManager.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemLifecycleManager.java @@ -5,7 +5,7 @@ import org.toxsoft.core.tslib.coll.*; import org.toxsoft.core.tslib.utils.errors.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; class InquiryItemLifecycleManager extends M5LifecycleManager { diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemM5Model.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemM5Model.java index ca6fdfa..950cf18 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemM5Model.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryItemM5Model.java @@ -14,7 +14,7 @@ import org.toxsoft.core.tsgui.m5.model.*; import org.toxsoft.core.tsgui.m5.model.impl.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Модель элементов {@link Inquiry#items()} типа {@link InquiryItem}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryLifecycleManager.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryLifecycleManager.java index b61dcd5..1c2714d 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryLifecycleManager.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryLifecycleManager.java @@ -7,7 +7,7 @@ import org.toxsoft.core.tslib.bricks.validator.*; import org.toxsoft.core.tslib.coll.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Менеджер ЖЦ сущностей {@link Inquiry}. diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryM5Model.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryM5Model.java index d202958..00025b9 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryM5Model.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryM5Model.java @@ -14,7 +14,7 @@ import org.toxsoft.core.tsgui.m5.std.fields.*; import org.toxsoft.core.tslib.bricks.strid.impl.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; /** * Модель {@link Inquiry} для отображения в списках diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryMpc.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryMpc.java index ad99b6b..bc34e99 100644 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryMpc.java +++ b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/m5/InquiryMpc.java @@ -27,7 +27,7 @@ import org.toxsoft.core.tslib.coll.primtypes.*; import org.toxsoft.core.tslib.coll.primtypes.impl.*; -import com.hazard157.psx24.explorer.unit.*; +import com.hazard157.psx24.core.bricks.unit.*; class InquiryMpc extends MultiPaneComponentModown { diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/IPsxResources.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/IPsxResources.java deleted file mode 100644 index 08d6c84..0000000 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/IPsxResources.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hazard157.psx24.explorer.pq2; - -/** - * Localizable resources. - * - * @author hazard157 - */ -@SuppressWarnings( "nls" ) -interface IPsxResources { - - /** - * {@link PqQueryProcessor} - */ - String FMT_WARN_UNKNOWN_EPISODE_IN_QUERY = "В запросе участвет неизвестный эпизод '%s'"; - -} diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqQueryProcessor.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqQueryProcessor.java deleted file mode 100644 index 3f6c981..0000000 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqQueryProcessor.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.hazard157.psx24.explorer.pq2; - -import static com.hazard157.psx24.explorer.pq2.IPsxResources.*; - -import org.toxsoft.core.tslib.bricks.filter.*; -import org.toxsoft.core.tslib.bricks.filter.impl.*; -import org.toxsoft.core.tslib.coll.*; -import org.toxsoft.core.tslib.coll.impl.*; -import org.toxsoft.core.tslib.coll.primtypes.*; -import org.toxsoft.core.tslib.coll.primtypes.impl.*; -import org.toxsoft.core.tslib.utils.errors.*; -import org.toxsoft.core.tslib.utils.logs.impl.*; - -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.*; - -/** - * Процессор (исполнитель) запросов. - *

- * Процессор выдает результат запроса {@link #queryData(ITsCombiFilterParams)} над входными данными - * {@link #inputData()}. - * - * @author hazard157 - */ -public class PqQueryProcessor { - - private final PqResultSet inputData; - - /** - * Набор посекундных срезов, соответствующий входным данным. - *

- * Набор представляь из собой сложную струтуру: - *

    - *
  • сначала это карта, ключи в которых - идентификатор эпизода, а значения посекундные срезы эпизода;
    • - *
  • посекундные срезы эпизода организованы в виде списка, который содержит в себе карту срезов, соответствующие - * {@link Svin}-ам входных данных. Список сортирован по времени, поскольку {@link PqResultSet} содержит сортированные - * списки {@link Svin}-ов;
    • - *
  • срез {@link Svin}-а это карта "секунда" - {@link SecondSlice}.
    • - *
- */ - private final IStringMapEdit>> secondSlices = new StringMap<>(); - - private final ITsFilterFactoriesRegistry ffReg = new TsFilterFactoriesRegistry<>( SecondSlice.class ); - - /** - * Конструктор с инвариантами. - * - * @param aInputData {@link PqResultSet} - входные данные - * @param aEpMan {@link IUnitEpisodes} - менеджер эпизодов - * @throws TsNullArgumentRtException любой аргумент = null - */ - public PqQueryProcessor( PqResultSet aInputData, IUnitEpisodes aEpMan ) { - TsNullArgumentRtException.checkNull( aInputData ); - inputData = aInputData; - for( EPqSingleFilterKind k : EPqSingleFilterKind.asList() ) { - ffReg.register( k.factory() ); - } - if( !inputData.isEmpty() ) { - for( String epId : inputData.epinsMap().keys() ) { - // проверка корректности (существования эпизода) - IEpisode e = aEpMan.items().findByKey( epId ); - if( e == null ) { - LoggerUtils.errorLogger().warning( FMT_WARN_UNKNOWN_EPISODE_IN_QUERY, epId ); - continue; - } - // создаем список карт - IListEdit> list = new ElemArrayList<>(); - secondSlices.put( epId, list ); - // формирует для каждоко эпизода посекундный срез состояний QpFilterInput - for( Svin svin : inputData.epinsMap().getByKey( epId ) ) { - IIntMapEdit ssMap = new IntMap<>( 157 ); - list.add( ssMap ); - for( int sec = svin.interval().start(); sec <= svin.interval().end(); sec++ ) { - SecondSlice fin = e.slices().get( sec ); - ssMap.put( sec, fin ); - } - } - } - } - } - - // ------------------------------------------------------------------------------------ - // API - // - - /** - * Возвращает набор входных данных, над которыми будет осуществлена выборка. - *

- * Входные данные задаются один раз в конструкторе процессора. - * - * @return {@link PqResultSet} - входные данные - */ - public PqResultSet inputData() { - return inputData; - } - - /** - * Выполняет запрос - выбирает данные из {@link #inputData()} по критериям аргумента - параметров запроса. - *

- * Если входные данные пустые, то возвращает пустой набор. - * - * @param aFilterParams {@link ITsCombiFilterParams} - параметры запроса - * @return {@link PqResultSet} - результаты запроса - * @throws TsNullArgumentRtException аргумент = null - */ - public PqResultSet queryData( ITsCombiFilterParams aFilterParams ) { - TsNullArgumentRtException.checkNull( aFilterParams ); - if( inputData.isEmpty() ) { - return PqResultSet.EMPTY; - } - if( aFilterParams == ITsCombiFilterParams.NONE ) { - return PqResultSet.EMPTY; - } - if( aFilterParams == ITsCombiFilterParams.ALL ) { - return inputData; - } - IListBasicEdit svins = new ElemLinkedBundleList<>(); - ITsFilter filter = TsCombiFilter.create( aFilterParams, ffReg ); - for( String epId : secondSlices.keys() ) { - IListEdit> list = secondSlices.getByKey( epId ); - for( IIntMap ssMap : list ) { - int startSec = -1; - int prevSec = -1; - for( int i = 0; i < ssMap.size(); i++ ) { - int sec = ssMap.keys().getValue( i ); - SecondSlice ss = ssMap.values().get( i ); - boolean accepted = filter.accept( ss ); - if( accepted ) { - if( startSec == -1 ) { - startSec = sec; - } - prevSec = sec; - } - else { - if( startSec != -1 ) { - svins.add( new Svin( epId, new Secint( startSec, prevSec ) ) ); - startSec = -1; - prevSec = -1; - } - } - } - if( startSec >= 0 ) { - svins.add( new Svin( epId, new Secint( startSec, prevSec ) ) ); - } - } - } - return new PqResultSet( svins ); - } - -} diff --git a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqResultSet.java b/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqResultSet.java deleted file mode 100644 index 9257feb..0000000 --- a/com.hazard157.psx24.explorer/src/com/hazard157/psx24/explorer/pq2/PqResultSet.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.hazard157.psx24.explorer.pq2; - -import org.toxsoft.core.tslib.bricks.strid.*; -import org.toxsoft.core.tslib.coll.*; -import org.toxsoft.core.tslib.coll.impl.*; -import org.toxsoft.core.tslib.coll.primtypes.*; -import org.toxsoft.core.tslib.coll.primtypes.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.episodes.*; - -/** - * Набор результатов запроса. - *

- * Набор используется и как вход для процессора запросов {@link PqQueryProcessor}, так и возвращается результат запроса. - * Таким образом, можно делать запросы к результатам запроса. - *

- * Для создания начального набора (сождержащего все интерваы всех эпизодов) используйте - * {@link #createFull(IUnitEpisodes)}. - *

- * Это неизменяемый класс. - * - * @author hazard157 - */ -public class PqResultSet { - - /** - * Всегда пустой набор. - */ - public static final PqResultSet EMPTY = new PqResultSet(); - - private final IStringMapEdit> epinsMap = new StringMap<>(); - - /** - * Конструктор со всеми инвариантами. - * - * @param aEpins {@link IList}<{@link Svin}> - список интервалов эпизодов - * @throws TsNullArgumentRtException аргумент = null - */ - public PqResultSet( IList aEpins ) { - TsNullArgumentRtException.checkNull( aEpins ); - for( Svin epin : aEpins ) { - IListBasicEdit list = (IListBasicEdit)epinsMap.findByKey( epin.episodeId() ); - if( list == null ) { - list = new SortedElemLinkedBundleList<>(); - epinsMap.put( epin.episodeId(), list ); - } - list.add( epin ); - } - } - - /** - * Создает набор, содержащий все интервалы всех эпизодов. - * - * @param aEpMan {@link IUnitEpisodes} - менеджер эпизодов - * @return {@link PqResultSet} - "корневой" набор, откуда пойдет первый запрос - * @throws TsNullArgumentRtException аргумент = null - */ - public static PqResultSet createFull( IUnitEpisodes aEpMan ) { - IListEdit list = new ElemLinkedBundleList<>(); - for( IEpisode e : aEpMan.items() ) { - Svin svin = new Svin( e.id(), IStridable.NONE_ID, new Secint( 0, e.info().duration() - 1 ) ); - list.add( svin ); - } - return new PqResultSet( list ); - } - - private PqResultSet() { - // nop - } - - // ------------------------------------------------------------------------------------ - // API - // - - /** - * Определяет, содержится ли что-нибудь в результате. - *

- * На данный момент равнозначно проверке на пустоту списка {@link #epinsMap()}. Сделан с учтотом возможности - * добавления полей к класс. - * - * @return boolean - признак непустого сожержимого - */ - public boolean isEmpty() { - return epinsMap.isEmpty(); - } - - /** - * Возвращает всю выборку в виде карты "ИД эпизода" - "список интервалов эпизода". - *

- * Списки в карте сортированы по правилам {@link Svin#compareTo(Svin)}. - * - * @return IStringMap<IList<{@link Svin}>> - карта "ИД эпизода" - "список интервалов эпизода" - */ - public IStringMap> epinsMap() { - return epinsMap; - } - - /** - * Возвращает все интервалы в виде одного сортированного списка. - * - * @return IList<{@link Svin}> - список всех интервалов в результате - */ - public IList listAllSvins() { - IListBasicEdit result = new SortedElemLinkedBundleList<>(); - for( IList ll : epinsMap.values() ) { - result.addAll( ll ); - } - return result; - } - -} diff --git a/com.hazard157.psx24.intro/src/com/hazard157/psx24/intro/utils/StartupGifDisplay.java b/com.hazard157.psx24.intro/src/com/hazard157/psx24/intro/utils/StartupGifDisplay.java index 03f94df..b98304a 100644 --- a/com.hazard157.psx24.intro/src/com/hazard157/psx24/intro/utils/StartupGifDisplay.java +++ b/com.hazard157.psx24.intro/src/com/hazard157/psx24/intro/utils/StartupGifDisplay.java @@ -23,11 +23,11 @@ import com.hazard157.psx.common.stuff.frame.*; import com.hazard157.psx.common.stuff.fsc.*; 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.*; import com.hazard157.psx24.core.*; +import com.hazard157.psx24.core.bricks.pq.*; +import com.hazard157.psx24.core.bricks.pq.filters.*; +import com.hazard157.psx24.core.bricks.unit.*; import com.hazard157.psx24.core.e4.services.filesys.*; import com.hazard157.psx24.core.utils.*; @@ -74,18 +74,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 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 svins = out.listByEpisode( episode.id() ); if( svins == null || svins.isEmpty() ) { return; }