1

Common/nbproject/private/private.properties

@@ -1,6 +1,9 @@
 compile.on.save=true
 do.depend=false
 do.jar=true
+<<<<<<< HEAD
+=======
+>>>>>>> 9424929ba4fe9afe21ab70bff638a1960335fa7f
 javac.debug=true
 javadoc.preview=true
 user.properties.file=C:\\Users\\tange\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties

JuderUI/build/built-jar.properties

@@ -1,4 +1,4 @@
-#Sat, 13 Jan 2024 16:01:25 +0800
+#Sat, 13 Jan 2024 20:50:26 +0800
 
 
 K\:\\OJ\\JuderUI=

JuderUI/config/Config.properties

@@ -1,26 +1,26 @@
 #update config.properties
-#Sat Jan 13 19:30:59 CST 2024
+#Sat Jan 13 20:50:27 CST 2024
-=\=\=\=\=\=\=
+srcDir=G\:\\org\\JuderUI\\test
-<<<<<<<=.mine
+isCppRelative=true
->>>>>>>=.r76
+relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin
-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
-cppCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin
+ThreadNumber=1
-distributorIP=106.15.36.190
 distributorPort=80
 exeDir=G\:\\org\\JuderUI\\TMP
-isCppRelative=true
+MinGWDir=C\:\\MinGW\\bin
-isJavaRelative=true
-javaCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin
 relativeCCompilerDir=\\MinGW\\bin
+distributorIP=106.15.36.190
+JavaRelative=3
+>>>>>>>=.r76
+isJavaRelative=true
+<<<<<<<=.mine
+MinGWRelative=3
 relativeCppCompilerDir=\\MinGW\\bin
-relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin
+javaCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin
-srcDir=G\:\\org\\JuderUI\\test
+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

JuderUI/nbproject/private/private.properties

@@ -3,5 +3,5 @@ do.depend=false
 do.jar=true
 javac.debug=true
 javadoc.preview=true
-project.Judger=D:\\SchoolStudy\\ojrepull\\DHUOJ\\Judger
+project.Judger=K:\\OJ\\Judger
 user.properties.file=C:\\Users\\tange\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties

Judger/build/built-jar.properties

@@ -1,6 +0,0 @@
-#Sat, 13 Jan 2024 16:03:33 +0800
-
-
-K\:\\OJ\\Judger=
-
-K\:\\OJ\\Common=

Judger/nbproject/private/private.properties

@@ -1,6 +1,12 @@
 compile.on.save=true
 do.depend=false
 do.jar=true
+<<<<<<< HEAD
+=======
+file.reference.jna-platform-4.4.0.jar=D:\\SchoolStudy\\ojrepull\\DHUOJ\\Lib\\jna-platform-4.4.0.jar
+file.reference.jna.jar=D:\\SchoolStudy\\ojrepull\\DHUOJ\\Lib\\jna.jar
+file.reference.registry.jar=D:\\SchoolStudy\\ojrepull\\DHUOJ\\Lib\\registry.jar
+>>>>>>> 9424929ba4fe9afe21ab70bff638a1960335fa7f
 javac.debug=true
 javadoc.preview=true
 user.properties.file=C:\\Users\\tange\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties

Judger/nbproject/project.properties

@@ -42,10 +42,8 @@ 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-1=../Lib/jna-platform-4.4.0.jar
+file.reference.jna-platform-4.4.0.jar-2=../Lib/jna-platform-4.4.0.jar
-file.reference.jna-platform-4.4.0.jar-2=..\\Lib\\jna-platform-4.4.0.jar
+file.reference.jna.jar-2=../Lib/jna.jar
-file.reference.jna.jar-1=../Lib/jna.jar
-file.reference.jna.jar-2=..\\Lib\\jna.jar
 file.reference.jta.jar=../Lib/jta.jar
 file.reference.mysql-connector-java-5.1.6-bin.jar=../Lib/mysql-connector-java-5.1.6-bin.jar
 file.reference.registry.jar-1=..\\Lib\\registry-3.1.3\\bin\\registry.jar
@@ -65,9 +63,9 @@ javac.classpath=\
     ${file.reference.jdom2-2.0.5.jar}:\
     ${file.reference.jta.jar}:\
     ${file.reference.mysql-connector-java-5.1.6-bin.jar}:\
-    ${file.reference.jna-platform-4.4.0.jar-1}:\
-    ${file.reference.jna.jar-1}:\
     ${reference.Common.jar}:\
+    ${file.reference.jna.jar-2}:\
+    ${file.reference.jna-platform-4.4.0.jar-2}:\
     ${file.reference.jna-platform-4.4.0.jar-2}:\
     ${file.reference.jna.jar-2}:\
     ${file.reference.registry.jar-1}

client/build/built-jar.properties

@@ -1,10 +1,14 @@
+<<<<<<< Updated upstream
 #Sat, 13 Jan 2024 21:07:07 +0800
+=======
+#Sat, 13 Jan 2024 20:52:16 +0800
+>>>>>>> Stashed changes
 
 
-D\:\\SchoolStudy\\ojrepull\\DHUOJ\\client=
+K\:\\OJ\\client=
 
-D\:\\SchoolStudy\\ojrepull\\DHUOJ\\Common=
+K\:\\OJ\\Common=
 
-D\:\\SchoolStudy\\ojrepull\\DHUOJ\\Judger=
+K\:\\OJ\\Judger=
 
-D\:\\SchoolStudy\\ojrepull\\DHUOJ\\clientUpdater=
+K\:\\OJ\\clientUpdater=

client/nbproject/genfiles.properties

@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.80.1.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=7c720cd6
-nbproject/build-impl.xml.script.CRC32=1384de55
+nbproject/build-impl.xml.script.CRC32=81946d2f
-nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.106.0.48
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

client/nbproject/project.properties

@@ -267,11 +267,11 @@ javac.classpath=\
     ${file.reference.xsdlib-2010.1.jar}:\
     ${file.reference.swt.jar}:\
     ${reference.Common.jar}:\
-    ${reference.Judger.jar}:\
     ${file.reference.registry.jar}:\
     ${file.reference.rsyntaxtextarea.jar}:\
     ${reference.clientUpdater.jar}:\
-    ${file.reference.junit-4.12.jar}
+    ${file.reference.junit-4.12.jar}:\
+    ${reference.Judger.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false