[ jEdit-commits ] SF.net SVN: jedit:[16571] plugins/JDiffPlugin/trunk/jdiff/component/ui/ BasicMergeToolBarUI.java

[<dal...@us...>]

Revision: 16571
          http://jedit.svn.sourceforge.net/jedit/?rev=16571&view=rev
Author:   daleanson
Date:     2009-12-01 16:21:59 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
Fixed diff button so it is enabled at the proper time.

Modified Paths:
--------------
    plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicMergeToolBarUI.java

Modified: plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicMergeToolBarUI.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicMergeToolBarUI.java	2009-11-30 21:07:43 UTC (rev 16570)
+++ plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicMergeToolBarUI.java	2009-12-01 16:21:59 UTC (rev 16571)
@@ -343,7 +343,7 @@
             new Runnable() {
                 public void run() {
                     boolean enabled = BasicMergeToolBarUI.this.view.getEditPanes().length == 2;
-                    diff.setEnabled( enabled );
+                    diff.setEnabled( !enabled );
                     next.setEnabled( enabled );
                     prev.setEnabled( enabled );
                     move_right.setEnabled( enabled );


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