From 75e0098dc7e6e4d350855e965c5fa291a92b47c5 Mon Sep 17 00:00:00 2001 From: ztimson Date: Mon, 28 Jan 2019 22:30:06 -0500 Subject: [PATCH] All done --- configuration.properties | 2 +- src/com/zakscode/FormulaManager/Frame.java | 36 ++++------------------ 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/configuration.properties b/configuration.properties index e7cd8c2..106299f 100644 --- a/configuration.properties +++ b/configuration.properties @@ -1,4 +1,4 @@ -#Mon Jan 28 22:07:04 EST 2019 +#Mon Jan 28 22:29:19 EST 2019 debug=false allow-publish=false URL=screenprintingsuppliescanada.com diff --git a/src/com/zakscode/FormulaManager/Frame.java b/src/com/zakscode/FormulaManager/Frame.java index 72a2323..43c35ea 100644 --- a/src/com/zakscode/FormulaManager/Frame.java +++ b/src/com/zakscode/FormulaManager/Frame.java @@ -541,46 +541,22 @@ class Frame extends JFrame { Frame.this.dtm.removeRow(i); } if (Frame.this.viewVendor.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Vendor)Main.vendors.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Vendor)Main.vendors.get(key)).toArray())); } else if (Frame.this.viewUserVendor.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Vendor)Main.userVendors.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Vendor)Main.userVendors.get(key)).toArray())); } else if (Frame.this.viewComponent.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Component)Main.components.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Component)Main.components.get(key)).toArray())); } else if (Frame.this.viewUserComponent.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Component)Main.userComponents.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Component)Main.userComponents.get(key)).toArray())); } else if (Frame.this.viewFormula.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Formula)Main.formulas.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Formula)Main.formulas.get(key)).toArray())); } else if (Frame.this.viewUserFormula.isSelected()) { - Main.vendors.keySet().stream().filter(key -> key.contains(searchBar.getText())).forEach(key -> Frame.this.dtm.addRow(((Formula)Main.userFormulas.get(key)).toArray())); + Main.vendors.keySet().stream().filter(key -> key.toLowerCase().contains(searchBar.getText().toLowerCase())).forEach(key -> Frame.this.dtm.addRow(((Formula)Main.userFormulas.get(key)).toArray())); } } else { Frame.this.reloadView(); } } - - private /* synthetic */ boolean lambda$updated$10(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } - - private /* synthetic */ boolean lambda$updated$8(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } - - private /* synthetic */ boolean lambda$updated$6(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } - - private /* synthetic */ boolean lambda$updated$4(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } - - private /* synthetic */ boolean lambda$updated$2(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } - - private /* synthetic */ boolean lambda$updated$0(JTextField searchBar2, String key) { - return key.toLowerCase().contains(searchBar2.getText()); - } }); this.setVisible(true); this.viewFormula.doClick();