Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[15148] plugins/JDiffPlugin/trunk
|
From: <dal...@us...> - 2009-04-28 22:03:40
|
Revision: 15148
http://jedit.svn.sourceforge.net/jedit/?rev=15148&view=rev
Author: daleanson
Date: 2009-04-28 22:03:30 +0000 (Tue, 28 Apr 2009)
Log Message:
-----------
Major refactor of DualDiff. Split DualDiff into 4 classes: DualDiff, DualDiffManager, ScrollHander, and DualDiffUtil. This should help with maintainability as well as make it easier to track down the current local overview painting bug.
Modified Paths:
--------------
plugins/JDiffPlugin/trunk/actions.xml
plugins/JDiffPlugin/trunk/dockables.xml
plugins/JDiffPlugin/trunk/jdiff/DualDiff.java
plugins/JDiffPlugin/trunk/jdiff/DualDiffDialog.java
plugins/JDiffPlugin/trunk/jdiff/JDiffPlugin.java
plugins/JDiffPlugin/trunk/jdiff/component/DiffTextAreaModel.java
plugins/JDiffPlugin/trunk/jdiff/component/LineRendererPane.java
plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicDiffLocalOverviewUI.java
plugins/JDiffPlugin/trunk/jdiff/component/ui/BasicMergeToolBarUI.java
Added Paths:
-----------
plugins/JDiffPlugin/trunk/jdiff/DualDiffManager.java
plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil.java
plugins/JDiffPlugin/trunk/jdiff/util/ScrollHandler.java
Modified: plugins/JDiffPlugin/trunk/actions.xml
===================================================================
--- plugins/JDiffPlugin/trunk/actions.xml 2006-01-17 03:42:40 UTC (rev 15147)
+++ plugins/JDiffPlugin/trunk/actions.xml 2009-04-28 22:03:30 UTC (rev 15148)
@@ -5,10 +5,10 @@
<ACTIONS>
<ACTION NAME="toggle-dual-diff">
<CODE>
- jdiff.DualDiff.toggleFor(view);
+ jdiff.DualDiffManager.toggleFor(view);
</CODE>
<IS_SELECTED>
- return jdiff.DualDiff.isEnabledFor(view);
+ return jdiff.DualDiffManager.isEnabledFor(view);
</IS_SELECTED>
</ACTION>
@@ -22,84 +22,84 @@
<ACTION NAME="jdiff.refresh-diff">
<CODE>
- jdiff.DualDiff.refreshFor(view);
+ jdiff.DualDiffManager.refreshFor(view);
</CODE>
</ACTION>
<ACTION NAME="jdiff.toggle-ignore-case">
<CODE>
- jdiff.DualDiff.toggleIgnoreCaseFor(view);
+ jdiff.DualDiffManager.toggleIgnoreCaseFor(view);
</CODE>
<IS_SELECTED>
- return jdiff.DualDiff.getIgnoreCaseFor(view);
+ return jdiff.DualDiffManager.getIgnoreCaseFor(view);
</IS_SELECTED>
</ACTION>
<ACTION NAME="jdiff.toggle-trim-whitespace">
<CODE>
- jdiff.DualDiff.toggleTrimWhitespaceFor(view);
+ jdiff.DualDiffManager.toggleTrimWhitespaceFor(view);
</CODE>
<IS_SELECTED>
- return jdiff.DualDiff.getTrimWhitespaceFor(view);
+ return jdiff.DualDiffManager.getTrimWhitespaceFor(view);
</IS_SELECTED>
</ACTION>
<ACTION NAME="jdiff.toggle-ignore-amount-whitespace">
<CODE>
- jdiff.DualDiff.toggleIgnoreAmountOfWhitespaceFor(view);
+ jdiff.DualDiffManager.toggleIgnoreAmountOfWhitespaceFor(view);
</CODE>
<IS_SELECTED>
- return jdiff.DualDiff.getIgnoreAmountOfWhitespaceFor(view);
+ return jdiff.DualDiffManager.getIgnoreAmountOfWhitespaceFor(view);
</IS_SELECTED>
</ACTION>
<ACTION NAME="jdiff.toggle-ignore-all-whitespace">
<CODE>
- jdiff.DualDiff.toggleIgnoreAllWhitespaceFor(view);
+ jdiff.DualDiffManager.toggleIgnoreAllWhitespaceFor(view);
</CODE>
<IS_SELECTED>
- return jdiff.DualDiff.getIgnoreAllWhitespaceFor(view);
+ return jdiff.DualDiffManager.getIgnoreAllWhitespaceFor(view);
</IS_SELECTED>
</ACTION>
<ACTION NAME="jdiff.next-diff">
<CODE>
- jdiff.DualDiff.nextDiff(editPane);
+ jdiff.DualDiffManager.nextDiff(editPane);
</CODE>
</ACTION>
<ACTION NAME="jdiff.prev-diff">
<CODE>
- jdiff.DualDiff.prevDiff(editPane);
+ jdiff.DualDiffManager.prevDiff(editPane);
</CODE>
</ACTION>
<ACTION NAME="jdiff.diff-normal-output">
<CODE>
- jdiff.DualDiff.diffNormalOutput(view);
+ jdiff.DualDiffManager.diffNormalOutput(view);
</CODE>
</ACTION>
<ACTION NAME="jdiff.apply-patch">
<CODE>
- jdiff.DualDiff.applyPatch(view);
+ jdiff.DualDiffManager.applyPatch(view);
</CODE>
</ACTION>
<ACTION NAME="jdiff.move-right">
<CODE>
- jdiff.DualDiff.moveRight(editPane);
+ jdiff.DualDiffManager.moveRight(editPane);
</CODE>
</ACTION>
<ACTION NAME="jdiff.move-left">
<CODE>
- jdiff.DualDiff.moveLeft(editPane);
+ jdiff.DualDiffManager.moveLeft(editPane);
</CODE>
</ACTION>
</ACTIONS>
Modified: plugins/JDiffPlugin/trunk/dockables.xml
===================================================================
--- plugins/JDiffPlugin/trunk/dockables.xml 2006-01-17 03:42:40 UTC (rev 15147)
+++ plugins/JDiffPlugin/trunk/dockables.xml 2009-04-28 22:03:30 UTC (rev 15148)
@@ -3,7 +3,7 @@
<DOCKABLES>
<DOCKABLE NAME="jdiff-lines">
- jdiff.DualDiff dualDiff = jdiff.DualDiff.getDualDiffFor(view);
+ jdiff.DualDiff dualDiff = jdiff.DualDiffManager.getDualDiffFor(view);
if (dualDiff != null) {
return dualDiff.getDiffLineOverview();
}
Modified: plugins/JDiffPlugin/trunk/jdiff/DualDiff.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiff.java 2006-01-17 03:42:40 UTC (rev 15147)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiff.java 2009-04-28 22:03:30 UTC (rev 15148)
@@ -21,15 +21,7 @@
package jdiff;
import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
import java.awt.Font;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
import java.io.*;
import java.nio.*;
@@ -41,47 +33,25 @@
import jdiff.component.DiffGlobalPhysicalOverview;
import jdiff.component.DiffOverview;
import jdiff.component.DiffLineOverview;
-import jdiff.component.PatchSelectionDialog;
import jdiff.text.FileLine;
import jdiff.util.Diff;
-import jdiff.util.DiffOutput;
-import jdiff.util.DiffNormalOutput;
-import jdiff.util.patch.Patch;
-import jdiff.util.patch.PatchUtils;
+import jdiff.util.DualDiffUtil;
+import jdiff.util.ScrollHandler;
import org.gjt.sp.jedit.Buffer;
import org.gjt.sp.jedit.EBComponent;
import org.gjt.sp.jedit.EBMessage;
-import org.gjt.sp.jedit.EditBus;
import org.gjt.sp.jedit.EditPane;
-import org.gjt.sp.jedit.GUIUtilities;
import org.gjt.sp.jedit.View;
import org.gjt.sp.jedit.jEdit;
-import org.gjt.sp.jedit.gui.DockableWindowManager;
import org.gjt.sp.jedit.msg.BufferUpdate;
import org.gjt.sp.jedit.msg.EditPaneUpdate;
import org.gjt.sp.jedit.textarea.JEditTextArea;
import org.gjt.sp.jedit.textarea.TextArea;
import org.gjt.sp.jedit.textarea.TextAreaPainter;
-import org.gjt.sp.jedit.textarea.ScrollListener;
-import org.gjt.sp.util.Log;
public class DualDiff implements EBComponent {
- private static boolean ignoreCaseDefault = jEdit.getBooleanProperty( "jdiff.ignore-case",
- false );
-
- private static boolean trimWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.trim-whitespace", false );
-
- private static boolean ignoreAmountOfWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.ignore-amount-whitespace", false );
-
- private static boolean ignoreAllWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.ignore-all-whitespace", false );
-
- private static HashMap<View, DualDiff> dualDiffs = new HashMap<View, DualDiff>();
-
private boolean ignoreCase;
private boolean trimWhitespace;
@@ -106,24 +76,16 @@
private DiffOverview diffOverview1;
- private final ScrollHandler scrollHandler = new ScrollHandler();
+ private final ScrollHandler scrollHandler;
private DiffLineOverview diffLineOverview;
- private static final String JDIFF_LINES = "jdiff-lines";
- private static final String BEEP_ON_ERROR = "jdiff.beep-on-error";
- private static final String HORIZ_SCROLL = "jdiff.horiz-scroll";
- private static final String SELECT_WORD = "jdiff.select-word";
-
- private static HashMap<View, String> splitConfigs = new HashMap<View, String>();
- private static HashMap < View, HashMap < String, List<Integer> >> caretPositions = new HashMap < View, HashMap < String, List<Integer> >> ();
-
- private DualDiff( View view ) {
- this( view, ignoreCaseDefault, trimWhitespaceDefault,
- ignoreAmountOfWhitespaceDefault, ignoreAllWhitespaceDefault );
+ protected DualDiff( View view ) {
+ this( view, DualDiffUtil.ignoreCaseDefault, DualDiffUtil.trimWhitespaceDefault,
+ DualDiffUtil.ignoreAmountOfWhitespaceDefault, DualDiffUtil.ignoreAllWhitespaceDefault );
}
- private DualDiff( View view, boolean ignoreCase, boolean trimWhitespace,
+ protected DualDiff( View view, boolean ignoreCase, boolean trimWhitespace,
boolean ignoreAmountOfWhiteSpace, boolean ignoreAllWhiteSpace ) {
this.ignoreCase = ignoreCase;
this.trimWhitespace = trimWhitespace;
@@ -139,11 +101,36 @@
this.textArea0 = this.editPane0.getTextArea();
this.textArea1 = this.editPane1.getTextArea();
+ scrollHandler = new ScrollHandler( this );
this.initOverviews();
this.addOverviews();
}
+
+ public EditPane getEditPane0() {
+ return editPane0;
+ }
+
+ public EditPane getEditPane1() {
+ return editPane1;
+ }
+ public TextArea getTextArea0() {
+ return textArea0;
+ }
+
+ public TextArea getTextArea1() {
+ return textArea1;
+ }
+
+ public DiffOverview getDiffOverview0() {
+ return diffOverview0;
+ }
+
+ public DiffOverview getDiffOverview1() {
+ return diffOverview1;
+ }
+
public View getView() {
return view;
}
@@ -169,17 +156,17 @@
EditPaneUpdate epu = ( EditPaneUpdate ) message;
EditPane editPane = epu.getEditPane();
View view = editPane.getView();
- if ( !DualDiff.isEnabledFor( view ) ) {
+ if ( !DualDiffManager.isEnabledFor( view ) ) {
return ;
}
if ( epu.getWhat() == EditPaneUpdate.CREATED ) {
- DualDiff.editPaneCreated( view );
+ DualDiffManager.editPaneCreated( view );
}
else if ( epu.getWhat() == EditPaneUpdate.DESTROYED ) {
- DualDiff.editPaneDestroyed( view, editPane );
+ DualDiffManager.editPaneDestroyed( view, editPane );
}
else if ( epu.getWhat() == EditPaneUpdate.BUFFER_CHANGED ) {
- DualDiff.editPaneBufferChanged( view );
+ DualDiffManager.editPaneBufferChanged( view );
}
}
}
@@ -246,18 +233,18 @@
Buffer buf1 = this.editPane1.getBuffer();
if ( !buf0.isLoaded() || !buf1.isLoaded() ) {
- this.edits = null;
- this.diffOverview0 = new DiffLocalOverview( DualDiff.this );
- this.diffOverview1 = new DiffGlobalPhysicalOverview( DualDiff.this );
+ edits = null;
+ diffOverview0 = new DiffLocalOverview( this );
+ diffOverview1 = new DiffGlobalPhysicalOverview( this );
}
else {
- FileLine[] fileLines0 = this.getFileLines( buf0 );
- FileLine[] fileLines1 = this.getFileLines( buf1 );
+ FileLine[] fileLines0 = DualDiffUtil.getFileLines( this, buf0 );
+ FileLine[] fileLines1 = DualDiffUtil.getFileLines( this, buf1 );
Diff d = new Diff( fileLines0, fileLines1 );
- this.edits = d.diff_2();
- this.diffOverview0 = new DiffLocalOverview( DualDiff.this );
- this.diffOverview1 = new DiffGlobalPhysicalOverview( DualDiff.this );
+ edits = d.diff_2();
+ diffOverview0 = new DiffLocalOverview( this );
+ diffOverview1 = new DiffGlobalPhysicalOverview( this );
}
}
@@ -267,12 +254,12 @@
}
// remove overviews and merge controls
- private void removeOverviews() {
+ protected void removeOverviews() {
this.textArea0.removeLeftOfScrollBar( this.diffOverview0 );
this.textArea1.removeLeftOfScrollBar( this.diffOverview1 );
}
- private void refresh() {
+ protected void refresh() {
this.removeHandlers();
this.disableHighlighters();
@@ -288,7 +275,7 @@
this.diffOverview1.repaint();
}
- private void enableHighlighters() {
+ protected void enableHighlighters() {
DiffHighlight diffHighlight0 = ( DiffHighlight ) DiffHighlight
.getHighlightFor( this.editPane0 );
@@ -323,7 +310,7 @@
diffHighlight1.updateTextArea();
}
- private void disableHighlighters() {
+ protected void disableHighlighters() {
DiffHighlight diffHighlight0 = ( DiffHighlight ) DiffHighlight
.getHighlightFor( this.editPane0 );
@@ -341,7 +328,7 @@
}
}
- private void addHandlers() {
+ protected void addHandlers() {
this.textArea0.addScrollListener( this.scrollHandler );
this.textArea0.addFocusListener( this.scrollHandler );
@@ -349,7 +336,7 @@
this.textArea1.addFocusListener( this.scrollHandler );
}
- private void removeHandlers() {
+ protected void removeHandlers() {
this.textArea0.removeScrollListener( this.scrollHandler );
this.textArea0.removeFocusListener( this.scrollHandler );
@@ -357,413 +344,6 @@
this.textArea1.removeFocusListener( this.scrollHandler );
}
- private FileLine[] getFileLines( Buffer buffer ) {
- FileLine[] lines = new FileLine[ buffer.getLineCount() ];
-
- for ( int i = buffer.getLineCount() - 1; i >= 0; i-- ) {
- int start = buffer.getLineStartOffset( i );
- int end = buffer.getLineEndOffset( i );
-
- // We get the line i without the line separator (always
- // \n)
- int len = ( end - 1 ) - start;
- if ( len == 0 ) {
- lines[ i ] = new FileLine( "", "" );
- continue;
- }
-
- String text = "";
- String canonical = "";
-
- text = buffer.getText( start, len );
- canonical = text;
- if ( ignoreCase ) {
- canonical = canonical.toUpperCase();
- }
- if ( trimWhitespace && !ignoreAllWhitespace ) {
- canonical = trimWhitespaces( canonical );
- }
- if ( ignoreAmountOfWhitespace && !ignoreAllWhitespace ) {
- canonical = squeezeRepeatedWhitespaces( canonical );
- }
- if ( ignoreAllWhitespace ) {
- canonical = removeWhitespaces( canonical );
- }
-
- lines[ i ] = new FileLine( text, canonical );
- }
-
- return lines;
- }
-
- public static String squeezeRepeatedWhitespaces( String str ) {
- int inLen = str.length();
- int outLen = 0;
- char[] inStr = new char[ inLen ];
- char[] outStr = new char[ inLen ];
- str.getChars( 0, inLen, inStr, 0 );
-
- boolean space = false;
-
- int idx = 0;
- // Skip leading whitespaces
- while ( idx < inLen && Character.isWhitespace( inStr[ idx ] ) ) {
- idx++;
- }
-
- for ( ; idx < inLen; idx++ ) {
- if ( Character.isWhitespace( inStr[ idx ] ) ) {
- space = true;
- continue;
- }
-
- if ( space ) {
- outStr[ outLen++ ] = ' ';
- space = false;
- }
- outStr[ outLen++ ] = inStr[ idx ];
- }
-
- return new String( outStr, 0, outLen );
- }
-
- public static String removeWhitespaces( String str ) {
- int inLen = str.length();
- int outLen = 0;
- char[] inStr = new char[ inLen ];
- char[] outStr = new char[ inLen ];
- str.getChars( 0, inLen, inStr, 0 );
-
- for ( int i = 0; i < inLen; i++ ) {
- if ( !Character.isWhitespace( inStr[ i ] ) ) {
- outStr[ outLen ] = inStr[ i ];
- outLen++;
- }
- }
-
- return new String( outStr, 0, outLen );
- }
-
- public static String trimWhitespaces( String str ) {
- int inLen = str.length();
- char[] inStr = new char[ inLen ];
- str.getChars( 0, inLen, inStr, 0 );
-
- // Skip leading whitespaces
- int startIdx = 0;
- while ( ( startIdx < inLen ) && Character.isWhitespace( inStr[ startIdx ] ) ) {
- startIdx++;
- }
-
- // Skip trailing whitespaces
- int endIdx = inLen - 1;
- while ( ( endIdx >= startIdx ) && Character.isWhitespace( inStr[ endIdx ] ) ) {
- endIdx--;
- }
-
- if ( ( startIdx > 0 ) || ( endIdx < inLen - 1 ) ) {
- return new String( inStr, startIdx, endIdx - startIdx + 1 );
- }
- else {
- return str;
- }
- }
-
- public static DualDiff getDualDiffFor( View view ) {
- return ( DualDiff ) dualDiffs.get( view );
- }
-
- public static boolean isEnabledFor( View view ) {
- return ( dualDiffs.get( view ) != null );
- }
-
- private static void editPaneCreated( View view ) {
- DualDiff.removeFrom( view );
- }
-
- private static void editPaneDestroyed( View view, EditPane editPane ) {
- DualDiff.removeFrom( view );
- DiffHighlight.removeHighlightFrom( editPane );
- }
-
- private static void editPaneBufferChanged( View view ) {
- DualDiff.refreshFor( view );
- }
-
- /*
- * Go through the split config and check if any of the files listed in the
- * config have been closed since the config was cached. Let the user know
- * if any file have been closed.
- */
- private static void validateConfig( View view, String splitConfig ) {
- if ( splitConfig == null ) {
- return ;
- }
-
- String[] tokens = splitConfig.split( " " );
- HashSet<String> filenames = new HashSet<String>();
- for ( int i = 0; i < tokens.length; i++ ) {
- String token = tokens[ i ];
- // tokens starting and ending with " are probably file names
- if ( token.startsWith( "\"" ) && token.endsWith( "\"" )
- && ( tokens[ i + 1 ].equals( "buffer" ) || tokens[ i + 1 ].equals( "buff" ) ) ) {
- token = token.substring( 1, token.length() - 1 );
- if ( jEdit.getBuffer( token ) == null ) {
- filenames.add( token );
- }
- }
- }
- for ( String filename : filenames ) {
- JOptionPane.showMessageDialog( view, "JDiff encountered this problem while restoring perspective:\n\nFile closed during diff:\n" + filename, "JDiff Error", JOptionPane.ERROR_MESSAGE );
- }
- }
-
- public static void toggleFor( final View view ) {
- Runnable r = new Runnable() {
- public void run() {
- if ( DualDiff.isEnabledFor( view ) ) {
- // possibly restore split config, see tracker 2540573
- if ( jEdit.getBooleanProperty( "jdiff.restore-view", true ) ) {
- String splitConfig = splitConfigs.get( view );
- if ( splitConfig != null ) {
- validateConfig( view, splitConfig );
- splitConfigs.remove( view );
- view.setSplitConfig( null, splitConfig );
- }
- else {
- view.unsplit();
- }
- }
-
- // turn off DualDiff so auto-scroll is deactivated before
- // restoring caret and viewport.
- DualDiff.removeFrom( view );
- view.getDockableWindowManager().hideDockableWindow( JDIFF_LINES );
-
- // possibly restore caret positions/viewports regardless of
- // restore split config setting
- if ( jEdit.getBooleanProperty( "jdiff.restore-caret", true ) ) {
- HashMap < String, List < Integer >> cps = caretPositions.get( view );
- if ( cps != null ) {
- for ( EditPane ep : view.getEditPanes() ) {
- List<Integer> values = cps.get( ep.getBuffer().getPath( false ) );
- if ( values != null ) {
- int caret_position = values.get( 0 );
- int first_physical_line = values.get( 1 );
- ep.getTextArea().setCaretPosition( caret_position );
- ep.getTextArea().setFirstPhysicalLine( first_physical_line );
- }
- }
- cps = null;
- caretPositions.remove( view );
- }
- }
-
- // let others know that the diff session is over --
- // the SVN Plugin needs this, others might be interested.
- EditBus.send( new DiffMessage( view, DiffMessage.OFF ) );
-
- view.invalidate();
- view.validate();
- }
- else {
- // remember split configuration so it can be restored later
- // and caret positions
- EditPane[] editPanes = view.getEditPanes();
- String splitConfig = view.getSplitConfig();
- if ( splitConfig != null ) {
- splitConfigs.put( view, splitConfig );
- }
-
- // split the view -- if already split correctly,
- // don't split. This might be a bit of a hack in
- // the case where the view is split in two, but
- // horizontally rather than vertically. I'm checking
- // the output of the split config, if it ends with
- // "horizontal", the view is split horizontally and
- // needs to be split vertically.
- if ( editPanes.length != 2 || ( splitConfig != null && !splitConfig.endsWith( "horizontal" ) ) ) {
- view.unsplit();
- view.splitVertically();
- }
-
- // at this point, the View is split, so capture the
- // caret positions and first physical lines for the two files
- editPanes = view.getEditPanes();
- HashMap < String, List < Integer >> cps = new HashMap < String, List < Integer >> (); // <String = buffer path, List<Integer> = [0] caret position, [1] first physical line
- List<Integer> values = new ArrayList<Integer>();
- values.add( editPanes[ 0 ].getTextArea().getCaretPosition() );
- values.add( editPanes[ 0 ].getTextArea().getFirstPhysicalLine() );
- cps.put( editPanes[ 0 ].getBuffer().getPath( false ), values );
- values = new ArrayList<Integer>();
- values.add( editPanes[ 1 ].getTextArea().getCaretPosition() );
- values.add( editPanes[ 1 ].getTextArea().getFirstPhysicalLine() );
- cps.put( editPanes[ 1 ].getBuffer().getPath( false ), values );
- caretPositions.put( view, cps );
-
- DualDiff.addTo( view );
- DockableWindowManager dwm = view.getDockableWindowManager();
- if ( !dwm.isDockableWindowVisible( JDIFF_LINES ) && jEdit.getBooleanProperty( "jdiff.auto-show-dockable" ) ) {
- if ( dwm.getDockableWindow( JDIFF_LINES ) == null ) {
- dwm.addDockableWindow( JDIFF_LINES );
- }
- dwm.showDockableWindow( JDIFF_LINES );
- }
-
- EditBus.send( new DiffMessage( view, DiffMessage.ON ) );
-
- // danson, make sure the divider is in the middle. For some reason,
- // the left side would be much smaller than the right side, this
- // takes care of that.
- view.invalidate();
- view.validate();
-
- SwingUtilities.invokeLater( new Runnable() {
- public void run() {
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
- }
- }
- );
- }
- }
- };
- SwingUtilities.invokeLater( r );
- }
-
- public static void refreshFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff != null ) {
- dualDiff.refresh();
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- view.invalidate();
- view.validate();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- }
- }
-
- public static boolean getIgnoreCaseFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff == null ) {
- return false;
- }
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- return dualDiff.getIgnoreCase();
- }
-
- public static void toggleIgnoreCaseFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff != null ) {
- dualDiff.toggleIgnoreCase();
- dualDiff.refresh();
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- view.invalidate();
- view.validate();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- }
- }
-
- public static boolean getTrimWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff == null ) {
- return false;
- }
-
- return dualDiff.getTrimWhitespace();
- }
-
- public static void toggleTrimWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff != null ) {
- dualDiff.toggleTrimWhitespace();
- dualDiff.refresh();
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- view.invalidate();
- view.validate();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- }
- }
-
- public static boolean getIgnoreAmountOfWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff == null ) {
- return false;
- }
-
- return dualDiff.getIgnoreAmountOfWhitespace();
- }
-
- public static void toggleIgnoreAmountOfWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff != null ) {
- dualDiff.toggleIgnoreAmountOfWhitespace();
- dualDiff.refresh();
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- view.invalidate();
- view.validate();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- }
- }
-
- public static boolean getIgnoreAllWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff == null ) {
- return false;
- }
-
- return dualDiff.getIgnoreAllWhitespace();
- }
-
- public static void toggleIgnoreAllWhitespaceFor( View view ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
- if ( dualDiff != null ) {
- dualDiff.toggleIgnoreAllWhitespace();
- dualDiff.refresh();
-
- JSplitPane sp = view.getSplitPane();
- sp.setDividerLocation( 0.5 );
-
- view.invalidate();
- view.validate();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- }
- }
-
public Font getFont() {
return textArea0.getPainter().getFont();
}
@@ -772,257 +352,7 @@
return textArea0.getPainter().getBackground();
}
- public static void nextDiff( EditPane editPane ) {
- // danson, the nextDiff0 and nextDiff1 weren't working correctly, they
- // were using the first visible line rather than the caret line to
- // calculate the next diff position. Using the first physical line
- // meant the "next" diff was always the first visible diff, even if
- // there were 2 visible diffs.
- DualDiff dualDiff = DualDiff.getDualDiffFor( editPane.getView() );
- if ( dualDiff == null ) {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- editPane.getToolkit().beep();
- }
- return ;
- }
-
- if ( dualDiff.editPane0 == editPane ) {
- dualDiff.nextDiff0();
- }
- else if ( dualDiff.editPane1 == editPane ) {
- dualDiff.nextDiff1();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- editPane.getToolkit().beep();
- }
- }
- }
-
- public static void prevDiff( EditPane editPane ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( editPane.getView() );
- if ( dualDiff == null ) {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- editPane.getToolkit().beep();
- }
- return ;
- }
-
- if ( dualDiff.editPane0 == editPane ) {
- dualDiff.prevDiff0();
- }
- else if ( dualDiff.editPane1 == editPane ) {
- dualDiff.prevDiff1();
- }
- else {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- editPane.getToolkit().beep();
- }
- }
- }
-
- public static void moveRight( EditPane editPane ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( editPane.getView() );
- if ( dualDiff == null ) {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- editPane.getToolkit().beep();
- }
- return ;
- }
- editPane = editPane.getView().getEditPanes() [ 0 ];
- dualDiff.diffOverview0.moveRight( editPane.getTextArea().getCaretLine() );
- }
-
- public static void moveLeft( EditPane editPane ) {
- DualDiff dualDiff = DualDiff.getDualDiffFor( editPane.getView() );
- if ( dualDiff == null ) {
- editPane.getToolkit().beep();
- return ;
- }
- editPane = editPane.getView().getEditPanes() [ 1 ];
- dualDiff.diffOverview0.moveLeft( editPane.getTextArea().getCaretLine() );
- }
-
- public static void diffNormalOutput( View view ) {
- if ( !DualDiff.isEnabledFor( view ) ) {
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
- view.getToolkit().beep();
- }
- return ;
- }
-
- DualDiff dualDiff = DualDiff.getDualDiffFor( view );
-
- // Generate the script
- Buffer buf0 = dualDiff.editPane0.getBuffer();
- Buffer buf1 = dualDiff.editPane1.getBuffer();
-
- FileLine[] fileLines0 = dualDiff.getFileLines( buf0 );
- FileLine[] fileLines1 = dualDiff.getFileLines( buf1 );
-
- Diff d = new Diff( fileLines0, fileLines1 );
- Diff.Change script = d.diff_2();
-
- // Files are identical: return
- if ( script == null ) {
- GUIUtilities.message( view, "jdiff.identical-files", null );
- return ;
- }
-
- // Generate the normal output
- StringWriter sw = new StringWriter();
- DiffOutput diffOutput = new DiffNormalOutput( fileLines0, fileLines1 );
- diffOutput.setOut( new BufferedWriter( sw ) );
- diffOutput.setLineSeparator( "\n" );
- try {
- diffOutput.writeScript( script );
- }
- catch ( IOException ioe ) {
- Log.log( Log.DEBUG, DualDiff.class, ioe );
- }
-
- // Get/create the output view and create a new buffer
- View outputView = jEdit.getFirstView();
- for ( ; outputView != null; outputView = outputView.getNext() ) {
- if ( !DualDiff.isEnabledFor( outputView ) ) {
- break;
- }
- }
- if ( outputView == null ) {
- outputView = jEdit.newView( view, view.getBuffer() );
- }
- Buffer outputBuffer = jEdit.newFile( outputView );
-
- // Insert the normal output into the buffer
- String s = sw.toString();
- outputBuffer.insert( 0, s );
- // When the string ends with a newline, the generated buffer
- // adds one extra newline so we remove it
- if ( s.endsWith( "\n" ) && outputBuffer.getLength() > 0 ) {
- outputBuffer.remove( outputBuffer.getLength() - 1, 1 );
- }
- }
-
- /**
- * Shows a dialog for the user to select
- * a patch file, then applies that patch file to the current buffer.
- * @param view the view displaying the buffer
- */
- public static void applyPatch( View view ) {
- try {
- // let the user select the patch file and patch file type
- PatchSelectionDialog dialog = new PatchSelectionDialog( view );
- center( view, dialog );
- dialog.setVisible( true );
- String patch_file = dialog.getPatchFile();
- if ( patch_file == null || patch_file.length() == 0 ) {
- // null means user canceled
- return ;
- }
-
- // load the patch file
- Reader reader = new BufferedReader( new FileReader( patch_file ) );
- StringWriter writer = new StringWriter();
- PatchUtils.copyToWriter( reader, writer );
- String patch = writer.toString();
- if ( patch == null || patch.length() == 0 ) {
- JOptionPane.showMessageDialog( view, "Invalid patch file, file has no content.", "Error", JOptionPane.ERROR_MESSAGE );
- return ;
- }
-
- // load the file to be patched
- Buffer buffer = view.getEditPane().getBuffer();
- String bufferText = buffer.getText( 0, buffer.getLength() );
-
- // apply the patch
- String results = Patch.patch( patch, bufferText );
-
- // show the results as a new file so the user can check it against
- // the original before saving it
- jEdit.newFile( view ).insert( 0, results );
- }
- catch ( Exception e ) {
- JOptionPane.showMessageDialog( view, e.getMessage(), "Error", JOptionPane.ERROR_MESSAGE );
- }
- }
-
- /**
- * @return the index of the first character where <code>left</code> is not the
- * same as <code>right</code>.
- */
- private static int firstNoMatch( String left, String right ) {
- if ( left == null || right == null ) {
- return 0;
- }
- boolean ignoreCase = jEdit.getBooleanProperty( "jdiff.ignore-case" );
- if ( ignoreCase ) {
- if ( left == right || left.equalsIgnoreCase( right ) ) {
- return -1;
- }
- }
- else {
- if ( left == right || left.equals( right ) ) {
- return -1;
- }
- }
-
- if ( left.charAt( 0 ) != right.charAt( 0 ) ) {
- return 0;
- }
-
- int minLength = Math.min( left.length(), right.length() );
- if ( ignoreCase ) {
- left = left.toLowerCase();
- right = right.toLowerCase();
- }
-
- int i;
- for ( i = 0; i < minLength; i++ ) {
- if ( left.charAt( i ) != right.charAt( i ) ) {
- break;
- }
- }
- return i;
- }
-
- private static void centerOnDiff( TextArea leftTextArea, TextArea rightTextArea ) {
- if ( leftTextArea == null || rightTextArea == null ) {
- return ;
- }
-
- String leftLine = getCurrentLineText( leftTextArea );
- String rightLine = getCurrentLineText( rightTextArea );
-
- int diffOffset = firstNoMatch( leftLine, rightLine );
-
- leftTextArea.setCaretPosition( leftTextArea.getCaretPosition() + diffOffset, false );
- rightTextArea.setCaretPosition( rightTextArea.getCaretPosition() + diffOffset, false );
-
- alignCaretLeft( leftTextArea );
- alignCaretLeft( rightTextArea );
- }
-
- private static String getCurrentLineText( TextArea ta ) {
- if ( ta == null ) {
- return "";
- }
- int caretPosition = ta.getCaretPosition();
- int lineOffset = ta.getLineOfOffset( caretPosition );
- return ta.getLineText( lineOffset );
- }
-
- private static void alignCaretLeft( TextArea ta ) {
- int caretPhysOffset = ta.getCaretPosition();
- int caretPhysLine = ta.getLineOfOffset( caretPhysOffset );
- int caretPhysLineStartOffset = ta.getLineStartOffset( caretPhysLine );
- int caretRelOffset = caretPhysOffset - caretPhysLineStartOffset;
- // caretLocation will be (X,Y) relative to the current view area
- Point caretLocation = ta.offsetToXY( caretPhysLine, caretRelOffset );
- // to scroll the caret to the left, we need to add caretLocation.x to the horizontalOffset
- ta.setHorizontalOffset( -1 * ( Math.abs( ta.getHorizontalOffset() ) + caretLocation.x ) );
- }
-
- private void nextDiff0() {
+ protected void nextDiff0() {
Diff.Change hunk = this.edits;
int caretLine = this.textArea0.getCaretLine();
for ( ; hunk != null; hunk = hunk.next ) {
@@ -1052,30 +382,30 @@
this.textArea1.setFirstLine( hunk.first1 - distance );
// maybe move the caret to the first actual diff character
- if ( jEdit.getBooleanProperty( HORIZ_SCROLL ) ) {
- centerOnDiff( this.textArea0, this.textArea1 );
+ if ( jEdit.getBooleanProperty( DualDiffManager.HORIZ_SCROLL ) ) {
+ DualDiffUtil.centerOnDiff( this.textArea0, this.textArea1 );
// maybe select the first diff word
- if ( jEdit.getBooleanProperty( SELECT_WORD ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.SELECT_WORD ) ) {
this.textArea0.selectWord();
this.textArea1.selectWord();
}
}
if ( this.textArea0.getFirstLine() != line &&
- jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea0.getToolkit().beep();
}
return ;
}
}
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea1.getToolkit().beep();
}
}
- private void nextDiff1() {
+ protected void nextDiff1() {
Diff.Change hunk = this.edits;
int caretLine = this.textArea1.getCaretLine();
for ( ; hunk != null; hunk = hunk.next ) {
@@ -1105,30 +435,30 @@
this.textArea0.setFirstLine( hunk.first0 - distance );
// maybe move the caret to the first actual diff character
- if ( jEdit.getBooleanProperty( HORIZ_SCROLL ) ) {
- centerOnDiff( this.textArea0, this.textArea1 );
+ if ( jEdit.getBooleanProperty( DualDiffManager.HORIZ_SCROLL ) ) {
+ DualDiffUtil.centerOnDiff( this.textArea0, this.textArea1 );
// maybe select the first diff word
- if ( jEdit.getBooleanProperty( SELECT_WORD ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.SELECT_WORD ) ) {
this.textArea0.selectWord();
this.textArea1.selectWord();
}
}
if ( this.textArea1.getFirstLine() != line &&
- jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea1.getToolkit().beep();
}
return ;
}
}
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea1.getToolkit().beep();
}
}
- private void prevDiff0() {
+ protected void prevDiff0() {
Diff.Change hunk = this.edits;
int caretLine = this.textArea0.getCaretLine();
for ( ; hunk != null; hunk = hunk.next ) {
@@ -1137,8 +467,8 @@
// go to start of current hunk. If caret line is after end of
// current hunk, but before the next hunk, go to start of current
// hunk.
- if ( hunk.first0 + hunk.lines0 > caretLine || // NOPMD caret is in current hunk
- hunk.next == null || // caret is after last hunk
+ if ( hunk.first0 + hunk.lines0 > caretLine || // NOPMD caret is in current hunk
+ hunk.next == null || // caret is after last hunk
hunk.next.first0 >= caretLine ) { // caret is before next hunk
int line = hunk.first0; // first line of diff hunk
@@ -1165,18 +495,18 @@
this.textArea1.setFirstLine( hunk.first1 - distance );
// maybe move the caret to the first actual diff character
- if ( jEdit.getBooleanProperty( HORIZ_SCROLL ) ) {
- centerOnDiff( textArea0, textArea1 );
+ if ( jEdit.getBooleanProperty( DualDiffManager.HORIZ_SCROLL ) ) {
+ DualDiffUtil.centerOnDiff( textArea0, textArea1 );
// maybe select the first diff word
- if ( jEdit.getBooleanProperty( SELECT_WORD ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.SELECT_WORD ) ) {
textArea0.selectWord();
textArea1.selectWord();
}
}
if ( this.textArea0.getFirstLine() != line &&
- jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea0.getToolkit().beep();
}
return ;
@@ -1184,12 +514,12 @@
}
}
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea0.getToolkit().beep();
}
}
- private void prevDiff1() {
+ protected void prevDiff1() {
Diff.Change hunk = this.edits;
int caretLine = this.textArea1.getCaretLine();
for ( ; hunk != null; hunk = hunk.next ) {
@@ -1198,8 +528,8 @@
// go to start of current hunk. If caret line is after end of
// current hunk, but before current hunk, go to start of current
// hunk.
- if ( hunk.first1 + hunk.lines1 > caretLine || // NOPMD caret is in current hunk
- hunk.next == null || // caret is after last hunk
+ if ( hunk.first1 + hunk.lines1 > caretLine || // NOPMD caret is in current hunk
+ hunk.next == null || // caret is after last hunk
hunk.next.first1 >= caretLine ) { // caret is before next hunk
int line = hunk.first1; // first line of hunk
@@ -1226,18 +556,18 @@
this.textArea0.setFirstLine( hunk.first0 - distance );
// maybe move the caret to the first actual diff character
- if ( jEdit.getBooleanProperty( HORIZ_SCROLL ) ) {
- centerOnDiff( textArea0, textArea1 );
+ if ( jEdit.getBooleanProperty( DualDiffManager.HORIZ_SCROLL ) ) {
+ DualDiffUtil.centerOnDiff( textArea0, textArea1 );
// maybe select the first diff word
- if ( jEdit.getBooleanProperty( SELECT_WORD ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.SELECT_WORD ) ) {
textArea0.selectWord();
textArea1.selectWord();
}
}
if ( this.textArea1.getFirstLine() != line &&
- jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea1.getToolkit().beep();
}
return ;
@@ -1245,160 +575,8 @@
}
}
- if ( jEdit.getBooleanProperty( BEEP_ON_ERROR ) ) {
+ if ( jEdit.getBooleanProperty( DualDiffManager.BEEP_ON_ERROR ) ) {
this.textArea1.getToolkit().beep();
}
}
-
- private static void addTo( View view ) {
- DualDiff dualDiff = new DualDiff( view );
-
- EditBus.addToBus( dualDiff );
-
- dualDiff.enableHighlighters();
- dualDiff.addHandlers();
- jdiff.component.DiffLineOverview diffLineOverview = new jdiff.component.DiffLineOverview( dualDiff, view );
- dualDiff.setDiffLineOverview( diffLineOverview );
-
- dualDiff.diffOverview0.synchroScrollRight();
- dualDiff.diffOverview1.repaint();
-
- dualDiffs.put( view, dualDiff );
- diffLineOverview.reset();
- }
-
- private static void removeFrom( View view ) {
- DualDiff dualDiff = ( DualDiff ) dualDiffs.get( view );
-
- EditBus.removeFromBus( dualDiff );
-
- if ( dualDiff != null ) {
- dualDiff.removeHandlers();
- dualDiff.disableHighlighters();
-
- dualDiff.removeOverviews();
-
- dualDiffs.remove( view );
-
- dualDiff.getDiffLineOverview().setModel( null );
- }
- }
-
- private class ScrollHandler implements ScrollListener, FocusListener, MouseListener {
- private Runnable syncWithRightVert = new Runnable() {
- public void run() {
- DualDiff.this.diffOverview0.repaint();
- DualDiff.this.diffOverview0.synchroScrollRight();
- DualDiff.this.diffOverview1.repaint();
- }
- };
-
- private Runnable syncWithLeftVert = new Runnable() {
- public void run() {
- DualDiff.this.diffOverview1.repaint();
- DualDiff.this.diffOverview1.synchroScrollLeft();
- DualDiff.this.diffOverview0.repaint();
- }
- };
-
- private Runnable syncWithRightHoriz = new Runnable() {
- public void run() {
- DualDiff.this.textArea1.setHorizontalOffset( DualDiff.this.textArea0
- .getHorizontalOffset() );
- }
- };
-
- private Runnable syncWithLeftHoriz = new Runnable() {
- public void run() {
- DualDiff.this.textArea0.setHorizontalOffset( DualDiff.this.textArea1
- .getHorizontalOffset() );
- }
- };
-
-
- public void scrolledHorizontally( TextArea textArea ) {
- if ( textArea == DualDiff.this.textArea0 ) {
- SwingUtilities.invokeLater( this.syncWithRightHoriz );
- }
- else if ( textArea == DualDiff.this.textArea1 ) {
- SwingUtilities.invokeLater( this.syncWithLeftHoriz );
- }
- }
-
- public void scrolledVertically( TextArea textArea ) {
- if ( textArea == DualDiff.this.textArea0 ) {
- SwingUtilities.invokeLater( this.syncWithRightVert );
- }
- else if ( textArea == DualDiff.this.textArea1 ) {
- SwingUtilities.invokeLater( this.syncWithLeftVert );
- }
- }
-
- public void focusGained( FocusEvent e ) {
- //Log.log( Log.DEBUG, this, "**** focusGained " + e );
- if ( jEdit.getBooleanProperty( "jdiff.auto-show-dockable" ) ) {
- if ( !view.getDockableWindowManager().isDockableWindowVisible( JDIFF_LINES ) ) { // NOPMD ifs on separate lines for readability
- view.getDockableWindowManager().showDockableWindow( JDIFF_LINES );
- }
- }
- }
-
- public void focusLost( FocusEvent e ) {
- //Log.log( Log.DEBUG, this, "**** focusLost " + e );
- }
-
- public void mouseClicked( MouseEvent e ) {}
-
- public void mouseEntered( MouseEvent e ) {}
-
- public void mouseExited( MouseEvent e ) {}
-
- public void mousePressed( MouseEvent e ) {
- //Log.log( Log.DEBUG, this, "**** mousePressed " + e );
- }
-
- public void mouseReleased( MouseEvent e ) {
- //Log.log( Log.DEBUG, this, "**** mouseReleased " + e );
- }
-
- }
-
- public static void propertiesChanged() {
- boolean newIgnoreCaseDefault = jEdit.getBooleanProperty( "jdiff.ignore-case", false );
- boolean newTrimWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.trim-whitespace", false );
- boolean newIgnoreAmountOfWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.ignore-amount-whitespace", false );
- boolean newIgnoreAllWhitespaceDefault = jEdit.getBooleanProperty(
- "jdiff.ignore-all-whitespace", false );
-
- if ( ( newIgnoreCaseDefault != ignoreCaseDefault )
- || ( newTrimWhitespaceDefault != trimWhitespaceDefault )
- || ( newIgnoreAmountOfWhitespaceDefault != ignoreAmountOfWhitespaceDefault )
- || ( newIgnoreAllWhitespaceDefault != ignoreAllWhitespaceDefault ) ) {
- ignoreCaseDefault = newIgnoreCaseDefault;
- trimWhitespaceDefault = newTrimWhitespaceDefault;
- ignoreAmountOfWhitespaceDefault = newIgnoreAmountOfWhitespaceDefault;
- ignoreAllWhitespaceDefault = newIgnoreAllWhitespaceDefault;
- }
- }
-
- /**
- * Centers <code>you</code> on <code>me</code>. Useful for centering
- * dialogs on their parent frames.
- *
- * @param me Component to use as basis for centering.
- * @param you Component to center on <code>me</code>.
- */
- public static void center( Component me, Component you ) {
- Rectangle my = me.getBounds();
- Dimension your = you.getSize();
- int x = my.x + ( my.width - your.width ) / 2;
- if ( x < 0 )
- x = 0;
- int y = my.y + ( my.height - your.height ) / 2;
- if ( y < 0 )
- y = 0;
- you.setLocation( x, y );
- }
}
\ No newline at end of file
Modified: plugins/JDiffPlugin/trunk/jdiff/DualDiffDialog.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiffDialog.java 2006-01-17 03:42:40 UTC (rev 15147)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiffDialog.java 2009-04-28 22:03:30 UTC (rev 15148)
@@ -223,8 +223,8 @@
}
editPanes[ 0 ].setBuffer( baseBuffer );
editPanes[ 1 ].setBuffer( newBuffer );
- if ( !DualDiff.isEnabledFor( DualDiffDialog.this.view ) ) {
- DualDiff.toggleFor( DualDiffDialog.this.view );
+ if ( !DualDiffManager.isEnabledFor( DualDiffDialog.this.view ) ) {
+ DualDiffManager.toggleFor( DualDiffDialog.this.view );
}
}
}
Added: plugins/JDiffPlugin/trunk/jdiff/DualDiffManager.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/DualDiffManager.java (rev 0)
+++ plugins/JDiffPlugin/trunk/jdiff/DualDiffManager.java 2009-04-28 22:03:30 UTC (rev 15148)
@@ -0,0 +1,534 @@
+package jdiff;
+
+import java.io.*;
+import java.util.*;
+import javax.swing.*;
+
+import org.gjt.sp.jedit.*;
+import org.gjt.sp.jedit.gui.DockableWindowManager;
+import org.gjt.sp.util.Log;
+
+import jdiff.component.*;
+import jdiff.text.FileLine;
+import jdiff.util.*;
+import jdiff.util.patch.*;
+
+public class DualDiffManager {
+
+ public static final String JDIFF_LINES = "jdiff-lines";
+ public static final String BEEP_ON_ERROR = "jdiff.beep-on-error";
+ public static final String HORIZ_SCROLL = "jdiff.horiz-scroll";
+ public static final String SELECT_WORD = "jdiff.select-word";
+
+ private static HashMap<View, DualDiff> dualDiffs = new HashMap<View, DualDiff>();
+ private static HashMap<View, String> splitConfigs = new HashMap<View, String>();
+ private static HashMap< View, HashMap < String, List<Integer> >> caretPositions = new HashMap < View, HashMap < String, List<Integer> >> ();
+
+ public static DualDiff getDualDiffFor( View view ) {
+ return ( DualDiff ) dualDiffs.get( view );
+ }
+
+ public static boolean isEnabledFor( View view ) {
+ return ( dualDiffs.get( view ) != null );
+ }
+
+ public static void editPaneCreated( View view ) {
+ DualDiffManager.removeFrom( view );
+ }
+
+ public static void editPaneDestroyed( View view, EditPane editPane ) {
+ DualDiffManager.removeFrom( view );
+ DiffHighlight.removeHighlightFrom( editPane );
+ }
+
+ public static void editPaneBufferChanged( View view ) {
+ DualDiffManager.refreshFor( view );
+ }
+
+ public static void addTo( View view ) {
+ DualDiff dualDiff = new DualDiff( view );
+
+ EditBus.addToBus( dualDiff );
+
+ dualDiff.enableHighlighters();
+ dualDiff.addHandlers();
+ DiffLineOverview diffLineOverview = new DiffLineOverview( dualDiff, view );
+ dualDiff.setDiffLineOverview( diffLineOverview );
+
+ dualDiff.getDiffOverview0().synchroScrollRight();
+ dualDiff.getDiffOverview1().repaint();
+
+ dualDiffs.put( view, dualDiff );
+ diffLineOverview.reset();
+ }
+
+ public static void removeFrom( View view ) {
+ DualDiff dualDiff = ( DualDiff ) dualDiffs.get( view );
+
+ EditBus.removeFromBus( dualDiff );
+
+ if ( dualDiff != null ) {
+ dualDiff.removeHandlers();
+ dualDiff.disableHighlighters();
+
+ dualDiff.removeOverviews();
+
+ dualDiffs.remove( view );
+
+ dualDiff.getDiffLineOverview().setModel( null );
+ }
+ }
+
+ /*
+ * Go through the split config and check if any of the files listed in the
+ * config have been closed since the config was cached. Let the user know
+ * if any file have been closed.
+ */
+ private static void validateConfig( View view, String splitConfig ) {
+ if ( splitConfig == null ) {
+ return ;
+ }
+
+ String[] tokens = splitConfig.split( " " );
+ HashSet<String> filenames = new HashSet<String>();
+ for ( int i = 0; i < tokens.length; i++ ) {
+ String token = tokens[ i ];
+ // tokens starting and ending with " are probably file names
+ if ( token.startsWith( "\"" ) && token.endsWith( "\"" )
+ && ( tokens[ i + 1 ].equals( "buffer" ) || tokens[ i + 1 ].equals( "buff" ) ) ) {
+ token = token.substring( 1, token.length() - 1 );
+ if ( jEdit.getBuffer( token ) == null ) {
+ filenames.add( token );
+ }
+ }
+ }
+ for ( String filename : filenames ) {
+ JOptionPane.showMessageDialog( view, "JDiff encountered this problem while restoring perspective:\n\nFile closed during diff:\n" + filename, "JDiff Error", JOptionPane.ERROR_MESSAGE );
+ }
+ }
+
+ public static void toggleFor( final View view ) {
+ Runnable r = new Runnable() {
+ public void run() {
+ if ( DualDiffManager.isEnabledFor( view ) ) {
+ // possibly restore split config, see tracker 2540573
+ if ( jEdit.getBooleanProperty( "jdiff.restore-view", true ) ) {
+ String splitConfig = splitConfigs.get( view );
+ if ( splitConfig != null ) {
+ validateConfig( view, splitConfig );
+ splitConfigs.remove( view );
+ view.setSplitConfig( null, splitConfig );
+ }
+ else {
+ view.unsplit();
+ }
+ }
+
+ // turn off DualDiff so auto-scroll is deactivated before
+ // restoring caret and viewport.
+ DualDiffManager.removeFrom( view );
+ view.getDockableWindowManager().hideDockableWindow( JDIFF_LINES );
+
+ // possibly restore caret positions/viewports regardless of
+ // restore split config setting
+ if ( jEdit.getBooleanProperty( "jdiff.restore-car...
[truncated message content] |