Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5311 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/compare

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

subclipse svn commit: r5311 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/compare

Author selsemore
Full name Stephen Elsemore
Date 2012-02-22 11:42:51 PST
Message Author: selsemore
Date: 2012-02-22 11:42:51-0800
New Revision: 5311

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/SV​NLocalCompareSummary​Input.java
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Su​mmaryEditionNode.jav​a

Log:
Fix "Compare with latest from Repository" for project, when project name is not
the same as repository folder name.
Issue #: 1374


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/SV​NLocalCompareSummary​Input.java
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​ui/src/org/tigris/su​bversion/subclipse/u​i/compare/SVNLocalCo​mpareSummaryInput.ja​va?view=diff&pat​hrev=5311&r1=531​0&r2=5311
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/SV​NLocalCompareSummary​Input.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/SV​NLocalCompareSummary​Input.java 2012-02-22 11:42:51-0800
@@ -114,6 +114,7 @@
                         diffSummary = getDiffSummaryWithSu​bfolders(diffSummary​);
                         ITypedElement left = new SVNLocalResourceSumm​aryNode(resource, diffSummary, resource.getResource​().getLocation().toS​tring());
                         SummaryEditionNode right = new SummaryEditionNode(r​emoteFolder);
+ right.setName(resour​ce.getName());
                         right.setRootFolder(​(RemoteFolder)remote​Folder);
                         right.setNodeType(Su​mmaryEditionNode.RIG​HT);
                         right.setRoot(true);

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Su​mmaryEditionNode.jav​a
Url: http://subclipse.tig​ris.org/source/brows​e/subclipse/trunk/su​bclipse/org.tigris.s​ubversion.subclipse.​ui/src/org/tigris/su​bversion/subclipse/u​i/compare/SummaryEdi​tionNode.java?view=d​iff&pathrev=5311​&r1=5310&r2=​5311
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Su​mmaryEditionNode.jav​a (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Su​mmaryEditionNode.jav​a 2012-02-22 11:42:51-0800
@@ -41,6 +41,7 @@
     private boolean root;
     private RemoteFolder rootFolder;
     private int nodeType = LEFT;
+ private String name;
     
     public final static int LEFT = 0;
     public final static int RIGHT = 1;
@@ -60,6 +61,10 @@
         }
     }
 
+ public void setName(String name) {
+ this.name = name;
+ }
+
     public ISVNRemoteResource getRemoteResource() {
         return resource;
     }
@@ -233,6 +238,9 @@
     }
 
     public String getName() {
+ if (name != null) {
+ return name;
+ }
         return resource == null ? "" : resource.getName(); //$NON-NLS-1$
     }

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
subclipse svn commit: r5311 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/compare selsemore Stephen Elsemore 2012-02-22 11:42:51 PST
Messages per page: