2697 |
2697 |
2698 orgName1 := ''. |
2698 orgName1 := ''. |
2699 (sel size > 0 |
2699 (sel size > 0 |
2700 and:[lastFileDiffDirectory notNil |
2700 and:[lastFileDiffDirectory notNil |
2701 and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[ |
2701 and:[lastFileDiffDirectory asFilename isDirectory]]) ifTrue:[ |
2702 f := lastFileDiffDirectory asFilename construct:sel. |
2702 f := lastFileDiffDirectory asFilename construct:sel. |
2703 (f exists |
2703 (f exists |
2704 and:[f isReadable]) ifTrue:[ |
2704 and:[f isReadable]) ifTrue:[ |
2705 orgName1 := f name |
2705 orgName1 := f name |
2706 ] |
2706 ] |
2707 ]. |
2707 ]. |
2708 |
2708 |
2709 name1 := orgName1 asValue. |
2709 name1 := orgName1 asValue. |
2710 name2 := self getSelectedFileName asValue. |
2710 name2 := self getSelectedFileName asValue. |
2711 here := currentDirectory pathName. |
2711 here := currentDirectory pathName. |
2719 box addAbortAndOkButtons. |
2719 box addAbortAndOkButtons. |
2720 |
2720 |
2721 box showAtPointer. |
2721 box showAtPointer. |
2722 |
2722 |
2723 box accepted ifTrue:[ |
2723 box accepted ifTrue:[ |
2724 name1 := name1 value. |
2724 name1 := name1 value. |
2725 (name1 isNil or:[name1 isEmpty]) ifTrue:[ |
2725 (name1 isNil or:[name1 isEmpty]) ifTrue:[ |
2726 text1 := subView contents. |
2726 "/ text1 := subView contents. |
2727 name1 := nil. |
2727 text1 := subView list asStringCollection withTabs. |
2728 l1 := 'browser contents' |
2728 text1 := text1 collect:[:l | l isNil ifTrue:[' '] ifFalse:[l]]. |
2729 ] ifFalse:[ |
2729 name1 := nil. |
2730 name1 := currentDirectory filenameFor:name1. |
2730 l1 := 'browser contents' |
2731 name1 isReadable ifFalse:[ |
2731 ] ifFalse:[ |
2732 nm := name1. |
2732 name1 := currentDirectory filenameFor:name1. |
2733 name1 exists ifFalse:[ |
2733 name1 isReadable ifFalse:[ |
2734 err := '%1 does not exist'. |
2734 nm := name1. |
2735 ] ifTrue:[ |
2735 name1 exists ifFalse:[ |
2736 err := '%1 is not readable' |
2736 err := '%1 does not exist'. |
2737 ]. |
2737 ] ifTrue:[ |
2738 ]. |
2738 err := '%1 is not readable' |
2739 l1 := name1 pathName |
2739 ]. |
2740 ]. |
2740 ]. |
2741 |
2741 l1 := name1 pathName |
2742 name2 := currentDirectory filenameFor:name2 value. |
2742 ]. |
2743 err isNil ifTrue:[ |
2743 |
2744 name2 isReadable ifFalse:[ |
2744 name2 := currentDirectory filenameFor:name2 value. |
2745 nm := name2. |
2745 err isNil ifTrue:[ |
2746 name2 exists ifFalse:[ |
2746 name2 isReadable ifFalse:[ |
2747 err := '%1 does not exist'. |
2747 nm := name2. |
2748 ] ifTrue:[ |
2748 name2 exists ifFalse:[ |
2749 err := '%1 is not readable' |
2749 err := '%1 does not exist'. |
2750 ]. |
2750 ] ifTrue:[ |
2751 ]. |
2751 err := '%1 is not readable' |
2752 ]. |
2752 ]. |
2753 err notNil ifTrue:[ |
2753 ]. |
2754 self warn:(resources string:err with:nm pathName). |
2754 ]. |
2755 ^ self |
2755 err notNil ifTrue:[ |
2756 ]. |
2756 self warn:(resources string:err with:nm pathName). |
2757 |
2757 ^ self |
2758 self withWaitCursorDo:[ |
2758 ]. |
2759 (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[ |
2759 |
2760 lastFileDiffDirectory := name1 directoryName |
2760 self withWaitCursorDo:[ |
2761 ]. |
2761 (name1 notNil and:[name1 name ~= orgName1]) ifTrue:[ |
2762 name1 notNil ifTrue:[ |
2762 lastFileDiffDirectory := name1 directoryName |
2763 text1 := name1 contents. |
2763 ]. |
2764 ]. |
2764 name1 notNil ifTrue:[ |
2765 text2 := name2 contents. |
2765 text1 := name1 contents. |
2766 text1 = text2 ifTrue:[ |
2766 ]. |
2767 self information:'same contents' |
2767 text2 := name2 contents. |
2768 ] ifFalse:[ |
2768 text1 = text2 ifTrue:[ |
2769 d := DiffTextView |
2769 self information:'same contents' |
2770 openOn:text1 label:l1 |
2770 ] ifFalse:[ |
2771 and:text2 label:name2 pathName. |
2771 d := DiffTextView |
2772 d label:'file differences'. |
2772 openOn:text1 label:l1 |
2773 ] |
2773 and:text2 label:name2 pathName. |
2774 ] |
2774 d label:'file differences'. |
|
2775 ] |
|
2776 ] |
2775 ]. |
2777 ]. |
2776 |
2778 |
2777 "Created: / 7.12.1995 / 20:33:58 / cg" |
2779 "Created: / 7.12.1995 / 20:33:58 / cg" |
2778 "Modified: / 18.9.1997 / 17:31:46 / stefan" |
2780 "Modified: / 18.9.1997 / 17:31:46 / stefan" |
2779 "Modified: / 25.8.1998 / 21:11:46 / cg" |
2781 "Modified: / 5.5.1999 / 16:04:10 / cg" |
2780 ! |
2782 ! |
2781 |
2783 |
2782 openEditor |
2784 openEditor |
2783 self openTool:EditTextView |
2785 self openTool:EditTextView |
2784 ! |
2786 ! |