From 72f77c200c16c80905f2ad8b8ce975d4958b8a99 Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Thu, 20 Sep 2007 08:07:00 +0000 Subject: [PATCH] ITable interface to Table svn changeset:2349/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/IScrollTable.java | 12 ++++++------ .../toolkit/terminal/gwt/client/ui/ITablePaging.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java index 3729cbfa4d..edcc9e916e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java @@ -49,7 +49,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable.IScrollTableBody.I * * TODO implement unregistering for child componts in Cells */ -public class IScrollTable extends Composite implements ITable, ScrollListener { +public class IScrollTable extends Composite implements Table, ScrollListener { public static final String CLASSNAME = "i-table"; /** @@ -77,7 +77,7 @@ public class IScrollTable extends Composite implements ITable, ScrollListener { private boolean immediate; - private int selectMode = ITable.SELECT_MODE_NONE; + private int selectMode = Table.SELECT_MODE_NONE; private Vector selectedRowKeys = new Vector(); @@ -160,9 +160,9 @@ public class IScrollTable extends Composite implements ITable, ScrollListener { if (uidl.hasAttribute("selectmode")) { if (uidl.getStringAttribute("selectmode").equals("multi")) - selectMode = ITable.SELECT_MODE_MULTI; + selectMode = Table.SELECT_MODE_MULTI; else - selectMode = ITable.SELECT_MODE_SINGLE; + selectMode = Table.SELECT_MODE_SINGLE; } if (uidl.hasVariable("columnorder")) { @@ -1804,7 +1804,7 @@ public class IScrollTable extends Composite implements ITable, ScrollListener { case Event.ONCLICK: if ((CLASSNAME + "-cell-content").equals(s)) { ApplicationConnection.getConsole().log("Row click"); - if (selectMode > ITable.SELECT_MODE_NONE) { + if (selectMode > Table.SELECT_MODE_NONE) { toggleSelection(); client.updateVariable(paintableId, "selected", selectedRowKeys.toArray(), immediate); @@ -1836,7 +1836,7 @@ public class IScrollTable extends Composite implements ITable, ScrollListener { private void toggleSelection() { selected = !selected; if (selected) { - if (selectMode == ITable.SELECT_MODE_SINGLE) + if (selectMode == Table.SELECT_MODE_SINGLE) IScrollTable.this.deselectAll(); selectedRowKeys.add(String.valueOf(rowKey)); addStyleName("i-selected"); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java index 6d464575b1..731d1cc2e4 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITablePaging.java @@ -27,7 +27,7 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL; * TODO make this work (just an early prototype). We may want to have paging * style table which will be much lighter than IScrollTable is. */ -public class ITablePaging extends Composite implements ITable, Paintable, +public class ITablePaging extends Composite implements Table, Paintable, ClickListener { private Grid tBody = new Grid(); @@ -47,7 +47,7 @@ public class ITablePaging extends Composite implements ITable, Paintable, private boolean immediate = false; - private int selectMode = ITable.SELECT_MODE_NONE; + private int selectMode = Table.SELECT_MODE_NONE; private Vector selectedRowKeys = new Vector(); @@ -101,9 +101,9 @@ public class ITablePaging extends Composite implements ITable, Paintable, if (uidl.hasAttribute("selectmode")) { if (uidl.getStringAttribute("selectmode").equals("multi")) - selectMode = ITable.SELECT_MODE_MULTI; + selectMode = Table.SELECT_MODE_MULTI; else - selectMode = ITable.SELECT_MODE_SINGLE; + selectMode = Table.SELECT_MODE_SINGLE; if (uidl.hasAttribute("selected")) { Set selectedKeys = uidl.getStringArrayVariableAsSet("selected"); @@ -314,7 +314,7 @@ public class ITablePaging extends Composite implements ITable, Paintable, DOM.eventCancelBubble(event, true); break; case Event.BUTTON_LEFT: - if (ITablePaging.this.selectMode > ITable.SELECT_MODE_NONE) + if (ITablePaging.this.selectMode > Table.SELECT_MODE_NONE) row.toggleSelected(); break; default: @@ -370,7 +370,7 @@ public class ITablePaging extends Composite implements ITable, Paintable, if (selected) { setSelected(false); } else { - if (ITablePaging.this.selectMode == ITable.SELECT_MODE_SINGLE) { + if (ITablePaging.this.selectMode == Table.SELECT_MODE_SINGLE) { ITablePaging.this.deselectAll(); } setSelected(true); -- 2.39.5