[Sql2java-develop] SF.net SVN: sql2java:[127] core/trunk/src/net/sf/sql2java

[<ca...@us...>]

Revision: 127
          http://sql2java.svn.sourceforge.net/sql2java/?rev=127&view=rev
Author:   calmera
Date:     2008-10-16 10:24:47 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Added Support for an external merge application. For this purpose, WinMerge has been tested and found working.

Modified Paths:
--------------
    core/trunk/src/net/sf/sql2java/generator/Generator.java
    core/trunk/src/net/sf/sql2java/generator/GeneratorConfigurer.java
    core/trunk/src/net/sf/sql2java/generator/GeneratorSupport.java
    core/trunk/src/net/sf/sql2java/generator/writer/CheckedCodeWriter.java
    core/trunk/src/net/sf/sql2java/generator/writer/CodeWriter.java

Added Paths:
-----------
    core/trunk/src/net/sf/sql2java/common/parameters/handlers/SimpleMapParameterHandler.java
    core/trunk/src/net/sf/sql2java/generator/merger/
    core/trunk/src/net/sf/sql2java/generator/merger/AbstractMerger.java
    core/trunk/src/net/sf/sql2java/generator/merger/ExternalMerger.java
    core/trunk/src/net/sf/sql2java/generator/merger/MergeHelper.java
    core/trunk/src/net/sf/sql2java/generator/writer/merge/
    core/trunk/src/net/sf/sql2java/generator/writer/merge/Conflict.java
    core/trunk/src/net/sf/sql2java/generator/writer/merge/MergeCodeWriter.java


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.