From 21e462da689766c486d56182bbccdb58e68db6f8 Mon Sep 17 00:00:00 2001 From: servertood Date: Sun, 28 Sep 2008 21:50:36 +0000 Subject: [PATCH] create table field list broken --- extra/jheidi/createTableEvents.ajl | 15 ++++-- extra/jheidi/createTableState.ajl | 10 +--- extra/jheidi/fieldListEvents.ajl | 73 +++++++++++------------------ extra/jheidi/lib/ajl.jar | Bin 245519 -> 245519 bytes 4 files changed, 40 insertions(+), 58 deletions(-) diff --git a/extra/jheidi/createTableEvents.ajl b/extra/jheidi/createTableEvents.ajl index 45255afa..03938304 100644 --- a/extra/jheidi/createTableEvents.ajl +++ b/extra/jheidi/createTableEvents.ajl @@ -171,18 +171,23 @@ ListBox l = context.get("/fields"); ListDataModel model = (ListDataModel)l.getModel(); String fieldName = f.getText(); + if ( fieldName != null ) + { + fieldName = fieldName.trim(); + } - if ( fieldName != null && (fieldName.trim().length() > 0) && - !model.contains(fieldName.trim())) + if ( fieldName != null && (fieldName.length() > 0) && + !model.contains(fieldName)) { model.add(fieldName); - l.setSelectedIndex(model.indexOf(fieldName)); + context.put("addField", true); + l.setSelectedIndex(model.indexOf(fieldName)); //why isnt this firing? } - else if ( fieldName == null || fieldName.trim().length() == 0 ) + else if ( fieldName == null || fieldName.length() == 0 ) { d.popupMessage("Create Table", "Please enter a field name to add."); } - else if ( model.contains(fieldName.trim()) ) + else if ( model.contains(fieldName) ) { d.popupMessage("Create Table", "Field name '" + fieldName.trim() + "' already exists in this table."); } diff --git a/extra/jheidi/createTableState.ajl b/extra/jheidi/createTableState.ajl index 1f4c3c40..df11e0be 100644 --- a/extra/jheidi/createTableState.ajl +++ b/extra/jheidi/createTableState.ajl @@ -4,16 +4,10 @@ HashObject ho = l.getProperty(arg("fieldKey")); - if ( ho == null ) - { - ho = new HashObject(); - l.setProperty(arg("fieldKey"), ho); - } - log.debug("storing props for: " + arg("fieldKey")); //put all values in col map - log.debug("ho:" + ho); + log.debug("ho (before store):" + ho); ho.put("type", ((Combo)context.get("/types")).getText()); ho.put("length", ((Field)context.get("/lengthSet")).getText()); ho.put("default", ((Field)context.get("/defaultValue")).getText()); @@ -25,7 +19,7 @@ ho.put("binary", ((CheckBox)context.get("/binary")).isSelected()); ho.put("unsigned", ((CheckBox)context.get("/unsigned")).isSelected()); ho.put("zeroFill", ((CheckBox)context.get("/zeroFill")).isSelected()); - + log.debug("ho (after store):" + ho); diff --git a/extra/jheidi/fieldListEvents.ajl b/extra/jheidi/fieldListEvents.ajl index 69b600e2..456b881a 100644 --- a/extra/jheidi/fieldListEvents.ajl +++ b/extra/jheidi/fieldListEvents.ajl @@ -5,58 +5,41 @@ String lastSel = l.getProperty("lastSel"); String item = (String)l.getSelectedValue(); + boolean addingNewItem = context.get("addField") != null; + context.put("addField", null); - if ( lastSel == null ) + log.debug("adding new?:" + addingNewItem); + log.debug("curItem:" + item); + log.debug("lastSel:" + lastSel); + + if ( addingNewItem ) { l.setProperty("lastSel", item); HashObject ho = new HashObject(); ho.put("colName", item); l.setProperty(item, ho); } - else + + args().put("fieldKey", addingNewItem? item : lastSel); + script("createTableState", args()); + + l.setProperty("lastSel", item); + HashObject ho = l.getProperty(item); + + if ( ho != null && !item.equals(lastSel) ) { - if ( !lastSel.equals(item) ) - { - args().put("fieldKey", lastSel); - script("createTableState", args()); - - l.setProperty("lastSel", item); - HashObject ho = l.getProperty(item); - log.debug("getting props for: " + item); - if ( ho != null ) - { - log.debug("populating props for: " + item); - ((Combo)context.get("/types")).select(ho.get("type")); - ((Field)context.get("/lengthSet")).setText(ho.get("length")); - ((Field)context.get("/defaultValue")).setText(ho.get("default")); - ((JCheckBox)context.get("/primary")).setSelected((Boolean)ho.getObject("primary")); - ((JCheckBox)context.get("/unique")).setSelected((Boolean)ho.getObject("unique")); - ((JCheckBox)context.get("/index")).setSelected((Boolean)ho.getObject("index")); - ((JCheckBox)context.get("/notNull")).setSelected((Boolean)ho.getObject("notNull")); - ((JCheckBox)context.get("/autoInc")).setSelected((Boolean)ho.getObject("autoInc")); - ((JCheckBox)context.get("/binary")).setSelected((Boolean)ho.getObject("binary")); - ((JCheckBox)context.get("/unsigned")).setSelected((Boolean)ho.getObject("unsigned")); - ((JCheckBox)context.get("/zeroFill")).setSelected((Boolean)ho.getObject("zeroFill")); - } - else - { - log.debug("no props yet for: " + item + " clearing fields setting new props"); - //set the type to clear the fields - ((Combo)context.get("/types")).setProperty("currentCheckState", null); - ((Combo)context.get("/types")).select(((Combo)context.get("/types")).getText()); - l.setProperty(item, new HashObject()); - } - - - - } + log.debug("populating props for: " + item); + ((Combo)context.get("/types")).select(ho.get("type")); + ((Field)context.get("/lengthSet")).setText(ho.get("length")); + ((Field)context.get("/defaultValue")).setText(ho.get("default")); + ((JCheckBox)context.get("/primary")).setSelected((Boolean)ho.getObject("primary")); + ((JCheckBox)context.get("/unique")).setSelected((Boolean)ho.getObject("unique")); + ((JCheckBox)context.get("/index")).setSelected((Boolean)ho.getObject("index")); + ((JCheckBox)context.get("/notNull")).setSelected((Boolean)ho.getObject("notNull")); + ((JCheckBox)context.get("/autoInc")).setSelected((Boolean)ho.getObject("autoInc")); + ((JCheckBox)context.get("/binary")).setSelected((Boolean)ho.getObject("binary")); + ((JCheckBox)context.get("/unsigned")).setSelected((Boolean)ho.getObject("unsigned")); + ((JCheckBox)context.get("/zeroFill")).setSelected((Boolean)ho.getObject("zeroFill")); } - - - - - - - - + \ No newline at end of file diff --git a/extra/jheidi/lib/ajl.jar b/extra/jheidi/lib/ajl.jar index 228b83ad76798ec50cebbcf2ce20928df121a9b1..e2b37825e67936705cbfd41106db5d1a92545355 100644 GIT binary patch delta 5507 zcmZ8kdtA-uA3x9YoYUo0M>j=blEtqQ*=QTK8KY=PrBW$mTVtcf&k|kfuA7s-l}i%3 zNVg;3Zo;q(`?<766o#2>!?an=WY76N&*%K{^LlaKug~+jyg%>HbNR{{QsoS(RNf1T zTq)E3u~AJ);8U483JHQ^8QQLk~xR&em9^t*z<)`Qj-oli4bS zs0M7M&b2hwl(^jDNfKRKc#`*~PaMILtnuQB)g3+^QjW{D^8+5x4%Z-Iwl}fTH29hz zX~ExSb$}AdWS=9!%oqvOdi%`-ns-hk5Ii=&W$O}v5bpjX`16Ea1gRWw~Sp4;B~ zIMj^UiZ}kjYFwx&h;lcP$;@qqD-&srU5Uh8b0*ryg!$Q|Oy#lOsT(;upXSeEn``fP zHq+PvTlEzmE8%7mQE7ZKPV>-_g$sDVr$uk+OATE(y76Ea?KA?Zql&E6XZAg0Rq9G3 z6_UeX%FAg_iA+{yD6CLWIWL#WHSXm~xwPmstnu!8$g^bXz8^x=&#vxb-g%v8c!Nv3hV+;%xCgdZYi||XEb7nh^|HkU_b2jz zjX(Xs2j<;p0V+NEi%2EQlds9Xq#|tA<1E#YeR`U-$4NXy^=uvNuRpwriMHo1x3O8_ zbf+W=R}{orxRgOmG1*-1h{t$H-b3y`7kgsdCiDQi}8SPy&Y+^ieQ}j)q9CCrz#GuXVkV zG`s@SnOg}#Swty@3_~&8@rEgSoe_Cql@RDciHx8`Mrw(O_U33d>r{-eM9Vq6XoU{y zNz7cYRMfAfsa3-J-n8r7Y@!g0N26Sx+T}HLgGnYD+oSPp69rVScWkCHU3$X%BHiy# zDPu8k0=mS5oc@C{c~FZpn!&b%I5-8xau_oW*>PC%HfrKw!86b_TdCiJJ@$w1(E?|Q zu7E;Vw}Vn^_ecHg-~`0AE&74B>Zd2?zcCo1JGoN2QEUX$e9G%dI8yO8(8ox@Hi)QPjVALxXRSqkBc=FhbFbfQ zr}2}Ju=ob8W4e==3FlMMIcc@4!}`1Hw5>9^_AapzThh=|KD3%lG=kSSza1HKg>U4b zajeF%d}PItU{i?hO6R4Z2(?N;JW+&B^N^H1$epQl?ay)Mcj+-v8A>9G&r8rN?lf42 zTzFxpL&({HWeKi94>^bVb?6$B_Ryq}L@Ou{|LdGWL++;@%#V!@XT^q1QR3pdZmm zKD{vy5PuUyyNBoi_x-jHRdM*$FDQ%CH+YP?xb?>;D4h$pb^vYR*2jbB7uKK9`w9(6 zQZ#nsI36EN@BsG=P~c$J-*6v;?nXnIY{*hrT!(DL8wR+`Q0m;{jsEeL^tjg;XgjwR zubX2h&RX9Z-{nI7HVOxE>q0x6&yLV8A72+a4PB(vzC8s8h)OiG$0~NnJ=Q+F7(vBq z!qUT(;D!~V`vkn1Q|p+BpK{phh^Mk=QvBT&ui+J!yJ7lGqPZQ?U@~K*k7Ds)$PHsige}Zo;#9`aLl? z4@-|pwI(T1drGi@Oy(@uZNd)X$FcZN-bZL6e#ApOw_>%I@(1+DK}baKUl_yLjoReB&~d1bYz1Ky}9Np)pp3LAQ>BoUS)U^mnyyjFJXCw z>y`K}>#V&B|ILfFRpWAnbSmG&i``o}*u{JovIc`GMJ0Zke zSmH@a7^MMEV#+BQdyxrT88>g@&0(ewdC48N`w>HKE%GO~xphk*d4>$N$NzkT-fkoq zhmpyG({akIK8P4`|C1qP4u|?-#Dhb>6~utU<>6#3`|KSX_U&m8`kjnlV@JGtHCe^> zj$j#0-jHYu3!@49?~4!{O{O!O7){<`=+9{KE<S?;X0nu_>03wuLwQ?>4?{n1fz`ROuv!uebsxtTDzzs`=(ZmsPnig}-z*uRQ2&UmoOptV1(*ki`bt6RZ7p7IyA{ zz3^}cOmU_fYUimT`zV&~H#3*pAh~V3hTMLhH#g*5!$M7{{;%sJp5G z{F)k|hEfCUmui4Pl@7hoK)#TppoZosJbPx1kR`kk__a1dU87^Ly6hNS2W`jT@C+BB z?kW-XfhdyYjJ<6W=p5Tb!kFz&6DU5T8T2b`1}@K=f!{|hz`3Rc>YB7dY(y(WeA5bk h6WYj1RwJto)a`478uN|=Dg#u|4vE9sLENL%_AkOObj|<( delta 5507 zcmZ8kdtA-uA3x9YoYUo0M>jOI(Hs$BC&1DoVsZ=V7Y%?}AepZn#bdzpQ^{re& z=&IY1Z#Q9T8TN8%jmTw~$u>;8)C_yh_jx|&kDu3z^L~Av&*lAjf1b-%)@xPPYn94p z5s@op+CS6gT%MMra&XlCN(TOqoc=~^_|@H1sYNKaZM5_teAQaPQHPBMX13lDL2`zs+0Rrk6y?~UlZnMlRSmT`lM{(=t61$i*2fT z*wsX12W-_>eXWFBiA1IG-F1$K4lh{913oF7rY|*g@x+#+-L%s+NF7;dt!_W~m{qAg zv{4~B3?{#t`kcsQ6^6n}1(oy4A-Tq*R4JDhorZLMu-!-|`)-&dhqM?|sWxIc%tSk6 zrX7jiPWxF6`ZC#8W0`D(+I5$O#;@_BzO+=9G2(tKt)E8!N=w4-Bx0=gK9j<7^qiT@ z=Vj7y)4V#BapA-9 zJYdU@-}8a_^jUyPPyQlO$0}A$sE7AoMG{R9;oitjtu%WRFzp z$R`p-Pr2r0+Xit~D00FEVw=tvVeI<25eqM#fy> zn^|ZKt8p?HSurHo6rlUkdC4zCEfNq<7ou}KBzZsbU@BezV~qKIdQ4P?l8EA;#pn%p z8Z1FBys*~w8?x!tbRdN|tDE*D zEsyysdIzBtY7vudd=Ih(o>XMk?Zl!SuO#a9H9babPsoK``^ix8KrhPT-mZ7hTbxqx z59kb^p4}tF-vrVAF*?G1zv)929DeyT%HZ@3o}zAU{oxr(%`wd-9JEm1yRGRqT*^u77-K z4Hc^qOAk}LJ64Duh)U=!r~L;-7t;N8?3Y+EOz2+0gpA3R=z4czS)M}T=SG_dt{ZLgbhUR5eW4=EYj8aH&E%mG9xj?um4|ed^iv)>4|RdR)SZxQSTg`|YRotVkCb2Cw`yDRSe*89;bSPDtgtlw8*H^y`%eU(qN3 z@XoIo5_b-bjL0hP8)-_qxYfg)tYOC`az@^hP4sK&p^a{8y;dZd4SQ$*hBdwP%3mm5 z`BH5m(}DD}=_QRNw|Tyg9mz74wCARmR;g-ezCJsdY^re9ii{Al9Eqv;&pV`pC5;@K z+AvI@ci8Pu47s&1fZXNQZ9(J(GSnXb3-x;Y zkYK!mOcI<_?ehfU#n7n) zsAiZ5T?QvY?D0fc9ZV$iS;X8OWFAB5I@Gm;EMzwOoy41=O*?_hnVrDdG6}MT=}=h` z)E(5><|cz*Ml$H~Q!><@lmhJIQlRd)DZq4iD$FA?6%=Ysg$Uy`&?+JgY8+1k&TrDd zZ}Bd$9nzuxU9dVg9VT-i9oRohht>CX!&EbOgYC|4VCtL!eQeHv*p3V`m#Jo)3HxPL zCQM7rglgtlkR?0|RvUCSk`2}TvZ2e0Y?#7dI-7S6^mZ@@@;%j|nS00*1MP{`eme_! zdtfg--UCydsfOA)YRG;^4Xaaf;f&Q-|hi)$WmOvr;d_2j{f-_D1b#O6c3tNFlj zlmL2d6hPtA0{B@J0IM|xU~4UaU13lN3_=Q_u11H9ibyEae_avif3^rBEcXKE)qBZO z=67l@C~Ub8x?H&r>Nf0y2*rNL60{#8YIHVy0Bp++0IRwK5FsyyF8zvuRe3RF9xMi3 z790eda1gjWJP29b4*{$6L!k4IhhPV|ABMVFhat<|!;r@{6m0uS!SRxtE=EZp00u#s^bv5;y6fE zr$eL~vIJGbGtf{C9g!M{^{;{0V>Qqlu7!SsYr%H176zlN0~A(Ama{HT*TFc3)I;6X z_2Ac74>gn;V82WQ3@UW!r3Uhao&Ys8C*avLYk({f4ZyFZ0qPo^gw^FI;W}tN35RE> z2z6JBun$C$gfsTGji7UEBU!<0_ZmU*8BL&HK@)KKvkCZp*bJPjo1v~r3&gHzfrzhL jz;9eDS;cB(w1T>Qtx#kBDL^HF^4lQsiZ&4U1hxGOsViBu