]> source.dussan.org Git - vaadin-framework.git/log
vaadin-framework.git
16 years agofixes #1233
Matti Tahvonen [Mon, 17 Dec 2007 13:47:11 +0000 (13:47 +0000)]
fixes #1233

svn changeset:3247/svn branch:trunk

16 years agochanged underscores to pipes in parameter keys (now allows to have underscore in...
Matti Tahvonen [Mon, 17 Dec 2007 13:46:43 +0000 (13:46 +0000)]
changed underscores to pipes in parameter keys (now allows to have underscore in testingID and paramater names)

svn changeset:3246/svn branch:trunk

16 years agoDevelopment.
Marko Grönroos [Fri, 14 Dec 2007 15:43:44 +0000 (15:43 +0000)]
Development.

svn changeset:3244/svn branch:trunk

16 years agoAccordion now supports sizing with height also.
Jouni Koivuviita [Fri, 14 Dec 2007 14:17:51 +0000 (14:17 +0000)]
Accordion now supports sizing with height also.

svn changeset:3243/svn branch:trunk

16 years agoNew component: Accordion. Doesn't support sizing properly yet (only width).
Jouni Koivuviita [Fri, 14 Dec 2007 13:38:16 +0000 (13:38 +0000)]
New component: Accordion. Doesn't support sizing properly yet (only width).
-ITabsheet refactored: new superclass for different kinds of tabs, ITabsheetBase. Use this when you want to create some sort of tabbable component.

svn changeset:3242/svn branch:trunk

16 years agorefactored method name to correspond to the one (setDebugId) to be added to GWT ...
Matti Tahvonen [Fri, 14 Dec 2007 10:16:22 +0000 (10:16 +0000)]
refactored method name to correspond to the one (setDebugId) to be added to GWT (according to rumors)

svn changeset:3241/svn branch:trunk

16 years agoadded testingId field to Paintable
Matti Tahvonen [Fri, 14 Dec 2007 09:51:46 +0000 (09:51 +0000)]
added testingId field to Paintable

svn changeset:3240/svn branch:trunk

16 years agoImplemented layout spacing in IOrderedLayout.
Jouni Koivuviita [Fri, 14 Dec 2007 07:38:54 +0000 (07:38 +0000)]
Implemented layout spacing in IOrderedLayout.

svn changeset:3236/svn branch:trunk

16 years agoAjaxifiead FeatureBrowser (don't force filter refresh)
Matti Tahvonen [Thu, 13 Dec 2007 14:40:38 +0000 (14:40 +0000)]
Ajaxifiead FeatureBrowser (don't force filter refresh)

svn changeset:3234/svn branch:trunk

16 years agoremoved flickering node state indicator
Matti Tahvonen [Thu, 13 Dec 2007 13:53:06 +0000 (13:53 +0000)]
removed flickering node state indicator

svn changeset:3233/svn branch:trunk

16 years agoNew IOrderedLayout implementation (without sizing abilities).
Jouni Koivuviita [Thu, 13 Dec 2007 13:45:11 +0000 (13:45 +0000)]
New IOrderedLayout implementation (without sizing abilities).

svn changeset:3232/svn branch:trunk

16 years agoCleaned up setStyle -> setStyleName and removed all references to Sizeable.
Jouni Koivuviita [Thu, 13 Dec 2007 11:46:06 +0000 (11:46 +0000)]
Cleaned up setStyle -> setStyleName and removed all references to Sizeable.

svn changeset:3229/svn branch:trunk

16 years agoMajor layout API changes: Sizeable is now deprecated. Use HasSize-interface instead...
Jouni Koivuviita [Thu, 13 Dec 2007 10:11:49 +0000 (10:11 +0000)]
Major layout API changes: Sizeable is now deprecated. Use HasSize-interface instead in combination with Size object (see ExpandLayout.java for example). OrderedLayout is no longer sizable. Table and Panel implement compatibility methods to proxy old size calls to the new Size object.

svn changeset:3228/svn branch:trunk

16 years agofixing testing server default uri (when not specified in web.xml)
Matti Tahvonen [Wed, 12 Dec 2007 12:43:38 +0000 (12:43 +0000)]
fixing testing server default uri (when not specified in web.xml)

svn changeset:3223/svn branch:trunk

16 years agosome steps towards Testing Tools supports
Matti Tahvonen [Tue, 11 Dec 2007 14:53:15 +0000 (14:53 +0000)]
some steps towards Testing Tools supports

svn changeset:3219/svn branch:trunk

16 years agoComboBox fixes: select newitem, entered item exists, etc issues
Marc Englund [Tue, 11 Dec 2007 13:46:41 +0000 (13:46 +0000)]
ComboBox fixes: select newitem, entered item exists, etc issues

svn changeset:3218/svn branch:trunk

16 years agosome steps towards Testing Tools supports
Matti Tahvonen [Tue, 11 Dec 2007 13:42:43 +0000 (13:42 +0000)]
some steps towards Testing Tools supports

svn changeset:3217/svn branch:trunk

16 years agoDocumentation URIs corrected.
Marc Englund [Tue, 11 Dec 2007 13:41:22 +0000 (13:41 +0000)]
Documentation URIs corrected.

svn changeset:3216/svn branch:trunk

16 years agoSplitpanel removed from example - does not work in IE (usese position:relative)
Marc Englund [Tue, 11 Dec 2007 13:40:40 +0000 (13:40 +0000)]
Splitpanel removed from example - does not work in IE (usese position:relative)

svn changeset:3215/svn branch:trunk

16 years agoFixes #1213 in another way. Remove indicator element altogether.
Marko Grönroos [Tue, 11 Dec 2007 12:23:56 +0000 (12:23 +0000)]
Fixes #1213 in another way. Remove indicator element altogether.

svn changeset:3214/svn branch:trunk

16 years agoFixed #1213. Reshow error indicator if re-enabled.
Marko Grönroos [Mon, 10 Dec 2007 18:44:04 +0000 (18:44 +0000)]
Fixed #1213. Reshow error indicator if re-enabled.

svn changeset:3212/svn branch:trunk

16 years agoenhanced documentation
Matti Tahvonen [Mon, 10 Dec 2007 15:57:51 +0000 (15:57 +0000)]
enhanced documentation

svn changeset:3211/svn branch:trunk

16 years agorefactored method signature
Matti Tahvonen [Mon, 10 Dec 2007 15:51:52 +0000 (15:51 +0000)]
refactored method signature

svn changeset:3210/svn branch:trunk

16 years agofinally the right solution for "Joonas, Safari and network with latency rendering...
Matti Tahvonen [Mon, 10 Dec 2007 15:43:18 +0000 (15:43 +0000)]
finally the right solution for "Joonas, Safari and network with latency rendering bug"

svn changeset:3209/svn branch:trunk

16 years ago"-" -> "" clientside as well.
Marc Englund [Mon, 10 Dec 2007 15:18:38 +0000 (15:18 +0000)]
"-" -> "" clientside as well.
One filtering bug fixed.

svn changeset:3208/svn branch:trunk

16 years agobetter workaround for "Joonas, Safari and network with latency rendering bug"
Matti Tahvonen [Mon, 10 Dec 2007 15:16:37 +0000 (15:16 +0000)]
better workaround for "Joonas, Safari and network with latency rendering bug"

svn changeset:3207/svn branch:trunk

16 years agoworkaround for "Joonas, Safari and network with latency rendering bug"
Matti Tahvonen [Mon, 10 Dec 2007 14:26:57 +0000 (14:26 +0000)]
workaround for "Joonas, Safari and network with latency rendering bug"

svn changeset:3206/svn branch:trunk

16 years agobetter notifications
Marc Englund [Mon, 10 Dec 2007 14:25:02 +0000 (14:25 +0000)]
better notifications

svn changeset:3205/svn branch:trunk

16 years agoReservations refreshed better.
Marc Englund [Mon, 10 Dec 2007 14:08:22 +0000 (14:08 +0000)]
Reservations refreshed better.
Tried to fix hsqldb threading/locking issue: failed thus far...

svn changeset:3204/svn branch:trunk

16 years agofixed one negative argument (IE)
Marc Englund [Mon, 10 Dec 2007 13:51:18 +0000 (13:51 +0000)]
fixed one negative argument (IE)

svn changeset:3203/svn branch:trunk

16 years ago-Loading throbbers should now be cleared after updates (all three timers).
Jouni Koivuviita [Mon, 10 Dec 2007 13:26:46 +0000 (13:26 +0000)]
-Loading throbbers should now be cleared after updates (all three timers).
-ITwinColSelect won't wrap elements anymore.
-ITree won't wrap it's texts anymore.

svn changeset:3202/svn branch:trunk

16 years agoSelects newitem.
Marc Englund [Mon, 10 Dec 2007 10:34:03 +0000 (10:34 +0000)]
Selects newitem.
nullitem "-" -> ""

svn changeset:3201/svn branch:trunk

16 years agorelocated utility method
Matti Tahvonen [Mon, 10 Dec 2007 10:32:36 +0000 (10:32 +0000)]
relocated utility method

svn changeset:3200/svn branch:trunk

16 years agoFeedback box hidden field. Feedback is sent to whole tk-dev team.
Jouni Koivuviita [Mon, 10 Dec 2007 10:26:11 +0000 (10:26 +0000)]
Feedback box hidden field. Feedback is sent to whole tk-dev team.

svn changeset:3199/svn branch:trunk

16 years agoQuick-fix for BETA release. Now layouts without size work more reliably.
Jouni Koivuviita [Mon, 10 Dec 2007 10:23:02 +0000 (10:23 +0000)]
Quick-fix for BETA release. Now layouts without size work more reliably.

svn changeset:3198/svn branch:trunk

16 years agoremoved obsolete methods
Matti Tahvonen [Mon, 10 Dec 2007 10:13:00 +0000 (10:13 +0000)]
removed obsolete methods

svn changeset:3197/svn branch:trunk

16 years agoremoved obsolete code
Matti Tahvonen [Mon, 10 Dec 2007 10:10:56 +0000 (10:10 +0000)]
removed obsolete code

svn changeset:3196/svn branch:trunk

16 years agoadded TODO
Matti Tahvonen [Mon, 10 Dec 2007 10:10:21 +0000 (10:10 +0000)]
added TODO

svn changeset:3195/svn branch:trunk

16 years agoRewrote "criticalError"
Matti Tahvonen [Mon, 10 Dec 2007 10:09:10 +0000 (10:09 +0000)]
Rewrote "criticalError"

svn changeset:3194/svn branch:trunk

16 years agocase-insensitive filtering
Marc Englund [Mon, 10 Dec 2007 09:51:27 +0000 (09:51 +0000)]
case-insensitive filtering

svn changeset:3193/svn branch:trunk

16 years agoFix
Jani Laakso [Mon, 10 Dec 2007 08:40:20 +0000 (08:40 +0000)]
Fix

svn changeset:3192/svn branch:trunk

16 years agoEnhancements for Session invalid/expired, critical notifications sending.
Jani Laakso [Sat, 8 Dec 2007 15:32:43 +0000 (15:32 +0000)]
Enhancements for Session invalid/expired, critical notifications sending.
Transaction Listener bugfixes.
Refactoring

svn changeset:3191/svn branch:trunk

16 years agoFixed critical memory leak, applications could never be garbage collected on real...
Jani Laakso [Sat, 8 Dec 2007 10:31:16 +0000 (10:31 +0000)]
Fixed critical memory leak, applications could never be garbage collected on real environments.

svn changeset:3189/svn branch:trunk

16 years agoCleaner error reporting (not full stacktrace) when client abruptly presses STOP butto...
Jani Laakso [Sat, 8 Dec 2007 10:29:28 +0000 (10:29 +0000)]
Cleaner error reporting (not full stacktrace) when client abruptly presses STOP button on browser or closes sockets in the middle of request sending by other means. Anyone gets these on production server and stacktraces were replaced with cleaner warning messages indicating that this is most likely not a bug.

svn changeset:3188/svn branch:trunk

16 years agoWe do not need this synhronized block in each http request.
Jani Laakso [Sat, 8 Dec 2007 10:26:52 +0000 (10:26 +0000)]
We do not need this synhronized block in each http request.
WeakHashMap helps nothing here, using HashMap, reference cleared explicitly on session timeout (valueUnbound)

svn changeset:3187/svn branch:trunk

16 years agoFixes small bug (after closing popup from somewhere else than the calendar button...
Jouni Koivuviita [Fri, 7 Dec 2007 08:55:54 +0000 (08:55 +0000)]
Fixes small bug (after closing popup from somewhere else than the calendar button you have to click twice to open it again).

svn changeset:3185/svn branch:trunk

16 years agowar build added
Jani Laakso [Wed, 5 Dec 2007 16:24:02 +0000 (16:24 +0000)]
war build added

svn changeset:3180/svn branch:trunk

16 years agoresources fix, did not work if context was set
Jani Laakso [Wed, 5 Dec 2007 16:19:16 +0000 (16:19 +0000)]
resources fix, did not work if context was set

svn changeset:3179/svn branch:trunk

16 years agoRemoved obsolete files, building 5.0.0
Jani Laakso [Wed, 5 Dec 2007 15:39:51 +0000 (15:39 +0000)]
Removed obsolete files, building 5.0.0

svn changeset:3177/svn branch:trunk

16 years agoFixed resource loading if no context used in web application.
Jani Laakso [Wed, 5 Dec 2007 15:38:33 +0000 (15:38 +0000)]
Fixed resource loading if no context used in web application.

svn changeset:3176/svn branch:trunk

16 years agoFixed #1206
Jani Laakso [Wed, 5 Dec 2007 14:39:07 +0000 (14:39 +0000)]
Fixed #1206

Refactored also applicationRunner code more cleaner.

svn changeset:3175/svn branch:trunk

16 years agosvn changeset:3174/svn branch:trunk
Jani Laakso [Wed, 5 Dec 2007 09:46:26 +0000 (09:46 +0000)]
svn changeset:3174/svn branch:trunk

16 years agoAdded "Beta" label for index.html.
Jouni Koivuviita [Wed, 5 Dec 2007 09:20:47 +0000 (09:20 +0000)]
Added "Beta" label for index.html.

svn changeset:3173/svn branch:trunk

16 years agowe are in beta stage
Jani Laakso [Wed, 5 Dec 2007 09:13:32 +0000 (09:13 +0000)]
we are in beta stage

svn changeset:3172/svn branch:trunk

16 years agoFixed hosted mode for mac leopard, obviously it still needs -XstartOnFirstThread
Jani Laakso [Wed, 5 Dec 2007 09:01:13 +0000 (09:01 +0000)]
Fixed hosted mode for mac leopard, obviously it still needs -XstartOnFirstThread

svn changeset:3171/svn branch:trunk

16 years agoFixed overlapping panels.
Jouni Koivuviita [Wed, 5 Dec 2007 08:21:52 +0000 (08:21 +0000)]
Fixed overlapping panels.

svn changeset:3170/svn branch:trunk

16 years agoFixes
Jani Laakso [Tue, 4 Dec 2007 20:28:49 +0000 (20:28 +0000)]
Fixes

svn changeset:3168/svn branch:trunk

16 years agoFound 3rd party license required stuff..
Jani Laakso [Tue, 4 Dec 2007 20:04:35 +0000 (20:04 +0000)]
Found 3rd party license required stuff..

svn changeset:3166/svn branch:trunk

16 years agofix
Jani Laakso [Tue, 4 Dec 2007 19:55:31 +0000 (19:55 +0000)]
fix

svn changeset:3164/svn branch:trunk

16 years agoLicense parametrized
Jani Laakso [Tue, 4 Dec 2007 19:52:39 +0000 (19:52 +0000)]
License parametrized

svn changeset:3163/svn branch:trunk

16 years agoLicense header parametrized
Jani Laakso [Tue, 4 Dec 2007 19:51:22 +0000 (19:51 +0000)]
License header parametrized
Cleanup performed
Organized imports
Format

svn changeset:3162/svn branch:trunk

16 years agoFixed #943 (Creating new applications without altering web.xml)
Jani Laakso [Tue, 4 Dec 2007 18:13:55 +0000 (18:13 +0000)]
Fixed #943 (Creating new applications without altering web.xml)

How to use
 * Try http://localhost:8080/myContext/run/com.itmill.toolkit.demo.Calc

web.xml contains run/* servlet with applicationRunner=true parameter.
This should not affect Toolkit in any way if applicationRunner is not defined.
Currently it is defined only with run/*

This needs review. Reason why I did this is to
 * skip one step more for newbies
 * "how to start" flash demo is simpler (included XML is enough for any new application)

Side-effects
 * UIDL request have part of URI path after their UIDL request, see firebug

svn changeset:3160/svn branch:trunk

16 years agopackaging fixes
Jani Laakso [Tue, 4 Dec 2007 17:20:06 +0000 (17:20 +0000)]
packaging fixes

svn changeset:3159/svn branch:trunk

16 years agofix
Jani Laakso [Tue, 4 Dec 2007 16:54:05 +0000 (16:54 +0000)]
fix

svn changeset:3157/svn branch:trunk

16 years agofixed manual link
Jani Laakso [Tue, 4 Dec 2007 16:50:45 +0000 (16:50 +0000)]
fixed manual link

svn changeset:3156/svn branch:trunk

16 years agofixed googmaps issue with hosted mode (127.0.0.1 => localhost)
Jani Laakso [Tue, 4 Dec 2007 16:27:25 +0000 (16:27 +0000)]
fixed googmaps issue with hosted mode (127.0.0.1 => localhost)

svn changeset:3155/svn branch:trunk

16 years agopackaging fixes, hosted mode for linux should work too
Jani Laakso [Tue, 4 Dec 2007 16:24:00 +0000 (16:24 +0000)]
packaging fixes, hosted mode for linux should work too

svn changeset:3154/svn branch:trunk

16 years agoSelect a category to begin with, for quicker initial render.
Marc Englund [Tue, 4 Dec 2007 16:05:01 +0000 (16:05 +0000)]
Select a category to begin with, for quicker initial render.

svn changeset:3153/svn branch:trunk

16 years agoJAR duplicated.
Jani Laakso [Tue, 4 Dec 2007 16:04:52 +0000 (16:04 +0000)]
JAR duplicated.

svn changeset:3152/svn branch:trunk

16 years agoJAR is again downloadable from index.html (duplicated it)
Jani Laakso [Tue, 4 Dec 2007 16:04:25 +0000 (16:04 +0000)]
JAR is again downloadable from index.html (duplicated it)

svn changeset:3151/svn branch:trunk

16 years agoremoved calendar on "all reservations" -tab
Marc Englund [Tue, 4 Dec 2007 15:52:18 +0000 (15:52 +0000)]
removed calendar on "all reservations" -tab

svn changeset:3150/svn branch:trunk

16 years agoWAR is now 25Megabytes, removing it from package.
Jani Laakso [Tue, 4 Dec 2007 15:48:45 +0000 (15:48 +0000)]
WAR is now 25Megabytes, removing it from package.

svn changeset:3149/svn branch:trunk

16 years agoLayoutExample added (+ small changes)
Marc Englund [Tue, 4 Dec 2007 15:40:02 +0000 (15:40 +0000)]
LayoutExample added (+ small changes)

svn changeset:3148/svn branch:trunk

16 years agoFixed links, took away WAR link.
Jani Laakso [Tue, 4 Dec 2007 15:20:46 +0000 (15:20 +0000)]
Fixed links, took away WAR link.

svn changeset:3147/svn branch:trunk

16 years agoImproved readme files.
Marko Grönroos [Tue, 4 Dec 2007 10:35:20 +0000 (10:35 +0000)]
Improved readme files.

svn changeset:3142/svn branch:trunk

16 years agoChanged caption for clarity
Marc Englund [Tue, 4 Dec 2007 10:12:39 +0000 (10:12 +0000)]
Changed caption for clarity

svn changeset:3139/svn branch:trunk

16 years agoEditmode + misc.
Marc Englund [Tue, 4 Dec 2007 09:51:19 +0000 (09:51 +0000)]
Editmode + misc.

svn changeset:3138/svn branch:trunk

16 years agocommented
Marc Englund [Tue, 4 Dec 2007 09:39:53 +0000 (09:39 +0000)]
commented

svn changeset:3137/svn branch:trunk

16 years agolink-style button alignment fixed
Marc Englund [Tue, 4 Dec 2007 09:39:36 +0000 (09:39 +0000)]
link-style button alignment fixed

svn changeset:3136/svn branch:trunk

16 years agoNotifications set caption (not message) if only one string is provided.
Marc Englund [Tue, 4 Dec 2007 09:29:14 +0000 (09:29 +0000)]
Notifications set caption (not message) if only one string is provided.

svn changeset:3135/svn branch:trunk

16 years agoTable example improved
Marc Englund [Tue, 4 Dec 2007 09:28:08 +0000 (09:28 +0000)]
Table example improved

svn changeset:3134/svn branch:trunk

16 years agoAdded table example (not done yet)
Marc Englund [Tue, 4 Dec 2007 08:35:27 +0000 (08:35 +0000)]
Added table example (not done yet)

svn changeset:3133/svn branch:trunk

16 years agoStatus labels -> Notifications.
Marc Englund [Tue, 4 Dec 2007 07:23:37 +0000 (07:23 +0000)]
Status labels -> Notifications.
Etc, etc.

svn changeset:3132/svn branch:trunk

16 years agoPackaging fixes
Jani Laakso [Mon, 3 Dec 2007 19:14:00 +0000 (19:14 +0000)]
Packaging fixes
Added open source license and 3rd party licenses
Building new package

svn changeset:3129/svn branch:trunk

16 years agoSelectExample added
Marc Englund [Mon, 3 Dec 2007 15:19:22 +0000 (15:19 +0000)]
SelectExample added

svn changeset:3127/svn branch:trunk

16 years agosmall change
Marc Englund [Mon, 3 Dec 2007 14:48:27 +0000 (14:48 +0000)]
small change

svn changeset:3126/svn branch:trunk

16 years agosome documentation
Marc Englund [Mon, 3 Dec 2007 14:47:50 +0000 (14:47 +0000)]
some documentation

svn changeset:3124/svn branch:trunk

16 years agoValueInputExample added
Marc Englund [Mon, 3 Dec 2007 14:43:07 +0000 (14:43 +0000)]
ValueInputExample added

svn changeset:3123/svn branch:trunk

16 years agoAllow ApplicationConnection to handle caption
Marc Englund [Mon, 3 Dec 2007 14:35:40 +0000 (14:35 +0000)]
Allow ApplicationConnection to handle caption

svn changeset:3122/svn branch:trunk

16 years agoRenamed LabelsExample -> LabelExample
Marc Englund [Mon, 3 Dec 2007 13:27:58 +0000 (13:27 +0000)]
Renamed LabelsExample -> LabelExample

svn changeset:3121/svn branch:trunk

16 years agoUpdated LabelsExample, added ButtonExample
Marc Englund [Mon, 3 Dec 2007 13:26:46 +0000 (13:26 +0000)]
Updated LabelsExample, added ButtonExample

svn changeset:3120/svn branch:trunk

16 years agoFixed several target/features bugs
Marc Englund [Mon, 3 Dec 2007 12:40:47 +0000 (12:40 +0000)]
Fixed several target/features bugs

svn changeset:3119/svn branch:trunk

16 years agoperformance test for subtree caching
Matti Tahvonen [Mon, 3 Dec 2007 12:40:04 +0000 (12:40 +0000)]
performance test for subtree caching

svn changeset:3118/svn branch:trunk

16 years agoplatform fix
Jani Laakso [Mon, 3 Dec 2007 12:28:36 +0000 (12:28 +0000)]
platform fix

svn changeset:3117/svn branch:trunk

16 years agoStart.scpt is used to produce Start.app under build/package directory. This contains...
Jani Laakso [Mon, 3 Dec 2007 12:27:27 +0000 (12:27 +0000)]
Start.scpt is used to produce Start.app under build/package directory. This contains mac specific files for Start icon (executes start.sh script).

svn changeset:3116/svn branch:trunk

16 years agoAdded source links.
Jani Laakso [Mon, 3 Dec 2007 12:23:50 +0000 (12:23 +0000)]
Added source links.

svn changeset:3115/svn branch:trunk

16 years agoCreating new build.
Jani Laakso [Mon, 3 Dec 2007 12:21:59 +0000 (12:21 +0000)]
Creating new build.

svn changeset:3114/svn branch:trunk

16 years agocheck for negative value in fixSpacers()
Marc Englund [Mon, 3 Dec 2007 12:18:35 +0000 (12:18 +0000)]
check for negative value in fixSpacers()

svn changeset:3113/svn branch:trunk

16 years agopackaging fixes
Jani Laakso [Mon, 3 Dec 2007 12:08:51 +0000 (12:08 +0000)]
packaging fixes

svn changeset:3112/svn branch:trunk

16 years agolang fix
Jani Laakso [Mon, 3 Dec 2007 11:48:41 +0000 (11:48 +0000)]
lang fix

svn changeset:3111/svn branch:trunk