gCubeSystem
/
tabular-data-widgetx
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-widgetx@111807 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-02-09 15:09:46 +00:00 committed by Giancarlo Panichi
parent c9cfd22019
commit c7823d700b
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/gcube/portlets/user/tdwx/client/TabularDataXGridPanel.java
View File

@ -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.client.type.GridHeaderColumnMenuItemType;
import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData; 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.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.GridAndCellSelectionModel;
import org.gcube.portlets.user.tdwx.client.config.Row; 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.TableViewConfig;
import org.gcube.portlets.user.tdwx.client.config.TabularDataGridViewConfig; 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;
import org.gcube.portlets.user.tdwx.client.event.CloseTableEvent.CloseTableEventHandler; 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.GridReadyEvent;
import org.gcube.portlets.user.tdwx.client.event.OpenTableEvent; import org.gcube.portlets.user.tdwx.client.event.OpenTableEvent;
import org.gcube.portlets.user.tdwx.client.event.OpenTableEvent.OpenTableEventHandler; 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.style.DefaultRowStyle;
import org.gcube.portlets.user.tdwx.client.util.ColumnPositionComparator; import org.gcube.portlets.user.tdwx.client.util.ColumnPositionComparator;
import org.gcube.portlets.user.tdwx.client.util.PagingLoadUrlEncoder; 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.ServletParameters;
import org.gcube.portlets.user.tdwx.shared.StaticFilterInformation; import org.gcube.portlets.user.tdwx.shared.StaticFilterInformation;
import org.gcube.portlets.user.tdwx.shared.model.ColumnDefinition; 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.event.shared.EventBus;
import com.google.gwt.http.client.RequestBuilder; import com.google.gwt.http.client.RequestBuilder;
import com.sencha.gxt.core.client.Style.SelectionMode; 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.core.client.util.Margins;
import com.sencha.gxt.data.client.loader.HttpProxy; import com.sencha.gxt.data.client.loader.HttpProxy;
import com.sencha.gxt.data.shared.ListStore; 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.MarginData;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; 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.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;
import com.sencha.gxt.widget.core.client.event.HeaderContextMenuEvent.HeaderContextMenuHandler; 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;
import com.sencha.gxt.widget.core.client.event.HeaderMouseDownEvent.HeaderMouseDownHandler; 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.ColumnConfig;
import com.sencha.gxt.widget.core.client.grid.ColumnModel; 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.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.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.Item;
import com.sencha.gxt.widget.core.client.menu.Menu; 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.MenuItem;
import com.sencha.gxt.widget.core.client.menu.SeparatorMenuItem; 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.selection.CellSelection;
import com.sencha.gxt.widget.core.client.toolbar.PagingToolBar; 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<DataRow> store; private ListStore<DataRow> store;
private Grid<DataRow> grid; private Grid<DataRow> grid;
private ToolBar toolBar; //private ToolBar toolBar;
// protected GridInlineEditing<DataRow> editing; // protected GridInlineEditing<DataRow> editing;
private TableDefinition tableDefinition; private TableDefinition tableDefinition;
private VerticalLayoutContainer container; private VerticalLayoutContainer container;
private ExtendedLiveGridView<DataRow> liveGridView; //private ExtendedLiveGridView<DataRow> liveGridView;
private DataRowPagingReader reader; private DataRowPagingReader reader;
@ -143,11 +132,11 @@ public class TabularDataXGridPanel extends ContentPanel {
private GridAndCellSelectionModel<DataRow> sm; private GridAndCellSelectionModel<DataRow> sm;
private TDXLiveToolItem tdxLiveToolItem; //private TDXLiveToolItem tdxLiveToolItem;
private PagingToolBar pagingToolBar; private PagingToolBar pagingToolBar;
private FilterPagingLoadConfig lastFilterPagingLoadConfig; //private FilterPagingLoadConfig lastFilterPagingLoadConfig;
/** /**
* @param eventBus * @param eventBus
@ -710,6 +699,7 @@ public class TabularDataXGridPanel extends ContentPanel {
columnModel = checkOnlyColumn(columnModel); columnModel = checkOnlyColumn(columnModel);
/*
columnModel columnModel
.addColumnMoveHandler(new ColumnMoveEvent.ColumnMoveHandler() { .addColumnMoveHandler(new ColumnMoveEvent.ColumnMoveHandler() {
@ -744,7 +734,7 @@ public class TabularDataXGridPanel extends ContentPanel {
} }
} }
}); });
*/
if (grid == null) { if (grid == null) {
Log.debug("Setup reader"); Log.debug("Setup reader");
@ -762,10 +752,11 @@ public class TabularDataXGridPanel extends ContentPanel {
builder); builder);
proxy.setWriter(new PagingLoadUrlEncoder(staticFilters)); proxy.setWriter(new PagingLoadUrlEncoder(staticFilters));
/*
if (loader != null) { if (loader != null) {
lastFilterPagingLoadConfig = loader.getLastLoadConfig(); lastFilterPagingLoadConfig = loader.getLastLoadConfig();
} }*/
loader = new PagingLoader<FilterPagingLoadConfig, PagingLoadResult<DataRow>>( loader = new PagingLoader<FilterPagingLoadConfig, PagingLoadResult<DataRow>>(
proxy, reader) { proxy, reader) {
@ -810,7 +801,7 @@ public class TabularDataXGridPanel extends ContentPanel {
// grid.setView(gridView); // grid.setView(gridView);
// grid.setView(liveGridView); // grid.setView(liveGridView);
grid.setBorders(false); grid.setBorders(false);
grid.setColumnReordering(true); grid.setColumnReordering(false);
// Filter // Filter
ArrayList<Filter<DataRow, ?>> filters = FiltersGenerator ArrayList<Filter<DataRow, ?>> filters = FiltersGenerator