From edffb152a9cf31a9c3a3400e494f0bc90dfac747 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 12 Sep 2007 13:24:55 +0000 Subject: [PATCH] making it easier to extend ApplicationConnection (and creating own widget set) svn changeset:2292/svn branch:trunk --- .../gwt/client/ApplicationConnection.java | 18 +++++++++--------- .../gwt/client/DefaultWidgetFactory.java | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index 68d0c7faa8..c045a280b7 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -46,11 +46,15 @@ public class ApplicationConnection implements EntryPoint, FocusListener { private HashMap paintableToId = new HashMap(); - private WidgetFactory widgetFactory = new DefaultWidgetFactory(); + private final WidgetFactory widgetFactory; private IContextMenu contextMenu = null; private IView view = new IView(); + + public ApplicationConnection() { + widgetFactory = createWidgetFactory(); + } /** * This is the entry point method. @@ -72,6 +76,10 @@ public class ApplicationConnection implements EntryPoint, FocusListener { } + protected static WidgetFactory createWidgetFactory() { + return new DefaultWidgetFactory(); + } + public static Console getConsole() { return console; } @@ -313,14 +321,6 @@ public class ApplicationConnection implements EntryPoint, FocusListener { buf.toString(), immediate, 'a'); } - public WidgetFactory getWidgetFactory() { - return widgetFactory; - } - - public void setWidgetFactory(WidgetFactory widgetFactory) { - this.widgetFactory = widgetFactory; - } - public static Layout getParentLayout(Widget component) { Widget parent = component.getParent(); while (parent != null && !(parent instanceof Layout)) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java index fdaaf8a4f8..60c972f78e 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/DefaultWidgetFactory.java @@ -154,9 +154,11 @@ public class DefaultWidgetFactory implements WidgetFactory { * TODO: Class based impl, use when GWT supports return * (Widget)GWT.create(resolveWidgetClass(uidl)); */ + + } - private String resolveWidgetTypeName(UIDL uidl) { + protected String resolveWidgetTypeName(UIDL uidl) { String tag = uidl.getTag(); if ("button".equals(tag)) { -- 2.39.5