Login | Register
My pages Projects Community openCollabNet

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

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: r5381 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/compare/ResourceEditionNode.java

Author selsemore
Full name Stephen Elsemore
Date 2012-04-18 11:24:44 PDT
Message Author: selsemore
Date: 2012-04-18 11:24:43-0700
New Revision: 5381

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Re​sourceEditionNode.ja​va

Log:
Fix Compare with Base Revision to not show hidden resources as local deletions.
Issue #: 1406


Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Re​sourceEditionNode.ja​va
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/ResourceEd​itionNode.java?view=​diff&pathrev=538​1&r1=5380&r2​=5381
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Re​sourceEditionNode.ja​va (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/compare/Re​sourceEditionNode.ja​va 2012-04-18 11:24:43-0700
@@ -12,6 +12,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.lang.reflect.In​vocationTargetExcept​ion;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.eclipse.compare.CompareUI;
 import org.eclipse.compare.​IEncodedStreamConten​tAccessor;
@@ -25,10 +27,13 @@
 import org.eclipse.jface.op​eration.IRunnableWit​hProgress;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.team.cor​e.TeamException;
+import org.tigris.subversio​n.subclipse.core.ISV​NCoreConstants;
 import org.tigris.subversio​n.subclipse.core.ISV​NLocalResource;
 import org.tigris.subversio​n.subclipse.core.ISV​NRemoteResource;
+import org.tigris.subversio​n.subclipse.core.SVN​ProviderPlugin;
 import org.tigris.subversio​n.subclipse.core.res​ources.RemoteFile;
 import org.tigris.subversio​n.subclipse.core.res​ources.RemoteFolder;​
+import org.tigris.subversio​n.subclipse.core.uti​l.Util;
 import org.tigris.subversio​n.subclipse.ui.SVNUI​Plugin;
 import org.tigris.subversio​n.svnclientadapter.S​VNRevision;
 /**
@@ -55,6 +60,8 @@
     private String charset = "UTF8";
     private SVNRevision pegRevision;
     
+ private boolean ignoreHiddenChanges = SVNProviderPlugin.ge​tPlugin().getPluginP​references().getBool​ean(ISVNCoreConstant​s.PREF_IGNORE_HIDDEN​_CHANGES);
+
     
     public ResourceEditionNode(​ISVNRemoteResource resourceEdition) {
         this(resourceEdition, null);
@@ -126,21 +133,27 @@
                                     try {
                                         ISVNRemoteResource[] members = resource
                                                 .members(monitor);
- children = new ResourceEditionNode[​members.length];
+ List<ResourceEditionNode> nonHiddenChildren = new ArrayList<Resourc​eEditionNode>();
                                         for (int i = 0; i < members.length; i++) {
- children[i] = new ResourceEditionNode(members[i], pegRevision);
- SVNLocalResourceNode localNode = matchLocalResource((​ISVNRemoteResource) members[i]);
- if (localNode != null) {
- children[i]
- .setLocalResource(localNode);
- localNode.setRemoteR​esource(children[i])​;
- try {
- children[i].setChars​et(localNode.getChar​set());
- } catch (CoreException e) {
- SVNUIPlugin.log(IStatus.ERROR, e.getMessage(), e);
- }
+ if (!ignoreHiddenChanges || members[i].getResource() == null || !Util.isHidden(membe​rs[i].getResource(),​ false)) {
+ ResourceEditionNode child = new ResourceEditionNode(members[i], pegRevision);
+ SVNLocalResourceNode localNode = matchLocalResource((​ISVNRemoteResource) members[i]);
+ if (localNode != null) {
+ child.setLocalResour​ce(localNode);
+ localNode.setRemoteR​esource(child);
+ try {
+ child.setCharset(loc​alNode.getCharset())​;
+ } catch (CoreException e) {
+ SVNUIPlugin.log(IStatus.ERROR, e.getMessage(), e);
+ }
+ }
+ nonHiddenChildren.add(child);
                                             }
                                         }
+
+ children = new ResourceEditionNode[​nonHiddenChildren.si​ze()];
+ nonHiddenChildren.to​Array(children);
+
                                     } catch (TeamException e) {
                                         throw new InvocationTargetException(e);
                                     }

« 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: r5381 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui/compare/ResourceEditionNode.java selsemore Stephen Elsemore 2012-04-18 11:24:44 PDT
Messages per page: