1
|
### Eclipse Workspace Patch 1.0
|
2
|
#P web_client_utils
|
3
|
Index: src/com/servoy/plugins/WebClientProvider.java
|
4
|
===================================================================
|
5
|
--- src/com/servoy/plugins/WebClientProvider.java (revision 54)
|
6
|
+++ src/com/servoy/plugins/WebClientProvider.java (working copy)
|
7
|
@@ -1,5 +1,6 @@
|
8
|
package com.servoy.plugins;
|
9
|
|
10
|
+import java.awt.Container;
|
11
|
import java.util.HashMap;
|
12
|
import java.util.List;
|
13
|
import java.util.Map;
|
14
|
@@ -8,15 +9,24 @@
|
15
|
import org.apache.wicket.Component;
|
16
|
import org.apache.wicket.ResourceReference;
|
17
|
import org.apache.wicket.behavior.IBehavior;
|
18
|
+import org.apache.wicket.markup.IMarkupCacheKeyProvider;
|
19
|
+import org.apache.wicket.markup.html.panel.Panel;
|
20
|
import org.mozilla.javascript.Function;
|
21
|
import org.mozilla.javascript.NativeArray;
|
22
|
import org.mozilla.javascript.NativeJavaObject;
|
23
|
import org.mozilla.javascript.Scriptable;
|
24
|
|
25
|
+import com.servoy.j2db.FormController;
|
26
|
+import com.servoy.j2db.IForm;
|
27
|
+import com.servoy.j2db.IFormUIInternal;
|
28
|
import com.servoy.j2db.Messages;
|
29
|
+import com.servoy.j2db.persistence.Form;
|
30
|
import com.servoy.j2db.plugins.IClientPluginAccess;
|
31
|
import com.servoy.j2db.server.headlessclient.IWebClientPluginAccess;
|
32
|
+import com.servoy.j2db.server.headlessclient.WebForm;
|
33
|
+import com.servoy.j2db.ui.IFormUI;
|
34
|
import com.servoy.j2db.ui.IProviderStylePropertyChanges;
|
35
|
+import com.servoy.j2db.ui.runtime.IRuntimeComponent;
|
36
|
|
37
|
/**
|
38
|
* Provider class
|
39
|
@@ -351,6 +361,13 @@
|
40
|
if (element instanceof Component) {
|
41
|
return ((Component) element).getMarkupId();
|
42
|
}
|
43
|
+ else if(element instanceof IForm) {
|
44
|
+ IFormUI form = ((IForm)element).getFormUI();
|
45
|
+ if(form instanceof Panel) {
|
46
|
+ Component child = ((Panel)form).get("servoywebform");
|
47
|
+ return child.getMarkupId();
|
48
|
+ }
|
49
|
+ }
|
50
|
return null;
|
51
|
}
|
52
|
|