Clean and add some comments to the content providers

git-svn-id: https://svn.argeo.org/slc/trunk@4427 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
index f23e5faf82458d339071b294386172d4409d1f3a..a79376c4858821328acbad7ac141eac782abf8cf 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
+++ b/eclipse/runtime/org.argeo.slc.client.core/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Import-Package: org.apache.commons.io;version="1.4.0",
  org.apache.commons.logging;version="1.1.1",
  org.argeo.eclipse.spring,
  org.argeo.eclipse.ui,
+ org.argeo.slc.client.ui,
  org.argeo.slc.core.structure.tree,
  org.argeo.slc.core.test.tree,
  org.argeo.slc.dao.process,

diff --git a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
index 10cf6a619a591eae55f18c39907d10db105d9daf..f04ba5672c04a95a4697b1456cf4f46bd24ab98c 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
+++ b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailContentProvider.java
@@ -24,7 +24,9 @@ public class ResultDetailContentProvider implements ITreeContentProvider {
 
        public Object[] getChildren(Object parent) {
                if (parent instanceof TreeTestResult) {
-                       log.error("We should not reach this point.");
+                       if (log.isErrorEnabled())
+                               log.error("Trying to get children for parent object of type TreeTestResult. "
+                                               + "We should not reach this point.");
                        return null;
                }
 
@@ -183,6 +185,7 @@ public class ResultDetailContentProvider implements ITreeContentProvider {
 
                public ResultPartNode(String label, Integer status, String message) {
                        super(label);
+                       log.debug("Creating new leaf with label : " + label);
                        handleStatus(status);
                        this.message = message;
                }

diff --git a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
index a1db51ba57a5cb2c3049793d92754367e4516040..137ede44068305b38d9399dae55524d0bb0106aa 100644 (file)
--- a/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
+++ b/eclipse/runtime/org.argeo.slc.client.core/src/main/java/org/argeo/slc/client/contentprovider/ResultDetailLabelProvider.java
@@ -1,5 +1,7 @@
 package org.argeo.slc.client.contentprovider;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.ResultPartNode;
 import org.argeo.slc.client.contentprovider.ResultDetailContentProvider.StatusAware;
@@ -15,44 +17,59 @@ import org.eclipse.swt.graphics.Image;
  */
 public class ResultDetailLabelProvider extends LabelProvider implements
                ITableLabelProvider {
-       // private static final Log log = LogFactory
-       // .getLog(ResultDetailLabelProvider.class);
+       private static final Log log = LogFactory
+                       .getLog(ResultDetailLabelProvider.class);
 
-       public String getColumnText(Object obj, int index) {
+       // TODO : find a solution to get the icons here.
+       // Images
+       // public final static Image FAILED = ClientUiPlugin.getImageDescriptor(
+       // "icons/failed.gif").createImage();
+       // public final static Image PASSED = ClientUiPlugin.getImageDescriptor(
+       // "icons/passed.gif").createImage();
 
-               if (obj instanceof TreeParent) {
-                       if (index == 0)
-                               return ((TreeParent) obj).getName();
-                       else
-                               return null;
-               }
+       public String getColumnText(Object obj, int index) {
 
                if (obj instanceof ResultPartNode) {
                        ResultPartNode rpn = (ResultPartNode) obj;
                        switch (index) {
+                       // case 0:
+                       // if (log.isDebugEnabled())
+                       // log.debug("Get col text, index = 0 & rpn.toString="
+                       // + rpn.toString());
+                       // return rpn.toString();
                        case 0:
-                               return rpn.toString();
-                       case 1:
                                return rpn.getStatus().toString();
-                       case 2:
+                       case 1:
                                return rpn.getMessage();
-                       case 3:
+                       case 2:
                                return rpn.getExceptionMessage();
                        }
                        return getText(obj);
                }
+
+               if (obj instanceof TreeParent) {
+                       if (index == 0) {
+                               if (log.isDebugEnabled())
+                                       log.debug("In GetTreeParent text, index = 0 & label ="
+                                                       + ((TreeParent) obj).getName());
+
+                               return ((TreeParent) obj).getName();
+                       } else
+                               return null;
+               }
+
                return null;
        }
 
        public Image getImage(Object element) {
                if (element instanceof StatusAware) {
-                       // FIXME: fin icons somewhere
-//                     if (((StatusAware) element).isPassed())
-//                             return ClientUiPlugin.getDefault().getImageRegistry()
-//                                             .get("passedTest");
-//                     else
-//                             return ClientUiPlugin.getDefault().getImageRegistry()
-//                                             .get("failedTest");
+                       // Package use conflict problem when getting the icons, uncomment
+                       // Images definition above and update Manifest to get it.
+
+                       // if (((StatusAware) element).isPassed())
+                       // return PASSED;
+                       // else
+                       // return FAILED;
                }
                return null;
        }