From 952550586528d537f940ab95bd55f1aea83eefa7 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Sat, 12 Jan 2019 13:33:45 +0100
Subject: [PATCH] dip updated

---
 diylc/diylc-library/lib/diylc-core.jar        | Bin 251309 -> 251309 bytes
 .../electromechanical/DIPSwitch.java          |  63 +++++++++---------
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 251309 -> 251309 bytes
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index c4e6906a7ffee42373a93b7dedadf6895037c5d0..b2770666915994e1d9adf8cef4ab8ed1891258f9 100644
GIT binary patch
delta 4312
zcmY*cd0dX^8t!?XL{v&zh*2Y3VHjbMgcI2#jD}PgTNoT?7GsMu(Wd27?<Z18lC-Gw
zwx}peMQAa$!^jW68HbQzhNSb{_x=8J{&8LR_1xQgKg*ZQjINm(T}`}Z2*b_>2AvEH
zA_JpM2J!uY(W5`fe|4joJ&z33`LO-~LCgg}WkUd-vf%(d_&9)t+!<gG9}N)1dg&sX
z%>FO2u7zWqgBS`fa|wb3<rHH<d?VZdMi>qQ_||Z+ggl*L6bJ0rv8)5gPfQ*ITrvF!
zYPDGn1B^9yGz2W^9*p*6>l}=FYr6??wVj86_3Y2=(XO-4Lk#ZgiT*bn-4M<DuLaa?
z8_;ML88~>h?`n4g4`yI6h3f)*En}QI=#mB)=j|NmkKRp#dLVvuvd5^;27iDeJ%>~q
z0X`W~kIO|PZ4m26%|`tEtM`b#$3|llIj)I_b0@6BCd((aaIBu^XVkKY8yJKe>XOZE
zl=wJdnfHgsGIXBhxg0Tf`U{v#Ub0tz46gRJNBr+Xnm~fjS6J-UH`~yEfv>e0_^%J_
ziuR868`1yO#$*%Fb=!?lKeTf$Vsp?ZOVFER-=Y0fZ;g}wba(*T0}|sge`S&j=6RoD
zi?(H|Gp@U*2}F-{GsFcM1%Nu!tOo!uvg#rG`E07zJ(s@j$NarrKxgNCF{^*&EsP#>
z$q2JgyxarrCDl|V<VqOY*4G}O|GPTekv!XmQ{b<=)c7mFk(+-*R{gJ7MfdS`8<?$k
zXn(rjGsh(T?@z-|+|+a)les*3jrxG!?_+VJXLNW<o>$=d&R5O2{@t4$xc>6bPlWGE
zaQ)PWG+bZM_5k&f?M@wKT{Xanou-Y}J+HjF(@-8WW8K_zD_znnW7W-=>7Wa>!IWKu
za3$WH9RtDLf}Izpa5~cxy;rW2=i`CS;#nVch!xulj%tAoduSpru&Q@t#|04gfvg*n
z`OfT1B>RT4en_&1Gh-yhF3c23^=Q_^&}_fV|GxLrZlB5gJ-9MFl-Z~qUD+@W`Np`h
zLUSN*W-~noMa*MiNO~@0?dW6Y!&*_X^<@{3Jn)xYVB$%wt#{yHdvm3IwoGibf~~=z
zT`SoX^sQRMt|8H{XBkL5HnAuqx3;htbPoK1xucS~m9?UBayv`H5zO4hX2Km*<AYfU
z4a;(O&xxtRz#vJnn8R&V&rqhq?x<`(YlE1AXf^|dSqHQgBRzAXSch>ts;A1>Nff)_
z5c5IToFgn2$<(9F26xN<I15LmIUPPg<}b@+Cy}f@&E8^j0r|`ml?;{5L#4fl4Z?7z
zGS(Z(v<g;bj*oz|r9LKB&MJy47Ixf5aVr*`Rrdy#f{{;dvS&!@Zo~G;dJpe0HzfAI
zv8_lBKVoj?u=Jl6HrW`6!$*ckSAEjXqS5C^!OM}1>BudS%<jw=Avs~ny^*w;^X*8s
zb>}OPJhI^qNIKZ@L2$O!VZHbls08%kosa~6&Nn0ZtskF`#CZ_UL~?g9Z$y$ajN2ip
z9l>`anLC>AKvFlB7a<9E<FAnHn8e2+De>UhSajV~?vF#bHjQr)IJFKJt!;mi5BI+r
zO|4I*FjN0Ei$`LB(Hx$RDNfJhIY1P-lYN!8N;%r7g?u%xeemJIwEbuLnok=kw||)O
zs-4*?5f?-kHOH4vK)2WaT5<2?d@?Hfm0UqGd@YYaa&A2zjfLND;ATjSH*!NHT{rOr
z^vT+yC4Bh<7kGC6+|HNb(xM<f0i2bCyLlZ<dEFkq3tnZlIgUGE8VfylLNfj!?}KD%
zJa53Ej7Z>BsI(p7UZ~7T=J*(^ekt4vmG4veAtaV3cm<MMCwVH89htm4c5xtwtC(k2
zE-!-L5Vg~Jo`Xtp1+TFKCHMjVWP#)rZ^5OlExcnle65aEu{~TK<Y*-^huf*?hN2G^
zs4)^Ml0C+vH@$~G!3i%trE7tq5@{?P)%q^N2VI7k34G|)Vsjy|t8z;@EU0+dN_>lC
zsIB;G8YlyniAnIArUq^hM(F&{O@gk(%Pry}{A{WPTg4rWiry~1$D3!oTX-Q^94!3c
z6O^-i#Tfb6DSz!1?to+V3HS>|3EU?}0lI~XUP}2sF%XPD_KER;14G0_bP5qO01HC|
z{Hdh84G~iTWzatWrGGCaDO5OsQ5lMV0x2Sl5HtIQQRa{^F&&(4hKbpL{laBC5?6%_
zSHRS8u@JB=Tr36jjUX(I5MP6By<d0%uGX-4zgPgaMI`0*jTG{J1S+Q@#Z15tk<|Ir
zD9W1{B{qQGHCn6&{3%+@1FY51Ax10$`{x*{QyW9;4m!%eUPpbG>L{Pp0pSV$eh0*6
zz=i{2KH#8OivKy5`lybjxE^tYYvO3VB#!#)q)?qD3dQFt!WZ&b=*eEC7jwZb){Acd
ztq)S48xIP9u<H+sHGt#eX<iBOq_@Y5??B&pi1Zs84m&JXfF5^PEC+1W&_6*0f?b=S
zefJSD2kgxnRvw}LEfWcsCsJPpiNYKFx+IAyfZj>+uuIHJqWS!tB;YtJlapyZESbKm
zDVgG3j?z5Ck5b>wM`>R@Qs_GqQ)nKaQYf#_F~a;~G!OGs!gU%}rOJyW>wR&Y{6ddY
zz9!9fO{2PzX{0|*qkddZP`$Vlq`x>p-|v=A7@1Dr`8b{Wbv;ROF()bR`AM3KYX;3P
zDue8Y8B}k?DaspqN}f}B4ey+i^N{F}DQ}X*RhjZ!NG#H@OO}k2_R=hwM`Bi%m<;$P
zOLzc|&6ej!;@)hEuhq~phw?7gFeOKxU+MQUhvG(^CjV_3R-BeMTCR7=CBLt8DLye*
z?wiz~<x>5zd4!>P^!<<W=p}H@C)|=R^UJxH<kP%N&d|I9&d|Q6Yxw#M`CYA)FUR}>
z0sr+<f(qz4xm-Y(*jlB_v0SCgm#tx|N<*DdNJ({tbja=(Qc}kv($^JHd{Gf?hG{Wv
z*79On&nPDUmSXaoP(qhAqJ-?bC6w3kEa{uiQe5#_s^7Vk`t&KKk3U*UoBXzvK7L9W
z<<XUq{kV+cT*@hKPdVkgQcmA(agO>~bdLN^oTI$2&ynAl^R&L}JoQzhVfPA}kADTN
zr)k(+LG{N~lD@l=;^ffr`L?=1`jQKzAHP6#-(8^f2^UEZxk#6{@gn7OxJ3P|xkPg<
zy+oI@*JZI7_VK67WZ%9_m(rz5ECXF%B?16jHQTS69<7>cu@dwzYv@rvTtj~CH8eM`
zD|Cr7G&H(Oc7TRwHMFTEeRD1SSX`;4!)JeuF6Y*3!Vl`)yGG|=_;q@O_goiCKySKE
z{f@suaWOZ@@An(DujA?n_iNasp-VmKdo{dUPklQ#P~Be|Xn*P&=p6NFBs;K?=2_TC
Ob2Pb0alSW&*Z%;{(Kt^4

delta 4312
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
AEdT%j

diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/DIPSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/DIPSwitch.java
index 7ac2d6e6..edd1f4b5 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/DIPSwitch.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/DIPSwitch.java
@@ -21,39 +21,38 @@
 */
 package org.diylc.components.electromechanical;
 
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
 
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.Display;
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.components.transform.DIL_ICTransformer;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.Theme;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.annotations.KeywordPolicy;
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.Display;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.common.Orientation;
+import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.transform.DIL_ICTransformer;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.core.annotations.PositiveMeasureValidator;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
 
 @ComponentDescriptor(name = "DIP Switch", author = "Branislav Stojkovic", category = "Electro-Mechanical",
     instanceNamePrefix = "SW", description = "Dual-in-line package switch", stretchable = false,
@@ -503,7 +502,7 @@ public class DIPSwitch extends AbstractTransparentComponent<String> {
 
   public static enum SwitchCount {
 
-    _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
+    _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12;
 
     @Override
     public String toString() {
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index c4e6906a7ffee42373a93b7dedadf6895037c5d0..b2770666915994e1d9adf8cef4ab8ed1891258f9 100644
GIT binary patch
delta 4312
zcmY*cd0dX^8t!?XL{v&zh*2Y3VHjbMgcI2#jD}PgTNoT?7GsMu(Wd27?<Z18lC-Gw
zwx}peMQAa$!^jW68HbQzhNSb{_x=8J{&8LR_1xQgKg*ZQjINm(T}`}Z2*b_>2AvEH
zA_JpM2J!uY(W5`fe|4joJ&z33`LO-~LCgg}WkUd-vf%(d_&9)t+!<gG9}N)1dg&sX
z%>FO2u7zWqgBS`fa|wb3<rHH<d?VZdMi>qQ_||Z+ggl*L6bJ0rv8)5gPfQ*ITrvF!
zYPDGn1B^9yGz2W^9*p*6>l}=FYr6??wVj86_3Y2=(XO-4Lk#ZgiT*bn-4M<DuLaa?
z8_;ML88~>h?`n4g4`yI6h3f)*En}QI=#mB)=j|NmkKRp#dLVvuvd5^;27iDeJ%>~q
z0X`W~kIO|PZ4m26%|`tEtM`b#$3|llIj)I_b0@6BCd((aaIBu^XVkKY8yJKe>XOZE
zl=wJdnfHgsGIXBhxg0Tf`U{v#Ub0tz46gRJNBr+Xnm~fjS6J-UH`~yEfv>e0_^%J_
ziuR868`1yO#$*%Fb=!?lKeTf$Vsp?ZOVFER-=Y0fZ;g}wba(*T0}|sge`S&j=6RoD
zi?(H|Gp@U*2}F-{GsFcM1%Nu!tOo!uvg#rG`E07zJ(s@j$NarrKxgNCF{^*&EsP#>
z$q2JgyxarrCDl|V<VqOY*4G}O|GPTekv!XmQ{b<=)c7mFk(+-*R{gJ7MfdS`8<?$k
zXn(rjGsh(T?@z-|+|+a)les*3jrxG!?_+VJXLNW<o>$=d&R5O2{@t4$xc>6bPlWGE
zaQ)PWG+bZM_5k&f?M@wKT{Xanou-Y}J+HjF(@-8WW8K_zD_znnW7W-=>7Wa>!IWKu
za3$WH9RtDLf}Izpa5~cxy;rW2=i`CS;#nVch!xulj%tAoduSpru&Q@t#|04gfvg*n
z`OfT1B>RT4en_&1Gh-yhF3c23^=Q_^&}_fV|GxLrZlB5gJ-9MFl-Z~qUD+@W`Np`h
zLUSN*W-~noMa*MiNO~@0?dW6Y!&*_X^<@{3Jn)xYVB$%wt#{yHdvm3IwoGibf~~=z
zT`SoX^sQRMt|8H{XBkL5HnAuqx3;htbPoK1xucS~m9?UBayv`H5zO4hX2Km*<AYfU
z4a;(O&xxtRz#vJnn8R&V&rqhq?x<`(YlE1AXf^|dSqHQgBRzAXSch>ts;A1>Nff)_
z5c5IToFgn2$<(9F26xN<I15LmIUPPg<}b@+Cy}f@&E8^j0r|`ml?;{5L#4fl4Z?7z
zGS(Z(v<g;bj*oz|r9LKB&MJy47Ixf5aVr*`Rrdy#f{{;dvS&!@Zo~G;dJpe0HzfAI
zv8_lBKVoj?u=Jl6HrW`6!$*ckSAEjXqS5C^!OM}1>BudS%<jw=Avs~ny^*w;^X*8s
zb>}OPJhI^qNIKZ@L2$O!VZHbls08%kosa~6&Nn0ZtskF`#CZ_UL~?g9Z$y$ajN2ip
z9l>`anLC>AKvFlB7a<9E<FAnHn8e2+De>UhSajV~?vF#bHjQr)IJFKJt!;mi5BI+r
zO|4I*FjN0Ei$`LB(Hx$RDNfJhIY1P-lYN!8N;%r7g?u%xeemJIwEbuLnok=kw||)O
zs-4*?5f?-kHOH4vK)2WaT5<2?d@?Hfm0UqGd@YYaa&A2zjfLND;ATjSH*!NHT{rOr
z^vT+yC4Bh<7kGC6+|HNb(xM<f0i2bCyLlZ<dEFkq3tnZlIgUGE8VfylLNfj!?}KD%
zJa53Ej7Z>BsI(p7UZ~7T=J*(^ekt4vmG4veAtaV3cm<MMCwVH89htm4c5xtwtC(k2
zE-!-L5Vg~Jo`Xtp1+TFKCHMjVWP#)rZ^5OlExcnle65aEu{~TK<Y*-^huf*?hN2G^
zs4)^Ml0C+vH@$~G!3i%trE7tq5@{?P)%q^N2VI7k34G|)Vsjy|t8z;@EU0+dN_>lC
zsIB;G8YlyniAnIArUq^hM(F&{O@gk(%Pry}{A{WPTg4rWiry~1$D3!oTX-Q^94!3c
z6O^-i#Tfb6DSz!1?to+V3HS>|3EU?}0lI~XUP}2sF%XPD_KER;14G0_bP5qO01HC|
z{Hdh84G~iTWzatWrGGCaDO5OsQ5lMV0x2Sl5HtIQQRa{^F&&(4hKbpL{laBC5?6%_
zSHRS8u@JB=Tr36jjUX(I5MP6By<d0%uGX-4zgPgaMI`0*jTG{J1S+Q@#Z15tk<|Ir
zD9W1{B{qQGHCn6&{3%+@1FY51Ax10$`{x*{QyW9;4m!%eUPpbG>L{Pp0pSV$eh0*6
zz=i{2KH#8OivKy5`lybjxE^tYYvO3VB#!#)q)?qD3dQFt!WZ&b=*eEC7jwZb){Acd
ztq)S48xIP9u<H+sHGt#eX<iBOq_@Y5??B&pi1Zs84m&JXfF5^PEC+1W&_6*0f?b=S
zefJSD2kgxnRvw}LEfWcsCsJPpiNYKFx+IAyfZj>+uuIHJqWS!tB;YtJlapyZESbKm
zDVgG3j?z5Ck5b>wM`>R@Qs_GqQ)nKaQYf#_F~a;~G!OGs!gU%}rOJyW>wR&Y{6ddY
zz9!9fO{2PzX{0|*qkddZP`$Vlq`x>p-|v=A7@1Dr`8b{Wbv;ROF()bR`AM3KYX;3P
zDue8Y8B}k?DaspqN}f}B4ey+i^N{F}DQ}X*RhjZ!NG#H@OO}k2_R=hwM`Bi%m<;$P
zOLzc|&6ej!;@)hEuhq~phw?7gFeOKxU+MQUhvG(^CjV_3R-BeMTCR7=CBLt8DLye*
z?wiz~<x>5zd4!>P^!<<W=p}H@C)|=R^UJxH<kP%N&d|I9&d|Q6Yxw#M`CYA)FUR}>
z0sr+<f(qz4xm-Y(*jlB_v0SCgm#tx|N<*DdNJ({tbja=(Qc}kv($^JHd{Gf?hG{Wv
z*79On&nPDUmSXaoP(qhAqJ-?bC6w3kEa{uiQe5#_s^7Vk`t&KKk3U*UoBXzvK7L9W
z<<XUq{kV+cT*@hKPdVkgQcmA(agO>~bdLN^oTI$2&ynAl^R&L}JoQzhVfPA}kADTN
zr)k(+LG{N~lD@l=;^ffr`L?=1`jQKzAHP6#-(8^f2^UEZxk#6{@gn7OxJ3P|xkPg<
zy+oI@*JZI7_VK67WZ%9_m(rz5ECXF%B?16jHQTS69<7>cu@dwzYv@rvTtj~CH8eM`
zD|Cr7G&H(Oc7TRwHMFTEeRD1SSX`;4!)JeuF6Y*3!Vl`)yGG|=_;q@O_goiCKySKE
z{f@suaWOZ@@An(DujA?n_iNasp-VmKdo{dUPklQ#P~Be|Xn*P&=p6NFBs;K?=2_TC
Ob2Pb0alSW&*Z%;{(Kt^4

delta 4312
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
AEdT%j