update of the class File from the Classpath version

Eclipse don't seems to be able to compare 2 files if one is not in a CVS repository.
So, I will have to compare by hand.

Fabien D's blog
Login to post comments

Use cp-compare

Submitted by admin on Sat, 04/23/2005 - 05:39.

Use the cp-compare task in the build.

You must have a classpath directory in the same directory that contains the jnode directory.

Also a classpath-5.0 directory is needed that contains the classpath generics-branch.

Ewout

diff command

Submitted by Fabien D on Sat, 04/23/2005 - 10:29.

The cp-compare task needs the 'diff' unix command.
Since I am under windows, I will have probably to install cygwin Sad to emulate a unix environment and run unix commands.

Fabien

GnuWin32

Submitted by admin on Sat, 04/23/2005 - 11:17.

See http://gnuwin32.sourceforge.net/packages/diffutils.htm

Ewout

thanks for the link

Submitted by Fabien D on Sat, 04/23/2005 - 14:14.

Thanks, now it work and I use Winmerge to merge (do you know a better tool ?).

Could you (or someone else) remove any kind of modification that is not really needed in the ClassPath parts of JNode ?

Instead of only having structural changes due to refactoring or different approach, I also have problems with code formatting (braces on one line statments). The worst : the method reordering in the source, that make the diff/merge tool completely lost !

Fabien