- Timestamp:
- 09/27/18 16:56:25 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gio/gesture/ExpediteeKBMGestureTranslator.java
r1144 r1165 72 72 { 73 73 // Track when the mouse has moved too far and should no-op 74 if (event.getInputType() == KBM) trackMouseDragNoop((KBMInputEvent) event); 75 74 if (event.getInputType() == KBM) { 75 trackMouseDragNoop((KBMInputEvent) event); 76 } 77 76 78 return super.onInputEvent(event); 77 79 } … … 95 97 96 98 // Check if it's a typing event 97 if (kbmEvent.getEventType() != KBMInputEvent.EventType.CHAR_TYPED) return null; 99 if (kbmEvent.getEventType() != KBMInputEvent.EventType.CHAR_TYPED) { 100 return null; 101 } 98 102 //System.err.println(details() + " " + kbmEvent.getCharTyped()); 99 103 // Generate a INSERT_STRING gesture … … 114 118 115 119 // Check if it's a mouse movement event 116 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) return null; 120 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) { 121 return null; 122 } 117 123 118 124 // Generate a CURSOR_MOVED gesture … … 151 157 152 158 // Check if it's a mouse movement event 153 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) return null; 159 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) { 160 return null; 161 } 154 162 155 163 // If we are just starting to drag, save the start position of the gesture … … 224 232 225 233 // Alt is for mouse emulation 226 if (kbmTranslator.isKeyDown(Key.ALT)) return null; 234 if (kbmTranslator.isKeyDown(Key.ALT)) { 235 return null; 236 } 227 237 228 238 // Decide which frame to navigate to … … 264 274 // Check we aren't over text 265 275 Item on = FrameUtils.getCurrentItem(); 266 if (on != null && on instanceof Text && !on.isFrameName()) return null; 276 if (on != null && on instanceof Text && !on.isFrameName()) { 277 return null; 278 } 267 279 268 280 // Generate a CURSOR_MOVED gesture … … 283 295 284 296 // Alt is for mouse emulation 285 if (kbmTranslator.isKeyDown(Key.ALT)) return null; 297 if (kbmTranslator.isKeyDown(Key.ALT)) { 298 return null; 299 } 286 300 287 301 // Decide which frame to navigate to … … 329 343 // Check we are over text 330 344 Item on = FrameUtils.getCurrentItem(); 331 if (on == null || !(on instanceof Text) || on.isFrameName()) return null; 345 if (on == null || !(on instanceof Text) || on.isFrameName()) { 346 return null; 347 } 332 348 333 349 // See if we are holding shift to select text … … 399 415 400 416 // Must be holding ALT for mouse emulation 401 if (!kbmTranslator.isKeyDown(Key.ALT)) return null; 417 if (!kbmTranslator.isKeyDown(Key.ALT)) { 418 return null; 419 } 402 420 403 421 // Decide how far to move … … 406 424 // Calculate the new cursor position 407 425 Point cursorPosition = EcosystemManager.getInputManager().getCursorPosition(); 408 if (kbmEvent.getKeyDown() == Key.UP_ARROW) cursorPosition.setY(cursorPosition.getY() - distance); 409 if (kbmEvent.getKeyDown() == Key.DOWN_ARROW) cursorPosition.setY(cursorPosition.getY() + distance); 410 if (kbmEvent.getKeyDown() == Key.LEFT_ARROW) cursorPosition.setX(cursorPosition.getX() - distance); 411 if (kbmEvent.getKeyDown() == Key.RIGHT_ARROW) cursorPosition.setX(cursorPosition.getX() + distance); 426 if (kbmEvent.getKeyDown() == Key.UP_ARROW) { 427 cursorPosition.setY(cursorPosition.getY() - distance); 428 } 429 if (kbmEvent.getKeyDown() == Key.DOWN_ARROW) { 430 cursorPosition.setY(cursorPosition.getY() + distance); 431 } 432 if (kbmEvent.getKeyDown() == Key.LEFT_ARROW) { 433 cursorPosition.setX(cursorPosition.getX() - distance); 434 } 435 if (kbmEvent.getKeyDown() == Key.RIGHT_ARROW) { 436 cursorPosition.setX(cursorPosition.getX() + distance); 437 } 412 438 413 439 // Create the MOVE_CURSOR gesture and return it … … 443 469 444 470 // Return if zoom is disabled 445 if (!ExperimentalFeatures.FrameZoom.get()) return null; 471 if (!ExperimentalFeatures.FrameZoom.get()) { 472 return null; 473 } 446 474 447 475 // Make sure we are pointing at free space (or the frame name) 448 476 Item currentItem = FrameUtils.getCurrentItem(); 449 477 Collection<Item> currentItems = FrameUtils.getCurrentItems(currentItem); 450 if ((currentItem != null && !currentItem.isFrameName()) || (currentItems != null && currentItems.size() > 0)) return null; 478 if ((currentItem != null && !currentItem.isFrameName()) || (currentItems != null && currentItems.size() > 0)) { 479 return null; 480 } 451 481 452 482 // Decide on where to zoom around … … 512 542 513 543 // Must be pressing F3 to change colours 514 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F3) return null; 544 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F3) { 545 return null; 546 } 515 547 516 548 // Decide how to change the colour … … 535 567 536 568 // Must be pressing F4 to toggle annotations 537 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F4) return null; 569 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F4) { 570 return null; 571 } 538 572 539 573 // Return the gesture … … 554 588 555 589 // Must be pressing F5 to insert the date 556 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F5) return null; 590 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F5) { 591 return null; 592 } 557 593 558 594 // Return the gesture … … 573 609 574 610 // Must be pressing F6 to create a new frameset 575 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F6) return null; 611 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F6) { 612 return null; 613 } 576 614 577 615 // Return the gesture … … 592 630 593 631 // Must be pressing F7 to rotate font style 594 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F7) return null; 632 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F7) { 633 return null; 634 } 595 635 596 636 // Return the gesture … … 611 651 612 652 // Must be pressing F8 to rotate font family 613 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F8) return null; 653 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F8) { 654 return null; 655 } 614 656 615 657 // Return the gesture … … 630 672 631 673 // Must be pressing F9 to toggle audience mode 632 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F9) return null; 674 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F9) { 675 return null; 676 } 633 677 634 678 // Return the gesture … … 649 693 650 694 // Must be pressing F10 to xray mode 651 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F10) return null; 695 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F10) { 696 return null; 697 } 652 698 653 699 // Return the gesture … … 668 714 669 715 // Must be pressing F11 to save 670 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F11) return null; 716 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F11) { 717 return null; 718 } 671 719 672 720 // Return the gesture … … 687 735 688 736 // Must be pressing F12 to refresh 689 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F12) return null; 737 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F12) { 738 return null; 739 } 690 740 691 741 // Decide how to refresh … … 710 760 711 761 // Shift/Ctrl + Esc is calculate 712 if (kbmTranslator.isKeyDown(Key.SHIFT) || kbmTranslator.isKeyDown(Key.CTRL)) return null; 762 if (kbmTranslator.isKeyDown(Key.SHIFT) || kbmTranslator.isKeyDown(Key.CTRL)) { 763 return null; 764 } 713 765 714 766 // Must be pressing ESC to drop down 715 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.ESC) return null; 767 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.ESC) { 768 return null; 769 } 716 770 717 771 // Return the gesture … … 732 786 733 787 // Check that shift or ctrl is down 734 if (!kbmTranslator.isKeyDown(Key.SHIFT) && !kbmTranslator.isKeyDown(Key.CTRL)) return null; 788 if (!kbmTranslator.isKeyDown(Key.SHIFT) && !kbmTranslator.isKeyDown(Key.CTRL)) { 789 return null; 790 } 735 791 736 792 // Must be pressing Esc to calculate 737 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.ESC) return null; 793 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.ESC) { 794 return null; 795 } 738 796 739 797 // Return the gesture … … 754 812 755 813 // Check that ctrl is down 756 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 814 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 815 return null; 816 } 757 817 758 818 // Must be pressing tab to calculate 759 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.TAB) return null; 819 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.TAB) { 820 return null; 821 } 760 822 761 823 // Return the gesture … … 776 838 777 839 // Check that ctrl is down 778 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 840 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 841 return null; 842 } 779 843 780 844 // Must be pressing L to link 781 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.L) return null; 845 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.L) { 846 return null; 847 } 782 848 783 849 // Return the gesture … … 798 864 799 865 // Check that ctrl is down 800 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 866 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 867 return null; 868 } 801 869 802 870 // Must be pressing G to link 803 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.G) return null; 871 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.G) { 872 return null; 873 } 804 874 805 875 // Return the gesture … … 820 890 821 891 // Check that ctrl is down 822 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 892 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 893 return null; 894 } 823 895 824 896 // Must be pressing A to action 825 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.A) return null; 897 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.A) { 898 return null; 899 } 826 900 827 901 // Return the gesture … … 842 916 843 917 // Check that ctrl is down 844 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 918 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 919 return null; 920 } 845 921 846 922 // Must be pressing B to toggle bold 847 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.B) return null; 923 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.B) { 924 return null; 925 } 848 926 849 927 // Return the gesture … … 864 942 865 943 // Check that ctrl is down 866 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 944 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 945 return null; 946 } 867 947 868 948 // Must be pressing I to toggle italics 869 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.I) return null; 949 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.I) { 950 return null; 951 } 870 952 871 953 // Return the gesture … … 886 968 887 969 // Check that ctrl is down 888 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 970 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 971 return null; 972 } 889 973 890 974 // Must be pressing V to paste 891 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.V) return null; 975 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.V) { 976 return null; 977 } 892 978 893 979 // Return the gesture … … 908 994 909 995 // Check that ctrl is down 910 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 996 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 997 return null; 998 } 911 999 912 1000 // Must be pressing C to copy 913 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.C) return null; 1001 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.C) { 1002 return null; 1003 } 914 1004 915 1005 // Return the gesture … … 930 1020 931 1021 // Check that ctrl is down 932 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1022 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1023 return null; 1024 } 933 1025 934 1026 // Must be pressing C to make circle 935 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.C) return null; 1027 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.C) { 1028 return null; 1029 } 936 1030 937 1031 // Make sure we aren't trying to do a copy-clone 938 if (FreeItems.hasItemsAttachedToCursor()) return null; 1032 if (FreeItems.hasItemsAttachedToCursor()) { 1033 return null; 1034 } 939 1035 940 1036 // Return the gesture … … 955 1051 956 1052 // Check that ctrl is down 957 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1053 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1054 return null; 1055 } 958 1056 959 1057 // Must be pressing X to cut 960 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.X) return null; 1058 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.X) { 1059 return null; 1060 } 961 1061 962 1062 // Return the gesture … … 977 1077 978 1078 // Check that ctrl is down 979 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1079 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1080 return null; 1081 } 980 1082 981 1083 // Must be pressing M to toggle items mark 982 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.M) return null; 1084 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.M) { 1085 return null; 1086 } 983 1087 984 1088 // Return the gesture … … 999 1103 1000 1104 // Check that ctrl is down 1001 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1105 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1106 return null; 1107 } 1002 1108 1003 1109 // Must be pressing Z to undo 1004 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.X) return null; 1110 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.X) { 1111 return null; 1112 } 1005 1113 1006 1114 // Holding shift as well makes this a redo gesture … … 1024 1132 1025 1133 // Check that ctrl is down 1026 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1134 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1135 return null; 1136 } 1027 1137 1028 1138 // Must be pressing D to delete character 1029 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.D) return null; 1139 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.D) { 1140 return null; 1141 } 1030 1142 1031 1143 // Return the gesture … … 1046 1158 1047 1159 // Check that ctrl is down 1048 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1160 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1161 return null; 1162 } 1049 1163 1050 1164 // Must be pressing DELETE to delete 1051 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.DELETE) return null; 1165 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.DELETE) { 1166 return null; 1167 } 1052 1168 1053 1169 // Decide if this is an alternate mode delete … … 1072 1188 1073 1189 // Check that ctrl is down 1074 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1190 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1191 return null; 1192 } 1075 1193 1076 1194 // Must be pressing F to format 1077 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F) return null; 1195 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.F) { 1196 return null; 1197 } 1078 1198 1079 1199 // Decide if this is an horizontal or vertical format … … 1097 1217 1098 1218 // Check that ctrl is down 1099 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1219 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1220 return null; 1221 } 1100 1222 1101 1223 // Must be pressing J to justify 1102 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.J) return null; 1224 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.J) { 1225 return null; 1226 } 1103 1227 1104 1228 // Return the gesture … … 1119 1243 1120 1244 // Check that ctrl is down 1121 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1245 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1246 return null; 1247 } 1122 1248 1123 1249 // Must be pressing R to justify 1124 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.R) return null; 1250 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.R) { 1251 return null; 1252 } 1125 1253 1126 1254 // Return the gesture … … 1141 1269 1142 1270 // Check that ctrl is down 1143 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1271 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1272 return null; 1273 } 1144 1274 1145 1275 // Ctrl + Shift + S is split text 1146 if (kbmTranslator.isKeyDown(Key.SHIFT)) return null; 1276 if (kbmTranslator.isKeyDown(Key.SHIFT)) { 1277 return null; 1278 } 1147 1279 1148 1280 // Must be pressing S to save 1149 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.S) return null; 1281 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.S) { 1282 return null; 1283 } 1150 1284 1151 1285 // Return the gesture … … 1166 1300 1167 1301 // Check that ctrl is down 1168 if (!kbmTranslator.isKeyDown(Key.CTRL)) return null; 1302 if (!kbmTranslator.isKeyDown(Key.CTRL)) { 1303 return null; 1304 } 1169 1305 1170 1306 // Ctrl + Shift + S is split text 1171 if (!kbmTranslator.isKeyDown(Key.SHIFT)) return null; 1307 if (!kbmTranslator.isKeyDown(Key.SHIFT)) { 1308 return null; 1309 } 1172 1310 1173 1311 // Must be pressing S to save 1174 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.S) return null; 1312 if (kbmEvent.getKeyDown() != KBMInputEvent.Key.S) { 1313 return null; 1314 } 1175 1315 1176 1316 // Return the gesture … … 1207 1347 1208 1348 // Check if it's a mouse movement event 1209 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) return null; 1349 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) { 1350 return null; 1351 } 1210 1352 1211 1353 // See if we should inherit the attributes of the thing we're picking up … … 1218 1360 1219 1361 // Wait till we have moved out of no-op range before performing drag-pickup 1220 if (!isMouseDragNoOp()) return null; 1362 if (!isMouseDragNoOp()) { 1363 return null; 1364 } 1221 1365 1222 1366 // Generate a PICK_UP gesture … … 1254 1398 1255 1399 // Wait for the button up to perform the pickup 1256 if (!Boolean.TRUE.equals(_pickup) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) return null; 1400 if (!Boolean.TRUE.equals(_pickup) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) { 1401 return null; 1402 } 1257 1403 1258 1404 // Reset pickup for next gesture … … 1261 1407 // Check we haven't moved too far 1262 1408 if (isMouseDragNoOp()) { 1263 if (!(_clickDownOn instanceof Text)) printNoopMessage(); 1409 if (!(_clickDownOn instanceof Text)) { 1410 printNoopMessage(); 1411 } 1264 1412 return null; 1265 1413 } 1266 1414 1267 1415 // Check we should be picking up (shift forces line creation) 1268 if (FreeItems.hasItemsAttachedToCursor() || kbmTranslator.isKeyDown(Key.SHIFT)) return null; 1416 if (FreeItems.hasItemsAttachedToCursor() || kbmTranslator.isKeyDown(Key.SHIFT)) { 1417 return null; 1418 } 1269 1419 1270 1420 // Check there is something to pick up 1271 if (!FrameUtils.hasCurrentItem() && FrameUtils.getCurrentItems() == null) return null; 1421 if (!FrameUtils.hasCurrentItem() && FrameUtils.getCurrentItems() == null) { 1422 return null; 1423 } 1272 1424 1273 1425 // Return the gesture … … 1304 1456 1305 1457 // Check if it's a mouse movement event 1306 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) return null; 1458 if (kbmEvent.getEventType() != KBMInputEvent.EventType.MOUSE_MOVE) { 1459 return null; 1460 } 1307 1461 1308 1462 // See if we should inherit the attributes of the thing we're picking up … … 1315 1469 1316 1470 // Wait till we have moved out of no-op range before performing drag-pickup 1317 if (!isMouseDragNoOp()) return null; 1471 if (!isMouseDragNoOp()) { 1472 return null; 1473 } 1318 1474 1319 1475 // Generate a PICK_UP gesture … … 1336 1492 public String details() { return "RIGHT MOUSE -> PICK_UP"; } 1337 1493 1494 @Override 1338 1495 public List<Gesture> onInputEvent(InputEvent event) 1339 1496 { … … 1368 1525 1369 1526 // Wait for the button up to perform the pickup 1370 if (!Boolean.TRUE.equals(_pickup) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) return null; 1527 if (!Boolean.TRUE.equals(_pickup) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) { 1528 return null; 1529 } 1371 1530 1372 1531 // Reset pickup for next gesture … … 1377 1536 1378 1537 // Reset the line pulse if it occured 1379 if (_extrusionDelayExpired) pulseExtrusionLines(false); 1538 if (_extrusionDelayExpired) { 1539 pulseExtrusionLines(false); 1540 } 1380 1541 1381 1542 // Check we haven't moved too far … … 1386 1547 1387 1548 // Check we should be picking up (shift forces line creation) 1388 if (FreeItems.hasItemsAttachedToCursor() || kbmTranslator.isKeyDown(Key.SHIFT)) return null; 1549 if (FreeItems.hasItemsAttachedToCursor() || kbmTranslator.isKeyDown(Key.SHIFT)) { 1550 return null; 1551 } 1389 1552 1390 1553 // Check there is something to pick up 1391 if (!FrameUtils.hasCurrentItem() && FrameUtils.getCurrentItems() == null) return null; 1554 if (!FrameUtils.hasCurrentItem() && FrameUtils.getCurrentItems() == null) { 1555 return null; 1556 } 1392 1557 1393 1558 // Return the gesture … … 1408 1573 { 1409 1574 int amount = PULSE_AMOUNT; 1410 if (!pulseOn) amount *= -1; 1575 if (!pulseOn) { 1576 amount *= -1; 1577 } 1411 1578 1412 1579 if (_clickedItem != null) { … … 1449 1616 1450 1617 // Wait for the button up to perform the place 1451 if (!Boolean.TRUE.equals(_place) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) return null; 1618 if (!Boolean.TRUE.equals(_place) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) { 1619 return null; 1620 } 1452 1621 1453 1622 // Reset place for next gesture … … 1461 1630 1462 1631 // Check we should be placing 1463 if (!FreeItems.hasItemsAttachedToCursor()) return null; 1632 if (!FreeItems.hasItemsAttachedToCursor()) { 1633 return null; 1634 } 1464 1635 1465 1636 // Return the gesture … … 1493 1664 1494 1665 // Wait for the button up to perform the place 1495 if (!Boolean.TRUE.equals(_place) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) return null; 1666 if (!Boolean.TRUE.equals(_place) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) { 1667 return null; 1668 } 1496 1669 1497 1670 // Reset place for next gesture … … 1505 1678 1506 1679 // Check we should be placing 1507 if (!FreeItems.hasItemsAttachedToCursor()) return null; 1680 if (!FreeItems.hasItemsAttachedToCursor()) { 1681 return null; 1682 } 1508 1683 1509 1684 // Return the gesture … … 1569 1744 1570 1745 // Wait for the button up to perform the delete 1571 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) return null; 1746 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) { 1747 return null; 1748 } 1572 1749 1573 1750 // Reset state for next gesture … … 1614 1791 1615 1792 // Wait for the button up to perform the create 1616 if (!Boolean.TRUE.equals(_create) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) return null; 1793 if (!Boolean.TRUE.equals(_create) || kbmEvent.getMouseButtonUp() != MouseButton.MIDDLE) { 1794 return null; 1795 } 1617 1796 1618 1797 // Reset create for next gesture … … 1626 1805 1627 1806 // Check we can create 1628 if (FreeItems.hasItemsAttachedToCursor()) return null; 1807 if (FreeItems.hasItemsAttachedToCursor()) { 1808 return null; 1809 } 1629 1810 1630 1811 // Check we're not trying to pick up (shift forces item creation) 1631 if (!kbmTranslator.isKeyDown(Key.SHIFT) && (FrameUtils.hasCurrentItem() || FrameUtils.getCurrentItems() != null)) return null; 1812 if (!kbmTranslator.isKeyDown(Key.SHIFT) && (FrameUtils.hasCurrentItem() || FrameUtils.getCurrentItems() != null)) { 1813 return null; 1814 } 1632 1815 1633 1816 // Return the gesture … … 1661 1844 1662 1845 // Wait for the button up to perform the create 1663 if (!Boolean.TRUE.equals(_create) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) return null; 1846 if (!Boolean.TRUE.equals(_create) || kbmEvent.getMouseButtonUp() != MouseButton.RIGHT) { 1847 return null; 1848 } 1664 1849 1665 1850 // Reset create for next gesture … … 1673 1858 1674 1859 // Check we can create 1675 if (FreeItems.hasItemsAttachedToCursor()) return null; 1860 if (FreeItems.hasItemsAttachedToCursor()) { 1861 return null; 1862 } 1676 1863 1677 1864 // Check we're not trying to pick up (shift forces item creation) 1678 if (!kbmTranslator.isKeyDown(Key.SHIFT) && (FrameUtils.hasCurrentItem() || FrameUtils.getCurrentItems() != null)) return null; 1865 if (!kbmTranslator.isKeyDown(Key.SHIFT) && (FrameUtils.hasCurrentItem() || FrameUtils.getCurrentItems() != null)) { 1866 return null; 1867 } 1679 1868 1680 1869 // Return the gesture … … 1711 1900 1712 1901 // Wait for the button up to perform the click 1713 if (!Boolean.TRUE.equals(_click) || kbmEvent.getMouseButtonUp() != MouseButton.LEFT) return null; 1902 if (!Boolean.TRUE.equals(_click) || kbmEvent.getMouseButtonUp() != MouseButton.LEFT) { 1903 return null; 1904 } 1714 1905 1715 1906 // Reset click for next gesture … … 1782 1973 1783 1974 // Wait for the button up to perform the click 1784 if (!Boolean.TRUE.equals(_click) || kbmEvent.getMouseButtonUp() != MouseButton.LEFT) return null; 1975 if (!Boolean.TRUE.equals(_click) || kbmEvent.getMouseButtonUp() != MouseButton.LEFT) { 1976 return null; 1977 } 1785 1978 1786 1979 // Reset click for next gesture … … 1807 2000 } 1808 2001 } 1809 if (line == null) return null; 2002 if (line == null) { 2003 return null; 2004 } 1810 2005 1811 2006 // Check we haven't moved too far … … 1880 2075 1881 2076 // Wait for the button up to perform the extraction 1882 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) return null; 2077 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) { 2078 return null; 2079 } 1883 2080 1884 2081 // Reset state for next gesture … … 1892 2089 1893 2090 // Make sure we are over something to extract from 1894 if (!FrameUtils.hasCurrentItem()) return null; 2091 if (!FrameUtils.hasCurrentItem()) { 2092 return null; 2093 } 1895 2094 1896 2095 // Return the gesture … … 1956 2155 1957 2156 // Wait for the button up to perform the extraction 1958 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) return null; 2157 if (_state != STATE_BOTH_MOUSE_BUTTON_DOWN || kbmTranslator.isAnyMouseButtonDown()) { 2158 return null; 2159 } 1959 2160 1960 2161 // Reset state for next gesture … … 1968 2169 1969 2170 // Make sure we are not extracting 1970 if (FrameUtils.hasCurrentItem()) return null; 2171 if (FrameUtils.hasCurrentItem()) { 2172 return null; 2173 } 1971 2174 1972 2175 // Return the gestures … … 2041 2244 } else if (_mouseDragStart == null) { 2042 2245 org.expeditee.core.Line mouseMove = event.getMouseMove(); 2043 if (mouseMove != null) _mouseDragStart = mouseMove.getFirstEnd().clone(); 2246 if (mouseMove != null) { 2247 _mouseDragStart = mouseMove.getFirstEnd().clone(); 2248 } 2044 2249 } else if (_noop == false) { 2045 2250 org.expeditee.core.Line mouseMove = event.getMouseMove();
Note:
See TracChangeset
for help on using the changeset viewer.
