From 9f6cfbce67583dd5c5133d1de5c1fedc58916de0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 22 May 2015 20:38:35 +0300
Subject: [PATCH] Show declarative output for component selected in debug
 window (#17960)

Change-Id: I975eef2f06db4395925f76e40c044078028b0e66
---
 .../debug/internal/HierarchySection.java      | 141 +++++++++++++++---
 .../vaadin/client/debug/internal/Icon.java    |   2 +
 .../client/debug/internal/theme/font.eot      | Bin 7388 -> 7752 bytes
 .../client/debug/internal/theme/font.svg      |   1 +
 .../client/debug/internal/theme/font.ttf      | Bin 7224 -> 7588 bytes
 .../client/debug/internal/theme/font.woff     | Bin 7300 -> 7664 bytes
 .../com/vaadin/client/ui/ui/UIConnector.java  |  13 +-
 server/src/com/vaadin/ui/UI.java              |  29 ++++
 .../shared/ui/ui/DebugWindowServerRpc.java    |  10 ++
 9 files changed, 177 insertions(+), 19 deletions(-)

diff --git a/client/src/com/vaadin/client/debug/internal/HierarchySection.java b/client/src/com/vaadin/client/debug/internal/HierarchySection.java
index c772a9d267..ffb4042e69 100644
--- a/client/src/com/vaadin/client/debug/internal/HierarchySection.java
+++ b/client/src/com/vaadin/client/debug/internal/HierarchySection.java
@@ -66,9 +66,69 @@ public class HierarchySection implements Section {
             "Show used connectors and how to optimize widgetset");
     private final Button showHierarchy = new DebugButton(Icon.HIERARCHY,
             "Show the connector hierarchy tree");
+    private final Button generateDesign = new DebugButton(Icon.SHOW_DESIGN,
+            "Generate a declarative design for the given component sub tree");
 
     private HandlerRegistration highlightModeRegistration = null;
 
+    public interface FindHandler {
+
+        /**
+         * Called when the user hovers over a connector, which is highlighted.
+         * Also called when hovering outside the tree, e.g. over the debug
+         * console, but in this case the connector is null
+         * 
+         * @param connector
+         */
+        void onHover(ComponentConnector connector);
+
+        /**
+         * Called when the user clicks on a highlighted connector.
+         * 
+         * @param connector
+         */
+        void onSelected(ComponentConnector connector);
+
+    }
+
+    private FindHandler inspectComponent = new FindHandler() {
+
+        @Override
+        public void onHover(ComponentConnector connector) {
+            if (connector == null) {
+                infoPanel.clear();
+            } else {
+                printState(connector, false);
+            }
+        }
+
+        @Override
+        public void onSelected(ComponentConnector connector) {
+            stopFind();
+            printState(connector, true);
+        }
+
+    };
+    private FindHandler showComponentDesign = new FindHandler() {
+
+        @Override
+        public void onHover(ComponentConnector connector) {
+            Highlight.showOnly(connector);
+        }
+
+        @Override
+        public void onSelected(ComponentConnector connector) {
+            stopFind();
+            connector.getConnection().getUIConnector()
+                    .showServerDesign(connector);
+            content.setWidget(new HTML(
+                    "Design file for component sent to server log"));
+        }
+
+    };
+
+    private FindHandler activeFindHandler;
+
     public HierarchySection() {
         controls.add(showHierarchy);
         showHierarchy.setStylePrimaryName(VDebugWindow.STYLENAME_BUTTON);
@@ -84,7 +144,7 @@ public class HierarchySection implements Section {
         find.addClickHandler(new ClickHandler() {
             @Override
             public void onClick(ClickEvent event) {
-                toggleFind();
+                toggleFind(inspectComponent);
             }
         });
 
@@ -107,6 +167,17 @@ public class HierarchySection implements Section {
             }
         });
 
+        controls.add(generateDesign);
+        generateDesign.setStylePrimaryName(VDebugWindow.STYLENAME_BUTTON);
+        generateDesign.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                content.setWidget(new HTML(
+                        "Select a layout or component to generate the declarative design"));
+                toggleFind(showComponentDesign);
+            }
+        });
+
         hierarchyPanel.addListener(new SelectConnectorListener() {
             @Override
             public void select(ServerConnector connector, Element element) {
@@ -132,7 +203,8 @@ public class HierarchySection implements Section {
                 + showHierarchy.getTitle() + "<br/>" + find.getHTML() + " "
                 + find.getTitle() + "<br/>" + analyze.getHTML() + " "
                 + analyze.getTitle() + "<br/>" + generateWS.getHTML() + " "
-                + generateWS.getTitle() + "<br/>");
+                + generateWS.getTitle() + "<br/>" + generateDesign.getHTML()
+                + " " + generateDesign.getTitle() + "<br/>");
         info.setStyleName(VDebugWindow.STYLENAME + "-info");
         helpPanel.add(info);
     }
@@ -189,33 +261,62 @@ public class HierarchySection implements Section {
         // NOP
     }
 
+    private boolean isFindMode(FindHandler handler) {
+        return activeFindHandler == handler;
+    }
+
     private boolean isFindMode() {
-        return (highlightModeRegistration != null);
+        return (activeFindHandler != null);
     }
 
-    private void toggleFind() {
+    private void toggleFind(FindHandler handler) {
         if (isFindMode()) {
-            stopFind();
+            // Currently finding something
+            if (isFindMode(handler)) {
+                // Toggle off, stop finding
+                stopFind();
+                return;
+            } else {
+                // Stop finding something else, start finding this
+                stopFind();
+                startFind(handler);
+            }
         } else {
-            startFind();
+            // Not currently finding anything
+            startFind(handler);
         }
     }
 
-    private void startFind() {
+    private void startFind(FindHandler handler) {
+        if (isFindMode()) {
+            stopFind();
+        }
         Highlight.hideAll();
-        if (!isFindMode()) {
-            highlightModeRegistration = Event
-                    .addNativePreviewHandler(highlightModeHandler);
+
+        highlightModeRegistration = Event
+                .addNativePreviewHandler(highlightModeHandler);
+        activeFindHandler = handler;
+        if (handler == inspectComponent) {
             find.addStyleDependentName(VDebugWindow.STYLENAME_ACTIVE);
+        } else if (handler == showComponentDesign) {
+            generateDesign.addStyleDependentName(VDebugWindow.STYLENAME_ACTIVE);
         }
+
     }
 
+    /**
+     * Stop any current find operation, regardless of the handler
+     */
     private void stopFind() {
-        if (isFindMode()) {
-            highlightModeRegistration.removeHandler();
-            highlightModeRegistration = null;
-            find.removeStyleDependentName(VDebugWindow.STYLENAME_ACTIVE);
+        if (!isFindMode()) {
+            return;
         }
+
+        highlightModeRegistration.removeHandler();
+        highlightModeRegistration = null;
+        find.removeStyleDependentName(VDebugWindow.STYLENAME_ACTIVE);
+        generateDesign.removeStyleDependentName(VDebugWindow.STYLENAME_ACTIVE);
+        activeFindHandler = null;
     }
 
     private void printState(ServerConnector connector, boolean serverDebug) {
@@ -244,7 +345,9 @@ public class HierarchySection implements Section {
                 Element eventTarget = WidgetUtil.getElementFromPoint(event
                         .getNativeEvent().getClientX(), event.getNativeEvent()
                         .getClientY());
+
                 if (VDebugWindow.get().getElement().isOrHasChild(eventTarget)) {
+                    // Do not prevent using debug window controls
                     infoPanel.clear();
                     return;
                 }
@@ -258,21 +361,21 @@ public class HierarchySection implements Section {
                                 RootPanel.get(), eventTarget);
                     }
                     if (connector != null) {
-                        printState(connector, false);
+                        activeFindHandler.onHover(connector);
                         event.cancel();
                         event.consume();
                         event.getNativeEvent().stopPropagation();
                         return;
                     }
                 }
-                infoPanel.clear();
+                // Not over any connector
+                activeFindHandler.onHover(null);
             }
             if (event.getTypeInt() == Event.ONCLICK) {
                 Highlight.hideAll();
                 event.cancel();
                 event.consume();
                 event.getNativeEvent().stopPropagation();
-                stopFind();
                 Element eventTarget = WidgetUtil.getElementFromPoint(event
                         .getNativeEvent().getClientX(), event.getNativeEvent()
                         .getClientY());
@@ -286,10 +389,12 @@ public class HierarchySection implements Section {
                     }
 
                     if (connector != null) {
-                        printState(connector, true);
+                        activeFindHandler.onSelected(connector);
                         return;
                     }
                 }
+                // Click on something else -> stop find operation
+                stopFind();
             }
             event.cancel();
         }
diff --git a/client/src/com/vaadin/client/debug/internal/Icon.java b/client/src/com/vaadin/client/debug/internal/Icon.java
index d05eca2f6f..a30dc05fcb 100644
--- a/client/src/com/vaadin/client/debug/internal/Icon.java
+++ b/client/src/com/vaadin/client/debug/internal/Icon.java
@@ -18,6 +18,7 @@ package com.vaadin.client.debug.internal;
 
 public enum Icon {
 
+    // Font can be updated using e.g. http://icomoon.io/
     SEARCH("&#xf002;"), //
     OK("&#xf00c;"), //
     REMOVE("&#xf00d;"), //
@@ -46,6 +47,7 @@ public enum Icon {
     RESET("&#xf021;"), //
     PERSIST("&#xf02e"), //
     TESTBENCH("&#xe600"), //
+    SHOW_DESIGN("&#xf1c9"), //
     ;
 
     private String id;
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.eot b/client/src/com/vaadin/client/debug/internal/theme/font.eot
index cf38942e0a7f779e96391a916fde65f8dc0240b8..0244d9afcca8345e97de4d884ce0a131e8e21e57 100755
GIT binary patch
delta 1324
zcmZuwOKcle6us{=?~P|7&p7@i{$*k(HYg}{VrML>q>0q3C8Yro1yBKrn8dY%Vmmkq
zq*7I@2oR#1wj&BiWrMOTEZRl7U=bk}bO{TJM1+6^UA0nC5fa1+cVcJ9lb+tW=bU?w
zJ$i5F>F>tHGYNpr_*G%^B5h7womy)e-QIHm@HOuFg=%r-<)br$03?R>Zn?O+f~N^U
zd+=1t%jeIHAB8!rEr6cQN~yRgjx1gTh<uB>T|q*A!_gnv#d@GpUE5f^PLcpo^uvYa
z`a<!ApU$Ely@B;qwYV{|0#CrlNbDeC)r!^9XQw^?VvPgH2P^f}HDIVf{5@9(##Wt0
zGI{DQ+uq-XDTW()g8Oh;2f*!dcMP@m$qrmG;P5N*d7Q-|;QUU8>7%=jN%QV;f{qIB
zi`YP%OY|w{3iUW&(&y&VFa!9FNIsnzCPQQ_n;s%r5htmnkX{n>2SVWl$qkO$g=1ul
zF)tZWlCE`(<y~qd7tDrog{(b6a-*&lJA_kaiKbB)cuV^Kj5KH}7`F)5y@dhl!6ISN
zvzov4chJujMhvO>8zS&1(r{}^4f$HHxn1cs`wZiT=23L<*f1=Xq^Ur{(jy|EbIr5|
zTD{CA2-h%&-rs#7C^4nhP3Zk#Hy2blqC^C`4yaZyQn!!uy<k%S>~FCe+kzhaNJDTO
zUWGdT`%pL(^aZ3y^(QmwF<-u5=lVy(p|A|*(nm--<M*Xdm>~VWeqtBwKDWUj;gA#t
z5gFG~=tn|G;kxsa1gF@O#KsXUok<t`?WQJnFf?V@DO2w<&2S6CCay4ra5QF~xhLc;
z>DzgT<lZ#hX+2P+D&m3=Ua4?G5UNtSq^k6cs=murDdMs%$+(az|4nj*JWr&M11jf;
zgiz@(W-J<R)edr+VRj8cmu_b6`Q&XOc0Zxh82@nh8U>6|f^OjD%kHp{f`K=6TsK`M
z<i??bKOpETdo%8I@-s$K#f{t>bTbdH>qL_lUpL180-fWH1o-~LD++*i2==#}N+d`7
zxbu1Bozra#x-<wt0=^=YjFPv>V|t4%vp@Ko{0Bu<E{des5I@Siye|Jy=hQo%W1dg7
zdF_tAp?}dedl1~`yb^t~DREN!)liTy-@y#A-N793dIu|@L$HGd^3Qg#1`+tkeJ<RC
zj2D$QrijZO%n(m>Fh_jB#Z%azKnU+wyFs8Z+rb(>&dsHTdbM7!!4fRs<*VYZL+zzf
zV|A%svqpxqPBs>j9g}l1mO3$8Dz7gW8#twe(d)1bMQHr*l#}(^npG~<N{!-LY0-M)
VyfwX0pTV$U=lxiLFns!n{{TC9;uHV?

delta 982
zcmY*XTSydP6h8lD{+XT0S=*cL)n(W8L6LRWOO|Ob6@rLlH$iYWH8<LIO^xhDUwSJ-
z9qJ+WA$sU3BI+$HmZ0cSBBF<d9+jvdDZ7x_nVpen=KOQM^PO|P`Dgy~s=M4J${~RL
zp=Hs*`-AB|V>#qmK9OG3SM-Abu!<`^md{KtY@~(&2-d>K$;|9D`f32GpjReySI!MT
zN^f9{T+Q|DL}r|Av7Z3`BIY}?NXXB*6XQ1+*Jtx{^CP!N4C5ad&*utbnW6gwD*ypg
zw<n*OZ=HrlxQWC=B%)K9{KRShz0Vl0;U<nu7iQ;xVFp6AW*!&^W1RH%?q#JNyjckj
zBTsPcUeOAm_%!=G_%yQ~;P4K85;Zuuj1Q#62+%fTkS4iVVl2~U;|`ULr*t5fgb7$c
z)wYJl7J}A9+7k^;Bq72i9uu-o(7bMsuO>p!Qu~q}ojnAtoiUxXN-?{woweDC)|5Bl
zOLZnX4v|#SZbJc6${1ylMa5gCM_m_X_hw**#=Uxtq9}xGvRAK)x~Kywr%BOa)xG^)
zb4rq+5+j^(g{kft;rSAnQIVCYL}`T`@mH6!{^~lXv#2^GO?-7aqbx?_o{EkZ5FU-I
zimytqb8Y)sugw$WDm$U;zds2|B*ql3x(Ho2)ddw)3libkv&(P$E&j2_|9BhiL+DEf
z`$wJK-$3K|zX8@Rynpu3@05(CV2Vb-coDojSSe8Pa3b)UG>}u|Hm#*^*%DXz4ZbBc
zOLxUlQ53)AGx8H9qRcC0$63d!dQ~lJMeQYao9{#|FsBoT5>L^+sKWz$APDHlTKl4i
zkJ*?ZuD3BqeA31e_%O2S1;{uo7FMAR#>^?<4rEMC3tO5NwlonRz#>c3N?4*67TDZn
tH(R3TQMdqkTm_girouksS~wnp<2Zqna0zmdff@L}XfxbNf#Ih{{sOAKn<@YR

diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.svg b/client/src/com/vaadin/client/debug/internal/theme/font.svg
index c5a97a6c8b..313645c78f 100755
--- a/client/src/com/vaadin/client/debug/internal/theme/font.svg
+++ b/client/src/com/vaadin/client/debug/internal/theme/font.svg
@@ -33,4 +33,5 @@
 <glyph unicode="&#xf10c;" d="M731.428 448q0 59.428-23.144 113.428t-62.572 93.428-93.428 62.572-113.428 23.142-113.428-23.142-93.43-62.572-62.57-93.428-23.144-113.428 23.144-113.428 62.57-93.428 93.43-62.572 113.428-23.144 113.428 23.144 93.428 62.572 62.572 93.428 23.144 113.428zM877.714 448q0-119.428-58.856-220.286t-159.714-159.714-220.286-58.856-220.286 58.856-159.714 159.714-58.856 220.286 58.856 220.286 159.714 159.714 220.286 58.856 220.286-58.856 159.714-159.714 58.856-220.286z" horiz-adv-x="878" />
 <glyph unicode="&#xf110;" d="M283.428 192q0-34.286-24.286-58.286t-58-24q-34.286 0-58.286 24t-24 58.286 24 58.286 58.286 24q33.714 0 58-24t24.286-58.286zM530.286 82.286q0-30.286-21.428-51.714t-51.714-21.428-51.714 21.428-21.428 51.714 21.428 51.714 51.714 21.428 51.714-21.428 21.428-51.714zM182.856 448q0-37.714-26.856-64.572t-64.57-26.856-64.57 26.856-26.856 64.572 26.856 64.572 64.57 26.856 64.57-26.856 26.856-64.572zM777.144 192q0-26.286-18.856-45.144t-45.144-18.856-45.144 18.856-18.856 45.144 18.856 45.144 45.144 18.856 45.144-18.856 18.856-45.144zM301.714 704q0-41.714-29.428-71.144t-71.144-29.428-71.144 29.428-29.43 71.144 29.43 71.144 71.144 29.428 71.144-29.428 29.428-71.144zM566.856 813.714q0-45.714-32-77.714t-77.714-32-77.714 32-32 77.714 32 77.714 77.714 32 77.714-32 32-77.714zM877.714 448q0-22.856-16-38.856t-38.856-16-38.856 16-16 38.856 16 38.856 38.856 16 38.856-16 16-38.856zM758.856 704q0-18.856-13.428-32.286t-32.286-13.428-32.286 13.428-13.428 32.286 13.428 32.286 32.286 13.428 32.286-13.428 13.428-32.286z" horiz-adv-x="896" />
 <glyph unicode="&#xf111;" d="M877.714 448q0-119.428-58.856-220.286t-159.714-159.714-220.286-58.856-220.286 58.856-159.714 159.714-58.856 220.286 58.856 220.286 159.714 159.714 220.286 58.856 220.286-58.856 159.714-159.714 58.856-220.286z" horiz-adv-x="878" />
+<glyph unicode="&#xf1c9;" d="M838.857 733.714q16-16 27.429-43.429t11.429-50.286v-658.286q0-22.857-16-38.857t-38.857-16h-768q-22.857 0-38.857 16t-16 38.857v914.286q0 22.857 16 38.857t38.857 16h512q22.857 0 50.286-11.429t43.429-27.429zM585.143 873.143v-214.857h214.857q-5.714 16.571-12.571 23.429l-178.857 178.857q-6.857 6.857-23.429 12.571zM804.571 0v585.143h-237.714q-22.857 0-38.857 16t-16 38.857v237.714h-438.857v-877.714h731.429zM274.286 512q4.571 6.286 12 7.143t13.714-3.714l29.143-21.714q6.286-4.571 7.143-12t-3.714-13.714l-104-138.857 104-138.857q4.571-6.286 3.714-13.714t-7.143-12l-29.143-21.714q-6.286-4.571-13.714-3.714t-12 7.143l-129.143 172q-8 10.857 0 21.714zM732.571 340q8-10.857 0-21.714l-129.143-172q-4.571-6.286-12-7.143t-13.714 3.714l-29.143 21.714q-6.286 4.571-7.143 12t3.714 13.714l104 138.857-104 138.857q-4.571 6.286-3.714 13.714t7.143 12l29.143 21.714q6.286 4.571 13.714 3.714t12-7.143zM378.286 76.571q-7.429 1.143-11.714 7.429t-3.143 13.714l78.857 474.857q1.143 7.429 7.429 11.714t13.714 3.143l36-5.714q7.429-1.143 11.714-7.429t3.143-13.714l-78.857-474.857q-1.143-7.429-7.429-11.714t-13.714-3.143z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.ttf b/client/src/com/vaadin/client/debug/internal/theme/font.ttf
index 734e69ac3f2ed7b8f90e248ca6295627f1189539..56ed0cfbfffaaa19a06489445b06570432410d59 100755
GIT binary patch
delta 1351
zcmXw3QD|FL82<lr?mg$`rY1K{Zqg)8o1|?rsI+O4CNkG<A~>q6!&)ap!NxXgCTUXB
z)^#uz6%lbSy5Lk8DALC<WP4~Id?>P)J?euKEMi~W(}t6Ys7>pClJvmI`Tp<!{{K5U
zoO8FH+IYGS2mnra7dWI&zdV|Dce~CJ^Bv8(`K7}0t4F7Y0I-+hy~V=HGOZQ>>!H<H
zEMGi#>?q7q90lmvC>09}Vszm$K<EzTb0s3=_ZsO#dlV0rmR8pnu3;P?OnSIfuFgMG
zc<JY}BnV$8;>1#6eHo6xXB6*H9IX_VieEnO_>W?0fFCYbS5|4GG$J3UJaE49>GtuH
zclq|gHk{xziB|vUa70@`m8jWEx%SFis$S6GH{!F@N&{bG5=YphyNxnt)$%o_h3ge6
zz{V~fY5ajtG#u>3dIF|_jtH}f<OmMqcq%cBDG|YexR5Tiy*_`S4>LpQTz(SAId|ch
z9#_(Fo>kOX#!mS&`BZKKGifEI3L$wa;l`x;Nr`?;`2*?PaZKe#kzdeEcYg3~>HRZQ
zV*_@i9!1UR$`3LJMSW3r*7P?2w!NCp(Jf7HP52&#YAR;TEng2>+ohn@?{;4|9lBFI
zcDtiI&IWvaQD;c_oSJFn2Ae^y2y7X#`+E-rLra?7$nM+SnqbZ_3SU=?X$Ec9t=;~L
z@7r|&aIncMd=q-;_=e$Gcnzv_F8+Yu_V}b2h{cnMaZfg%%f!+Fe?Z!q#3&|`Ue5p}
zCNSoSVJ@HRR|Rei_@!{8NGeG_Mud<;sk6tCy3k?ds0B|X6M1jDs7@7}L`i<qa&}o(
zpa}tsMu0&e+-se>C*&>Z*?CCh{uJA3KG3BhA_7q>l{7?xhSc9P40g&e-q#E%BC?&5
z5g`q2S86(*Mk(Z=p=pGKFxanFZ#dAbw0!CTew9F%(@Ng+$lF5fea@!H{^8zL24th#
z%J9k+)y%Jx;SDE^8!F>hc9fwF*ebI>t-9kcWXW`8xj&>l4=?gWofY12ANvcO8r@ZZ
zA3pj-2QUx8!Di!5FvI$_#y`Oevuz2fOz=S;+(d?Hd<P%1TfEGF*WS{8)D8Wzh>Lac
zlg!F%@?T@t*m6udzA)#^E$6!Po35FbaX&P`X!$X^{@%I^Zgw_=Ac=3kGDdi=gE`?`
z2Wy1aI#{Rgi`~J3_!m0Zgb;kJo|onz#zmPnW`q|zm=m5*_(>9J6kO^gbnw%yYZnOO
zXFAxV$Gp+_Hf+bv6l*KztCi^3ND9tC5o)jk=jn!4sBR2KAf;4l+B3z)wQ`|GJ&I(!
s24yHfO=UvQRV%B}#bTvcE36h5qHkV|PR&=RtJTU#V>g^fPAAj%KUjv|KmY&$

delta 961
zcmY*XOH30{6us{=pU%)3Y^Q~OEENzo21{G01_ezNV>D<aq9i0z5nCdqrJ&XgxNvEV
zGSP+U${1HHjBbn))3|U=j4>`qbO#GG!6<$r;+@VA<IMY<bMCum-g|Q&c0JoO3j_dE
zxDE_rC;E5CwK=T|l?Cj>Be`^8W+l-NK*GpZGwG=U&b0tk##zpcU%NQ?WOxNRYIQfW
zqv;E5o&5v|lri3!ML~MSb>wf6H)nIxrJ;MI5%~|~rSbg8!F2z8-yA^DGVac$O9g0!
zyT~6Sk4~g>qh|t-J|kbmO&l)dr>1eE_=M}NI4}-(Dm^{hSY;DmR)GU3TPNCjqE$d~
zw9*V5t*8MU-s2oc3l1K$m$aEzNYb1qaq}ZdnE~48j>9O-pjon|wT+mQ)Ho(-#OF2q
zbrFIsu`}M8>L%Da7}H3*&}gm0*1?iapgrM>`4g#F=YEoiJ85VjqL2B4MrLK7TZ?)o
zCGVGDkv93XI$4$pS0$h3j(VsICEb$fpyJ*5uIhpyQh^c9xXcu9Q8d<qMFmxf3Y1pW
zp+IdV8>ns2^|Im;RPn2>M_D6nGO9jmP&8Do$bPrh;MoYU9!DprRd+&{e}57w5g3!X
z;vsa|au=yc)esSlnk{`JVCzpa?2oV2x$L9Eq2uTDecwRkc&`A9mp;7wH*Z$V)nI}~
zz}ykKda}Ae!JiO;H>8COko&ZrzGJt!!f)|)VVCeg>=n!6FX^oGT#m>kdC7I&wV>Qk
zmejKP8ndl$q8C_2h_z>~5wE!!s+rZ0+54fO!4U^D#LW)oh)+9M06#K&y$BK(gN+qP
z!iZHU+=YteX=B^d#<r)8ZBN99Fu^vp10p8xb&_q<F*MFY4tpLZU;rzu2vaatWl?B{
gHi((a;ifR0!cYb-!#JdI$$x2P-}V#*hKG*)1<nAOA^-pY

diff --git a/client/src/com/vaadin/client/debug/internal/theme/font.woff b/client/src/com/vaadin/client/debug/internal/theme/font.woff
index a9e6d5576bbe729f4fe20e8545bef6dcd07df060..9f5ed668ecbd33230d4049953c5b2487aec2f054 100755
GIT binary patch
delta 1338
zcmZuxO>7%Q6n^uwGwWR|UdL;1VmpqLICdo<Z4%d3OVU&VQUZ-iLnx{cqQ-IUApaCQ
zp{Z2G0wILj3v@++E6TA#s68adid%2Mfg({MxKJc$)F2QN#0hU~mlGqsoo~MPz4z^`
zX7=4951+Izo|>Hn0yqX9g4v!o+;Q6X;p0}**V}VGU&&nnASKM~s(AV6{Ae-PK#nfq
zTJMHcEMGd0Tp6HmL&ellSS%HCsEJsp$*2$qm)1*2BKIt=6Ds7F+$vR8){w(mxU6F7
zIvFn4@~4&X7bK3WIQ`vOtCCwo<LCig$J=oLKC0#_1>~?Hc~8Zs&w2j2P;0E<hQ9hw
z#}F~raJ^*a#2t2f|27<F7|6D_j<Xu^_Oq=;6vdpvQG6;@6gd2da~gFVZ1)NoqdRxp
zEs|E#Z)Ae@yyV7c)_sw_U?gE4@OzMS(*1(kv0%UsIWaOhI+4j9BZnF5A>-O`GBt)c
zopE=l%~2v;AB!FFWfO18!0+KY9SIJ^2{(JP3F^T`EKbiFf!1Ha0M{7tNh44f_D;C2
z)|C3ByUzNjVsSGpY?B*SCei9=BX$g17}%5E-+dq`v82&U=>1?X7u1XpVSC$5s~?$L
zzp}kxQvmF5vMSqzKHTYJ@D#iPHQY+b2?hPO6eB~!spMgQI-8jsns7pn3{EBwl4L62
zAHl>l8S)R2Og1y93Vg%~N#P?Rr6k!QB!m=7ot`1sB{M@Z*n%Zf$!wrg)Wiygq7*w}
znO@6sTHshX912b(YMs0*<W1?nw~gf99KF|iph;Z}2ts(N#0f#DOYLo4rzds&9j;3;
zAUi2JAf(QJl3XLFh!irRbB;&|o&I1&BTlQ@_Gvoo8Un9rrSAIWEg^P4rgLb&y?c!U
z+Gs&#c=f7k7Sho0hKb{b%7m01X7B}qDzi7Qx|8qGl4{CwZ&Z0cI&;%antRPR^(UAd
zj}^ez?|+~H7>~gIrfY>K=^%HX313|7NKj>f4KetfP%=T@B7e}EtjvDqZ}4w4U0WB!
zVoiK2)AG9fTVK?-JjXnr80U;FbIttByU;cs1h;)_@v`DQ54eL7Z&PAlb;OYa3Fo?)
zA<lF$N4(m_8vZAOT`Z7)zKabA!xeQ|xCfaY%yckCT<l_oc)E)@;>!xZiUk^k@U(Rb
z1SS@`*ueX?v7E0}YPBjXLmrP}1)~PlGlhC%xmJyjj~#+DP=Go#P=E>SGY(^Ls9WW3
zM@F7rC=^%AxjMEj;Jd6s8FEnn-?p>0>Poy=s21wEmBLc|^-J-&d~F`x$J{5PS;Fw6
G#r_3!MBvf@

delta 1007
zcmY*XOH30{6us}gndx)}rr0n2(ok$;AkDN>enG(n)|eO!f+z`5DppFQ6bpvBfelMz
zl!-0~D;KU@$<7c%ShyxGj0+N%uu!8W;wK>9`4Hpuo%hZ?@80ufUhkKl<!<l7rF<R;
z;1gK}*<8Ey3~hYe*07|kC_NM9!YlwO;m$_`i+kG8WMK|9I*hSsqhWIT{%zF800IvT
zjJ_P-D-{d30D^m%(_w(^vtK0?0YY(%TMRh1I9I7WUqh`QV_cy&_LMYFS0)CH#0?aB
z4Gg^)SSc53cyQ<d<G6_wJeet!ivZyWzT`OrSA)+#&sOH<@q_SiJC7k_9O!kVukQrg
zJi;H_gtMp;#PJh13B}pS_u_2qdVz!YxMtCd1Gm0H()t$3=|4%9Gg9!jG`&a%ma<TU
zMRd$1Q)z;um9(qLR-y_~l4uqj3c=y?c>RGG!J(bZc69a<9PNxLB*Qn`W$i3yZ)7x|
z>eo8ejx$8d+GS{9S}`^0A}M21g(jl<16e)9<U!F_uf*MV9iDHYDoyy5fGCQDlN~;#
zKJKPYlw5{HM<vhU581`@0_7Ru7$-8xQx&{lLsbb?2jwX>RsA{(4x2S{Nbt&>B>L->
zCih{GCA_9gP%;mty9b{HN_fUZPI42vYZwVspmLZ9-nwJ`Flg!P>+Fv&Wnce=@$khP
zuG8N^=J2Kgw(op+{ck<m)VsnOje%YcFXYVx3ICQDyd_C8LRM)bea9Yg68DhX=iB&a
zLS9%Cemkx?UWqZWChj<IIya<cX-8g@-(a<IW=u~<PAw^RgpCUdoVS~SA#brchy04o
zdGKRoy|DleYzT`>kb?=M6F4U-hNs0XPm5cg7PmZ+_hW%&YHbKu+-(<Irc-EKfij{3
rGcbY;R)sm3GNU+TAPuUnMH3OYj9Zg%52m4jDgTw}tI<w<I~xBB=!BTH

diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index e7c252f26a..26ccff1191 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -810,6 +810,18 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
                 serverConnector);
     }
 
+    /**
+     * Sends a request to the server to print a design to the console for the
+     * given component.
+     * 
+     * @since
+     * @param connector
+     *            the component connector to output a declarative design for
+     */
+    public void showServerDesign(ServerConnector connector) {
+        getRpcProxy(DebugWindowServerRpc.class).showServerDesign(connector);
+    }
+
     @OnStateChange("theme")
     void onThemeChange() {
         final String oldTheme = activeTheme;
@@ -1061,5 +1073,4 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
     private static Logger getLogger() {
         return Logger.getLogger(UIConnector.class.getName());
     }
-
 }
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 8dd600ddd0..b16d7e32d3 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.ui;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -67,6 +69,7 @@ import com.vaadin.shared.ui.ui.UIConstants;
 import com.vaadin.shared.ui.ui.UIServerRpc;
 import com.vaadin.shared.ui.ui.UIState;
 import com.vaadin.ui.Component.Focusable;
+import com.vaadin.ui.declarative.Design;
 import com.vaadin.util.ConnectorHelper;
 import com.vaadin.util.CurrentInstance;
 
@@ -211,6 +214,32 @@ public abstract class UI extends AbstractSingleComponentContainer implements
                     json.toString());
         }
 
+        @Override
+        public void showServerDesign(Connector connector) {
+            if (!(connector instanceof Component)) {
+                getLogger().severe(
+                        "Tried to output declarative design for " + connector
+                                + ", which is not a component");
+                return;
+            }
+            if (connector instanceof UI) {
+                // We want to see the content of the UI, so we can add it to
+                // another UI or component container
+                connector = ((UI) connector).getContent();
+            }
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            try {
+                Design.write((Component) connector, baos);
+                getLogger().info(
+                        "Design for " + connector
+                                + " requested from debug window:\n"
+                                + baos.toString("UTF-8"));
+            } catch (IOException e) {
+                getLogger().log(Level.WARNING,
+                        "Error producing design for " + connector, e);
+            }
+
+        }
     };
 
     /**
diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java b/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
index cb94a9b081..9ca0a0a1bb 100644
--- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
+++ b/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java
@@ -47,4 +47,14 @@ public interface DebugWindowServerRpc extends ServerRpc {
      */
     public void analyzeLayouts();
 
+    /**
+     * Sends a request to the server to print a design to the console for the
+     * given component.
+     * 
+     * @since
+     * @param connector
+     *            the component connector to output a declarative design for
+     */
+    public void showServerDesign(Connector connector);
+
 }
-- 
2.39.5