Files Comparison

The comparison of a pair of files is done by opening them in two editors arranged in a side-by-side layout. The line numbers on the left side of each editor help you to identify quickly the locations of the differences.

You can edit both the source and the target file. The differences are refreshed when you save the modified document.

 

Figure 14.4.  The Compare Files Window

The Compare Files Window

The window is comprised of the following components:

 The Main Menu

The Main Menu provides access to all the functions and features available in this window:

 Edit Menu

  • Cut - cut selection to clipboard from the local file currently opened in the Editor view or the Compare view.

  • Copy - copy selection to clipboard from the local file currently opened in the Editor view or the Compare view.

  • Paste - paste selection from clipboard in the local file currently opened in the Editor view or the Compare view.

  • Undo - undo edit changes in the local file currently opened in the Editor view or the Compare view.

  • Redo - redo edit changes in the local file currently opened in the Editor view or the Compare view.

 Find Menu

  • Find/Replace - perform find/replace operations in the local file currently opened in the Editor view or the Compare view.

  • Find Next - go to the next find match using the same find options of the last find operation. The action runs in the editor panel and in any non editable text area, for example the Console view.

  • Find Previous - go to the previous find match using the same find options of the last find operation. The action runs in the editor panel and in any non editable text area, for example the Console view.

 Source Menu

Here you can select the source file to be compared.

SourceOpen : Browses for a file (the source file).

SourceOpen URL : Opens URL to be used as a source file. See Open URL for details.

SourceSave : Saves the changes made in the source file.

 The Target Menu

Here you can select the target file to be compared.

TargetOpen : Browses for a file (the target file).

TargetOpen URL : Opens URL to be used as a target file. See Open URL for details.

TargetSave : Saves the changes made in the target file.

 Operations Menu

OperationsPerform files differencing : Performs the comparison of the source and the target files.

OperationsGo to first modification : Selects the first difference in the files. (The button becomes available if the selection is not on the first modification)

OperationsGo to previous modification : Selects the previous difference in the files. (The button becomes available if the selection is not on the first modification)

OperationsGo to next modification : Selects the next difference in the files. (The button becomes available if the selection is not on the last modification)

OperationsGo to last modification : Selects the last difference in the files. (The button becomes available if the selection is not on the last modification)

OperationsCopy all non-conflicting changes from left to right : Copies the non-conflicting changes from the source to the target.

OperationsCopy all non-conflicting changes from right to left : Copies the non-conflicting changes from the target to the source.

OperationsCopy change from left to right : Copies the selected difference from the source to the target.

OperationsCopy changes from right to left : Copies the selected difference from the target to the source.

OperationsShow modification details at word level : Provides Word Level Comparison

OperationsShow modification details at char level : Provides Character Level Comparison

 Option Menu

  • Preferences - opens the preferences dialog.

  • Menu Shortcut Keys - opens the preferences dialog directly on the Menu Shortcut Keys option page, where users can configure in one place the keyboard shortcuts available for menu items available in <oXygen/> XML Diff.

  • Export Options - allows you to export the current options to a file.

  • Import Options - allows you to import options you have previously exported.

  • Reset Options - resets all your options to the default ones.

 Help Menu

  • Help - opens the Help dialog.

  • Check for New Versions - checks the availability of new <oXygen/> XML Diff versions.