From 326c7747558d7ff683119a63761d69c1bcc16875 Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Wed, 3 Jan 2007 12:58:47 +0000 Subject: Millstone -> IT Mill Toolkit svn changeset:216/svn branch:toolkit --- .../toolkit/demo/features/FeatureBrowser.java | 16 +-- .../toolkit/demo/features/FeatureBuffering.java | 2 +- .../toolkit/demo/features/FeatureButton.java | 2 +- .../toolkit/demo/features/FeatureContainers.java | 2 +- .../toolkit/demo/features/FeatureDateField.java | 2 +- .../toolkit/demo/features/FeatureEmbedded.java | 4 +- .../demo/features/FeatureOrderedLayout.java | 3 - .../toolkit/demo/features/FeatureParameters.java | 3 - .../toolkit/demo/features/FeatureProperties.java | 4 +- .../toolkit/demo/features/FeatureSelect.java | 1 + .../toolkit/demo/features/FeatureServerEvents.java | 132 --------------------- .../toolkit/demo/features/FeatureTextField.java | 4 +- .../itmill/toolkit/demo/features/FeatureTree.java | 2 +- .../toolkit/demo/features/FeatureValidators.java | 2 +- .../toolkit/demo/features/FeatureWindow.java | 2 +- .../toolkit/demo/features/FeaturesApplication.java | 2 +- .../toolkit/demo/features/PropertyPanel.java | 2 +- .../itmill/toolkit/demo/features/m-bullet-blue.gif | Bin 0 -> 8417 bytes .../toolkit/demo/features/millstone-logo.gif | Bin 9841 -> 0 bytes 19 files changed, 22 insertions(+), 163 deletions(-) delete mode 100644 src/com/itmill/toolkit/demo/features/FeatureServerEvents.java create mode 100644 src/com/itmill/toolkit/demo/features/m-bullet-blue.gif delete mode 100644 src/com/itmill/toolkit/demo/features/millstone-logo.gif (limited to 'src/com/itmill/toolkit') diff --git a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java index 31dcbba193..bf0bed42e3 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureBrowser.java +++ b/src/com/itmill/toolkit/demo/features/FeatureBrowser.java @@ -46,14 +46,13 @@ public class FeatureBrowser private boolean initialized = false; private static final String WELCOME_TEXT = - "

Welcome to the Millstone feature tour!

" - + "In this Millstone application you may view a demonstration of some of its " - + "features.
" + "

Welcome to the IT Mill Toolkit feature tour!

" + + "In this application you may view and play with some features of IT Mill Toolkit.
" + "Most of the features can be tested online and include simple example of their " + "usage associated with it.

" + "Start your tour by selecting features from the list on the left.

" - + "For more information, point your browser to: www.millstone.org"; + + "For more information, point your browser to: www.itmill.com"; public void attach() { @@ -86,7 +85,7 @@ public class FeatureBrowser "", new ClassResource( getClass(), - "millstone-logo.gif", + "m-bullet-blue.gif", getApplication())); welcomePanel.addComponent(welcome); welcomePanel.addComponent(greeting); @@ -143,9 +142,6 @@ public class FeatureBrowser registerFeature("/Data Model/Containers", new FeatureContainers()); registerFeature("/Data Model/Validators", new FeatureValidators()); registerFeature("/Data Model/Buffering", new FeatureBuffering()); - registerFeature( - "/Terminal/Server Initiated Events", - new FeatureServerEvents()); registerFeature( "/Terminal/Parameters and URI Handling", new FeatureParameters()); @@ -194,7 +190,7 @@ public class FeatureBrowser layout.removeComponent(1, 0); layout.addComponent(currentFeature, 1, 0); getWindow().setCaption( - "Millstone Features / " + "IT Mill Toolkit Features / " + features.getContainerProperty(id, "name")); } } diff --git a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java index a02215cd36..0004e48735 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java +++ b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java @@ -40,7 +40,7 @@ public class FeatureBuffering extends Feature { * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML() */ protected String getDescriptionXHTML() { - return "

Millstone data model provides interface for implementing " + return "

IT Mill Toolkit data model provides interface for implementing " + "buffering in data components. The basic idea is that a component " + "reading their state from data source can implement " + "Buffered-interface, for storing the value internally. " diff --git a/src/com/itmill/toolkit/demo/features/FeatureButton.java b/src/com/itmill/toolkit/demo/features/FeatureButton.java index 584b7c41d1..eea04f0c2f 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureButton.java +++ b/src/com/itmill/toolkit/demo/features/FeatureButton.java @@ -69,7 +69,7 @@ public class FeatureButton extends Feature { * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML() */ protected String getDescriptionXHTML() { - return "In Millstone, boolean input values are represented by buttons. " + return "In IT Mill Toolkit, boolean input values are represented by buttons. " + "Buttons may function either as a push buttons or switches. (checkboxes)

" + "Button can be directly connected to any method of an object, which " + "is an easy way to trigger events: new Button(\"Play\", myPiano \"playIt\"). " diff --git a/src/com/itmill/toolkit/demo/features/FeatureContainers.java b/src/com/itmill/toolkit/demo/features/FeatureContainers.java index 5cc6a32dfe..262a5fc0f5 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureContainers.java +++ b/src/com/itmill/toolkit/demo/features/FeatureContainers.java @@ -36,7 +36,7 @@ public class FeatureContainers extends Feature { protected String getDescriptionXHTML() { return "

Container is the most advanced of the data " - + "model supported by Millstone. It provides a very flexible " + + "model supported by IT Mill Toolkit. It provides a very flexible " + "way of managing set of items that share common properties. Each " + "item is identified by an item id. " + "Properties can be requested from container with item " diff --git a/src/com/itmill/toolkit/demo/features/FeatureDateField.java b/src/com/itmill/toolkit/demo/features/FeatureDateField.java index 74547ce238..52cbc8f07c 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureDateField.java +++ b/src/com/itmill/toolkit/demo/features/FeatureDateField.java @@ -114,7 +114,7 @@ public class FeatureDateField extends Feature { protected String getDescriptionXHTML() { return "

Representing Dates and times and providing a way to select " + "or enter some specific date and/or time is an typical need in " - + "data-entry userinterfaces. Millstone provides a DateField " + + "data-entry userinterfaces. IT Mill Toolkit provides a DateField " + "component that is intuitive to use and yet controllable through " + "its properties.

" + "

The calendar-style allows point-and-click selection "+ diff --git a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java index e9c447d385..d88041b764 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java +++ b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java @@ -91,8 +91,8 @@ public class FeatureEmbedded extends Feature { "source", new Object[] { null, - new ClassResource("millstone-logo.gif", getApplication())}, - new Object[] { "null", "Millstone logo" }); + new ClassResource("m-bullet-blue.gif", getApplication())}, + new Object[] { "null", "IT Mill (m)" }); p.addProperties("Embedded Properties", ap); p.getField("standby").setDescription( "The text to display while loading the object."); diff --git a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java index 7a5acfefac..69ee330d19 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java +++ b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java @@ -98,6 +98,3 @@ public class FeatureOrderedLayout extends Feature { } } - -/* This Millstone sample code is public domain. * - * For more information see www.millstone.org. */ \ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/features/FeatureParameters.java b/src/com/itmill/toolkit/demo/features/FeatureParameters.java index 9c5887f19f..cdaa671954 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureParameters.java +++ b/src/com/itmill/toolkit/demo/features/FeatureParameters.java @@ -155,6 +155,3 @@ public class FeatureParameters } } } - -/* This Millstone sample code is public domain. * - * For more information see www.millstone.org. */ \ No newline at end of file diff --git a/src/com/itmill/toolkit/demo/features/FeatureProperties.java b/src/com/itmill/toolkit/demo/features/FeatureProperties.java index 52efc42489..2f33ac71c8 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureProperties.java +++ b/src/com/itmill/toolkit/demo/features/FeatureProperties.java @@ -39,7 +39,7 @@ public class FeatureProperties extends Feature { } protected String getDescriptionXHTML() { - return "

Millstone data model is one of the core concepts " + return "

IT Mill Toolkti data model is one of the core concepts " + "in the library and Property-interface is the base of that " + "model. Property provides standardized API for a singe data object " + "that can be getted and setted. A property is always typed, but can optionally " @@ -50,7 +50,7 @@ public class FeatureProperties extends Feature { + "editor and viewer classes. Typically this is used to connect different " + "data sources to UI components for editing and viewing their contents.

" + "

Properties can be utilized either by implementing the interface " - + "or by using some of the existing property implementations. Millstone " + + "or by using some of the existing property implementations. IT Mill Toolkit " + "includes Property interface implementations for " + "arbitrary function pairs or Bean-properties as well as simple object " + "properties.

" diff --git a/src/com/itmill/toolkit/demo/features/FeatureSelect.java b/src/com/itmill/toolkit/demo/features/FeatureSelect.java index 93b0ad8d3b..9a1ba87656 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureSelect.java +++ b/src/com/itmill/toolkit/demo/features/FeatureSelect.java @@ -74,6 +74,7 @@ public class FeatureSelect extends Feature { "s.addItem(\"Volvo\");\n"; } + /** * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML() */ diff --git a/src/com/itmill/toolkit/demo/features/FeatureServerEvents.java b/src/com/itmill/toolkit/demo/features/FeatureServerEvents.java deleted file mode 100644 index cdf371a91d..0000000000 --- a/src/com/itmill/toolkit/demo/features/FeatureServerEvents.java +++ /dev/null @@ -1,132 +0,0 @@ -/* ************************************************************************* - - IT Mill Toolkit - - Development of Browser User Intarfaces Made Easy - - Copyright (C) 2000-2006 IT Mill Ltd - - ************************************************************************* - - This product is distributed under commercial license that can be found - from the product package on license/license.txt. Use of this product might - require purchasing a commercial license from IT Mill Ltd. For guidelines - on usage, see license/licensing-guidelines.html - - ************************************************************************* - - For more information, contact: - - IT Mill Ltd phone: +358 2 4802 7180 - Ruukinkatu 2-4 fax: +358 2 4802 7181 - 20540, Turku email: info@itmill.com - Finland company www: www.itmill.com - - Primary source for information and releases: www.itmill.com - - ********************************************************************** */ - -package com.itmill.toolkit.demo.features; - -import java.net.MalformedURLException; -import java.net.URL; - -import com.itmill.toolkit.terminal.ExternalResource; -import com.itmill.toolkit.ui.*; - -public class FeatureServerEvents extends Feature { - - protected String getTitle() { - return "Server Events"; - } - - protected Component getDemoComponent() { - OrderedLayout l = new OrderedLayout(); - - l.addComponent( - new Label( - "

Multiplayer GO-Game

For demonstration, see GO-Game example application. The application implements a " - + "multi-player board game, where the moved by one player are immediately reflected to " - + "another player.

" - + "

Updating another players screen is totally automatic, and the programmed " - + "does not need to be avare when the refresh requests are sent to screen by the server. In " - + "web adapter the requests are passed through open HTTP-connection as java-script fragments " - + "that update the windows that need repainting.

", - Label.CONTENT_UIDL)); - - URL goUrl = null; - try { - goUrl = new URL(getApplication().getURL(), "../go/"); - } catch (MalformedURLException e) { - } - - if (goUrl != null) { - Link link = new Link("Start GO-Game", new ExternalResource(goUrl)); - link.setTargetName("gogame"); - link.setTargetBorder(Link.TARGET_BORDER_NONE); - l.addComponent(link); - } - - l.addComponent( - new Label( - "

Chat example

For some purposes it might be better to create your own "+ - "stream. The easiest way of creating a continuous stream for "+ - "simple purposes is to use StreamResource-class. See chat "+ - "example below, how this technique can be used for creation "+ - "of simple chat program.

", - Label.CONTENT_UIDL)); - - URL chatUrl = null; - try { - chatUrl = new URL(getApplication().getURL(), "../chat/"); - } catch (MalformedURLException e) { - } - - if (goUrl != null) { - Link link = new Link("Start chat", new ExternalResource(chatUrl)); - link.setTargetName("chat"); - link.setTargetBorder(Link.TARGET_BORDER_NONE); - l.addComponent(link); - } - - return l; - } - - protected String getDescriptionXHTML() { - return "

Millstone component framework supports both transactional and " - + "continuous terminals. This means that either the events from the " - + "terminal are sent together as transactions or the events are " - + "passed immediately when the user initiates them through the user " - + "interface.

" - + "

WebAdapter converts the Millstone applications to web-environment " - + "by transferring the events as HTTP-parameters and drawing the " - + "pages after the components have received and handled the events. " - + "In the web-environment the web browser is always the active party that " - + "starts the transaction. This is problematic when the server should " - + "notify the user about changes without HTTP-request initiated by the " - + "user.

" - + "

WebAdapter Solution

" - + "

Millstone solves the problem by combining component frameworks " - + "ability to automatically notify terminal adapter about all visual " - + "changes to HTTP-protocols ability to handle very long and slow " - + "page downloads. WebAdapter provides the web browser with " - + "possibility to keep special server command stream open all the time. " - + "All the visual updates that happen in components causes the " - + "WebAdapter to automatically creates JavaScript that updates the " - + "corresponding web browser window and to send the script immediately " - + "to browser for execution.

" - + "

The mechanism is fairly complicated, but using the mechanism in " - + "any Millstone application is trivial. Application just needs " - + "to make sure that WebBrowser opens a hidden iframe to location: " - + "?SERVER_COMMANDS=1.

" - + "

See the example of the usage on Demo-tab to get better understanding " - + "of the mechanism. If you read the example's source code, you will notice that " - + "the program does not contain any support for sending events to client, as " - + "it is completely automatic.

"; - } - - protected String getImage() { - return "serverevents.jpg"; - } - -} diff --git a/src/com/itmill/toolkit/demo/features/FeatureTextField.java b/src/com/itmill/toolkit/demo/features/FeatureTextField.java index 68766ea57d..09f6e2b5a9 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTextField.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTextField.java @@ -73,9 +73,9 @@ public class FeatureTextField extends Feature { * @see com.itmill.toolkit.demo.features.Feature#getDescriptionXHTML() */ protected String getDescriptionXHTML() { - return "

Millstone combines the logic of both the single line text-entry field and the multi-line " + return "

TextField combines the logic of both the single line text-entry field and the multi-line " + "text-area into one component. " - + "As with all Data-components of Millstone, the Textfield can also be bound to an " + + "As with all Data-components of IT Mill Toolkit, the TextField can also be bound to an " + "underlying data source, both directly or in a buffered (asynchronous) " + "mode. In buffered mode its background color will change to indicate " + "that the value has changed but is not committed.

" diff --git a/src/com/itmill/toolkit/demo/features/FeatureTree.java b/src/com/itmill/toolkit/demo/features/FeatureTree.java index b832655772..f2d019ea60 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureTree.java +++ b/src/com/itmill/toolkit/demo/features/FeatureTree.java @@ -162,7 +162,7 @@ public class FeatureTree extends Feature implements Action.Handler { protected String getDescriptionXHTML() { return "

A tree is a natural way to represent datasets that have" + " hierarchical relationships, such as filesystems, message " - + "threads or... family trees. Millstone features a versatile " + + "threads or... family trees. IT Mill Toolkit features a versatile " + "and powerful Tree component that works much like the tree components " + "of most modern operating systems.

" + "

The most prominent use of the Tree component is to " diff --git a/src/com/itmill/toolkit/demo/features/FeatureValidators.java b/src/com/itmill/toolkit/demo/features/FeatureValidators.java index ac19f02b48..7a98a1e73c 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureValidators.java +++ b/src/com/itmill/toolkit/demo/features/FeatureValidators.java @@ -40,7 +40,7 @@ public class FeatureValidators extends Feature { protected String getDescriptionXHTML() { return - "

Millstone contains simple, yet powerful validation interface, "+ + "

IT Mill Toolkit contains simple, yet powerful validation interface, "+ "that consists of two parts: Validator and Validatable. Validator is "+ "any class that can check validity of an Object. Validatable is "+ "a class with configurable validation. "+ diff --git a/src/com/itmill/toolkit/demo/features/FeatureWindow.java b/src/com/itmill/toolkit/demo/features/FeatureWindow.java index a08b94afdc..2f14f339a3 100644 --- a/src/com/itmill/toolkit/demo/features/FeatureWindow.java +++ b/src/com/itmill/toolkit/demo/features/FeatureWindow.java @@ -89,7 +89,7 @@ public class FeatureWindow extends Feature { } protected String getDescriptionXHTML() { - return "The window support of Millstone allows for opening and closing windows, " + return "The window support in IT Mill Toolkit allows for opening and closing windows, " + "refreshing one window from another (for asynchronous terminals), " + "resizing windows and scrolling window content. " + "There are also a number of preset window border styles defined by " diff --git a/src/com/itmill/toolkit/demo/features/FeaturesApplication.java b/src/com/itmill/toolkit/demo/features/FeaturesApplication.java index a4951b8326..755444cdf7 100644 --- a/src/com/itmill/toolkit/demo/features/FeaturesApplication.java +++ b/src/com/itmill/toolkit/demo/features/FeaturesApplication.java @@ -34,7 +34,7 @@ public class FeaturesApplication extends com.itmill.toolkit.Application { public void init() { - Window main = new Window("Millstone Features Tour"); + Window main = new Window("IT Mill Toolkit Features Tour"); setMainWindow(main); main.addComponent(new FeatureBrowser()); } diff --git a/src/com/itmill/toolkit/demo/features/PropertyPanel.java b/src/com/itmill/toolkit/demo/features/PropertyPanel.java index b25c66f0f0..be43e81165 100644 --- a/src/com/itmill/toolkit/demo/features/PropertyPanel.java +++ b/src/com/itmill/toolkit/demo/features/PropertyPanel.java @@ -267,7 +267,7 @@ public class PropertyPanel "Those components that have internal state that can be written are settable to readOnly-mode," + " where the object can only be read, not written."); set.getField("componentError").setDescription( - "Millstone supports extensive error reporting. One part of the error reporting are component" + "IT Mill Toolkit supports extensive error reporting. One part of the error reporting are component" + " errors that can be controlled by the programmer. This example only contains couple of " + "sample errors; to get the full picture, read browse ErrorMessage-interface implementors " + "API documentation."); diff --git a/src/com/itmill/toolkit/demo/features/m-bullet-blue.gif b/src/com/itmill/toolkit/demo/features/m-bullet-blue.gif new file mode 100644 index 0000000000..fa6b38b4c9 Binary files /dev/null and b/src/com/itmill/toolkit/demo/features/m-bullet-blue.gif differ diff --git a/src/com/itmill/toolkit/demo/features/millstone-logo.gif b/src/com/itmill/toolkit/demo/features/millstone-logo.gif deleted file mode 100644 index 05da85723e..0000000000 Binary files a/src/com/itmill/toolkit/demo/features/millstone-logo.gif and /dev/null differ -- cgit v1.2.3