diff --git a/src/main/java/org/gcube/portlets/user/tdwx/client/TabularDataXGridPanel.java b/src/main/java/org/gcube/portlets/user/tdwx/client/TabularDataXGridPanel.java index da4093f..03c41ca 100644 --- a/src/main/java/org/gcube/portlets/user/tdwx/client/TabularDataXGridPanel.java +++ b/src/main/java/org/gcube/portlets/user/tdwx/client/TabularDataXGridPanel.java @@ -13,15 +13,12 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridHeaderColum import org.gcube.portlets.user.td.widgetcommonevent.client.type.GridHeaderColumnMenuItemType; import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData; import org.gcube.portlets.user.td.widgetcommonevent.shared.grid.model.RowRaw; -import org.gcube.portlets.user.tdwx.client.config.ExtendedLiveGridView; import org.gcube.portlets.user.tdwx.client.config.GridAndCellSelectionModel; import org.gcube.portlets.user.tdwx.client.config.Row; -import org.gcube.portlets.user.tdwx.client.config.TDXLiveToolItem; import org.gcube.portlets.user.tdwx.client.config.TableViewConfig; import org.gcube.portlets.user.tdwx.client.config.TabularDataGridViewConfig; import org.gcube.portlets.user.tdwx.client.event.CloseTableEvent; import org.gcube.portlets.user.tdwx.client.event.CloseTableEvent.CloseTableEventHandler; -import org.gcube.portlets.user.tdwx.client.event.ColumnsReorderingEvent; import org.gcube.portlets.user.tdwx.client.event.GridReadyEvent; import org.gcube.portlets.user.tdwx.client.event.OpenTableEvent; import org.gcube.portlets.user.tdwx.client.event.OpenTableEvent.OpenTableEventHandler; @@ -36,7 +33,6 @@ import org.gcube.portlets.user.tdwx.client.model.util.ColumnConfigGenerator; import org.gcube.portlets.user.tdwx.client.style.DefaultRowStyle; import org.gcube.portlets.user.tdwx.client.util.ColumnPositionComparator; import org.gcube.portlets.user.tdwx.client.util.PagingLoadUrlEncoder; -import org.gcube.portlets.user.tdwx.shared.ColumnsReorderingConfig; import org.gcube.portlets.user.tdwx.shared.ServletParameters; import org.gcube.portlets.user.tdwx.shared.StaticFilterInformation; import org.gcube.portlets.user.tdwx.shared.model.ColumnDefinition; @@ -55,7 +51,6 @@ import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.event.shared.EventBus; import com.google.gwt.http.client.RequestBuilder; import com.sencha.gxt.core.client.Style.SelectionMode; -import com.sencha.gxt.core.client.resources.ThemeStyles; import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.HttpProxy; import com.sencha.gxt.data.shared.ListStore; @@ -69,26 +64,20 @@ import com.sencha.gxt.widget.core.client.ContentPanel; import com.sencha.gxt.widget.core.client.container.MarginData; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; -import com.sencha.gxt.widget.core.client.event.ColumnMoveEvent; import com.sencha.gxt.widget.core.client.event.HeaderContextMenuEvent; import com.sencha.gxt.widget.core.client.event.HeaderContextMenuEvent.HeaderContextMenuHandler; import com.sencha.gxt.widget.core.client.event.HeaderMouseDownEvent; import com.sencha.gxt.widget.core.client.event.HeaderMouseDownEvent.HeaderMouseDownHandler; -import com.sencha.gxt.widget.core.client.event.ReconfigureEvent; -import com.sencha.gxt.widget.core.client.event.ReconfigureEvent.ReconfigureHandler; import com.sencha.gxt.widget.core.client.grid.ColumnConfig; import com.sencha.gxt.widget.core.client.grid.ColumnModel; import com.sencha.gxt.widget.core.client.grid.Grid; -import com.sencha.gxt.widget.core.client.grid.GridView; import com.sencha.gxt.widget.core.client.grid.filters.Filter; -import com.sencha.gxt.widget.core.client.info.Info; import com.sencha.gxt.widget.core.client.menu.Item; import com.sencha.gxt.widget.core.client.menu.Menu; import com.sencha.gxt.widget.core.client.menu.MenuItem; import com.sencha.gxt.widget.core.client.menu.SeparatorMenuItem; import com.sencha.gxt.widget.core.client.selection.CellSelection; import com.sencha.gxt.widget.core.client.toolbar.PagingToolBar; -import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** * @@ -112,14 +101,14 @@ public class TabularDataXGridPanel extends ContentPanel { private ListStore store; private Grid grid; - private ToolBar toolBar; + //private ToolBar toolBar; // protected GridInlineEditing editing; private TableDefinition tableDefinition; private VerticalLayoutContainer container; - private ExtendedLiveGridView liveGridView; + //private ExtendedLiveGridView liveGridView; private DataRowPagingReader reader; @@ -143,11 +132,11 @@ public class TabularDataXGridPanel extends ContentPanel { private GridAndCellSelectionModel sm; - private TDXLiveToolItem tdxLiveToolItem; + //private TDXLiveToolItem tdxLiveToolItem; private PagingToolBar pagingToolBar; - private FilterPagingLoadConfig lastFilterPagingLoadConfig; + //private FilterPagingLoadConfig lastFilterPagingLoadConfig; /** * @param eventBus @@ -710,6 +699,7 @@ public class TabularDataXGridPanel extends ContentPanel { columnModel = checkOnlyColumn(columnModel); + /* columnModel .addColumnMoveHandler(new ColumnMoveEvent.ColumnMoveHandler() { @@ -744,7 +734,7 @@ public class TabularDataXGridPanel extends ContentPanel { } } }); - + */ if (grid == null) { Log.debug("Setup reader"); @@ -762,10 +752,11 @@ public class TabularDataXGridPanel extends ContentPanel { builder); proxy.setWriter(new PagingLoadUrlEncoder(staticFilters)); + /* if (loader != null) { lastFilterPagingLoadConfig = loader.getLastLoadConfig(); - } + }*/ loader = new PagingLoader>( proxy, reader) { @@ -810,7 +801,7 @@ public class TabularDataXGridPanel extends ContentPanel { // grid.setView(gridView); // grid.setView(liveGridView); grid.setBorders(false); - grid.setColumnReordering(true); + grid.setColumnReordering(false); // Filter ArrayList> filters = FiltersGenerator