diff options
4 files changed, 5 insertions, 114 deletions
diff --git a/src/com/itmill/toolkit/terminal/Identifiable.java b/src/com/itmill/toolkit/terminal/Identifiable.java deleted file mode 100644 index 706b974a7a..0000000000 --- a/src/com/itmill/toolkit/terminal/Identifiable.java +++ /dev/null @@ -1,96 +0,0 @@ -/* ************************************************************************* - - IT Mill Toolkit - - Development of Browser User Interfaces 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.pdf. Use of this product might - require purchasing a commercial license from IT Mill Ltd. For guidelines - on usage, see 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.terminal; - -import java.util.regex.Pattern; - -/** - * <p> - * Interface implemented by all classes that can be identified by Unique User - * Interface Identity (UUID). By default paintable ID's (PIDs) for all UI - * components are generated with a growing sequence number starting from 0. PIDs - * are unique but they are created when UI component is rendered to terminal and - * therefore PIDs may change between subsequent application or session - * initializations. Classes implementing this interface may set fixed PIDs for - * any UI component. - * </p> - * - * @author IT Mill Ltd. - * @version - * @VERSION@ - * @since 4.1.0 - */ -public class Identifiable { - - /** - * Unique user interface identifier (UUID) - */ - private String UIID = null; - - /** - * Valid UUID pattern - */ - private static Pattern validPattern = Pattern.compile("[a-zA-Z0-9_]{1,32}"); - - /** - * Set unique user interface identifier (UUID). This must be unique identity - * string consisting of characters 0-9, a-Z and _ and it's length must be - * from 1 to 32. - * - */ - public void setUIID(String UIID) { - - // check for valid characters - if (!((validPattern.matcher(UIID)).matches())) { - String errMsg = "Ignored setUUID for " + this.getClass() - + " because of invalid value [" + UIID + "], "; - if ((UIID.length() < 1) || (UIID.length() > 32)) { - // TODO change this: warn of invalid UUID - errMsg += "length must be from 1 to 32."; - } else { - errMsg += "invalid characters used."; - } - // TODO change this: warn of invalid UUID - System.err.println(errMsg); - // ignore UUID setting - return; - } - - this.UIID = UIID; - } - - /** - * Get unique user interface identifier (UUID) - * - */ - public String getUIID() { - return UIID; - } - -} diff --git a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java index bacda81236..298b95d2ca 100644 --- a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java +++ b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java @@ -54,7 +54,6 @@ import com.itmill.toolkit.Application; import com.itmill.toolkit.Application.WindowAttachEvent; import com.itmill.toolkit.Application.WindowDetachEvent; import com.itmill.toolkit.terminal.DownloadStream; -import com.itmill.toolkit.terminal.Identifiable; import com.itmill.toolkit.terminal.Paintable; import com.itmill.toolkit.terminal.URIHandler; import com.itmill.toolkit.terminal.Paintable.RepaintRequestEvent; @@ -592,18 +591,9 @@ public class AjaxApplicationManager implements public synchronized String getPaintableId(Paintable paintable) { String id = (String) paintableIdMap.get(paintable); - if (id == null) { - String UIID = null; - // try to get PID using unique user interface identity (UUID) - if (paintable instanceof Identifiable) - UIID = ((Identifiable) paintable).getUIID(); - if (UIID != null) - id = "PID" + UIID; - else { - // UUID not set, get PID using growing sequence number - id = "PID" + Integer.toString(idSequence++); - } - } + if (id == null) + // get PID using growing sequence number + id = "PID" + Integer.toString(idSequence++); paintableIdMap.put(paintable, id); return id; diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java index 91d6465d47..6c453d0a57 100644 --- a/src/com/itmill/toolkit/ui/AbstractComponent.java +++ b/src/com/itmill/toolkit/ui/AbstractComponent.java @@ -52,8 +52,7 @@ import java.lang.reflect.Method; * @VERSION@ * @since 3.0 */ -public abstract class AbstractComponent extends Identifiable implements - Component, MethodEventSource { +public abstract class AbstractComponent implements Component, MethodEventSource { /* Private members ************************************************* */ @@ -920,5 +919,4 @@ public abstract class AbstractComponent extends Identifiable implements public Object getData() { return this.applicationData; } - }
\ No newline at end of file diff --git a/src/com/itmill/toolkit/ui/CustomComponent.java b/src/com/itmill/toolkit/ui/CustomComponent.java index ddbbfcc07a..3aebcfeb6b 100644 --- a/src/com/itmill/toolkit/ui/CustomComponent.java +++ b/src/com/itmill/toolkit/ui/CustomComponent.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.Set; import com.itmill.toolkit.Application; -import com.itmill.toolkit.terminal.Identifiable; import com.itmill.toolkit.terminal.PaintException; import com.itmill.toolkit.terminal.PaintTarget; import com.itmill.toolkit.terminal.Resource; @@ -56,7 +55,7 @@ import com.itmill.toolkit.terminal.VariableOwner; * @VERSION@ * @since 3.0 */ -public class CustomComponent extends Identifiable implements Component { +public class CustomComponent implements Component { /** * The root component implementing the custom component. |