Skip to content
Snippets Groups Projects
Commit e7d29381 authored by buczekp's avatar buczekp
Browse files

minor: typed table grids cleanup

SVN: 19442
parent d5f79ee2
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,6 @@ import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModifica ...@@ -25,7 +25,6 @@ import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModifica
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set;
import com.extjs.gxt.ui.client.core.XDOM; import com.extjs.gxt.ui.client.core.XDOM;
import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.ButtonEvent;
...@@ -99,7 +98,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity> ...@@ -99,7 +98,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
registerLinkClickListenerFor(MatchingEntityColumnKind.IDENTIFIER.id(), registerLinkClickListenerFor(MatchingEntityColumnKind.IDENTIFIER.id(),
new ICellListener<TableModelRowWithObject<MatchingEntity>>() new ICellListener<TableModelRowWithObject<MatchingEntity>>()
{ {
public void handle(TableModelRowWithObject<MatchingEntity> rowItem, boolean keyPressed) public void handle(TableModelRowWithObject<MatchingEntity> rowItem,
boolean keyPressed)
{ {
showEntityViewer(rowItem, false, keyPressed); showEntityViewer(rowItem, false, keyPressed);
} }
...@@ -153,8 +153,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity> ...@@ -153,8 +153,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
} }
@Override @Override
protected void showEntityViewer(TableModelRowWithObject<MatchingEntity> object, boolean editMode, protected void showEntityViewer(TableModelRowWithObject<MatchingEntity> object,
boolean inBackground) boolean editMode, boolean inBackground)
{ {
MatchingEntity matchingEntity = object.getObjectOrNull(); MatchingEntity matchingEntity = object.getObjectOrNull();
final EntityKind entityKind = matchingEntity.getEntityKind(); final EntityKind entityKind = matchingEntity.getEntityKind();
...@@ -204,7 +204,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity> ...@@ -204,7 +204,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
} }
@Override @Override
protected void prepareExportEntities(TableExportCriteria<TableModelRowWithObject<MatchingEntity>> exportCriteria, protected void prepareExportEntities(
TableExportCriteria<TableModelRowWithObject<MatchingEntity>> exportCriteria,
AbstractAsyncCallback<String> callback) AbstractAsyncCallback<String> callback)
{ {
viewContext.getService().prepareExportMatchingEntities(exportCriteria, callback); viewContext.getService().prepareExportMatchingEntities(exportCriteria, callback);
...@@ -228,10 +229,4 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity> ...@@ -228,10 +229,4 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
createOrDelete(ObjectKind.VOCABULARY_TERM), edit(ObjectKind.VOCABULARY_TERM) }; createOrDelete(ObjectKind.VOCABULARY_TERM), edit(ObjectKind.VOCABULARY_TERM) };
} }
@Override
public void update(Set<DatabaseModificationKind> observedModifications)
{
refreshGridSilently();
}
} }
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data; package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.event.ButtonEvent; import com.extjs.gxt.ui.client.event.ButtonEvent;
...@@ -46,8 +45,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetCo ...@@ -46,8 +45,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetCo
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.FileFormatTypeGridColumnIDs; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.FileFormatTypeGridColumnIDs;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TableExportCriteria;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.TypedTableResultSet;
import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
...@@ -73,8 +70,7 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType> ...@@ -73,8 +70,7 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
private FileFormatTypeGrid(IViewContext<ICommonClientServiceAsync> viewContext) private FileFormatTypeGrid(IViewContext<ICommonClientServiceAsync> viewContext)
{ {
super(viewContext, BROWSER_ID, true, super(viewContext, BROWSER_ID, true, DisplayTypeIDGenerator.FILE_FORMAT_TYPE_BROWSER_GRID);
DisplayTypeIDGenerator.FILE_FORMAT_TYPE_BROWSER_GRID);
postRegistrationCallback = createRefreshGridAction(); postRegistrationCallback = createRefreshGridAction();
extendBottomToolbar(); extendBottomToolbar();
allowMultipleSelection(); allowMultipleSelection();
...@@ -97,7 +93,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType> ...@@ -97,7 +93,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
createItem.setId(ADD_NEW_TYPE_BUTTON_ID); createItem.setId(ADD_NEW_TYPE_BUTTON_ID);
addButton(createItem); addButton(createItem);
Button editButton = Button editButton =
createSelectedItemButton(viewContext.getMessage(Dict.EDIT_TYPE_BUTTON), createSelectedItemButton(
viewContext.getMessage(Dict.EDIT_TYPE_BUTTON),
new ISelectedEntityInvoker<BaseEntityModel<TableModelRowWithObject<FileFormatType>>>() new ISelectedEntityInvoker<BaseEntityModel<TableModelRowWithObject<FileFormatType>>>()
{ {
...@@ -159,8 +156,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType> ...@@ -159,8 +156,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
ConfirmationDialog confirmationDialog = ConfirmationDialog confirmationDialog =
new ConfirmationDialog(context new ConfirmationDialog(context
.getMessage(Dict.DELETE_CONFIRMATION_TITLE), context .getMessage(Dict.DELETE_CONFIRMATION_TITLE), context
.getMessage(Dict.DELETE_CONFIRMATION_MESSAGE, StringUtils .getMessage(Dict.DELETE_CONFIRMATION_MESSAGE,
.joinList(selectedTypeCodes))) StringUtils.joinList(selectedTypeCodes)))
{ {
@Override @Override
protected void onYes() protected void onYes()
...@@ -224,12 +221,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType> ...@@ -224,12 +221,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
return schema; return schema;
} }
@Override
protected List<IColumnDefinition<TableModelRowWithObject<FileFormatType>>> getInitialFilters()
{
return Collections.emptyList();
}
@Override @Override
protected void listTableRows( protected void listTableRows(
DefaultResultSetConfig<String, TableModelRowWithObject<FileFormatType>> resultSetConfig, DefaultResultSetConfig<String, TableModelRowWithObject<FileFormatType>> resultSetConfig,
...@@ -246,12 +237,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType> ...@@ -246,12 +237,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
viewContext.getService().prepareExportFileTypes(exportCriteria, callback); viewContext.getService().prepareExportFileTypes(exportCriteria, callback);
} }
@Override
public DatabaseModificationKind[] getRelevantModifications()
{
return new DatabaseModificationKind[] {};
}
@Override @Override
protected String translateColumnIdToDictionaryKey(String columnID) protected String translateColumnIdToDictionaryKey(String columnID)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment