jEdit

Email Archive: jedit-cvs (read-only)

2000:	_Jan (11)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (8)	_Sep (1)	_Oct	_Nov	_Dec
2001:	_Jan	_Feb (1)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (145)	_Nov (352)	_Dec (329)
2002:	_Jan (461)	_Feb (533)	_Mar (632)	_Apr (363)	_May (619)	_Jun (324)	_Jul (109)	_Aug (247)	_Sep (167)	_Oct (215)	_Nov (115)	_Dec (262)
2003:	_Jan (568)	_Feb (537)	_Mar (760)	_Apr (493)	_May (500)	_Jun (284)	_Jul (178)	_Aug (180)	_Sep (135)	_Oct (230)	_Nov (266)	_Dec (175)
2004:	_Jan (121)	_Feb (294)	_Mar (222)	_Apr (172)	_May (162)	_Jun (105)	_Jul (93)	_Aug (151)	_Sep (136)	_Oct (62)	_Nov (74)	_Dec (178)
2005:	_Jan (179)	_Feb (288)	_Mar (153)	_Apr (138)	_May (195)	_Jun (39)	_Jul (62)	_Aug (41)	_Sep (15)	_Oct (365)	_Nov (130)	_Dec (199)
2006:	_Jan (235)	_Feb (92)	_Mar (262)	_Apr (250)	_May (345)	_Jun (513)	_Jul (587)	_Aug (210)	_Sep (216)	_Oct (200)	_Nov (188)	_Dec (115)
2007:	_Jan (259)	_Feb (182)	_Mar (217)	_Apr (109)	_May (161)	_Jun (205)	_Jul (291)	_Aug (176)	_Sep (185)	_Oct (190)	_Nov (208)	_Dec (182)
2008:	_Jan (141)	_Feb (193)	_Mar (219)	_Apr (112)	_May (233)	_Jun (218)	_Jul (149)	_Aug (338)	_Sep (291)	_Oct (143)	_Nov (131)	_Dec (152)
2009:	_Jan (266)	_Feb (178)	_Mar (168)	_Apr (167)	_May (198)	_Jun (282)	_Jul (383)	_Aug (341)	_Sep (153)	_Oct (214)	_Nov (164)	_Dec (278)
2010:	_Jan (430)	_Feb (300)	_Mar (214)	_Apr (198)	_May (271)	_Jun (321)	_Jul (144)	_Aug (208)	_Sep (275)	_Oct (287)	_Nov (218)	_Dec (153)
2011:	_Jan (172)	_Feb (172)	_Mar (121)	_Apr (62)	_May (23)	_Jun (155)	_Jul (120)	_Aug (252)	_Sep (170)	_Oct (206)	_Nov (356)	_Dec (300)
2012:	_Jan (412)	_Feb (313)	_Mar (419)	_Apr (153)	_May (194)	_Jun (226)	_Jul (115)	_Aug (143)	_Sep (223)	_Oct (173)	_Nov (121)	_Dec (143)
2013:	_Jan (156)	_Feb (109)	_Mar (146)	_Apr (82)	_May (51)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[ jEdit-commits ] SF.net SVN: jedit: [11685] plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

From: <daleanson@us...> - 2008-02-05 05:07

Revision: 11685
          http://jedit.svn.sourceforge.net/jedit/?rev=11685&view=rev
Author:   daleanson
Date:     2008-02-04 21:07:25 -0800 (Mon, 04 Feb 2008)

Log Message:
-----------
Fix for 1886458, JDiff kills incremental search.  It turns out this fix also clears up an intermittent display problem I was seeing with showing the Diff dockable.

Modified Paths:
--------------
    plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

Modified: plugins/JDiffPlugin/trunk/jdiff/DualDiff.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-02-05 02:38:55 UTC (rev 11684)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-02-05 05:07:25 UTC (rev 11685)
@@ -969,10 +969,10 @@
                     }
                 };
 
+        int previousCaretLine = 0;
         public void caretUpdate( final CaretEvent e ) {
             Runnable r = new Runnable() {
                         public void run() {
-                            view.getDockableWindowManager().showDockableWindow( "jdiff-lines" );
                             JEditTextArea source = ( JEditTextArea ) e.getSource();
                             Diff.change hunk = DualDiff.this.edits;
                             String leftLine = "";
@@ -1025,7 +1025,12 @@
                         }
                     };
             if ( lineProcessor != null ) {
-                SwingUtilities.invokeLater( r );
+                JEditTextArea source = ( JEditTextArea ) e.getSource();
+                int caretLine = source.getCaretLine();
+                if ( caretLine != previousCaretLine ) {
+                    previousCaretLine = caretLine;
+                    SwingUtilities.invokeLater( r );
+                }
             }
         }
 
@@ -1053,6 +1058,9 @@
 
         public void focusGained( FocusEvent e ) {
             Log.log( Log.DEBUG, this, "**** focusGained " + e );
+            //if ( !view.getDockableWindowManager().isDockableWindowVisible("jdiff-lines") ) {
+                view.getDockableWindowManager().showDockableWindow( "jdiff-lines" );
+            //}
         }
 
         public void focusLost( FocusEvent e ) {


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

[ jEdit-commits ] SF.net SVN: jedit: [11830] plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

From: <daleanson@us...> - 2008-02-21 14:32

Revision: 11830
          http://jedit.svn.sourceforge.net/jedit/?rev=11830&view=rev
Author:   daleanson
Date:     2008-02-21 06:32:23 -0800 (Thu, 21 Feb 2008)

Log Message:
-----------
added events for refresh on buffer change

Modified Paths:
--------------
    plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

Modified: plugins/JDiffPlugin/trunk/jdiff/DualDiff.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-02-21 09:58:47 UTC (rev 11829)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-02-21 14:32:23 UTC (rev 11830)
@@ -151,7 +151,7 @@
                 // Not concerned by this message
                 return ;
             }
-            if ( bu.getWhat() == BufferUpdate.LOADED ) {
+            if ( bu.getWhat() == BufferUpdate.LOADED || bu.getWhat() == BufferUpdate.SAVED || bu.getWhat() == BufferUpdate.DIRTY_CHANGED ) {
                 this.refresh();
             }
         }


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

[ jEdit-commits ] SF.net SVN: jedit: [12666] plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

From: <daleanson@us...> - 2008-05-16 03:49

Revision: 12666
          http://jedit.svn.sourceforge.net/jedit/?rev=12666&view=rev
Author:   daleanson
Date:     2008-05-15 20:49:26 -0700 (Thu, 15 May 2008)

Log Message:
-----------
yet another fix for 1963921, made the hunk cursors work nicely.

Modified Paths:
--------------
    plugins/JDiffPlugin/trunk/jdiff/DualDiff.java

Modified: plugins/JDiffPlugin/trunk/jdiff/DualDiff.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-05-16 02:19:05 UTC (rev 12665)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiff.java	2008-05-16 03:49:26 UTC (rev 12666)
@@ -846,7 +846,7 @@
             if ( hunk.line0 > firstLine + ( ( hunk.deleted == 0 ) ? 1 : 0 ) ) {
                 int line = 0;
                 if ( hunk.deleted == 0 && hunk.line0 > 0 ) {
-                    line = hunk.line0 - 1;
+                    line = hunk.line0;// - 1;
                 }
                 else {
                     line = hunk.line0;
@@ -857,9 +857,11 @@
                 int caret_position = textArea0.getLineStartOffset( line );
                 this.textArea0.setCaretPosition( caret_position, false );
                 this.textArea0.scrollToCaret( false );
+                this.textArea0.scrollUpLine();
                 caret_position = textArea1.getLineStartOffset( hunk.line1 );
                 this.textArea1.setCaretPosition( caret_position, false );
                 this.textArea1.scrollToCaret( false );
+                this.textArea1.scrollUpLine();
 
                 if ( this.textArea0.getFirstLine() != line ) {
                     this.textArea0.getToolkit().beep();
@@ -878,7 +880,7 @@
             if ( hunk.line1 > firstLine + ( ( hunk.inserted == 0 ) ? 1 : 0 ) ) {
                 int line = 0;
                 if ( hunk.inserted == 0 && hunk.line1 > 0 ) {
-                    line = hunk.line1 - 1;
+                    line = hunk.line1;// - 1;
                 }
                 else {
                     line = hunk.line1;
@@ -889,9 +891,11 @@
                 int caret_position = textArea1.getLineStartOffset( line );
                 this.textArea1.setCaretPosition( caret_position, false );
                 this.textArea1.scrollToCaret( false );
+                this.textArea1.scrollUpLine();
                 caret_position = textArea0.getLineStartOffset( hunk.line0 );
                 this.textArea0.setCaretPosition( caret_position, false );
                 this.textArea0.scrollToCaret( false );
+                this.textArea0.scrollUpLine();
 
                 if ( this.textArea1.getFirstLine() != line ) {
                     this.textArea1.getToolkit().beep();
@@ -911,7 +915,7 @@
                 if ( hunk.link == null || hunk.link.line0 >= firstLine ) {
                     int line = 0;
                     if ( hunk.deleted == 0 && hunk.line0 > 0 ) {
-                        line = hunk.line0 - 1;
+                        line = hunk.line0;// - 1;
                     }
                     else {
                         line = hunk.line0;
@@ -922,10 +926,11 @@
                     int caret_position = textArea0.getLineStartOffset( line );
                     this.textArea0.setCaretPosition( caret_position, false );
                     this.textArea0.scrollToCaret( false );
+                    this.textArea0.scrollUpLine();
                     caret_position = textArea1.getLineStartOffset( hunk.line1 );
                     this.textArea1.setCaretPosition( caret_position, false );
                     this.textArea1.scrollToCaret( false );
-
+                    this.textArea1.scrollUpLine();
                     if ( this.textArea0.getFirstLine() != line ) {
                         this.textArea0.getToolkit().beep();
                     }
@@ -945,7 +950,7 @@
                 if ( hunk.link == null || hunk.link.line1 >= firstLine ) {
                     int line = 0;
                     if ( hunk.inserted == 0 && hunk.line1 > 0 ) {
-                        line = hunk.line1 - 1;
+                        line = hunk.line1;// - 1;
                     }
                     else {
                         line = hunk.line1;
@@ -956,9 +961,11 @@
                     int caret_position = textArea1.getLineStartOffset( line );
                     this.textArea1.setCaretPosition( caret_position, false );
                     this.textArea1.scrollToCaret( false );
+                    this.textArea1.scrollUpLine();
                     caret_position = textArea0.getLineStartOffset( hunk.line0 );
                     this.textArea0.setCaretPosition( caret_position, false );
                     this.textArea0.scrollToCaret( false );
+                    this.textArea0.scrollUpLine();
 
                     if ( this.textArea1.getFirstLine() != line ) {
                         this.textArea1.getToolkit().beep();


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