|
@@ -349,9 +349,249 @@ |
349 |
349 |
|
<component name="ProjectCodeStyleSettingsManager"> |
350 |
350 |
|
<option name="PER_PROJECT_SETTINGS"> |
351 |
351 |
|
<value> |
|
352 |
+ |
<option name="FIELD_NAME_PREFIX" value="m" /> |
|
353 |
+ |
<option name="STATIC_FIELD_NAME_PREFIX" value="s" /> |
|
354 |
+ |
<option name="PARAMETER_NAME_PREFIX" value="p" /> |
|
355 |
+ |
<option name="LOCAL_VARIABLE_NAME_PREFIX" value="z" /> |
|
356 |
+ |
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" /> |
|
357 |
+ |
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND"> |
|
358 |
+ |
<value> |
|
359 |
+ |
<package name="java.awt" withSubpackages="false" static="false" /> |
|
360 |
+ |
<package name="javax.swing" withSubpackages="false" static="false" /> |
|
361 |
+ |
<package name="org" withSubpackages="true" static="true" /> |
|
362 |
+ |
</value> |
|
363 |
+ |
</option> |
|
364 |
+ |
<option name="IMPORT_LAYOUT_TABLE"> |
|
365 |
+ |
<value> |
|
366 |
+ |
<package name="javax" withSubpackages="true" static="false" /> |
|
367 |
+ |
<package name="java" withSubpackages="true" static="false" /> |
|
368 |
+ |
<emptyLine /> |
|
369 |
+ |
<package name="junit" withSubpackages="true" static="false" /> |
|
370 |
+ |
<emptyLine /> |
|
371 |
+ |
<package name="org" withSubpackages="true" static="false" /> |
|
372 |
+ |
<emptyLine /> |
|
373 |
+ |
<package name="" withSubpackages="true" static="false" /> |
|
374 |
+ |
<emptyLine /> |
|
375 |
+ |
<package name="" withSubpackages="true" static="true" /> |
|
376 |
+ |
</value> |
|
377 |
+ |
</option> |
352 |
378 |
|
<XML> |
353 |
379 |
|
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" /> |
354 |
380 |
|
</XML> |
|
381 |
+ |
<codeStyleSettings language="JAVA"> |
|
382 |
+ |
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" /> |
|
383 |
+ |
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> |
|
384 |
+ |
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" /> |
|
385 |
+ |
<option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" /> |
|
386 |
+ |
<option name="SPACE_WITHIN_METHOD_PARENTHESES" value="true" /> |
|
387 |
+ |
<option name="SPACE_WITHIN_IF_PARENTHESES" value="true" /> |
|
388 |
+ |
<option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" /> |
|
389 |
+ |
<option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" /> |
|
390 |
+ |
<option name="SPACE_WITHIN_TRY_PARENTHESES" value="true" /> |
|
391 |
+ |
<option name="SPACE_WITHIN_CATCH_PARENTHESES" value="true" /> |
|
392 |
+ |
<option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" /> |
|
393 |
+ |
<option name="SPACE_WITHIN_SYNCHRONIZED_PARENTHESES" value="true" /> |
|
394 |
+ |
<arrangement> |
|
395 |
+ |
<groups> |
|
396 |
+ |
<group> |
|
397 |
+ |
<type>GETTERS_AND_SETTERS</type> |
|
398 |
+ |
<order>KEEP</order> |
|
399 |
+ |
</group> |
|
400 |
+ |
</groups> |
|
401 |
+ |
<rules> |
|
402 |
+ |
<rule> |
|
403 |
+ |
<match> |
|
404 |
+ |
<AND> |
|
405 |
+ |
<TYPE>FIELD</TYPE> |
|
406 |
+ |
<MODIFIER>PUBLIC</MODIFIER> |
|
407 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
408 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
409 |
+ |
</AND> |
|
410 |
+ |
</match> |
|
411 |
+ |
</rule> |
|
412 |
+ |
<rule> |
|
413 |
+ |
<match> |
|
414 |
+ |
<AND> |
|
415 |
+ |
<TYPE>FIELD</TYPE> |
|
416 |
+ |
<MODIFIER>PROTECTED</MODIFIER> |
|
417 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
418 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
419 |
+ |
</AND> |
|
420 |
+ |
</match> |
|
421 |
+ |
</rule> |
|
422 |
+ |
<rule> |
|
423 |
+ |
<match> |
|
424 |
+ |
<AND> |
|
425 |
+ |
<TYPE>FIELD</TYPE> |
|
426 |
+ |
<MODIFIER>PACKAGE_PRIVATE</MODIFIER> |
|
427 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
428 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
429 |
+ |
</AND> |
|
430 |
+ |
</match> |
|
431 |
+ |
</rule> |
|
432 |
+ |
<rule> |
|
433 |
+ |
<match> |
|
434 |
+ |
<AND> |
|
435 |
+ |
<TYPE>FIELD</TYPE> |
|
436 |
+ |
<MODIFIER>PRIVATE</MODIFIER> |
|
437 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
438 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
439 |
+ |
</AND> |
|
440 |
+ |
</match> |
|
441 |
+ |
</rule> |
|
442 |
+ |
<rule> |
|
443 |
+ |
<match> |
|
444 |
+ |
<AND> |
|
445 |
+ |
<TYPE>FIELD</TYPE> |
|
446 |
+ |
<MODIFIER>PUBLIC</MODIFIER> |
|
447 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
448 |
+ |
</AND> |
|
449 |
+ |
</match> |
|
450 |
+ |
</rule> |
|
451 |
+ |
<rule> |
|
452 |
+ |
<match> |
|
453 |
+ |
<AND> |
|
454 |
+ |
<TYPE>FIELD</TYPE> |
|
455 |
+ |
<MODIFIER>PROTECTED</MODIFIER> |
|
456 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
457 |
+ |
</AND> |
|
458 |
+ |
</match> |
|
459 |
+ |
</rule> |
|
460 |
+ |
<rule> |
|
461 |
+ |
<match> |
|
462 |
+ |
<AND> |
|
463 |
+ |
<TYPE>FIELD</TYPE> |
|
464 |
+ |
<MODIFIER>PACKAGE_PRIVATE</MODIFIER> |
|
465 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
466 |
+ |
</AND> |
|
467 |
+ |
</match> |
|
468 |
+ |
</rule> |
|
469 |
+ |
<rule> |
|
470 |
+ |
<match> |
|
471 |
+ |
<AND> |
|
472 |
+ |
<TYPE>FIELD</TYPE> |
|
473 |
+ |
<MODIFIER>PRIVATE</MODIFIER> |
|
474 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
475 |
+ |
</AND> |
|
476 |
+ |
</match> |
|
477 |
+ |
</rule> |
|
478 |
+ |
<rule> |
|
479 |
+ |
<match> |
|
480 |
+ |
<AND> |
|
481 |
+ |
<TYPE>FIELD</TYPE> |
|
482 |
+ |
<MODIFIER>PUBLIC</MODIFIER> |
|
483 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
484 |
+ |
</AND> |
|
485 |
+ |
</match> |
|
486 |
+ |
</rule> |
|
487 |
+ |
<rule> |
|
488 |
+ |
<match> |
|
489 |
+ |
<AND> |
|
490 |
+ |
<TYPE>FIELD</TYPE> |
|
491 |
+ |
<MODIFIER>PROTECTED</MODIFIER> |
|
492 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
493 |
+ |
</AND> |
|
494 |
+ |
</match> |
|
495 |
+ |
</rule> |
|
496 |
+ |
<rule> |
|
497 |
+ |
<match> |
|
498 |
+ |
<AND> |
|
499 |
+ |
<TYPE>FIELD</TYPE> |
|
500 |
+ |
<MODIFIER>PACKAGE_PRIVATE</MODIFIER> |
|
501 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
502 |
+ |
</AND> |
|
503 |
+ |
</match> |
|
504 |
+ |
</rule> |
|
505 |
+ |
<rule> |
|
506 |
+ |
<match> |
|
507 |
+ |
<AND> |
|
508 |
+ |
<TYPE>FIELD</TYPE> |
|
509 |
+ |
<MODIFIER>PRIVATE</MODIFIER> |
|
510 |
+ |
<MODIFIER>FINAL</MODIFIER> |
|
511 |
+ |
</AND> |
|
512 |
+ |
</match> |
|
513 |
+ |
</rule> |
|
514 |
+ |
<rule> |
|
515 |
+ |
<match> |
|
516 |
+ |
<AND> |
|
517 |
+ |
<TYPE>FIELD</TYPE> |
|
518 |
+ |
<MODIFIER>PUBLIC</MODIFIER> |
|
519 |
+ |
</AND> |
|
520 |
+ |
</match> |
|
521 |
+ |
</rule> |
|
522 |
+ |
<rule> |
|
523 |
+ |
<match> |
|
524 |
+ |
<AND> |
|
525 |
+ |
<TYPE>FIELD</TYPE> |
|
526 |
+ |
<MODIFIER>PROTECTED</MODIFIER> |
|
527 |
+ |
</AND> |
|
528 |
+ |
</match> |
|
529 |
+ |
</rule> |
|
530 |
+ |
<rule> |
|
531 |
+ |
<match> |
|
532 |
+ |
<AND> |
|
533 |
+ |
<TYPE>FIELD</TYPE> |
|
534 |
+ |
<MODIFIER>PACKAGE_PRIVATE</MODIFIER> |
|
535 |
+ |
</AND> |
|
536 |
+ |
</match> |
|
537 |
+ |
</rule> |
|
538 |
+ |
<rule> |
|
539 |
+ |
<match> |
|
540 |
+ |
<AND> |
|
541 |
+ |
<TYPE>FIELD</TYPE> |
|
542 |
+ |
<MODIFIER>PRIVATE</MODIFIER> |
|
543 |
+ |
</AND> |
|
544 |
+ |
</match> |
|
545 |
+ |
</rule> |
|
546 |
+ |
<rule> |
|
547 |
+ |
<match> |
|
548 |
+ |
<TYPE>FIELD</TYPE> |
|
549 |
+ |
</match> |
|
550 |
+ |
</rule> |
|
551 |
+ |
<rule> |
|
552 |
+ |
<match> |
|
553 |
+ |
<TYPE>CONSTRUCTOR</TYPE> |
|
554 |
+ |
</match> |
|
555 |
+ |
</rule> |
|
556 |
+ |
<rule> |
|
557 |
+ |
<match> |
|
558 |
+ |
<AND> |
|
559 |
+ |
<TYPE>METHOD</TYPE> |
|
560 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
561 |
+ |
</AND> |
|
562 |
+ |
</match> |
|
563 |
+ |
</rule> |
|
564 |
+ |
<rule> |
|
565 |
+ |
<match> |
|
566 |
+ |
<TYPE>METHOD</TYPE> |
|
567 |
+ |
</match> |
|
568 |
+ |
</rule> |
|
569 |
+ |
<rule> |
|
570 |
+ |
<match> |
|
571 |
+ |
<TYPE>ENUM</TYPE> |
|
572 |
+ |
</match> |
|
573 |
+ |
</rule> |
|
574 |
+ |
<rule> |
|
575 |
+ |
<match> |
|
576 |
+ |
<TYPE>INTERFACE</TYPE> |
|
577 |
+ |
</match> |
|
578 |
+ |
</rule> |
|
579 |
+ |
<rule> |
|
580 |
+ |
<match> |
|
581 |
+ |
<AND> |
|
582 |
+ |
<TYPE>CLASS</TYPE> |
|
583 |
+ |
<MODIFIER>STATIC</MODIFIER> |
|
584 |
+ |
</AND> |
|
585 |
+ |
</match> |
|
586 |
+ |
</rule> |
|
587 |
+ |
<rule> |
|
588 |
+ |
<match> |
|
589 |
+ |
<TYPE>CLASS</TYPE> |
|
590 |
+ |
</match> |
|
591 |
+ |
</rule> |
|
592 |
+ |
</rules> |
|
593 |
+ |
</arrangement> |
|
594 |
+ |
</codeStyleSettings> |
355 |
595 |
|
</value> |
356 |
596 |
|
</option> |
357 |
597 |
|
<option name="USE_PER_PROJECT_SETTINGS" value="true" /> |
|
@@ -412,7 +652,7 @@ |
412 |
652 |
|
<component name="ProjectResources"> |
413 |
653 |
|
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype> |
414 |
654 |
|
</component> |
415 |
|
- |
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> |
|
655 |
+ |
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> |
416 |
656 |
|
<output url="file://$PROJECT_DIR$/out" /> |
417 |
657 |
|
</component> |
418 |
658 |
|
<component name="ProjectRunConfigurationManager"> |