[ jEdit-commits ] SF.net SVN: jedit: [12929] plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/ LogResultsPanel.java

[<dal...@us...>]

Revision: 12929
          http://jedit.svn.sourceforge.net/jedit/?rev=12929&view=rev
Author:   daleanson
Date:     2008-06-26 05:00:15 -0700 (Thu, 26 Jun 2008)

Log Message:
-----------
added 'copy path' value to the log results output.  This information is available in the raw output, but wasn't being displayed in the gui output.  It's useful for knowing where a branch originated.

Modified Paths:
--------------
    plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java

Modified: plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java
===================================================================
--- plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java	2008-06-26 09:18:13 UTC (rev 12928)
+++ plugins/SVNPlugin/trunk/src/ise/plugin/svn/gui/LogResultsPanel.java	2008-06-26 12:00:15 UTC (rev 12929)
@@ -93,7 +93,7 @@
         Set < Map.Entry < String, List < SVNLogEntry >>> set = results.entrySet();
         for ( Map.Entry < String, List < SVNLogEntry >> me : set ) {
             String path = ( String ) me.getKey();
-            JLabel label = new JLabel( jEdit.getProperty("ips.Path>", "Path:") + " " + path );
+            JLabel label = new JLabel( jEdit.getProperty( "ips.Path>", "Path:" ) + " " + path );
 
             // sort the entries
             List<SVNLogEntry> entries = me.getValue();
@@ -109,7 +109,7 @@
             for ( int i = 0; it.hasNext(); i++ ) {
                 SVNLogEntry entry = ( SVNLogEntry ) it.next();
                 String revision = String.valueOf( entry.getRevision() );
-                String date = entry.getDate() != null ? new SimpleDateFormat( jEdit.getProperty("ips.yyyy-MM-dd_HH>mm>ss_Z", "yyyy-MM-dd HH:mm:ss Z"), Locale.getDefault() ).format( entry.getDate() ) : "---";
+                String date = entry.getDate() != null ? new SimpleDateFormat( jEdit.getProperty( "ips.yyyy-MM-dd_HH>mm>ss_Z", "yyyy-MM-dd HH:mm:ss Z" ), Locale.getDefault() ).format( entry.getDate() ) : "---";
                 String author = entry.getAuthor();
                 String comment = entry.getMessage();
                 data[ i ][ 0 ] = revision;
@@ -131,16 +131,21 @@
                             // type is one of A (added), M (modified), D (deleted), or R (replaced)
                             // show this along with the path
                             char type = lep.getType();
-                            associated_files.append( type ).append( " " );
+                            associated_files.append( type ).append( " " ).append(cp);
+                            associated_files.append( ( lep.getCopyPath() != null ) ? " (from "
+                                + lep.getCopyPath() + " revision "
+                                + lep.getCopyRevision() + ")" : "" ).append(ls);
                         }
-                        associated_files.append( cp ).append( ls );
+                        else {
+                            associated_files.append(cp).append(ls);
+                        }
                     }
                     data[ i ][ 4 ] = associated_files.toString();
                 }
             }
             String[] col_names = showPaths ?
-                    new String[] {jEdit.getProperty("ips.Revision", "Revision"), jEdit.getProperty("ips.Date", "Date"), jEdit.getProperty("ips.Author", "Author"), jEdit.getProperty("ips.Comment", "Comment"), jEdit.getProperty("ips.Paths", "Paths")} :
-                    new String[] {jEdit.getProperty("ips.Revision", "Revision"), jEdit.getProperty("ips.Date", "Date"), jEdit.getProperty("ips.Author", "Author"), jEdit.getProperty("ips.Comment", "Comment")};
+                    new String[] {jEdit.getProperty( "ips.Revision", "Revision" ), jEdit.getProperty( "ips.Date", "Date" ), jEdit.getProperty( "ips.Author", "Author" ), jEdit.getProperty( "ips.Comment", "Comment" ), jEdit.getProperty( "ips.Paths", "Paths" ) } :
+                    new String[] {jEdit.getProperty( "ips.Revision", "Revision" ), jEdit.getProperty( "ips.Date", "Date" ), jEdit.getProperty( "ips.Author", "Author" ), jEdit.getProperty( "ips.Comment", "Comment" ) };
             final LogTable table = new LogTable( data, col_names );
             table.setPath( path );
             table.addMouseListener( new TableMouseListener( table ) );
@@ -307,7 +312,7 @@
                 }
             }
             if ( !deleted_files.isEmpty() ) {
-                JMenuItem mi = new JMenuItem( jEdit.getProperty("ips.Undelete", "Undelete") );
+                JMenuItem mi = new JMenuItem( jEdit.getProperty( "ips.Undelete", "Undelete" ) );
                 popup.add( mi );
                 mi.addActionListener( new ActionListener() {
                             public void actionPerformed( ActionEvent ae ) {
@@ -362,7 +367,7 @@
         }
         if ( rows.length == 2 ) {
             final String path = table.getPath();
-            JMenuItem mi = new JMenuItem( jEdit.getProperty("ips.Diff", "Diff") );
+            JMenuItem mi = new JMenuItem( jEdit.getProperty( "ips.Diff", "Diff" ) );
             popup.add( mi );
             mi.addActionListener( new ActionListener() {
                         public void actionPerformed( ActionEvent ae ) {
@@ -376,7 +381,7 @@
                                 );
         }
         //popup.addSeparator();
-        JMenuItem mi = new JMenuItem( jEdit.getProperty("ips.Zoom", "Zoom") );
+        JMenuItem mi = new JMenuItem( jEdit.getProperty( "ips.Zoom", "Zoom" ) );
         mi.addActionListener( new ActionListener() {
                     public void actionPerformed( ActionEvent ae ) {
                         TableCellViewer viewer = new TableCellViewer( table );
@@ -388,4 +393,4 @@
 
         return popup;
     }
-}
+}
\ No newline at end of file


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