Changeset 8413 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
- Timestamp:
- 2015-05-22T01:39:47+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
r8404 r8413 303 303 /** The unique instance/ */ 304 304 public static final Always INSTANCE = new Always(); 305 @Override public boolean match(OsmPrimitive osm) { 305 @Override 306 public boolean match(OsmPrimitive osm) { 306 307 return true; 307 308 } … … 322 323 */ 323 324 public static class Not extends UnaryMatch { 324 public Not(Match match) {super(match);} 325 @Override public boolean match(OsmPrimitive osm) { 325 public Not(Match match) { 326 super(match); 327 } 328 @Override 329 public boolean match(OsmPrimitive osm) { 326 330 return !match.match(osm); 327 331 } 328 @Override public String toString() {return "!"+match;} 332 @Override 333 public String toString() { 334 return "!" + match; 335 } 329 336 public Match getMatch() { 330 337 return match; … … 357 364 */ 358 365 public static class And extends BinaryMatch { 359 public And(Match lhs, Match rhs) {super(lhs, rhs);} 360 @Override public boolean match(OsmPrimitive osm) { 366 public And(Match lhs, Match rhs) { 367 super(lhs, rhs); 368 } 369 @Override 370 public boolean match(OsmPrimitive osm) { 361 371 return lhs.match(osm) && rhs.match(osm); 362 372 } 363 @Override public String toString() { 373 @Override 374 public String toString() { 364 375 return lhs + " && " + rhs; 365 376 } … … 370 381 */ 371 382 public static class Or extends BinaryMatch { 372 public Or(Match lhs, Match rhs) {super(lhs, rhs);} 373 @Override public boolean match(OsmPrimitive osm) { 383 public Or(Match lhs, Match rhs) { 384 super(lhs, rhs); 385 } 386 @Override 387 public boolean match(OsmPrimitive osm) { 374 388 return lhs.match(osm) || rhs.match(osm); 375 389 } 376 @Override public String toString() { 390 @Override 391 public String toString() { 377 392 return lhs + " || " + rhs; 378 393 } … … 383 398 */ 384 399 public static class Xor extends BinaryMatch { 385 public Xor(Match lhs, Match rhs) {super(lhs, rhs);} 386 @Override public boolean match(OsmPrimitive osm) { 400 public Xor(Match lhs, Match rhs) { 401 super(lhs, rhs); 402 } 403 @Override 404 public boolean match(OsmPrimitive osm) { 387 405 return lhs.match(osm) ^ rhs.match(osm); 388 406 } 389 @Override public String toString() { 407 @Override 408 public String toString() { 390 409 return lhs + " ^ " + rhs; 391 410 } … … 396 415 */ 397 416 private static class Id extends RangeMatch { 398 public Id(Range range) {super(range);} 417 public Id(Range range) { 418 super(range); 419 } 399 420 public Id(PushbackTokenizer tokenizer) throws ParseError { 400 421 this(tokenizer.readRange(tr("Range of primitive ids expected"))); 401 422 } 402 @Override protected Long getNumber(OsmPrimitive osm) { 423 @Override 424 protected Long getNumber(OsmPrimitive osm) { 403 425 return osm.isNew() ? 0 : osm.getUniqueId(); 404 426 } 405 @Override protected String getString() { 427 @Override 428 protected String getString() { 406 429 return "id"; 407 430 } … … 412 435 */ 413 436 private static class ChangesetId extends RangeMatch { 414 public ChangesetId(Range range) {super(range);} 437 public ChangesetId(Range range) { 438 super(range); 439 } 415 440 public ChangesetId(PushbackTokenizer tokenizer) throws ParseError { 416 441 this(tokenizer.readRange(tr("Range of changeset ids expected"))); 417 442 } 418 @Override protected Long getNumber(OsmPrimitive osm) { 443 @Override 444 protected Long getNumber(OsmPrimitive osm) { 419 445 return (long) osm.getChangesetId(); 420 446 } 421 @Override protected String getString() { 447 @Override 448 protected String getString() { 422 449 return "changeset"; 423 450 } … … 428 455 */ 429 456 private static class Version extends RangeMatch { 430 public Version(Range range) {super(range);} 457 public Version(Range range) { 458 super(range); 459 } 431 460 public Version(PushbackTokenizer tokenizer) throws ParseError { 432 461 this(tokenizer.readRange(tr("Range of versions expected"))); 433 462 } 434 @Override protected Long getNumber(OsmPrimitive osm) { 463 @Override 464 protected Long getNumber(OsmPrimitive osm) { 435 465 return (long) osm.getVersion(); 436 466 } 437 @Override protected String getString() { 467 @Override 468 protected String getString() { 438 469 return "version"; 439 470 } … … 485 516 } 486 517 487 @Override public boolean match(OsmPrimitive osm) { 518 @Override 519 public boolean match(OsmPrimitive osm) { 488 520 489 521 if (keyPattern != null) { … … 696 728 return key + '=' + value; 697 729 } 698 699 730 } 700 731 … … 728 759 } 729 760 730 @Override public boolean match(OsmPrimitive osm) { 761 @Override 762 public boolean match(OsmPrimitive osm) { 731 763 if (!osm.hasKeys() && osm.getUser() == null) 732 764 return search.isEmpty(); … … 760 792 return false; 761 793 } 762 @Override public String toString() { 794 @Override 795 public String toString() { 763 796 return search; 764 797 } … … 773 806 type)); 774 807 } 775 @Override public boolean match(OsmPrimitive osm) { 808 @Override 809 public boolean match(OsmPrimitive osm) { 776 810 return type.equals(osm.getType()); 777 811 } 778 @Override public String toString() {return "type="+type;} 812 @Override 813 public String toString() { 814 return "type=" + type; 815 } 779 816 } 780 817 … … 792 829 } 793 830 794 @Override public boolean match(OsmPrimitive osm) { 831 @Override 832 public boolean match(OsmPrimitive osm) { 795 833 if (osm.getUser() == null) 796 834 return user == null; … … 799 837 } 800 838 801 @Override public String toString() { 839 @Override 840 public String toString() { 802 841 return "user=" + (user == null ? "" : user); 803 842 } … … 817 856 } 818 857 819 @Override public boolean match(OsmPrimitive osm) { 858 @Override 859 public boolean match(OsmPrimitive osm) { 820 860 for (OsmPrimitive ref: osm.getReferrers()) { 821 861 if (ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted()) { … … 832 872 } 833 873 834 @Override public String toString() { 874 @Override 875 public String toString() { 835 876 return "role=" + role; 836 877 } … … 920 961 } 921 962 922 923 963 /** 924 964 * Matches ways with a number of nodes in given range … … 1027 1067 */ 1028 1068 private static class New extends Match { 1029 @Override public boolean match(OsmPrimitive osm) { 1069 @Override 1070 public boolean match(OsmPrimitive osm) { 1030 1071 return osm.isNew(); 1031 1072 } 1032 @Override public String toString() { 1073 @Override 1074 public String toString() { 1033 1075 return "new"; 1034 1076 } … … 1039 1081 */ 1040 1082 private static class Modified extends Match { 1041 @Override public boolean match(OsmPrimitive osm) { 1083 @Override 1084 public boolean match(OsmPrimitive osm) { 1042 1085 return osm.isModified() || osm.isNewOrUndeleted(); 1043 1086 } 1044 @Override public String toString() {return "modified";} 1087 @Override 1088 public String toString() { 1089 return "modified"; 1090 } 1045 1091 } 1046 1092 … … 1049 1095 */ 1050 1096 private static class Selected extends Match { 1051 @Override public boolean match(OsmPrimitive osm) { 1097 @Override 1098 public boolean match(OsmPrimitive osm) { 1052 1099 return Main.main.getCurrentDataSet().isSelected(osm); 1053 1100 } 1054 @Override public String toString() {return "selected";} 1101 @Override 1102 public String toString() { 1103 return "selected"; 1104 } 1055 1105 } 1056 1106 … … 1061 1111 */ 1062 1112 private static class Incomplete extends Match { 1063 @Override public boolean match(OsmPrimitive osm) { 1113 @Override 1114 public boolean match(OsmPrimitive osm) { 1064 1115 return osm.isIncomplete(); 1065 1116 } 1066 @Override public String toString() {return "incomplete";} 1117 @Override 1118 public String toString() { 1119 return "incomplete"; 1120 } 1067 1121 } 1068 1122 … … 1073 1127 */ 1074 1128 private static class Untagged extends Match { 1075 @Override public boolean match(OsmPrimitive osm) { 1129 @Override 1130 public boolean match(OsmPrimitive osm) { 1076 1131 return !osm.isTagged() && !osm.isIncomplete(); 1077 1132 } 1078 @Override public String toString() {return "untagged";} 1133 @Override 1134 public String toString() { 1135 return "untagged"; 1136 } 1079 1137 } 1080 1138 … … 1083 1141 */ 1084 1142 private static class Closed extends Match { 1085 @Override public boolean match(OsmPrimitive osm) { 1143 @Override 1144 public boolean match(OsmPrimitive osm) { 1086 1145 return osm instanceof Way && ((Way) osm).isClosed(); 1087 1146 } 1088 @Override public String toString() {return "closed";} 1147 @Override 1148 public String toString() { 1149 return "closed"; 1150 } 1089 1151 } 1090 1152 … … 1096 1158 super(m); 1097 1159 } 1098 @Override public boolean match(OsmPrimitive osm) { 1160 @Override 1161 public boolean match(OsmPrimitive osm) { 1099 1162 boolean isParent = false; 1100 1163 … … 1110 1173 return isParent; 1111 1174 } 1112 @Override public String toString() {return "parent(" + match + ")";} 1175 @Override 1176 public String toString() { 1177 return "parent(" + match + ")"; 1178 } 1113 1179 } 1114 1180 … … 1122 1188 } 1123 1189 1124 @Override public boolean match(OsmPrimitive osm) { 1190 @Override 1191 public boolean match(OsmPrimitive osm) { 1125 1192 boolean isChild = false; 1126 1193 for (OsmPrimitive p : osm.getReferrers()) { … … 1129 1196 return isChild; 1130 1197 } 1131 @Override public String toString() {return "child(" + match + ")";} 1198 @Override 1199 public String toString() { 1200 return "child(" + match + ")"; 1201 } 1132 1202 } 1133 1203
Note:
See TracChangeset
for help on using the changeset viewer.