[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[23156] plugins/SVNPlugin/trunk
From:       daleanson () users ! sourceforge ! net
Date:       2013-08-29 23:24:18
Message-ID: E1VFBZa-0000Nj-IB () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 23156
          http://jedit.svn.sourceforge.net/jedit/?rev=23156&view=rev
Author:   daleanson
Date:     2013-08-29 23:24:18 +0000 (Thu, 29 Aug 2013)
Log Message:
-----------
Updated to use changes to BlamePane from CommonControls.

Modified Paths:
--------------
    plugins/SVNPlugin/trunk/SVNPlugin.props
    plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/BlameAction.java

Modified: plugins/SVNPlugin/trunk/SVNPlugin.props
===================================================================
--- plugins/SVNPlugin/trunk/SVNPlugin.props	2013-08-29 23:22:57 UTC (rev 23155)
+++ plugins/SVNPlugin/trunk/SVNPlugin.props	2013-08-29 23:24:18 UTC (rev 23156)
@@ -16,7 +16,7 @@
 plugin.ise.plugin.svn.SVNPlugin.depend.0=jdk 1.6.0
 plugin.ise.plugin.svn.SVNPlugin.depend.1=jedit 04.05.99.00
 plugin.ise.plugin.svn.SVNPlugin.depend.2=plugin projectviewer.ProjectPlugin 3.4.4
-plugin.ise.plugin.svn.SVNPlugin.depend.3=plugin CommonControlsPlugin 1.7
+plugin.ise.plugin.svn.SVNPlugin.depend.3=plugin CommonControlsPlugin 1.7.1
 plugin.ise.plugin.svn.SVNPlugin.depend.4=plugin jdiff.JDiffPlugin 3.3.0
 plugin.ise.plugin.svn.SVNPlugin.depend.5=plugin infoviewer.InfoViewerPlugin 1.6.1
 plugin.ise.plugin.svn.SVNPlugin.depend.6=plugin jnaplugin.JNAPlugin 3.2.4

Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/BlameAction.java
===================================================================
--- plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/BlameAction.java	2013-08-29 \
                23:22:57 UTC (rev 23155)
+++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/action/BlameAction.java	2013-08-29 \
23:24:18 UTC (rev 23156) @@ -158,34 +158,8 @@
                         model.setTextArea( textArea );
                         BlamePane pane = new BlamePane( model );
                         editPane.setBuffer(buffer);
-
-                        // remove any previous blame display
-                        Object old_blame = buffer.getProperty( "_old_blame_" );
-                        if ( old_blame != null ) {
-                            textArea.removeLeftOfScrollBar( ( JComponent ) old_blame \
                );
-                            Object old_closer = buffer.getProperty( "_old_closer_" \
                );
-                            textArea.removeTopComponent( ( JComponent ) old_closer \
                );
-                        }
-
-                        // add column of revisions and author names to the right
-                        // side of the text area
-                        textArea.addLeftOfScrollBar( pane );
-
-                        // add a "close" button at the top of the text area to be
-                        // able to remove the blame display
-                        JComponent closer = pane.getCloser( getView() );
-                        textArea.addTopComponent( closer );
-
-                        // caret listener moves the highlight in the text area to
-                        // correspond with the hightlight in the blame pane
-                        textArea.addCaretListener( pane );
-
-                        // store a reference to the blame display for future use
-                        buffer.setProperty( "_old_blame_", pane );
-                        buffer.setProperty( "_old_closer_", closer );
-
-                        getView().invalidate();
-                        getView().validate();
+                        pane.install(buffer);
+                        
                         logger.log( Level.INFO, jEdit.getProperty( "ips.Done.", \
"Done." ) );  if ( model.outOfDate() ) {
                             JOptionPane.showMessageDialog( getView(),

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


------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]