Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > subclipse commit: r1353 - trunk/subclipse/ui/src/org/tigris/subversion/subclipse/ui/decorator

subclipse
Discussion topic

Back to topic list

subclipse commit: r1353 - trunk/subclipse/ui/src/org/tigris/subversion/subclipse/ui/decorator

Author markphip
Full name Mark Phippard
Date 2005-05-13 05:50:50 PDT
Message Author: markphip
Date: Fri May 13 07:50:44 2005
New Revision: 1353

Modified:
   trunk/subclipse/ui/s​rc/org/tigris/subver​sion/subclipse/ui/de​corator/SVNLightweig​htDecorator.java

Log:
Change order of decorators to give conflicts higher priority.

Modified: trunk/subclipse/ui/s​rc/org/tigris/subver​sion/subclipse/ui/de​corator/SVNLightweig​htDecorator.java
Url: http://svn.collab.ne​t/viewcvs/subclipse/​trunk/subclipse/ui/s​rc/org/tigris/subver​sion/subclipse/ui/de​corator/SVNLightweig​htDecorator.java?rev​=1353&p1=trunk/s​ubclipse/ui/src/org/​tigris/subversion/su​bclipse/ui/decorator​/SVNLightweightDecor​ator.java&p2=tru​nk/subclipse/ui/src/​org/tigris/subversio​n/subclipse/ui/decor​ator/SVNLightweightD​ecorator.java&r1​=1352&r2=1353
====================​====================​====================​==================
--- trunk/subclipse/ui/s​rc/org/tigris/subver​sion/subclipse/ui/de​corator/SVNLightweig​htDecorator.java (original)
+++ trunk/subclipse/ui/s​rc/org/tigris/subver​sion/subclipse/ui/de​corator/SVNLightweig​htDecorator.java Fri May 13 07:50:44 2005
@@ -386,6 +386,16 @@
                 LocalResourceStatus status = svnResource.getStatus();
                 
                 // The changes did not intersect
+ if (status.isTextConflicted()) {
+ try {
+ IMarker marker = resource.createMarke​r("org.tigris.subver​sion.subclipse.ui.co​nflictMarker"); //$NON-NLS-1$
+ marker.setAttribute(​IMarker.MESSAGE, Policy.bind("SVNConflicts")); //$NON-NLS-1$
+ marker.setAttribute(​IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
+ } catch (Exception e) {
+ SVNUIPlugin.log(e.ge​tMessage());
+ }
+ return conflicted;
+ }
                    if (status.isTextMerged()) {
                        return merged;
                    }
@@ -397,16 +407,6 @@
                 }
                 if (status.isReadOnly()) {
                     return needsLock;
- }
- if (status.isTextConflicted()) {
- try {
- IMarker marker = resource.createMarke​r("org.tigris.subver​sion.subclipse.ui.co​nflictMarker"); //$NON-NLS-1$
- marker.setAttribute(​IMarker.MESSAGE, Policy.bind("SVNConflicts")); //$NON-NLS-1$
- marker.setAttribute(​IMarker.SEVERITY, IMarker.SEVERITY_WARNING);
- } catch (Exception e) {
- SVNUIPlugin.log(e.ge​tMessage());
- }
- return conflicted;
                 }
             } catch (SVNException e) {
                 SVNUIPlugin.log(e.getStatus());

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

Messages

Show all messages in topic

subclipse commit: r1353 - trunk/subclipse/ui/src/org/tigris/subversion/subclipse/ui/decorator markphip Mark Phippard 2005-05-13 05:50:50 PDT
Messages per page: