diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8b5c4dc..a0e69ab 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -3,7 +3,7 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java index 6550472..723301c 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/CkanContentModeratorWidget.java @@ -98,11 +98,7 @@ public class CkanContentModeratorWidget { }); } - - public ItemsTable getItemsTable() { - return itemsTable; - } - + public ScrollPanel getPanel(){ return cmsPanel; } diff --git a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java index 41194da..e182e74 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java +++ b/src/main/java/org/gcube/portlets/widgets/ckancontentmoderator/client/ui/table/ItemsTable.java @@ -131,7 +131,7 @@ public class ItemsTable extends AbstractItemsCellTab this.dataProvider = dataProvider; initAbstractTable(eventBus, fireEventOnClick, dataProvider, ContentModeratorWidgetConstants.ITEMS_PER_PAGE); this.dataProvider.addDataDisplay(sortedCellTable); - + // this.isAsyncronusTable = dataProvider instanceof // AbstractDataProvider?true:false; this.isAsyncronusTable = dataProvider instanceof ListDataProvider ? false : true; @@ -148,7 +148,12 @@ public class ItemsTable extends AbstractItemsCellTab public String getValue(T object) { if (object == null) return ""; - return ((CatalogueDataset) object).getType(); + + String type = ((CatalogueDataset) object).getType(); + + if (type == null) + return ""; + return type; } // ADDING TOOLTIP @@ -156,13 +161,16 @@ public class ItemsTable extends AbstractItemsCellTab public void render(com.google.gwt.cell.client.Cell.Context context, T object, SafeHtmlBuilder sb) { if (object == null) return; - sb.appendHtmlConstant("
"); + String type = ((CatalogueDataset) object).getType(); + if (type == null) + type = ""; + sb.appendHtmlConstant("
"); super.render(context, object, sb); sb.appendHtmlConstant("
"); }; }; - sortedCellTable.addColumn(name, "Type", true); + sortedCellTable.addColumn(type, "Type", true); if (!isAsyncronusTable) { Comparator c = new Comparator() { @@ -177,41 +185,6 @@ public class ItemsTable extends AbstractItemsCellTab } -// if (this.displayFields.contains(DISPLAY_FIELD.ICON)) { -// // ICONS -// ImageResourceCell iconResourceCell = new ImageResourceCell() { -// public Set getConsumedEvents() { -// HashSet events = new HashSet(); -// events.add("click"); -// return events; -// } -// }; -// -// icon = new Column(iconResourceCell) { -// @Override -// public ImageResource getValue(T dataObj) { -// return Util.getImage(dataObj); -// } -// -// /* -// * (non-Javadoc) -// * -// * @see -// * com.google.gwt.user.cellview.client.Column#render(com.google.gwt.cell.client. -// * Cell.Context, java.lang.Object, -// * com.google.gwt.safehtml.shared.SafeHtmlBuilder) -// */ -// @Override -// public void render(Context context, T object, SafeHtmlBuilder sb) { -// super.render(context, object, sb); -// -// } -// }; -//// icon.setSortable(false); -// sortedCellTable.addColumn(icon, "", false); -// sortedCellTable.setColumnWidth(icon, 32.0, Unit.PX); -// } - if (this.displayFields.contains(DISPLAY_FIELD.NAME)) { // NAME @@ -286,7 +259,7 @@ public class ItemsTable extends AbstractItemsCellTab } }; - sortedCellTable.addColumn(author, "Title", true); + sortedCellTable.addColumn(author, "Author", true); if (!isAsyncronusTable) { Comparator c = new Comparator() { @@ -300,7 +273,7 @@ public class ItemsTable extends AbstractItemsCellTab } - if (this.displayFields.contains(DISPLAY_FIELD.AUTHOR)) { + if (this.displayFields.contains(DISPLAY_FIELD.CREATED)) { DateCell date = new DateCell(dtformat); dateColumn = new Column(date) { @@ -341,6 +314,7 @@ public class ItemsTable extends AbstractItemsCellTab } } + GWT.log("startSortByColumn: " + startSortByColumn); @@ -358,6 +332,11 @@ public class ItemsTable extends AbstractItemsCellTab break; case AUTHOR: if (this.displayFields.contains(DISPLAY_FIELD.AUTHOR)) { + sortedCellTable.setInitialSortColumn(author); + } + break; + case CREATED: + if (this.displayFields.contains(DISPLAY_FIELD.CREATED)) { sortedCellTable.setDefaultSortOrder(dateColumn, false); // sorts ascending on first click sortedCellTable.setInitialSortColumn(dateColumn); GWT.log("sortedCellTable: " + sortedCellTable); @@ -366,6 +345,7 @@ public class ItemsTable extends AbstractItemsCellTab default: break; } + /* * final SingleSelectionModel selectionModel = new