From ab73fc2b3dfdd7c86cc737b2a3c1643524f28fb5 Mon Sep 17 00:00:00 2001
From: fmittag <fmittag@gmx.net>
Date: Thu, 4 Jun 2015 17:14:33 +0200
Subject: [PATCH] fixed some little bugs in ImagesListComposite

---
 .../ui/adminconsole/ImagesListComposite.java  | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesListComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesListComposite.java
index eb41e11ba36..04fc924a678 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesListComposite.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ImagesListComposite.java
@@ -31,7 +31,7 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sse.gwt.client.media.ImageDTO;
 
 /**
- * /** A composite showing the list of all images
+ * /** A composite showing the list of media images
  * 
  * @author Frank Mittag (C5163974)
  */
@@ -71,28 +71,25 @@ public class ImagesListComposite extends Composite {
         panel = new VerticalPanel();
         mainPanel.setWidget(panel);
 
-        HorizontalPanel eventControlsPanel = new HorizontalPanel();
-        eventControlsPanel.setSpacing(5);
-        panel.add(eventControlsPanel);
+        HorizontalPanel imagesControlsPanel = new HorizontalPanel();
+        imagesControlsPanel.setSpacing(5);
+        panel.add(imagesControlsPanel);
 
-        Button createEventBtn = new Button(stringMessages.actionAddEvent());
-        createEventBtn.addClickHandler(new ClickHandler() {
+        Button createImageBtn = new Button("Add image");
+        createImageBtn.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
-                openCreateEventDialog();
+                openCreateImageDialog();
             }
         });
-        eventControlsPanel.add(createEventBtn);
+        imagesControlsPanel.add(createImageBtn);
 
+        imageSelectionModel = new SingleSelectionModel<ImageDTO>();
         imageListDataProvider = new ListDataProvider<ImageDTO>();
-        imageTable = createEventTable();
+        imageTable = createImagesTable();
         imageTable.ensureDebugId("ImagesCellTable");
         imageTable.setVisible(false);
 
-        @SuppressWarnings("unchecked")
-        SingleSelectionModel<ImageDTO> multiSelectionModel = (SingleSelectionModel<ImageDTO>) imageTable.getSelectionModel();
-        imageSelectionModel = multiSelectionModel;
-
         imageSelectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
             @Override
             public void onSelectionChange(SelectionChangeEvent event) {
@@ -109,7 +106,7 @@ public class ImagesListComposite extends Composite {
         initWidget(mainPanel);
     }
 
-    private CellTable<ImageDTO> createEventTable() {
+    private CellTable<ImageDTO> createImagesTable() {
         CellTable<ImageDTO> table = new CellTable<ImageDTO>(/* pageSize */10000, tableRes);
         imageListDataProvider.addDataDisplay(table);
         table.setWidth("100%");
@@ -120,6 +117,16 @@ public class ImagesListComposite extends Composite {
                 return image.getTitle() != null ? image.getTitle() : "";
             }
         };
+        TextColumn<ImageDTO> sizeColumn = new TextColumn<ImageDTO>() {
+            @Override
+            public String getValue(ImageDTO image) {
+                String imageSize = "";
+                if (image.getWidthInPx() != null && image.getHeightInPx() != null) {
+                    imageSize = image.getWidthInPx() + " x " + image.getHeightInPx(); 
+                }
+                return imageSize;
+            }
+        };
 
         TextColumn<ImageDTO> createdAtDateColumn = new TextColumn<ImageDTO>() {
             @Override
@@ -168,11 +175,9 @@ public class ImagesListComposite extends Composite {
 
         table.addColumn(titleColumn, stringMessages.title());
         table.addColumn(createdAtDateColumn, "Created At");
-        table.addColumn(tagsColumn, "tags");
+        table.addColumn(sizeColumn, "Size");
+        table.addColumn(tagsColumn, "Tags");
         table.addColumn(imageActionColumn, stringMessages.actions());
-//        table.setSelectionModel(eventSelectionCheckboxColumn.getSelectionModel(),
-//                eventSelectionCheckboxColumn.getSelectionManager());
-
         table.addColumnSortHandler(getEventTableColumnSortHandler(imageListDataProvider.getList(), titleColumn, createdAtDateColumn));
         table.getColumnSortList().push(createdAtDateColumn);
 
@@ -210,7 +215,7 @@ public class ImagesListComposite extends Composite {
     private void removeImage(ImageDTO event) {
     }
 
-    private void openCreateEventDialog() {
+    private void openCreateImageDialog() {
 //        EventCreateDialog dialog = new EventCreateDialog(Collections.unmodifiableCollection(existingEvents),
 //                existingLeaderboardGroups, stringMessages, new DialogCallback<ImageDTO>() {
 //                    @Override
@@ -258,7 +263,7 @@ public class ImagesListComposite extends Composite {
         allImages.addAll(images);
     }
 
-    public List<ImageDTO> getAllEvents() {
+    public List<ImageDTO> getAllImages() {
         return allImages;
     }
 }