From e7d29381abd3b4f660ae287c2d355e07a8da838b Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Mon, 17 Jan 2011 10:17:03 +0000
Subject: [PATCH] minor: typed table grids cleanup
SVN: 19442
---
.../application/MatchingEntitiesPanel.java | 17 +++++--------
.../ui/data/FileFormatTypeGrid.java | 25 ++++---------------
2 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java
index 9fbfde34bf3..7de30f3a045 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/MatchingEntitiesPanel.java
@@ -25,7 +25,6 @@ import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModifica
import java.util.Arrays;
import java.util.List;
-import java.util.Set;
import com.extjs.gxt.ui.client.core.XDOM;
import com.extjs.gxt.ui.client.event.ButtonEvent;
@@ -99,7 +98,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
registerLinkClickListenerFor(MatchingEntityColumnKind.IDENTIFIER.id(),
new ICellListener<TableModelRowWithObject<MatchingEntity>>()
{
- public void handle(TableModelRowWithObject<MatchingEntity> rowItem, boolean keyPressed)
+ public void handle(TableModelRowWithObject<MatchingEntity> rowItem,
+ boolean keyPressed)
{
showEntityViewer(rowItem, false, keyPressed);
}
@@ -153,8 +153,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
}
@Override
- protected void showEntityViewer(TableModelRowWithObject<MatchingEntity> object, boolean editMode,
- boolean inBackground)
+ protected void showEntityViewer(TableModelRowWithObject<MatchingEntity> object,
+ boolean editMode, boolean inBackground)
{
MatchingEntity matchingEntity = object.getObjectOrNull();
final EntityKind entityKind = matchingEntity.getEntityKind();
@@ -204,7 +204,8 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
}
@Override
- protected void prepareExportEntities(TableExportCriteria<TableModelRowWithObject<MatchingEntity>> exportCriteria,
+ protected void prepareExportEntities(
+ TableExportCriteria<TableModelRowWithObject<MatchingEntity>> exportCriteria,
AbstractAsyncCallback<String> callback)
{
viewContext.getService().prepareExportMatchingEntities(exportCriteria, callback);
@@ -228,10 +229,4 @@ public final class MatchingEntitiesPanel extends TypedTableGrid<MatchingEntity>
createOrDelete(ObjectKind.VOCABULARY_TERM), edit(ObjectKind.VOCABULARY_TERM) };
}
- @Override
- public void update(Set<DatabaseModificationKind> observedModifications)
- {
- refreshGridSilently();
- }
-
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
index 14f21d634fc..a07381a5945 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import com.extjs.gxt.ui.client.event.ButtonEvent;
@@ -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.TableExportCriteria;
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.TableModelRowWithObject;
@@ -73,8 +70,7 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
private FileFormatTypeGrid(IViewContext<ICommonClientServiceAsync> viewContext)
{
- super(viewContext, BROWSER_ID, true,
- DisplayTypeIDGenerator.FILE_FORMAT_TYPE_BROWSER_GRID);
+ super(viewContext, BROWSER_ID, true, DisplayTypeIDGenerator.FILE_FORMAT_TYPE_BROWSER_GRID);
postRegistrationCallback = createRefreshGridAction();
extendBottomToolbar();
allowMultipleSelection();
@@ -97,7 +93,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
createItem.setId(ADD_NEW_TYPE_BUTTON_ID);
addButton(createItem);
Button editButton =
- createSelectedItemButton(viewContext.getMessage(Dict.EDIT_TYPE_BUTTON),
+ createSelectedItemButton(
+ viewContext.getMessage(Dict.EDIT_TYPE_BUTTON),
new ISelectedEntityInvoker<BaseEntityModel<TableModelRowWithObject<FileFormatType>>>()
{
@@ -159,8 +156,8 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
ConfirmationDialog confirmationDialog =
new ConfirmationDialog(context
.getMessage(Dict.DELETE_CONFIRMATION_TITLE), context
- .getMessage(Dict.DELETE_CONFIRMATION_MESSAGE, StringUtils
- .joinList(selectedTypeCodes)))
+ .getMessage(Dict.DELETE_CONFIRMATION_MESSAGE,
+ StringUtils.joinList(selectedTypeCodes)))
{
@Override
protected void onYes()
@@ -224,12 +221,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
return schema;
}
- @Override
- protected List<IColumnDefinition<TableModelRowWithObject<FileFormatType>>> getInitialFilters()
- {
- return Collections.emptyList();
- }
-
@Override
protected void listTableRows(
DefaultResultSetConfig<String, TableModelRowWithObject<FileFormatType>> resultSetConfig,
@@ -246,12 +237,6 @@ public class FileFormatTypeGrid extends TypedTableGrid<FileFormatType>
viewContext.getService().prepareExportFileTypes(exportCriteria, callback);
}
- @Override
- public DatabaseModificationKind[] getRelevantModifications()
- {
- return new DatabaseModificationKind[] {};
- }
-
@Override
protected String translateColumnIdToDictionaryKey(String columnID)
{
--
GitLab