Add the definition for the list of review data

9 files changed, 273 insertions, 50 deletions

diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_checked.gif b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_checked.gif
new file mode 100644
index 00000000..f2d25cd5
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_checked.gif
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_not_ok.gif b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_not_ok.gif
new file mode 100644
index 00000000..94a457a0
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/R4E_not_ok.gif
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/done_tsk.gif b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/done_tsk.gif
new file mode 100644
index 00000000..e17722de
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/icons/view16/done_tsk.gif
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableData.java b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableData.java
new file mode 100644
index 00000000..10c14bbe
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableData.java
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Ericsson
+ * 
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Description:
+ * 	This class implements the implementation of the review table view information.
+ * 
+ * Contributors:
+ *   Jacques Bouthillier - Initial Implementation of the table view information
+ ******************************************************************************/
+package org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.model;
+
+
+/**
+ * @author Jacques Bouthillier
+ * @version $Revision: 1.0 $
+ *
+ */
+public class ReviewTableData {
+	// ------------------------------------------------------------------------
+	// Constants
+	// ------------------------------------------------------------------------
+	//Definition of the review table list {name, width of the column, Resizeable, Moveable}
+	public enum ReviewTableDefinition {
+		//           Name		Width	Resize	Moveable
+		ID 			("ID",		 25, 	false, 	true),
+		SUBJECT 	("Subject", 200, 	true, 	true),
+		OWNER 		("Owner", 	100, 	true, 	true),
+		PROJECT 	("Project", 100, 	true, 	true),
+		BRANCH 		("Branch",	100, 	true, 	true),
+		UPDATED 	("Updated", 100, 	true, 	true),
+		CR 			("CR", 		27, 	false, 	true),
+		IC 			("IC", 		27, 	false, 	true),
+		VERIFY 		("V", 		27, 	false, 	true);
+		
+	    private String fHeader;    
+	    private int fwidth;  
+	    private Boolean fResize;
+	    private Boolean fMoveable;
+	    
+	    private ReviewTableDefinition (String aName, int aWidth, Boolean aResize, Boolean aMove) {
+	    	fHeader = aName;
+	    	fwidth = aWidth;
+	    	fResize = aResize;
+	    	fMoveable = aMove;
+	    }
+	    
+	    public String getName () {
+	    	return fHeader;
+	    }
+	    
+	    public int getWidth () {
+	    	return fwidth;
+	    }
+	    
+	    public Boolean getResize() {
+	    	return fResize;
+	    }
+	    
+	    public Boolean getMoveable () {
+	    	return fMoveable;
+	    }
+
+	}
+	
+//	public ReviewTableDefinition[] REVIEW_TABLE_INFO = ReviewTableDefinition.values();
+	
+	
+
+    private String fId;    
+    private String fSubject;  
+    private String fOwner;
+    private String fProject;
+    private String fBranch;    
+    private String fUpdated;
+    private String fCr;    
+    private String fIc;
+    private String fVerify;
+    
+    public ReviewTableData(String aID, String aSubject, String aOwner, String aProject, String aBranch, 
+    		String aUpdated, String aCr, String  aIc, String aVerify) {
+    	fId = null != aID ? aID : "";
+    	fSubject = null != aSubject ? aSubject : "";
+    	fOwner =  null != aOwner ? aOwner : "";
+    	fProject =  null != aProject ? aProject : "";        
+    	fBranch =  null != aBranch ? aBranch : "";
+    	fUpdated =  null != aUpdated ? aUpdated : "";
+    	fCr =  null != aCr ? aCr : "";
+    	fIc =  null != aIc ? aIc : "";
+    	fVerify =  null != aVerify ? aVerify : "";
+    }
+    
+    public String getId() {return fId;}
+    public String getSubject() {return fSubject;}
+    public String getOwner() {return fOwner;}
+    public String getProject() {return fProject;}    
+    public String getBranch() {return fBranch;}    
+    public String getUpdated() {return fUpdated;}
+    public String getCr() {return fCr;}    
+    public String getIc() {return fIc;}
+    public String getVerify() {return fVerify;}
+    
+    public String[] getAttributeValues() {
+        String[] values = {fId, fSubject, fOwner, fProject, fBranch, fUpdated, fCr, fIc, fVerify};
+        return values;
+    }
+    
+     
+
+//    public String [][] getTableAttributes () {
+//    	
+//    }
+
+}
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableLabelProvider.java b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableLabelProvider.java
new file mode 100644
index 00000000..e8fb1c9c
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/ReviewTableLabelProvider.java
@@ -0,0 +1,105 @@
+/**
+ * 
+ */
+package org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.model;
+
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.mylyn.reviews.r4e_gerrit.R4EGerritPlugin;
+import org.eclipse.mylyn.reviews.r4e_gerrit.ui.R4EGerritUi;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * @author lmcbout
+ *
+ */
+public class ReviewTableLabelProvider extends LabelProvider implements
+ITableLabelProvider {
+//public class ReviewTableLabelProvider implements ILabelProvider {
+
+	// Names of images used to represent review-checked
+	public static final String CHECKED_IMAGE = "R4E_checked";
+
+	// Names of images used to represent review-not OK
+	public static final String NOT_OK_IMAGE = "R4E_not_ok";
+
+	// For the images
+	private static ImageRegistry imageRegistry = new ImageRegistry();
+
+	/**
+	 * Note: An image registry owns all of the image objects registered with it,
+	 * and automatically disposes of them the SWT Display is disposed.
+	 */
+	static {
+		String iconPath = "icons/view16/";
+		imageRegistry.put(CHECKED_IMAGE, R4EGerritUi.getImageDescriptor(iconPath
+				+ CHECKED_IMAGE + ".gif"));
+		imageRegistry.put(NOT_OK_IMAGE, R4EGerritUi.getImageDescriptor(iconPath
+				+ NOT_OK_IMAGE + ".gif"));
+
+	}
+
+
+
+	public Image getImage(Object element) {
+		Image image = null;
+		R4EGerritPlugin.Ftracer.traceWarning("getImage column: " + element.toString() );
+//		IReviewEntityItem irei = (IReviewEntityItem) element;
+//		if (irei.getType().isReviewItem()) {
+//			if (columnIndex == ReviewEntityItemType.ITEM_ELE_REVIEWED) {
+//				if (ReviewEntityItemType.REVIEW_ITEM.isChecked(irei)) {
+					image = imageRegistry.get(CHECKED_IMAGE);
+//				}
+//			}
+//		}
+		return image;
+	}
+
+//	@Override
+//	public String getText(Object element) {
+//		// TODO Auto-generated method stub
+//		return null;
+//	}
+
+	
+	
+	
+public String getColumnText(Object obj, int index) {
+	R4EGerritPlugin.Ftracer.traceWarning("getColumnText column: " + index );
+	Image image = getReviewSate ( index %5);
+	if (image == null ) {
+		return getText(obj);		
+	}
+	return "";
+}
+
+public Image getColumnImage(Object obj, int index) {
+	R4EGerritPlugin.Ftracer.traceWarning("getColumnImage column: " + index );
+	return  getReviewSate ( index %3);
+	//return getImage(obj);
+}
+
+
+/**
+ * Retun an image representing the state of the object
+ * @param aState
+ * @return Image
+ */
+private Image getReviewSate(int aState) {
+	if (aState == 0) {
+		return imageRegistry.get(NOT_OK_IMAGE);
+	} else if (aState == 1) {
+		return imageRegistry.get(CHECKED_IMAGE);
+	}
+	return null;
+}
+
+	
+}
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/UIReviewTable.java b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/UIReviewTable.java
index 6bf109a1..04787fae 100644
--- a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/UIReviewTable.java
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4e_gerrit/ui/internal/model/UIReviewTable.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.mylyn.reviews.r4e_gerrit.R4EGerritPlugin;
+import org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.model.ReviewTableData.ReviewTableDefinition;
 import org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.utils.UIUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlEvent;
@@ -42,19 +43,6 @@ public class UIReviewTable {
 	// Constants
 	// ------------------------------------------------------------------------
 
-	//Definition of the review table list {name, width of the column}
-	private final String[] ID = 		{"ID", "30"};
-	private final String[] SUBJECT = 	{"Subject", "200"};
-	private final String[] OWNER =		{"Owner", "100"};
-	private final String[] PROJECT = 	{"Project", "100"};
-	private final String[] BRANCH = 	{"Branch", "100"};
-	private final String[] UPDATED = 	{"Updated", "100"};
-	private final String[] CR = 		{"CR", "30"};
-	private final String[] IC = 		{"IC", "30"};
-	private final String[] VERIFY = 	{"V","30"};
-
-	private final String TITLES[][] = { ID, SUBJECT, OWNER, PROJECT , BRANCH, UPDATED, CR, IC,VERIFY};
-	
 	private TableViewer aViewer;
 
 	// ------------------------------------------------------------------------
@@ -81,7 +69,7 @@ public class UIReviewTable {
 	
 		//Add a listener when the view is resized
 		GridLayout layout = new GridLayout();
-		layout.numColumns = TITLES.length;
+		layout.numColumns = ReviewTableData.ReviewTableDefinition.values().length;
 		layout.makeColumnsEqualWidth = false;
 		
 		viewerForm.setLayout(layout);
@@ -117,19 +105,24 @@ public class UIReviewTable {
 	 */
 	private TableViewer buildAndLayoutTable(final TableViewer aViewer) {
 		final Table table = aViewer.getTable();
-
-		int size = TITLES.length;
-		for (int index = 0; index < size; index++) {
-			R4EGerritPlugin.Ftracer.traceInfo("index [ " + index + " ] :[0] : "
-					+ TITLES[index][0] + " \tvalue 1: " + TITLES[index][1]);
-			int width = Integer.valueOf(TITLES[index][1]);
-			TableViewerColumn col = createTableViewerColumn(TITLES[index][0],
-					width);
+		
+		//Get the review table definition
+		ReviewTableDefinition[] tableInfo = ReviewTableData.ReviewTableDefinition.values();
+		int size = tableInfo.length;
+		for  (int index = 0; index < size; index++) {
+			R4EGerritPlugin.Ftracer.traceInfo("index [ " + index + 
+					" ] "  + tableInfo[index].getName() + 
+					"\t: " + tableInfo[index].getWidth() +
+					"\t: " + tableInfo[index].getResize() +
+					"\t: " + tableInfo[index].getMoveable() );
+			TableViewerColumn col = createTableViewerColumn(tableInfo[index]);
 			GridData gribData = new GridData(GridData.FILL_BOTH);
-			gribData.minimumWidth = width;
+			gribData.minimumWidth = tableInfo[index].getWidth();
 			col.getColumn().getParent().setLayoutData(gribData);
 
 		}
+
+
 		TableLayout tableLayout = new TableLayout();
 		table.setLayout(tableLayout);
 		table.addControlListener(new ControlListener() {
@@ -157,22 +150,22 @@ public class UIReviewTable {
 		return aViewer;
 	}
 
+	
 	/**
-	 * Create each column 
-	 * @param aTitle
-	 * @param aWidth
+	 * Create each column in the review table list
+	 * @param ReviewTableDefinition
 	 * @return TableViewerColumn
 	 */
-	private TableViewerColumn createTableViewerColumn(String aTitle, int aWidth) {
+	private TableViewerColumn createTableViewerColumn(ReviewTableDefinition  aTableInfo) {
 		final TableViewerColumn viewerColumn = new TableViewerColumn(aViewer,
 				SWT.NONE);
 		final TableColumn column = viewerColumn.getColumn();
-		column.setText(aTitle);
-		column.setWidth(aWidth);
-		column.setResizable(true);
-		column.setMoveable(true);
+		column.setText(aTableInfo.getName());
+		column.setWidth(aTableInfo.getWidth());
+		column.setResizable(aTableInfo.getResize());
+		column.setMoveable(aTableInfo.getMoveable());
 		return viewerColumn;
 
 	}
-
+	
 }
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4egerrit/ui/views/R4EGerritTableView.java b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4egerrit/ui/views/R4EGerritTableView.java
index ee94522c..fe6c2ac7 100644
--- a/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4egerrit/ui/views/R4EGerritTableView.java
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit.ui/src/org/eclipse/mylyn/reviews/r4egerrit/ui/views/R4EGerritTableView.java
@@ -33,6 +33,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
 import org.eclipse.mylyn.reviews.r4e_gerrit.R4EGerritPlugin;
+import org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.model.ReviewTableLabelProvider;
 import org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.model.UIReviewTable;
 import org.eclipse.mylyn.reviews.r4e_gerrit.ui.internal.utils.UIUtils;
 import org.eclipse.swt.SWT;
@@ -122,21 +123,24 @@ public class R4EGerritTableView extends ViewPart {
 		}
 	}
 
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		public String getColumnText(Object obj, int index) {
-			return getText(obj);
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			return getImage(obj);
-		}
-
-		public Image getImage(Object obj) {
-			return PlatformUI.getWorkbench().getSharedImages()
-					.getImage(ISharedImages.IMG_OBJ_ELEMENT);
-		}
-	}
+//	class ViewLabelProvider extends LabelProvider implements
+//			ITableLabelProvider {
+//		public String getColumnText(Object obj, int index) {
+//			R4EGerritPlugin.Ftracer.traceWarning("getColumnText column: " + index );
+//			return getText(obj);
+//		}
+//
+//		public Image getColumnImage(Object obj, int index) {
+//			R4EGerritPlugin.Ftracer.traceWarning("getColumnImage column: " + index );
+//			return getImage(obj);
+//		}
+//
+//		public Image getImage(Object obj) {
+//			R4EGerritPlugin.Ftracer.traceWarning("getImage column: " + obj.toString() );
+//			return PlatformUI.getWorkbench().getSharedImages()
+//					.getImage(ISharedImages.IMG_OBJ_ELEMENT);
+//		}
+//	}
 
 	class NameSorter extends ViewerSorter {
 	}
@@ -175,7 +179,9 @@ public class R4EGerritTableView extends ViewPart {
 		
 		
 		fViewer.setContentProvider(new ViewContentProvider());
-		fViewer.setLabelProvider(new ViewLabelProvider());
+//		fViewer.setLabelProvider(new ViewLabelProvider());
+		fViewer.setLabelProvider(new ReviewTableLabelProvider());
+		
 		fViewer.setSorter(new NameSorter());
 		fViewer.setInput(getViewSite());
 //
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit/icons/select.gif b/org.eclipse.mylyn.reviews.r4e-gerrit/icons/select.gif
new file mode 100644
index 00000000..e17722de
--- /dev/null
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit/icons/select.gif
diff --git a/org.eclipse.mylyn.reviews.r4e-gerrit/src/org/eclipse/mylyn/reviews/r4e_gerrit/internal/menus/DynamicMenuAddition.java b/org.eclipse.mylyn.reviews.r4e-gerrit/src/org/eclipse/mylyn/reviews/r4e_gerrit/internal/menus/DynamicMenuAddition.java
index 3d532585..3546c908 100644
--- a/org.eclipse.mylyn.reviews.r4e-gerrit/src/org/eclipse/mylyn/reviews/r4e_gerrit/internal/menus/DynamicMenuAddition.java
+++ b/org.eclipse.mylyn.reviews.r4e-gerrit/src/org/eclipse/mylyn/reviews/r4e_gerrit/internal/menus/DynamicMenuAddition.java
@@ -45,8 +45,9 @@ public class DynamicMenuAddition extends CompoundContributionItem implements IWo
 	/**
 	 * Field SELECT_PICTURE_FILE. (value is ""icons/select.png"")
 	 */
-	private String SELECT_PICTURE_FILE = "icons/select.png";
-
+//	private String SELECT_PICTURE_FILE = "icons/select.png";
+	private String SELECT_PICTURE_FILE = "icons/select.gif";
+	
 	// ------------------------------------------------------------------------
 	// Variables
 	// ------------------------------------------------------------------------