diff options
Diffstat (limited to 'src')
11 files changed, 54 insertions, 55 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index 1b7c2e50f7..9069bbe6d1 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -22,7 +22,7 @@ import com.google.gwt.user.client.ui.HasFocus; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; -import com.itmill.toolkit.terminal.gwt.client.ui.IContextMenu; +import com.itmill.toolkit.terminal.gwt.client.ui.ContextMenu; import com.itmill.toolkit.terminal.gwt.client.ui.IView; /** @@ -44,7 +44,7 @@ public class ApplicationConnection implements FocusListener { private final WidgetSet widgetSet; - private IContextMenu contextMenu = null; + private ContextMenu contextMenu = null; private IView view = new IView(); @@ -447,9 +447,9 @@ public class ApplicationConnection implements FocusListener { * * @return IContextMenu object */ - public IContextMenu getContextMenu() { + public ContextMenu getContextMenu() { if (contextMenu == null) { - contextMenu = new IContextMenu(); + contextMenu = new ContextMenu(); } return contextMenu; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAction.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java index 2288b746a1..f01c035ad6 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAction.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Action.java @@ -6,7 +6,7 @@ import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; /** * */ -public abstract class IAction implements Command { +public abstract class Action implements Command { protected IActionOwner owner; @@ -14,7 +14,7 @@ public abstract class IAction implements Command { protected String caption = ""; - public IAction(IActionOwner owner) { + public Action(IActionOwner owner) { this.owner = owner; } @@ -28,6 +28,7 @@ public abstract class IAction implements Command { if(getIconUrl() != null) { sb.append("<img src=\""+getIconUrl()+"\" alt=\"icon\" />"); } + sb.append(getCaption()); return sb.toString(); } @@ -54,7 +55,7 @@ interface IActionOwner { /** * @return Array of IActions */ - public IAction[] getActions(); + public Action[] getActions(); public ApplicationConnection getClient(); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ContextMenu.java index 636e9116c9..e8160e70df 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IContextMenu.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ContextMenu.java @@ -6,7 +6,7 @@ import com.google.gwt.user.client.ui.MenuBar; import com.google.gwt.user.client.ui.MenuItem; import com.google.gwt.user.client.ui.PopupPanel; -public class IContextMenu extends PopupPanel { +public class ContextMenu extends PopupPanel { private IActionOwner actionOwner; @@ -19,7 +19,7 @@ public class IContextMenu extends PopupPanel { * * @param cli to be set as an owner of menu */ - public IContextMenu() { + public ContextMenu() { super(true); setWidget(menu); setStyleName("i-contextmenu"); @@ -41,9 +41,9 @@ public class IContextMenu extends PopupPanel { */ public void showAt(int left, int top) { menu.clearItems(); - IAction[] actions = actionOwner.getActions(); + Action[] actions = actionOwner.getActions(); for (int i = 0; i < actions.length; i++) { - IAction a = actions[i]; + Action a = actions[i]; menu.addItem(new MenuItem(a.getHTML(), true, a)); } @@ -73,7 +73,7 @@ public class IContextMenu extends PopupPanel { public void onPopupClosed(PopupPanel sender, boolean autoClosed) { super.onPopupClosed(sender, autoClosed); - IContextMenu.this.hide(); + ContextMenu.this.hide(); } } } 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 b4a70db3b4..a3bd26cce3 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java @@ -49,8 +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 ITable, ScrollListener { public static final String CLASSNAME = "i-table"; /** @@ -1303,7 +1302,7 @@ public class IScrollTable extends Composite implements ITable, } } - class VisibleColumnAction extends IAction { + class VisibleColumnAction extends Action { String colKey; private boolean collapsed; @@ -1353,7 +1352,7 @@ public class IScrollTable extends Composite implements ITable, /* * Returns columns as Action array for column select popup */ - public IAction[] getActions() { + public Action[] getActions() { Object[] cols; if (IScrollTable.this.columnReordering) { cols = columnOrder; @@ -1370,7 +1369,7 @@ public class IScrollTable extends Composite implements ITable, for (Iterator it = collapsedColumns.iterator(); it.hasNext();) cols[i++] = it.next(); } - IAction[] actions = new IAction[cols.length]; + Action[] actions = new Action[cols.length]; for (int i = 0; i < cols.length; i++) { String cid = (String) cols[i]; @@ -1708,14 +1707,14 @@ public class IScrollTable extends Composite implements ITable, * element where to attach contenxt menu event */ private native void attachContextMenuEvent(Element el) /*-{ - var row = this; - el.oncontextmenu = function(e) { - if(!e) - e = $wnd.event; - row.@com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable.IScrollTableBody.IScrollTableRow::showContextMenu(Lcom/google/gwt/user/client/Event;)(e); - return false; - }; - }-*/; + var row = this; + el.oncontextmenu = function(e) { + if(!e) + e = $wnd.event; + row.@com.itmill.toolkit.terminal.gwt.client.ui.IScrollTable.IScrollTableBody.IScrollTableRow::showContextMenu(Lcom/google/gwt/user/client/Event;)(e); + return false; + }; + }-*/; public String getKey() { return String.valueOf(rowKey); @@ -1852,14 +1851,14 @@ public class IScrollTable extends Composite implements ITable, * * @see com.itmill.toolkit.terminal.gwt.client.ui.IActionOwner#getActions() */ - public IAction[] getActions() { + public Action[] getActions() { if (actionKeys == null) - return new IAction[] {}; - IAction[] actions = new IAction[actionKeys.length]; + return new Action[] {}; + Action[] actions = new Action[actionKeys.length]; for (int i = 0; i < actions.length; i++) { String actionKey = actionKeys[i]; - ITreeAction a = new ITreeAction(this, String - .valueOf(rowKey), actionKey); + TreeAction a = new TreeAction(this, String.valueOf(rowKey), + actionKey); a.setCaption(getActionCaption(actionKey)); actions[i] = a; } @@ -1889,7 +1888,8 @@ public class IScrollTable extends Composite implements ITable, } public void add(Widget w) { - throw new UnsupportedOperationException("ITable can contain only rows created by itself."); + throw new UnsupportedOperationException( + "ITable can contain only rows created by itself."); } public void clear() { diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITable.java deleted file mode 100644 index 458cca95e2..0000000000 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITable.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.itmill.toolkit.terminal.gwt.client.ui; - -import com.google.gwt.user.client.ui.HasWidgets; -import com.itmill.toolkit.terminal.gwt.client.Paintable; - -public interface ITable extends HasWidgets, Paintable { - final int SELECT_MODE_NONE = 0; - final int SELECT_MODE_SINGLE = 1; - final int SELECT_MODE_MULTI = 2; -} diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java index d0ebfa59d2..e6334c3fe5 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java @@ -233,13 +233,13 @@ public class ITree extends Tree implements Paintable { return childrenLoaded; } - public IAction[] getActions() { + public Action[] getActions() { if(actionKeys == null) - return new IAction[] {}; - IAction[] actions = new IAction[actionKeys.length]; + return new Action[] {}; + Action[] actions = new Action[actionKeys.length]; for (int i = 0; i < actions.length; i++) { String actionKey = actionKeys[i]; - ITreeAction a = new ITreeAction(this, String.valueOf(key), actionKey); + TreeAction a = new TreeAction(this, String.valueOf(key), actionKey); a.setCaption(getActionCaption(actionKey)); actions[i] = a; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java index 8492f66121..d937447005 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IView.java @@ -27,7 +27,7 @@ public class IView extends SimplePanel implements Paintable { private String id; - private IShortcutActionHandler actionHandler; + private ShortcutActionHandler actionHandler; public IView() { super(); @@ -93,7 +93,7 @@ public class IView extends SimplePanel implements Paintable { ((Paintable)w).updateFromUIDL(childUidl, client); } else if ("actions".equals(childUidl.getTag())) { if(actionHandler == null) { - actionHandler = new IShortcutActionHandler(id, client); + actionHandler = new ShortcutActionHandler(id, client); } actionHandler.updateActionMap(childUidl); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java index 031c057d80..420b175738 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java @@ -67,7 +67,7 @@ public class IWindow extends PopupPanel implements Paintable { private String id; - IShortcutActionHandler shortcutHandler; + ShortcutActionHandler shortcutHandler; public IWindow() { super(); @@ -175,7 +175,7 @@ public class IWindow extends PopupPanel implements Paintable { childUidl = uidl.getChildUIDL(1); if(childUidl.getTag().equals("actions")) { if(shortcutHandler == null) - shortcutHandler = new IShortcutActionHandler(id, client); + shortcutHandler = new ShortcutActionHandler(id, client); shortcutHandler.updateActionMap(childUidl); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IShortcutActionHandler.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ShortcutActionHandler.java index 2d481ef914..5710f1c7ea 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IShortcutActionHandler.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ShortcutActionHandler.java @@ -14,18 +14,18 @@ import com.itmill.toolkit.terminal.gwt.client.UIDL; * * @author IT Mill ltd */ -public class IShortcutActionHandler { +public class ShortcutActionHandler { private ArrayList actions = new ArrayList(); private ApplicationConnection client; private String paintableId; - private IShortcutActionHandler() {} + private ShortcutActionHandler() {} /** * * @param pid Paintable id * @param c reference to application connections */ - public IShortcutActionHandler(String pid, ApplicationConnection c) { + public ShortcutActionHandler(String pid, ApplicationConnection c) { paintableId = pid; client = c; } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/Table.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/Table.java new file mode 100644 index 0000000000..6d43946734 --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/Table.java @@ -0,0 +1,8 @@ +package com.itmill.toolkit.terminal.gwt.client.ui; + +public interface Table { + final int SELECT_MODE_NONE = 0; + final int SELECT_MODE_SINGLE = 1; + final int SELECT_MODE_MULTI = 2; + +} diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITreeAction.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java index dd8008da15..f2e283da3d 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITreeAction.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeAction.java @@ -4,16 +4,16 @@ package com.itmill.toolkit.terminal.gwt.client.ui; /** * This class is used for "row actions" in ITree and ITable */ -public class ITreeAction extends IAction { +public class TreeAction extends Action { String targetKey = ""; String actionKey = ""; - public ITreeAction(IActionOwner owner) { + public TreeAction(IActionOwner owner) { super(owner); } - public ITreeAction(IActionOwner owner, String target, String action) { + public TreeAction(IActionOwner owner, String target, String action) { this(owner); this.targetKey = target; this.actionKey = action; |