From a6effbe1711e15812e69573c937ac5740ea5be5c Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Wed, 30 May 2012 12:55:40 +0400
Subject: [PATCH] EA-36352 - IOOBE: ModelParser.updateComponent

---
 .../android/designer/icons/requestFocus.png   | Bin 0 -> 1603 bytes
 .../android/designer/model/ModelParser.java   |  19 +++++-----
 .../designer/model/RadRequestFocus.java       |  34 ++++++++++++++++++
 .../designer/model/views-meta-model.xml       |   9 +++++
 4 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/icons/requestFocus.png
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/RadRequestFocus.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/icons/requestFocus.png b/plugins/android-designer/src/com/intellij/android/designer/icons/requestFocus.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed239d4b4f9987775f4e2f7cc55ae84fe0c161bf
GIT binary patch
literal 1603
zcmbVMeM}Q)7(XE>3MhWej}F6mU6^sSch^tuq(Iwip-PdJ%1BrSr9I$6dsprbT0xz4
zx+usH9GR|~Y5c<~5dlXCDyX1QW}KPBG3K0Nrp}@GwM}J<?uyiHiSdtJa`(RP^FF`l
z<M%wzZO+b0kC`T#1^_^eDTA;GYi#h1oGg6fA3e7T%L3kz$LBD`yvN3pfY!kjk)X+C
zD<LhU&9SPypG*dT@KVZ}$LE<daXaIZ+JZV#ugfi<0U$Zm>$cg;NFFRAODI|c-8*_5
z0x5?EdQWLa%x*ndN@Y~BWKLC<)m~L*#~e^<3YhH01p_XUw}D=lljd-*1{$}E3;UoL
zhQM(ZzDxtX2rAE<4eA+|1eH=mVn<Xcs8UE#1%fHCL{NsH2#m^LL@hxPT&czp6r6Y<
z!5ix+#w~<#!k2K;K&3qI#$njw@kl*#DZ`e)D28D$B7<cziJ&3jR?)o8E1@}Y$O1uf
zc9wGU6hnhSi?$-Bg4aMoq%Tr%xy|O6hG}ksD1kEAYjeY>6oFl?U|!?e9B(223FDR8
zoOP9(ge@e;RIqlT9>wAiSm5sUj)ICpH24aZ5{hDT5{$jVMbf;9&_KeC)Im7}ijoi%
zRVxs+3{fSaD5j8WwMGKd6NnbmBC3#$S7Bv{&Y&`?<w{JgMo|Nrq?GA&s1i|Pgwd!a
z3?ZzE=6D-zCqsTI!S4iC_F62iXGt5+uvUg~hB_d-l;Ih!lyQUl9HkTm%{Dtl2PMG*
zy~vj!S*ntB7+J;zjx&r?uZRFq{5Ny0POaC=5tUj?s8KDUg(k3$|HB$A1Oo@#<6rF(
z5(zyR+`epn;qY>NNLrW~Rv3<{frrllAgtU(XszBK_?+dN8sD9hGL|o^Ig~bMVB?HU
zI~G}t<~akrDEiYsXt8*Hq$n`g;0LGH>^8)HIrUVXf6_<3G}FA>fi1O2Siu%3W$t>3
zadsOgU2<b!%GKvzRF7(|Vmqr_Kv7+<NGcX*%(!^$ep5ri)_V=9&yo}KqSmfkJ^JXW
zipLiQtV?d*`MqlC!Q8U9o0eVayD|IckqTe!S$*y4S*=6P-PwzuSynb*+LEx1+MB)j
z7>;3GzR~=%1<QS(<u)s?J^phj?C{A44^XnW?7%6yGkj%7XXli-GZ8hXuSflegT8mp
zt~oS#Zu%`23k;5|yVTmZq4H?VkaKSI<nW}p>G!?K>%tzFkA%mkcB1kcHjzu%<|{-Z
z{eC~#kTJhMA^vW|_B0T<GdsQQtyqu@TNt@f2R1DmF6#<Yi&re@Pq=E?uzPUi_B?P>
zcV>e9>yw4R^0uWHe$owBH#Iode^a_)?ePoF1JQei`#wBT{uigJKl9Pk)jjQ0ZDm&a
z-kIEzre)uy_4?CiW*0Qd8_j{-=H{WiQ#&t8;*_GgHAkvDFULIa#wkQG?;o#xqi11H
z{z~nne#fldVI*JeH;=8kS?Tdy-mbjPc0C!0I#Rbf<pM65wYd=Ar8}5wKQH&6Z|&%a
zI6M?x)b@RJ#AqW>VZe4|-Wf<cm>b1*#eH={cC>n|{*2v??`rMtKHt9YTk01c9~i1X
zXG%VC64@hrll(mCI{tCrqHBx8KY2J)8s9E0iui3GTXcnfT(aNFMs4hkij1v2ow&87
z#j-yQYDnsn*Hi2~^wtOB?)DW=ehu91>A1CXY>;~<IRS`g-1Ws|X1apEb(0~BXwem}
F{~IfePg?*0

literal 0
HcmV?d00001

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/ModelParser.java b/plugins/android-designer/src/com/intellij/android/designer/model/ModelParser.java
index c0312cdf44ac..060aa7b71f82 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/ModelParser.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/ModelParser.java
@@ -377,12 +377,7 @@ public class ModelParser extends XmlRecursiveElementVisitor {
   public static void updateRootComponent(RadViewComponent rootComponent,
                                          RenderSession session,
                                          RootView nativeComponent) {
-    List<ViewInfo> views = session.getRootViews();
-    List<RadComponent> children = rootComponent.getChildren();
-    int size = children.size();
-    for (int i = 0; i < size; i++) {
-      updateComponent((RadViewComponent)children.get(i), views.get(i), nativeComponent, 0, 0);
-    }
+    updateChildren(rootComponent, session.getRootViews(), nativeComponent, 0, 0);
 
     rootComponent.setNativeComponent(nativeComponent);
     rootComponent.setBounds(0, 0, nativeComponent.getWidth(), nativeComponent.getHeight());
@@ -407,12 +402,18 @@ public class ModelParser extends XmlRecursiveElementVisitor {
 
     component.setBounds(left, top, Math.max(width, EMPTY_COMPONENT_SIZE), Math.max(height, EMPTY_COMPONENT_SIZE));
 
-    List<ViewInfo> views = view.getChildren();
+    updateChildren(component, view.getChildren(), nativeComponent, left, top);
+  }
+
+  private static void updateChildren(RadViewComponent component, List<ViewInfo> views, RootView nativeComponent, int left, int top) {
     List<RadComponent> children = component.getChildren();
     int size = children.size();
 
-    for (int i = 0; i < size; i++) {
-      updateComponent((RadViewComponent)children.get(i), views.get(i), nativeComponent, left, top);
+    for (int componentIndex = 0, viewIndex = 0; componentIndex < size; componentIndex++) {
+      RadViewComponent childComponent = (RadViewComponent)children.get(componentIndex);
+      if (!(childComponent instanceof RadRequestFocus)) {
+        updateComponent(childComponent, views.get(viewIndex++), nativeComponent, left, top);
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadRequestFocus.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadRequestFocus.java
new file mode 100644
index 000000000000..16553e1f84b5
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadRequestFocus.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model;
+
+import com.intellij.designer.propertyTable.Property;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public class RadRequestFocus extends RadViewComponent {
+  public RadRequestFocus() {
+    super.setProperties(Collections.<Property>emptyList());
+  }
+
+  @Override
+  public void setProperties(List<Property> properties) {
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index ece7ef65ba27..5c36a1947d6a 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -19,6 +19,15 @@
     <palette title="Device Screen (#merge)" icon="/com/intellij/android/designer/icons/DeviceScreen.png"/>
   </meta>
 
+  <meta model="com.intellij.android.designer.model.RadRequestFocus"
+        class="java.lang.Object"
+        tag="requestFocus">
+
+    <palette title="requestFocus" icon="/com/intellij/android/designer/icons/requestFocus.png"
+             tooltip="Requests focus for the parent element or one of its descendants."/>
+
+  </meta>
+
   <meta model="com.intellij.android.designer.model.RadIncludeLayout"
         class="java.lang.Object"
         tag="include">