### Eclipse Workspace Patch 1.0 #P web_client_utils Index: src/com/servoy/plugins/WebClientProvider.java =================================================================== --- src/com/servoy/plugins/WebClientProvider.java (revision 54) +++ src/com/servoy/plugins/WebClientProvider.java (working copy) @@ -1,5 +1,6 @@ package com.servoy.plugins; +import java.awt.Container; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -8,15 +9,24 @@ import org.apache.wicket.Component; import org.apache.wicket.ResourceReference; import org.apache.wicket.behavior.IBehavior; +import org.apache.wicket.markup.IMarkupCacheKeyProvider; +import org.apache.wicket.markup.html.panel.Panel; import org.mozilla.javascript.Function; import org.mozilla.javascript.NativeArray; import org.mozilla.javascript.NativeJavaObject; import org.mozilla.javascript.Scriptable; +import com.servoy.j2db.FormController; +import com.servoy.j2db.IForm; +import com.servoy.j2db.IFormUIInternal; import com.servoy.j2db.Messages; +import com.servoy.j2db.persistence.Form; import com.servoy.j2db.plugins.IClientPluginAccess; import com.servoy.j2db.server.headlessclient.IWebClientPluginAccess; +import com.servoy.j2db.server.headlessclient.WebForm; +import com.servoy.j2db.ui.IFormUI; import com.servoy.j2db.ui.IProviderStylePropertyChanges; +import com.servoy.j2db.ui.runtime.IRuntimeComponent; /** * Provider class @@ -351,6 +361,13 @@ if (element instanceof Component) { return ((Component) element).getMarkupId(); } + else if(element instanceof IForm) { + IFormUI form = ((IForm)element).getFormUI(); + if(form instanceof Panel) { + Component child = ((Panel)form).get("servoywebform"); + return child.getMarkupId(); + } + } return null; }