X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fproviders%2FArtifactLabelProvider.java;h=a8edf5a809a938c0a57b48c612f5bf608613e70a;hb=868102c0f0220e12eca836b6ec9b3a2b9a3441e4;hp=ec4728d885b022349f7259e833461b842aa9ff13;hpb=49080f09ed17e6331c95594b012cf1dd5bded8f6;p=gpl%2Fargeo-slc.git

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/providers/ArtifactLabelProvider.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/providers/ArtifactLabelProvider.java
index ec4728d88..a8edf5a80 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/providers/ArtifactLabelProvider.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/providers/ArtifactLabelProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.client.ui.dist.providers;
 
 import java.text.DateFormat;
@@ -5,18 +20,19 @@ import java.text.SimpleDateFormat;
 
 import javax.jcr.Node;
 import javax.jcr.Property;
-import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
-import javax.jcr.Value;
 
 import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.client.ui.dist.DistConstants;
+import org.argeo.slc.client.ui.dist.DistImages;
+import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerCell;
+import org.eclipse.swt.graphics.Image;
 
 public class ArtifactLabelProvider extends ColumnLabelProvider implements
-		DistConstants {
+		DistConstants, SlcTypes {
 
 	// To be able to change column order easily
 	public static final int COLUMN_TREE = 0;
@@ -24,16 +40,42 @@ public class ArtifactLabelProvider extends ColumnLabelProvider implements
 	public static final int COLUMN_SIZE = 2;
 
 	// Utils
-	protected DateFormat timeFormatter = new SimpleDateFormat(DATE_TIME_FORMAT);
+	protected static DateFormat timeFormatter = new SimpleDateFormat(
+			DATE_TIME_FORMAT);
 
 	public void update(ViewerCell cell) {
+		int colIndex = cell.getColumnIndex();
 		Object element = cell.getElement();
-		cell.setText(getColumnText(element, cell.getColumnIndex()));
-		// Image image = getImage(element);
-		// cell.setImage(image);
-		// cell.setBackground(getBackground(element));
-		// cell.setForeground(getForeground(element));
-		// cell.setFont(getFont(element));
+		cell.setText(getColumnText(element, colIndex));
+		if (element instanceof Node && colIndex == 0) {
+			Node node = (Node) element;
+			try {
+				if (node.isNodeType(SLC_ARTIFACT_BASE))
+					cell.setImage(DistImages.IMG_ARTIFACT_BASE);
+				else if (node.isNodeType(SLC_ARTIFACT_VERSION_BASE))
+					cell.setImage(DistImages.IMG_ARTIFACT_VERSION_BASE);
+			} catch (RepositoryException e) {
+				// Silent
+			}
+		}
+	}
+
+	@Override
+	public Image getImage(Object element) {
+
+		if (element instanceof Node) {
+			Node node = (Node) element;
+			try {
+				if (node.isNodeType(SLC_ARTIFACT_BASE)) {
+					return DistImages.IMG_ARTIFACT_BASE;
+				} else if (node.isNodeType(SLC_ARTIFACT_VERSION_BASE)) {
+					return DistImages.IMG_ARTIFACT_VERSION_BASE;
+				}
+			} catch (RepositoryException e) {
+				// Silent
+			}
+		}
+		return null;
 	}
 
 	public String getColumnText(Object element, int columnIndex) {
@@ -50,10 +92,10 @@ public class ArtifactLabelProvider extends ColumnLabelProvider implements
 					else
 						return size + " KB";
 				case COLUMN_DATE:
-					if (node.hasProperty(Property.JCR_CREATED))
+					if (node.hasProperty(Property.JCR_LAST_MODIFIED))
 						return timeFormatter.format(node
-								.getProperty(Property.JCR_CREATED).getDate()
-								.getTime());
+								.getProperty(Property.JCR_LAST_MODIFIED)
+								.getDate().getTime());
 					else
 						return null;
 				}
@@ -64,22 +106,4 @@ public class ArtifactLabelProvider extends ColumnLabelProvider implements
 		}
 		return null;
 	}
-
-	private String formatValueAsString(Value value) {
-		// TODO enhance this method
-		try {
-			String strValue;
-
-			if (value.getType() == PropertyType.BINARY)
-				strValue = "<binary>";
-			else if (value.getType() == PropertyType.DATE)
-				strValue = timeFormatter.format(value.getDate().getTime());
-			else
-				strValue = value.getString();
-			return strValue;
-		} catch (RepositoryException e) {
-			throw new ArgeoException("unexpected error while formatting value",
-					e);
-		}
-	}
 }