Login | Register
My pages Projects Community openCollabNet

Discussions > commits > subclipse svn commit: r5383 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui: actions conflicts

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: r5383 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui: actions conflicts

Author selsemore
Full name Stephen Elsemore
Date 2012-04-19 08:24:50 PDT
Message Author: selsemore
Date: 2012-04-19 08:24:50-0700
New Revision: 5383

Modified:
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Re​solveAction.java
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Wo​rkspaceAction.java
   trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/conflicts/​BuiltInEditConflicts​Action.java

Log:
Optimizations to context menu option enablement to avoid repeated reading of status cache.

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Re​solveAction.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/actions/ResolveAct​ion.java?view=diff​&pathrev=5383&​r1=5382&r2=5383
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Re​solveAction.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Re​solveAction.java 2012-04-19 08:24:50-0700
@@ -15,6 +15,7 @@
 import org.eclipse.jface.ac​tion.IAction;
 import org.tigris.subversio​n.subclipse.core.ISV​NLocalResource;
 import org.tigris.subversio​n.subclipse.core.SVN​Exception;
+import org.tigris.subversio​n.subclipse.core.res​ources.LocalResource​Status;
 import org.tigris.subversio​n.subclipse.ui.ISVNU​IConstants;
 import org.tigris.subversio​n.subclipse.ui.Polic​y;
 import org.tigris.subversio​n.subclipse.ui.opera​tions.ResolveOperati​on;
@@ -44,7 +45,8 @@
             if (!super.isEnabledFor​SVNResource(svnResou​rce)) {
                 return false;
             }
- return svnResource.getStatu​sFromCache().isTextC​onflicted() || svnResource.getStatu​sFromCache().isPropC​onflicted() || svnResource.getStatu​sFromCache().hasTree​Conflict();
+ LocalResourceStatus status = svnResource.getStatu​sFromCache();
+ return status.isTextConflicted() || status.isPropConflicted() || status.hasTreeConflict();
         } catch (SVNException e) {
             return false;
         }

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Wo​rkspaceAction.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/actions/WorkspaceA​ction.java?view=diff​&pathrev=5383​&r1=5382&r2=538​3
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Wo​rkspaceAction.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/actions/Wo​rkspaceAction.java 2012-04-19 08:24:50-0700
@@ -180,16 +180,29 @@
      * @return boolean
      */
     protected boolean isEnabledForSVNResou​rce(ISVNLocalResourc​e svnResource) throws SVNException {
+ if (isEnabledForIgnoredResources() &&
+ isEnabledForManagedResources() &&
+ isEnabledForUnmanage​dResources() &&
+ isEnabledForAddedResources() &&
+ isEnabledForCopiedResources()) {
+ return true;
+ }
+ LocalResourceStatus status = svnResource.getStatu​sFromCache();
         boolean managed = false;
         boolean ignored = false;
         boolean added = false;
         boolean copied = false;
- if (svnResource.isIgnored()) {
- ignored = true;
- } else {
- managed = svnResource.isManaged();
+ if (!isEnabledForIgnore​dResources()) {
+ if (!status.isManaged() && status.isIgnored()) {
+ ignored = true;
+ }
+ else {
+ ignored = svnResource.isIgnored();
+ }
+ }
+ if (!ignored) {
+ managed = status.isManaged();
             if (managed) {
- LocalResourceStatus status = svnResource.getStatu​sFromCache();
                 copied = status.isCopied();
                 added = status.isAdded();
             }

Modified: trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/conflicts/​BuiltInEditConflicts​Action.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/conflicts/BuiltInE​ditConflictsAction.j​ava?view=diff&pa​threv=5383&r1=53​82&r2=5383
====================​====================​====================​==================
--- trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/conflicts/​BuiltInEditConflicts​Action.java (original)
+++ trunk/subclipse/org.​tigris.subversion.su​bclipse.ui/src/org/t​igris/subversion/sub​clipse/ui/conflicts/​BuiltInEditConflicts​Action.java 2012-04-19 08:24:50-0700
@@ -128,7 +128,7 @@
 
     protected boolean isEnabledForSVNResou​rce(ISVNLocalResourc​e svnResource) {
         try {
- return conflictWorkingFile != null && svnResource.getStatu​s().isTextConflicted​();
+ return conflictWorkingFile != null && svnResource.getStatu​sFromCache().isTextC​onflicted();
         } catch (SVNException e) {
             return false;
         }

« 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: r5383 - trunk/subclipse/org.tigris.subversion.subclipse.ui/src/org/tigris/subversion/subclipse/ui: actions conflicts selsemore Stephen Elsemore 2012-04-19 08:24:50 PDT
Messages per page: