Ticket #3475: improvements.diff
File improvements.diff, 5.2 KB (added by , 15 years ago) |
---|
-
src/org/openstreetmap/josm/actions/search/SearchAction.java
82 82 JCheckBox regexSearch = new JCheckBox(tr("regular expression"), initialValues.regexSearch); 83 83 84 84 JPanel left = new JPanel(new GridBagLayout()); 85 86 JTextField finput = null;87 if(initialValues instanceof Filter){88 JLabel fLabel = new JLabel(tr("Please enter a filter name."));89 finput = new JTextField(((Filter)initialValues).filterName);90 left.add(fLabel, GBC.eop());91 left.add(finput, GBC.eop().fill(GBC.HORIZONTAL));92 }93 94 85 left.add(label, GBC.eop()); 95 86 left.add(input, GBC.eop().fill(GBC.HORIZONTAL)); 96 87 left.add(replace, GBC.eol()); … … 135 126 Main.parent, 136 127 initialValues instanceof Filter ? tr("Filter") : tr("Search"), 137 128 new String[] { 138 initialValues instanceof Filter ? tr(" Makefilter") : tr("Start Search"),129 initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"), 139 130 tr("Cancel")} 140 131 ); 141 132 dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"}); … … 150 141 : (add.isSelected() ? SearchAction.SearchMode.add 151 142 : (remove.isSelected() ? SearchAction.SearchMode.remove : SearchAction.SearchMode.in_selection)); 152 143 if(initialValues instanceof Filter){ 153 return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected() , finput.getText());144 return new Filter(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected()); 154 145 } else { 155 146 return new SearchSetting(input.getText(), mode, caseSensitive.isSelected(), regexSearch.isSelected()); 156 147 } -
src/org/openstreetmap/josm/data/osm/Filters.java
133 133 } 134 134 135 135 public String getColumnName(int column){ 136 String[] names = { tr("F"), tr("D"), tr(" Name"), tr("C"), tr("I"), tr("M") };136 String[] names = { tr("F"), tr("D"), tr("Text"), tr("C"), tr("I"), tr("M") }; 137 137 return names[column]; 138 138 } 139 139 … … 158 158 savePref(row); 159 159 filter(); 160 160 return; 161 case 2: f. filterName= (String)aValue;161 case 2: f.text = (String)aValue; 162 162 savePref(row); 163 163 return; 164 164 case 3: f.applyForChildren = (Boolean)aValue; … … 177 177 switch(column){ 178 178 case 0: return f.filtered; 179 179 case 1: return f.disabled; 180 case 2: return f. filterName;180 case 2: return f.text; 181 181 case 3: return f.applyForChildren; 182 182 case 4: return f.inverted; 183 183 case 5: 184 184 switch(f.mode){ 185 case replace: return "∅";186 case add: return "∪";187 case remove: return "∖";188 case in_selection: return "∩";185 case replace: return tr("R"); 186 case add: return tr("A"); 187 case remove: return tr("D"); 188 case in_selection: return tr("F"); 189 189 } 190 190 } 191 191 return null; -
src/org/openstreetmap/josm/data/osm/Filter.java
10 10 */ 11 11 public class Filter extends SearchSetting { 12 12 private final String version = "1"; 13 public String filterName = "";14 13 public Boolean filtered = false; 15 14 public Boolean disabled = true; 16 15 public Boolean inverted = false; … … 18 17 public Filter() { 19 18 super("", SearchMode.add, false, false); 20 19 } 21 public Filter(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch , String filterName) {20 public Filter(String text, SearchMode mode, boolean caseSensitive, boolean regexSearch) { 22 21 super(text, mode, caseSensitive, regexSearch); 23 this.filterName = filterName;24 22 } 25 23 26 24 public Filter(String prefText){ … … 35 33 if(prfs[2].equals("in_selection")) mode = SearchMode.in_selection; 36 34 caseSensitive = Boolean.parseBoolean(prfs[3]); 37 35 regexSearch = Boolean.parseBoolean(prfs[4]); 38 filterName = prfs[5];39 36 filtered = Boolean.parseBoolean(prfs[6]); 40 37 disabled = Boolean.parseBoolean(prfs[7]); 41 38 inverted = Boolean.parseBoolean(prfs[8]); … … 46 43 public String getPrefString(){ 47 44 return version + ";" + 48 45 text + ";" + mode + ";" + caseSensitive + ";" + regexSearch + ";" + 49 filterName+ ";" + filtered + ";" + disabled + ";" +46 "legacy" + ";" + filtered + ";" + disabled + ";" + 50 47 inverted + ";" + applyForChildren; 51 48 } 52 49 }