Project: jEdit

Revision: 13530

Author: daleanson

Date: 04 Sep 2008 22:45:54

• /plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/DiffAction.java

  ......	@@ -312,28 +312,36 @@
  312	312	// show JDiff
  313	313	DualDiff.toggleFor( getView() );
  314	314
  315		Runnable r = new Runnable() {
  	315	SwingUtilities.invokeLater( new Runnable() {
  316	316	public void run() {
  317	317	// set the edit panes in the view
  318	318	EditPane[] editPanes = getView().getEditPanes();
  319	319
  320		// always show the 1st remote revision in the left edit pane
  321		editPanes[ 0 ].setBuffer( jEdit.openFile( getView(), remote1.getAbsolutePath() ) );
  322
  323	320	if ( remote2 == null ) {
  324		// or show the local working copy in the right edit pane
  	321	// show the local working copy in the right edit pane
  325	322	editPanes[ 1 ].setBuffer( jEdit.openFile( getView(), path1 ) );
  326	323	}
  327	324	else {
  328		// show the 2nd remote revision in the right edit pane
  	325	// or show the 2nd remote revision in the right edit pane
  329	326	editPanes[ 1 ].setBuffer( jEdit.openFile( getView(), remote2.getAbsolutePath() ) );
  330	327	}
  331	328
  332	329	// do an explicit repaint of the view to clean up the display
  333	330	getView().repaint();
  334	331	}
  335		};
  336		SwingUtilities.invokeLater( r );
  	332	});
  	333	SwingUtilities.invokeLater( new Runnable() {
  	334	public void run() {
  	335	// set the edit panes in the view
  	336	EditPane[] editPanes = getView().getEditPanes();
  	337
  	338	// always show the 1st remote revision in the left edit pane
  	339	editPanes[ 0 ].setBuffer( jEdit.openFile( getView(), remote1.getAbsolutePath() ) );
  	340
  	341	// do an explicit repaint of the view to clean up the display
  	342	getView().repaint();
  	343	}
  	344	});
  337	345
  338	346	}
  339	347	catch ( Exception e ) {