From 85554b244c6b18aee75d0e24392795e8a0cfb1c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 24 Nov 2022 02:17:12 +0100 Subject: [PATCH] Don't cherry-pick: - upgraded project files for Apache NetBeans IDE 15 - updated jar(s) - got rid of "Company" for opening-times --- lib/jcontacts-lib.jar | Bin 5456 -> 5463 bytes lib/jcoreee.jar | Bin 48061 -> 47956 bytes nbproject/ant-deploy.xml | 22 +++++++++++++++++- nbproject/build-impl.xml | 22 ++++-------------- nbproject/project.properties | 2 +- ...ncialsUserProfileWebRequestController.java | 1 + ...va => FinancialsOpeningTimeConverter.java} | 2 +- 7 files changed, 28 insertions(+), 21 deletions(-) rename src/java/org/mxchange/jfinancials/converter/business/opening_time/{FinancialsCompanyOpeningTimeConverter.java => FinancialsOpeningTimeConverter.java} (97%) diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar index 2625c0716b58383268279ac2cf76f6bdb35b6496..87eb95b5e57c10219e22125028222a11196fd788 100644 GIT binary patch delta 541 zcmcbhbzO@$z?+$ci-CcIfnn~N@`=0}ymQu+hjwU4-YaEbU?`pF6mO$vp=S_pXl|%$ zQ3@iH3=MUSK%|0(e^Fv`PO5@)eo;YwQDRAEex4>T7cUpW$d41RDKdVX_(O~F<78z< z6CfGEXvGY)X!2A>2QYnu(H=}oG1-CW&CyKPnZOKFRs&`*BZFfVgdxiFgaxejkAMZL zDGsI&bC$AKgwfzE>$*oAvNX$!5MODIaEd(eJ z2jXy+0K;2HdB({FB9fD3gm{3qXbQ0KsG)3ti^PR ziGcxxo#8eyFf3`*X9eq*6ETtpDRezmc*>EPfdPd5P!uLj&KHRV+i_k*nu(tWtc_dL Kp6!bONF4x!T#ZZs delta 536 zcmcbvbwP_az?+$ci-CcIfq{uHZ6dD*FC$-C=#%>LmOKUqhP;VR@ur4)26~2O+7`M6 z`Nbu=E~!bGiFvw)DXB?@hNXrI8V~_ZUM^lPgjt^^-c@A$H1WR{KBGODR%EgR(VLT)t}}rdHmnBBU`9U2DhNY{=Lri~Ewi8ns`Dm$2$}-T zt`n3MJq>hjeo?x9fHxzP2s6Y-pC)e*lx2K7`JA8(P}OTeStbd_$%RakKu;qpG7yqw z@&!rAPtFtK0ozn7B+b+T5>n?!RtxgL1)$Vvh-zLYPA!B%K*>;`Bj7+8&JtjF>&VLl zw!oi>15L~N3zJ@zFflNIum@ZV1H+O=Kadu$$=)ImH@y^=X3}5^AV+`;J}E3sAbx!UuLgA{ZQ*i|7tB;D|1!0Y~QP*t!C!#^L=}t{W$0D*_ZE$ z@Ba|C7Zw?e3Sb7l9&GBgW!P>EHkIwnh`SX45a=wZ@J-B}=&kVO_$K5AG`ZU6n=na} z?u?@P$~84r?m2b!{<`|g#&vbInKs3ykYBhue?Dd4NTCktH_33Ly^a)-Mv1kiP|#2k zq34J(#C9LC14k&zGJo6W3R2)#FbNwq;g?ZwMuP$)8WjZaii{>RHYr?ZqZzN7v027z z3T*IOu?1UYG|Sj#VaFCL>}b`{>oVT3;!U(^WV;oy*rB1FGIq(>En|;@1nf0qpNw`( zFQ$GRR_&@N2~LYf_HJ)im^Ci#(SFOs2RtsIF1u$ zyf33i#s{>j#1kq~?g^RMhcZr5p>4W>lZV=Dnr)9D(o zhn?vM;*9jAGtaON)ntepPFar{NLb4KWQ54JV}p()#Iv@Ru|Qqu$GF(V(cC9x<9`jN z-ZlZ+lSReC$z78?b`mCQ*E~hRR7}%EjwW(7k;j56YTcH(m}ka(1(BgWwMQj~j6xN~ zh*wdfiBe50Mm){(FO`^kxufCFEpA=cNrQ5C7oR$W(wWC8Z_pziJXS?g zE7NBUdW?=rE8PfkZXP_hg7KpHp_=CpIr}{#tkEQ@>i2Nv9sR{(nvtY^X=EAjh)qV_ z)@QU(#XyF*q)`ur7$Smh4!GUgd>olwJin&#MLquXv_3HF2lrYMXvd(PszNU54z+|< zNeAht&e>EpB`#Sfn9x) zXIX*1r=vjDjm76(B6}XIGO6plSNvJ5UxRj)!BW1c5-0r=`g6eWwFGG$V8*eiCG zJyJ!|aG8V3hg7;VXr%jLmuOk?$dpM-hP>jtr8@1XOronyv#LjEUA2w!E~xJR{e>Tw z%xh2U-y3v?#M;q%)rSI4A1Nik#w5CZVUAe8jXL|&sBn0$*s_;j%}lyJ>=Dgf`i4HE gOyvh-XjZq0)pjbp=n_{>uqlJuFJ_vyp3zeN3(_aiX#fBK delta 1850 zcmZWpX>b%(5dP-vvTrk)O(ubm&AG#6$cB(Cgb)tF3Wos-ksNZ!wLpYmvb#w(AcsZ- zJRk~5BOss#34$0Bk`3fQ4$B`{ASG5|6+bLWE!3hYz#o>Ng-6cwZ1` zdi%=n;`CkNcy@-xsseUkeQSBWW2j?YYkA4_+BKVf0DSfNiwAp#XAk$}X5?iC{MEtC z$)!unyuM7&^3tUqPmRYI8Yb$$`jVzw^iY#>U7-kzPN^b+T$Q#^r=_q@OkPWQiFL!( z)jM^-d~@jsC50}xC)Zy1yXOp_GZLSx7zCe+5%8PBClRotQiT;&D(0hFB4|gA%6V4V zvD%I`5-+K6z!!I?RZCGyNX2YP*INt6$3z~ai^KpyLRj{^W3ds58jJ}3w!O@XIl2# z@qQ#ez=w7;N*s{*hysP~&~xftVLd3(M8%GAp$5k~MOi?O=qGK5G<=N1)Nf!Kt&3h{ zJEGwe9Hnc~<1L?}nNsv5{g{Rpv}%}&r!^c$8x`n_ly*9-|CtyV7?jL9!~BaohJBVT_cgBa)XRgk%3%Oj5bA{DaNoMzt7NyVX_@lR77E_J+#O7 zq0&#oY$R(aG)0jqijhpu1PYW)+8rpNJAt^lnHa8M)+Ddb=MNg*Wy`om##Apall;D5 z=}W<3Mum6n(o$oszs6YUU0rGftIA538$rKOQ_Wx{7js#;mz`dy@>dvMpD|^6{zL^s zsD4yj$W^Hc*^d)a5Jy=%<02yXyOSBE(6iNDN-9MJXVtp63WeO#TVR2~oo0hXBL;GZ z0UGvUFmnoGunR+26X?$^`2=egjvBIg)?3{Qyddw|mJW#VjeaLw{nW9>v#HRnK z%k5U0(Bc+nA5oE1$M7!`rqH)7ZY8&&b(#`rXm!!KB1wT(x6<|iIOsfsdnTAUM{;nt zGKT7pJE_qdNsVpEbfhIpS;I_$ay-oMs8{Je@4D5CrnO~>ENeK`9re-d#)%@zq?Ni0~2@hd`c+<`|tWgj8{9OqlNJ@Q4HB!)p8qkEoeQ2PS%G{Ry|2 zo*!l#^Cewn=$gVXoia~miyN~^X-(zAIq0cECna@i)N(RaWmoU6 c+q)C#Vo$b6KNzO;roohVs=w{$X7k{G0o>8{(f|Me diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml index 2d5f8778..fdc06d56 100644 --- a/nbproject/ant-deploy.xml +++ b/nbproject/ant-deploy.xml @@ -1,4 +1,24 @@ + @@ -8,7 +28,7 @@ - + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 2306abde..a122b056 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -582,8 +582,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - - + @@ -615,8 +614,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - - + @@ -774,18 +772,6 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - - - - - - - - - - - - @@ -802,8 +788,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f - - + @@ -1443,6 +1428,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/project.properties b/nbproject/project.properties index 1bfc151b..7de2aa3a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -62,7 +62,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7-web -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.enterprise-api.jar:${j2ee.server.home}/modules/javax.security.enterprise.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar +j2ee.platform.classpath=${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.enterprise-api.jar:${j2ee.server.home}/modules/javax.security.enterprise.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar diff --git a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java index 9cda3d4d..3ec4efc5 100644 --- a/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java @@ -43,4 +43,5 @@ public interface FinancialsUserProfileWebRequestController extends Serializable * @return Whether the user's profile is visible */ boolean isProfileLinkVisibleByUser (final User user); + } diff --git a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsOpeningTimeConverter.java similarity index 97% rename from src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java rename to src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsOpeningTimeConverter.java index 866b6c2c..5f813684 100644 --- a/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsCompanyOpeningTimeConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/business/opening_time/FinancialsOpeningTimeConverter.java @@ -33,7 +33,7 @@ import org.mxchange.jfinancials.beans.business.opening_time.list.FinancialsOpeni * @author Roland Häder */ @FacesConverter ("OpeningTimeConverter") -public class FinancialsCompanyOpeningTimeConverter implements Converter { +public class FinancialsOpeningTimeConverter implements Converter { /** * Opening time backing bean -- 2.39.5