Diff File is a quick and dirty plugin that allows the user to view the current file and any other arbitrary file in IDEA's internal diff viewer. It currently adds a new option to the bottom of the editor popup menu. It is also bound to the Ctrl+Alt+D shorcut.
Changes for Version 1.7
- [Bug Fix] The API for DiffPanelFactory changed again.
-- MikeAbney - 31 Oct 2002
Bug Reports
- Please insert any bugs you have found here and I will fix and
delete them.
Feature Requests
- Please insert feature requests here and I will respond to them
and delete them after they are added or rejected.
- Adding a "ignore white space" option to the diff (-w)?
- What about using an external diff program?
- This would be doable for this kind of diff (between the active editor and another file), but it occurs to me that registering an "external tool" (see Options/External Tools... in the IDEA main menu) would be much easier and work at least as well. On the other hand, if you mean to replace the built-in diff viewer completely (e.g. for VCS diffs), that is interesting, but I do not think it is possible with the OpenAPI. -- MikeAbney - 03 Dec 2002
- Add the diff option to the project view context menus as well. -- KarstenTinnefeld - 20 Sep 2003
- Allow the diff option in the project view to operate on a two file multiselection. -- KarstenTinnefeld - 20 Sep 2003
Changes for Version 1.6
- [Bug Fix] IDEA Build 651 changed the DimensionService's
methods. The bounds-related methods were separated into
their size and location components.
-- MikeAbney - 03 Oct 2002
Changes for Version 1.5
- [Bug Fix] IDEA Build 647 changed the plugin.xml format.
To fix it, the <shortcut> tag was replaced by the
<keyboard-shortcut> tag.
- Actually changed the version number in the plugin.xml
this time. It should be changed every time from now on.
-- MikeAbney - 24 Sep 2002
Changes for Version 1.4
- [Bug Fix] Again basing my work on a look at the source
of MikeAizatsky's StarTeam plugin DiffWindow, I have
been able to work around the copy and find button bug.
(See IntelliJ Tracker #2612.)
- Removed some erroneous copyright notices. (Leftovers
from a new class template. Oops.)
-- MikeAbney - 30 Aug 2002
Changes for Version 1.3
- [Bug Fix] IDEA Build 642 or so changed the API for
the DiffPanelFactory, breaking older versions of
this plugin. This build uses the new API. (Thanks to
VinayMoharil for doing this for me while I could not.)
- Renamed the DiffPanelWrapper to the more appropriate
DiffPanelHelper.
- Changed to using the JFrame version of the viewer
in the plugin. (Mostly because it no longer avoided
the copy/paste bug to use a dialog -- see the NOTE.)
- Added some features from MikeAizatsky's work on a
DiffWindow for the StarTeam plugin
- keyboard shortcut for the escape key to close
the window
- added the diff icon to the JFrame
- use the DimensionService to remember the size
of the viewer windows
- dispose of things correctly by overriding the
dispose() method of the window.
- Removed the DiffViewerDialog class that use the
DialogWrapper and in its place used a JDialog.
Note: Now both the JFrame and Dialogs have a problem with getting the copy and paste buttons working. I will attempt to have this fixed (assuming it is something I can fix) by the next release.
-- MikeAbney - 28 Aug 2002
Changes for Version 1.2:
- [Bug Fix] The file from the editor did not reflect changes
made since the last save. There were two options for fixing
this: save before showing, or use the editor's contents. This
version shows the contents of the editor.
- [New Feature!] A "Swap Files" button has been added to the
viewer dialog. Pressing this button will swap the contents
of the two panes.
- Refactored into several classes. This should make it easier
for other plugins to use the same viewing code.
- DiffPanelWrapper: This is a wrapper for the
DiffPanel that adds some desireable features such as
using DiffFileTokens to represent the content, and
the ability to swap the pane contents.
- DiffFileToken: This is a simple helper class for
storing information about a file that is going to be part
of the diff.
- DiffViewerFrame: A JFrame that displays the
DiffPanel for two DiffFileTokens.
- DiffViewerDialog: A DialogWrapper that displays
the DiffPanel for two DiffFileTokens.
Note: The JFrame and DialogWrapper options are both have "quirks". The use of a JFrame (which is what the DiffFile plugin uses) allows the diff to be completely separate from the editor so that you can switch between them. However, the DiffPanel's copy and search buttons do not work (at least for IDEA build 639) when it is placed in a JFrame. A DialogWrapper, however, is always on top of the editor window even if non-modal. Focus can be sent to the editor, but the editor window can not be brought to the front. I can't see any use for a non-modal dialog if it is going to always be on top of the other windows and will be posting this as a bug.
-- MikeAbney - 16 Aug 2002
Changes for Version 1.1:
- [Bug Fix] The DiffPanel.goToFirstDiff() method is called
to prevent the scrolling problem in v1.0.
- [Bug Fix] There was a suspected conflict with the menu
accelerator used. (The JAD plugin used the same accelerator,
and this caused the IDE to hang.)
- The Diff view is now a JFrame instead of a JDialog.
- The class has been reorganized (not for the last time).
- The files are now both loaded as VirtualFile instances.
- The DiffPanel now uses the file type to allow syntax
highlighting.
- Several other enhancements to the code that do not have any
effect on functionality.
-- MikeAbney - 02 Aug 2002
|
|
