[xwiki-notifications] r5626 - xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters

[SVN]

Author: fmancinelli
Date: 2007-11-03 15:05:26 +0100 (Sat, 03 Nov 2007)
New Revision: 5626

Modified:
   
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiPageAdapter.java
Log:
XECLIPSE-30

* Added conflict icon visualization

Modified: 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiPageAdapter.java
===================================================================
--- 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiPageAdapter.java
      2007-11-03 13:57:58 UTC (rev 5625)
+++ 
xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/adapters/XWikiPageAdapter.java
      2007-11-03 14:05:26 UTC (rev 5626)
@@ -52,6 +52,10 @@
         if (object instanceof IXWikiPage) {
             IXWikiPage page = (IXWikiPage) object;
             
+            if(page.isConflict()) {
+                return 
XWikiEclipsePlugin.getImageDescriptor(XWikiEclipseConstants.XWIKI_PAGE_CONFLICT_ICON);
+            }
+            
             if(page.isCached()) {
                 return 
XWikiEclipsePlugin.getImageDescriptor(XWikiEclipseConstants.XWIKI_PAGE_CACHED_ICON);
             }

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications