From 2981909d02823e7c244709e8fc0487d375384880 Mon Sep 17 00:00:00 2001
From: Mo <born19th@gmail.com>
Date: Sat, 16 Apr 2016 16:58:17 +0300
Subject: [PATCH] add illegal only option to vendor filter

---
 .../controllers/VendorFilterController.java      |  4 ++++
 .../main/resources/lang/locale_en_US.properties  |  1 +
 .../main/resources/lang/locale_ru_RU.properties  |  1 +
 client/src/main/resources/view/vFilter.fxml      |  4 +++-
 .../main/java/ru/trader/core/VendorFilter.java   | 16 +++++++++++++---
 .../java/ru/trader/store/json/FiltersStore.java  |  3 +++
 .../ru/trader/store/json/FiltersStoreTest.java   |  2 ++
 7 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/VendorFilterController.java b/client/src/main/java/ru/trader/controllers/VendorFilterController.java
index e2fb177..22e2927 100644
--- a/client/src/main/java/ru/trader/controllers/VendorFilterController.java
+++ b/client/src/main/java/ru/trader/controllers/VendorFilterController.java
@@ -33,6 +33,8 @@ public class VendorFilterController {
     private CheckBox cbDontBuy;
     @FXML
     private CheckBox cbSkipIllegal;
+    @FXML
+    private CheckBox cbIllegalOnly;
 
     private VendorFilter filter;
     private Dialog<VendorFilter> dlg;
@@ -89,6 +91,7 @@ public class VendorFilterController {
 
     private void fill(VendorFilter filter){
         this.filter = filter;
+        cbIllegalOnly.setSelected(filter.isIllegalOnly());
         cbSkipIllegal.setSelected(filter.isSkipIllegal());
         cbDontSell.setSelected(filter.isDontSell());
         cbDontBuy.setSelected(filter.isDontBuy());
@@ -112,6 +115,7 @@ public class VendorFilterController {
 
     private void save() {
         LOG.trace("Old filter", filter);
+        filter.setIllegalOnly(cbIllegalOnly.isSelected());
         filter.setSkipIllegal(cbSkipIllegal.isSelected());
         filter.dontSell(cbDontSell.isSelected());
         filter.dontBuy(cbDontBuy.isSelected());
diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties
index ea2ab3f..4c35026 100644
--- a/client/src/main/resources/lang/locale_en_US.properties
+++ b/client/src/main/resources/lang/locale_en_US.properties
@@ -213,6 +213,7 @@ filter.stations.global=Default filter
 
 # vFilter.fxml
 filter.stations.legalOnly=Legals only
+filter.stations.illegalOnly=Sell illegal only
 filter.stations.notBuy=Don't buy
 filter.stations.notSell=Don't sell
 filter.stations.label.notBuy=Don't buy:
diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties
index 1f1f5d2..ce54428 100644
--- a/client/src/main/resources/lang/locale_ru_RU.properties
+++ b/client/src/main/resources/lang/locale_ru_RU.properties
@@ -213,6 +213,7 @@ filter.stations.global=\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0
 
 # vFilter.fxml
 filter.stations.legalOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043B\u0435\u0433\u0430\u043B\u044C\u043D\u044B\u0435
+filter.stations.illegalOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043A\u043E\u043D\u0442\u0440\u0430\u0431\u0430\u043D\u0434\u0430
 filter.stations.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C
 filter.stations.notSell=\u041D\u0435 \u043F\u0440\u043E\u0434\u0430\u0432\u0430\u0442\u044C
 filter.stations.label.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C:
diff --git a/client/src/main/resources/view/vFilter.fxml b/client/src/main/resources/view/vFilter.fxml
index 159778f..a1a51d4 100644
--- a/client/src/main/resources/view/vFilter.fxml
+++ b/client/src/main/resources/view/vFilter.fxml
@@ -3,11 +3,13 @@
 <VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.trader.controllers.VendorFilterController"
               styleClass="dialog" spacing="10">
         <HBox spacing="10">
+            <CheckBox fx:id="cbIllegalOnly" text="%filter.stations.illegalOnly"/>
             <CheckBox fx:id="cbSkipIllegal" text="%filter.stations.legalOnly"/>
+        </HBox>
+        <HBox spacing="10">
             <CheckBox fx:id="cbDontSell" text="%filter.stations.notBuy"/>
             <CheckBox fx:id="cbDontBuy" text="%filter.stations.notSell"/>
         </HBox>
-
         <VBox spacing="4">
             <Label text="%filter.stations.label.notBuy"/>
             <ScrollPane maxHeight="200" maxWidth="400">
diff --git a/core/src/main/java/ru/trader/core/VendorFilter.java b/core/src/main/java/ru/trader/core/VendorFilter.java
index 8d349ad..6898055 100644
--- a/core/src/main/java/ru/trader/core/VendorFilter.java
+++ b/core/src/main/java/ru/trader/core/VendorFilter.java
@@ -11,6 +11,7 @@ public class VendorFilter {
 
     private boolean disable;
     private boolean skipIllegal;
+    private boolean illegalOnly;
     private boolean dontBuy;
     private boolean dontSell;
     private final Collection<Item> buyExcludes;
@@ -20,6 +21,7 @@ public class VendorFilter {
         buyExcludes = new ArrayList<>();
         sellExcludes = new ArrayList<>();
         skipIllegal = false;
+        illegalOnly = false;
     }
 
     public boolean isDisable() {
@@ -38,6 +40,14 @@ public class VendorFilter {
         this.skipIllegal = skipIllegal;
     }
 
+    public boolean isIllegalOnly() {
+        return illegalOnly;
+    }
+
+    public void setIllegalOnly(boolean illegalOnly) {
+        this.illegalOnly = illegalOnly;
+    }
+
     public boolean isDontBuy() {
         return dontBuy;
     }
@@ -91,17 +101,17 @@ public class VendorFilter {
         if (skipIllegal && offer.isIllegal()) return true;
         switch (offer.getType()) {
             case SELL: return dontSell || sellExcludes.contains(offer.getItem());
-            case BUY: return dontBuy || buyExcludes.contains(offer.getItem());
+            case BUY: return dontBuy || (illegalOnly && !offer.isIllegal()) || buyExcludes.contains(offer.getItem());
         }
         return false;
     }
 
     public boolean isFiltered(Vendor vendor, Item item, OFFER_TYPE offerType){
         if (disable) return false;
-        if (skipIllegal && (item.isIllegal(vendor))) return true;
+        if (skipIllegal && item.isIllegal(vendor)) return true;
         switch (offerType) {
             case SELL: return dontSell || sellExcludes.contains(item);
-            case BUY: return dontBuy || buyExcludes.contains(item);
+            case BUY: return dontBuy || (illegalOnly && !item.isIllegal(vendor)) || buyExcludes.contains(item);
         }
         return false;
     }
diff --git a/core/src/main/java/ru/trader/store/json/FiltersStore.java b/core/src/main/java/ru/trader/store/json/FiltersStore.java
index 06fc461..d03ccfa 100644
--- a/core/src/main/java/ru/trader/store/json/FiltersStore.java
+++ b/core/src/main/java/ru/trader/store/json/FiltersStore.java
@@ -30,6 +30,7 @@ public class FiltersStore {
     private static final String DEFAULT_VENDOR_FILTER_KEY = "default";
     private static final String VENDOR_FILTERS_FIELD = "stations";
     private static final String LEGAL_ONLY_FIELD = "legalOnly";
+    private static final String SELL_ILLEGAL_ONLY_FIELD = "illegalOnly";
     private static final String DONT_SELL_FIELD = "notSell";
     private static final String DONT_BUY_FIELD = "notBuy";
     private static final String SELL_FILTER_FIELD = "excludeSell";
@@ -95,6 +96,7 @@ public class FiltersStore {
     private void write(String key, VendorFilter filter, JsonGenerator generator) throws IOException {
         generator.writeObjectFieldStart(key);
         generator.writeBooleanField(DISABLE_FIELD, filter.isDisable());
+        generator.writeBooleanField(SELL_ILLEGAL_ONLY_FIELD, filter.isIllegalOnly());
         generator.writeBooleanField(LEGAL_ONLY_FIELD, filter.isSkipIllegal());
         generator.writeBooleanField(DONT_SELL_FIELD, filter.isDontSell());
         generator.writeBooleanField(DONT_BUY_FIELD, filter.isDontBuy());
@@ -196,6 +198,7 @@ public class FiltersStore {
         filter.setDisable(node.get(DISABLE_FIELD).asBoolean());
         filter.setSkipIllegal(node.get(LEGAL_ONLY_FIELD).asBoolean());
         filter.dontSell(node.get(DONT_SELL_FIELD).asBoolean());
+        filter.setIllegalOnly(node.get(SELL_ILLEGAL_ONLY_FIELD).asBoolean());
         filter.dontBuy(node.get(DONT_BUY_FIELD).asBoolean());
         Iterator<JsonNode> iterator = node.get(SELL_FILTER_FIELD).elements();
         while (iterator.hasNext()) {
diff --git a/core/src/test/java/ru/trader/store/json/FiltersStoreTest.java b/core/src/test/java/ru/trader/store/json/FiltersStoreTest.java
index aca3739..ff48279 100644
--- a/core/src/test/java/ru/trader/store/json/FiltersStoreTest.java
+++ b/core/src/test/java/ru/trader/store/json/FiltersStoreTest.java
@@ -57,6 +57,7 @@ public class FiltersStoreTest extends Assert {
         VendorFilter vendorFilter = new VendorFilter();
         vendorFilter.setDisable(true);
         vendorFilter.setSkipIllegal(true);
+        vendorFilter.setIllegalOnly(true);
         vendorFilter.dontBuy(true);
         vendorFilter.addSellExclude(gold);
         vendorFilter.addSellExclude(tea);
@@ -102,6 +103,7 @@ public class FiltersStoreTest extends Assert {
 
     private void assertFilter(VendorFilter expected, VendorFilter actual){
         assertEquals(expected.isDisable(), actual.isDisable());
+        assertEquals(expected.isIllegalOnly(), actual.isIllegalOnly());
         assertEquals(expected.isSkipIllegal(), actual.isSkipIllegal());
         assertEquals(expected.isDontBuy(), actual.isDontBuy());
         assertEquals(expected.isDontSell(), actual.isDontSell());