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

List:       jedit-cvs
Subject:    [ jEdit-commits ] [ GitPlugin plugin ] GitPlugin jEdit plugin branch master updated. 90d93629f387eab
From:       "Alan Ezust" <ezust () users ! sourceforge ! net>
Date:       2013-08-30 1:28:15
Message-ID: E1VFDVb-0008Rl-Mz () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GitPlugin jEdit plugin".

The branch, master has been updated
       via  90d93629f387eabb3bb038c9154a5aebebe0c28d (commit)
      from  b458a5a1b278e99a1ca4c416f869c50bf158f720 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=commit;h=90d93629f387eabb3bb038c9154a5aebebe0c28d
                
commitdiff: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=commitdiff;h=90d93629f387eabb3bb038c9154a5aebebe0c28d
                
tree: http://jedit.git.sourceforge.net/git/gitweb.cgi?p=jedit/GitPlugin;a=tree;h=90d93629f387eabb3bb038c9154a5aebebe0c28d;hb=90d93629f387eabb3bb038c9154a5aebebe0c28d


commit 90d93629f387eabb3bb038c9154a5aebebe0c28d
Author: Alan Ezust <ezust@users.sourceforge.net>
Date:   Thu Aug 29 18:28:01 2013 -0700

    Refactored to use commoncontrols 1.7.1

diff --git a/GitPlugin.props b/GitPlugin.props
index f695230..48b5a13 100644
--- a/GitPlugin.props
+++ b/GitPlugin.props
@@ -8,7 +8,7 @@ plugin.git.GitPlugin.docs=index.html
 plugin.git.GitPlugin.description=Offers a git VersionControlService for \
ProjectViewer, and some additional git actions for jEdit.  \
plugin.git.GitPlugin.depend.0=jdk 1.6  plugin.git.GitPlugin.depend.1=jedit \
                05.00.99.00
-plugin.git.GitPlugin.depend.2=plugin CommonControlsPlugin 1.7
+plugin.git.GitPlugin.depend.2=plugin CommonControlsPlugin 1.7.1
 plugin.git.GitPlugin.depend.3=plugin projectviewer.ProjectPlugin 3.5.0
 
 
diff --git a/git/action/AbstractGitAction.java b/git/action/AbstractGitAction.java
index 544afbb..d5ff5c2 100644
--- a/git/action/AbstractGitAction.java
+++ b/git/action/AbstractGitAction.java
@@ -29,7 +29,7 @@ import projectviewer.vpt.VPTProject;
 
 /**
  * Abstract class that provides some common functionality for building
- * actions.
+ * ProjectViewer Actions.
  */
 abstract class AbstractGitAction extends Action {
 
diff --git a/git/command/Blame.java b/git/command/Blame.java
index 0e4f92f..15e33f7 100644
--- a/git/command/Blame.java
+++ b/git/command/Blame.java
@@ -115,33 +115,6 @@ public class Blame extends GitCommand implements LineVisitor
 	{	
 		BlameModel model = new BlameModel(textArea, blameLines, hoverTips);
 		BlamePane pane = new BlamePane( model );
-		
-		// 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( textArea.getView() );
-        textArea.addTopComponent( closer );
-
-        // caret listener moves the highlight in the text area to
-        // correspond with the highlight 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 );
-
-        textArea.getView().invalidate();
-        textArea.getView().validate();
+		pane.install(buffer);		
 	}//}}}
 }//}}}

-----------------------------------------------------------------------

Summary of changes:
 GitPlugin.props                   |    2 +-
 git/action/AbstractGitAction.java |    2 +-
 git/command/Blame.java            |   29 +----------------------------
 3 files changed, 3 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
GitPlugin jEdit plugin

------------------------------------------------------------------------------
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]