diff --git a/Common/dist/Common.jar b/Common/dist/Common.jar index 5a645a5..44942a2 100644 Binary files a/Common/dist/Common.jar and b/Common/dist/Common.jar differ diff --git a/JuderUI/build/built-jar.properties b/JuderUI/build/built-jar.properties index 6d4efde..4bcc77e 100644 --- a/JuderUI/build/built-jar.properties +++ b/JuderUI/build/built-jar.properties @@ -1,4 +1,4 @@ -#Fri, 12 Jan 2024 23:38:16 +0800 +#Sat, 13 Jan 2024 16:01:25 +0800 K\:\\OJ\\JuderUI= diff --git a/JuderUI/build/classes/cache/ProblemsCachManager.class b/JuderUI/build/classes/cache/ProblemsCachManager.class index 8314bf6..fa4437b 100644 Binary files a/JuderUI/build/classes/cache/ProblemsCachManager.class and b/JuderUI/build/classes/cache/ProblemsCachManager.class differ diff --git a/JuderUI/build/generated-sources/generated-sources1.iml b/JuderUI/build/generated-sources/generated-sources1.iml deleted file mode 100644 index 35d25d4..0000000 --- a/JuderUI/build/generated-sources/generated-sources1.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JuderUI/build/generated/generated1.iml b/JuderUI/build/generated/generated1.iml deleted file mode 100644 index 056329b..0000000 --- a/JuderUI/build/generated/generated1.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/JuderUI/config/Config.properties b/JuderUI/config/Config.properties index 937f0af..a83e44d 100644 --- a/JuderUI/config/Config.properties +++ b/JuderUI/config/Config.properties @@ -1,26 +1,26 @@ #update config.properties -#Fri Jan 12 23:38:08 CST 2024 -srcDir=G\:\\org\\JuderUI\\test -isCppRelative=true -relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin +#Sat Jan 13 15:45:36 CST 2024 +=\=\=\=\=\=\= +<<<<<<<=.mine +>>>>>>>=.r76 +Debug=1 +JavaCompileDir=C\:\\Program Files\\Java\\jdk1.8.0_121\\bin +JavaRelative=3 +MinGWDir=C\:\\MinGW\\bin +MinGWRelative=3 +StartThreadAuto=true +ThreadNumber=1 +URLaddress=10.202.40.190 Username=felix cCompilerDir=C\:\\\u65B0\u5EFA\u6587\u4EF6\u5939 -ThreadNumber=1 +cppCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin +distributorIP=106.15.36.190 distributorPort=80 exeDir=G\:\\org\\JuderUI\\TMP -MinGWDir=C\:\\MinGW\\bin -relativeCCompilerDir=\\MinGW\\bin -distributorIP=106.15.36.190 -JavaRelative=3 ->>>>>>>=.r76 +isCppRelative=true isJavaRelative=true -<<<<<<<=.mine -MinGWRelative=3 -relativeCppCompilerDir=\\MinGW\\bin javaCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin -JavaCompileDir=C\:\\Program Files\\Java\\jdk1.8.0_121\\bin -Debug=1 -URLaddress=10.202.40.190 -StartThreadAuto=true -=\=\=\=\=\=\= -cppCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin +relativeCCompilerDir=\\MinGW\\bin +relativeCppCompilerDir=\\MinGW\\bin +relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin +srcDir=G\:\\org\\JuderUI\\test diff --git a/JuderUI/dist/ICE_JNIRegistry.dll b/JuderUI/dist/ICE_JNIRegistry.dll new file mode 100644 index 0000000..9729f8c Binary files /dev/null and b/JuderUI/dist/ICE_JNIRegistry.dll differ diff --git a/JuderUI/dist/JuderUI.jar b/JuderUI/dist/JuderUI.jar index 4475ba5..caf63dd 100644 Binary files a/JuderUI/dist/JuderUI.jar and b/JuderUI/dist/JuderUI.jar differ diff --git a/JuderUI/dist/dist.zip b/JuderUI/dist/dist.zip new file mode 100644 index 0000000..ecf00bf Binary files /dev/null and b/JuderUI/dist/dist.zip differ diff --git a/JuderUI/dist/lib/Common.jar b/JuderUI/dist/lib/Common.jar index 5a645a5..6d9b549 100644 Binary files a/JuderUI/dist/lib/Common.jar and b/JuderUI/dist/lib/Common.jar differ diff --git a/JuderUI/dist/lib/Judger.bak.jar b/JuderUI/dist/lib/Judger.bak.jar new file mode 100644 index 0000000..aec8312 Binary files /dev/null and b/JuderUI/dist/lib/Judger.bak.jar differ diff --git a/JuderUI/dist/lib/Judger.jar b/JuderUI/dist/lib/Judger.jar index 7ee5700..d682263 100644 Binary files a/JuderUI/dist/lib/Judger.jar and b/JuderUI/dist/lib/Judger.jar differ diff --git a/JuderUI/dist/lib/jna-platform-4.4.0.jar b/JuderUI/dist/lib/jna-platform-4.4.0.jar new file mode 100644 index 0000000..4d60212 Binary files /dev/null and b/JuderUI/dist/lib/jna-platform-4.4.0.jar differ diff --git a/JuderUI/dist/lib/jna.jar b/JuderUI/dist/lib/jna.jar new file mode 100644 index 0000000..33461ec Binary files /dev/null and b/JuderUI/dist/lib/jna.jar differ diff --git a/JuderUI/dist/lib/swt.jar b/JuderUI/dist/lib/swt.jar new file mode 100644 index 0000000..916306b Binary files /dev/null and b/JuderUI/dist/lib/swt.jar differ diff --git a/JuderUI/dist/libatomic-1.dll b/JuderUI/dist/libatomic-1.dll new file mode 100644 index 0000000..3478b3d Binary files /dev/null and b/JuderUI/dist/libatomic-1.dll differ diff --git a/JuderUI/dist/libcharset-1.dll b/JuderUI/dist/libcharset-1.dll new file mode 100644 index 0000000..eb0487f Binary files /dev/null and b/JuderUI/dist/libcharset-1.dll differ diff --git a/JuderUI/dist/libgcc_s_dw2-1.dll b/JuderUI/dist/libgcc_s_dw2-1.dll new file mode 100644 index 0000000..8e7ad66 Binary files /dev/null and b/JuderUI/dist/libgcc_s_dw2-1.dll differ diff --git a/JuderUI/dist/libgcc_s_sjlj-1.dll b/JuderUI/dist/libgcc_s_sjlj-1.dll new file mode 100644 index 0000000..e23e899 Binary files /dev/null and b/JuderUI/dist/libgcc_s_sjlj-1.dll differ diff --git a/JuderUI/dist/libiconv-2.dll b/JuderUI/dist/libiconv-2.dll new file mode 100644 index 0000000..d208113 Binary files /dev/null and b/JuderUI/dist/libiconv-2.dll differ diff --git a/JuderUI/dist/libintl-8.dll b/JuderUI/dist/libintl-8.dll new file mode 100644 index 0000000..245830b Binary files /dev/null and b/JuderUI/dist/libintl-8.dll differ diff --git a/JuderUI/dist/libquadmath-0.dll b/JuderUI/dist/libquadmath-0.dll new file mode 100644 index 0000000..854e42b Binary files /dev/null and b/JuderUI/dist/libquadmath-0.dll differ diff --git a/JuderUI/dist/libssp-0.dll b/JuderUI/dist/libssp-0.dll new file mode 100644 index 0000000..91d03b3 Binary files /dev/null and b/JuderUI/dist/libssp-0.dll differ diff --git a/JuderUI/dist/libstdc++-6.dll b/JuderUI/dist/libstdc++-6.dll new file mode 100644 index 0000000..760c2fc Binary files /dev/null and b/JuderUI/dist/libstdc++-6.dll differ diff --git a/JuderUI/dist/libvtv-0.dll b/JuderUI/dist/libvtv-0.dll new file mode 100644 index 0000000..7940a84 Binary files /dev/null and b/JuderUI/dist/libvtv-0.dll differ diff --git a/JuderUI/dist/libvtv_stubs-0.dll b/JuderUI/dist/libvtv_stubs-0.dll new file mode 100644 index 0000000..3a220e0 Binary files /dev/null and b/JuderUI/dist/libvtv_stubs-0.dll differ diff --git a/JuderUI/dist/libwinpthread-1.dll b/JuderUI/dist/libwinpthread-1.dll new file mode 100644 index 0000000..db8acef Binary files /dev/null and b/JuderUI/dist/libwinpthread-1.dll differ diff --git a/JuderUI/nbproject/private/private.properties b/JuderUI/nbproject/private/private.properties index a4778f1..58ee606 100644 --- a/JuderUI/nbproject/private/private.properties +++ b/JuderUI/nbproject/private/private.properties @@ -1,8 +1,6 @@ compile.on.save=true do.depend=false do.jar=true -file.reference.oscache-2.4.1.jar=K:\\OJ\\Lib\\oscache-2.4.1.jar -file.reference.registry.jar=K:\\OJ\\Lib\\registry.jar javac.debug=true javadoc.preview=true project.Judger=K:\\OJ\\Judger diff --git a/JuderUI/nbproject/project.properties b/JuderUI/nbproject/project.properties index a9d9296..1070184 100644 --- a/JuderUI/nbproject/project.properties +++ b/JuderUI/nbproject/project.properties @@ -38,14 +38,21 @@ file.reference.dom4j-1.6.jar=../Lib/dom4j-1.6.jar file.reference.hibernate3.jar=../Lib/hibernate3.jar file.reference.jdom.jar=../Lib/jdom.jar file.reference.jdom2-2.0.5.jar=../Lib/jdom2-2.0.5.jar +file.reference.jna-platform-4.4.0.jar=../Lib/jna-platform-4.4.0.jar +file.reference.jna.jar=../Lib/jna.jar file.reference.jta.jar=../Lib/jta.jar +file.reference.Judger.bak.jar=../Lib/Judger.bak.jar file.reference.mysql-connector-java-5.1.6-bin.jar=../Lib/mysql-connector-java-5.1.6-bin.jar -file.reference.oscache-2.4.1.jar=F:\\Java\u5f15\u7528\u5305\\oscache-2.4.1.jar -file.reference.registry.jar=G:\\registry-3.1.3\\bin\\registry.jar +file.reference.oscache-2.4.1.jar=../Lib/oscache-2.4.1.jar +file.reference.registry.jar=../Lib/registry.jar +file.reference.swt.jar=../Lib/swt.jar includes=** +jar.archive.disabled=${jnlp.enabled} jar.compress=false +jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.antlr_2.7.6.jar}:\ + ${file.reference.oscache-2.4.1.jar}:\ ${file.reference.asm-all-2.2.3.jar}:\ ${file.reference.cglib-nodep-2.1.3.jar}:\ ${file.reference.commons-collections-2.1.1.jar}:\ @@ -59,7 +66,10 @@ javac.classpath=\ ${file.reference.registry.jar}:\ ${reference.Common.jar}:\ ${reference.Judger.jar}:\ - ${file.reference.oscache-2.4.1.jar} + ${file.reference.jna.jar}:\ + ${file.reference.jna-platform-4.4.0.jar}:\ + ${file.reference.swt.jar}:\ + ${file.reference.Judger.bak.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false @@ -84,7 +94,20 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= main.class=gui.MainFrame +# \u53ef\u4ee5\u9009\u62e9\u8986\u76d6\u9ed8\u8ba4\u7684\u4ee3\u7801\u5e93\u6e05\u5355\u5c5e\u6027, \u7528\u4e8e\u9632\u6b62 RIA \u88ab\u7528\u4f5c\u5176\u4ed6\u7528\u9014 +manifest.custom.codebase= +# \u53ef\u4ee5\u9009\u62e9\u8986\u76d6\u9ed8\u8ba4\u7684\u6743\u9650\u6e05\u5355\u5c5e\u6027 (\u652f\u6301\u7684\u503c: sandbox, all-permissions) +manifest.custom.permissions= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false diff --git a/Judger/build/built-jar.properties b/Judger/build/built-jar.properties new file mode 100644 index 0000000..6909792 --- /dev/null +++ b/Judger/build/built-jar.properties @@ -0,0 +1,6 @@ +#Sat, 13 Jan 2024 16:03:33 +0800 + + +K\:\\OJ\\Judger= + +K\:\\OJ\\Common= diff --git a/Judger/dist/Judger.jar b/Judger/dist/Judger.jar index 5420095..90f966a 100644 Binary files a/Judger/dist/Judger.jar and b/Judger/dist/Judger.jar differ diff --git a/Judger/dist/lib/Common.jar b/Judger/dist/lib/Common.jar index 5a645a5..44942a2 100644 Binary files a/Judger/dist/lib/Common.jar and b/Judger/dist/lib/Common.jar differ diff --git a/Lib/Judger.bak.jar b/Lib/Judger.bak.jar new file mode 100644 index 0000000..aec8312 Binary files /dev/null and b/Lib/Judger.bak.jar differ diff --git a/Lib/swt.jar b/Lib/swt.jar new file mode 100644 index 0000000..916306b Binary files /dev/null and b/Lib/swt.jar differ diff --git a/client/build/built-jar.properties b/client/build/built-jar.properties index f082d61..3863201 100644 --- a/client/build/built-jar.properties +++ b/client/build/built-jar.properties @@ -1,4 +1,4 @@ -#Fri, 12 Jan 2024 20:58:59 +0800 +#Sat, 13 Jan 2024 10:35:51 +0800 K\:\\OJ\\client= diff --git a/clientUpdater/build/classes/.netbeans_automatic_build b/clientUpdater/build/classes/.netbeans_automatic_build deleted file mode 100644 index e69de29..0000000 diff --git a/clientUpdater/build/classes/.netbeans_update_resources b/clientUpdater/build/classes/.netbeans_update_resources deleted file mode 100644 index e69de29..0000000 diff --git a/clientUpdater/build/classes/clientupdater/UpdaterFrame$1.class b/clientUpdater/build/classes/clientupdater/UpdaterFrame$1.class index bcc4e72..2384aac 100644 Binary files a/clientUpdater/build/classes/clientupdater/UpdaterFrame$1.class and b/clientUpdater/build/classes/clientupdater/UpdaterFrame$1.class differ diff --git a/clientUpdater/build/classes/clientupdater/UpdaterFrame$3.class b/clientUpdater/build/classes/clientupdater/UpdaterFrame$3.class index 2b781da..0c555cc 100644 Binary files a/clientUpdater/build/classes/clientupdater/UpdaterFrame$3.class and b/clientUpdater/build/classes/clientupdater/UpdaterFrame$3.class differ diff --git a/clientUpdater/build/classes/clientupdater/UpdaterFrame.class b/clientUpdater/build/classes/clientupdater/UpdaterFrame.class index 3d40078..c1c03f5 100644 Binary files a/clientUpdater/build/classes/clientupdater/UpdaterFrame.class and b/clientUpdater/build/classes/clientupdater/UpdaterFrame.class differ diff --git a/clientUpdater/build/classes/clientupdater/UpdaterFrame.form b/clientUpdater/build/classes/clientupdater/UpdaterFrame.form deleted file mode 100644 index d24fcdf..0000000 --- a/clientUpdater/build/classes/clientupdater/UpdaterFrame.form +++ /dev/null @@ -1,101 +0,0 @@ - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/clientUpdater/dist/clientUpdater.jar b/clientUpdater/dist/clientUpdater.jar index 3f4cb4d..6a9bafb 100644 Binary files a/clientUpdater/dist/clientUpdater.jar and b/clientUpdater/dist/clientUpdater.jar differ diff --git a/clientUpdater/dist/lib/Common.jar b/clientUpdater/dist/lib/Common.jar index 4642743..593c9ff 100644 Binary files a/clientUpdater/dist/lib/Common.jar and b/clientUpdater/dist/lib/Common.jar differ