From 8b090fe8324d85d6b9b7525ad61e68411301b1a3 Mon Sep 17 00:00:00 2001
From: Jered Ye <87924680+JeredYe@users.noreply.github.com>
Date: Sat, 13 Jan 2024 20:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Common/nbproject/private/private.xml | 4 ---
JuderUI/build/built-jar.properties | 2 +-
JuderUI/config/Config.properties | 38 ++++++++++++++--------------
Judger/nbproject/private/private.xml | 1 +
client/nbproject/private/private.xml | 3 ++-
5 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/Common/nbproject/private/private.xml b/Common/nbproject/private/private.xml
index 087b6dd..92556d0 100644
--- a/Common/nbproject/private/private.xml
+++ b/Common/nbproject/private/private.xml
@@ -4,11 +4,7 @@
- file:/K:/OJ/Common/test/common/LangSelectorTest.java
- file:/K:/OJ/Common/src/common/Const.java
- file:/K:/OJ/Common/src/common/Config.java
file:/K:/OJ/Common/src/common/FileFinder.java
- file:/K:/OJ/Common/src/common/LangSelector.java
diff --git a/JuderUI/build/built-jar.properties b/JuderUI/build/built-jar.properties
index 4bcc77e..d07adbb 100644
--- a/JuderUI/build/built-jar.properties
+++ b/JuderUI/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Sat, 13 Jan 2024 16:01:25 +0800
+#Sat, 13 Jan 2024 20:31:31 +0800
K\:\\OJ\\JuderUI=
diff --git a/JuderUI/config/Config.properties b/JuderUI/config/Config.properties
index e985a5e..6d25171 100644
--- a/JuderUI/config/Config.properties
+++ b/JuderUI/config/Config.properties
@@ -1,26 +1,26 @@
#update config.properties
-#Sat Jan 13 19:30:59 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
+#Sat Jan 13 20:31:33 CST 2024
+srcDir=G\:\\org\\JuderUI\\test
+isCppRelative=true
+relativeJavaCompilerDir=C\:\\Program Files\\Java\\jdk1.8.0_40\\bin
Username=felix
cCompilerDir=C\:\\\u65B0\u5EFA\u6587\u4EF6\u5939
-cppCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin
-distributorIP=106.15.36.190
+ThreadNumber=1
distributorPort=80
exeDir=G\:\\org\\JuderUI\\TMP
-isCppRelative=true
-isJavaRelative=true
-javaCompilerDir=\\\\vmware-host\\Shared Folders\\\u6587\u7A3F\\NetBeansProjects\\oj\\client\\MinGW\\bin
+MinGWDir=C\:\\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
-srcDir=G\:\\org\\JuderUI\\test
+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
diff --git a/Judger/nbproject/private/private.xml b/Judger/nbproject/private/private.xml
index 027eaae..2334df7 100644
--- a/Judger/nbproject/private/private.xml
+++ b/Judger/nbproject/private/private.xml
@@ -10,6 +10,7 @@
file:/K:/OJ/Judger/src/main/Answer.java
+ file:/K:/OJ/Judger/src/kernel/ExeCommand.java
file:/K:/OJ/Judger/src/kernel/Judger.java
file:/K:/OJ/Judger/src/share/gui/NewCompileSetting.java
diff --git a/client/nbproject/private/private.xml b/client/nbproject/private/private.xml
index 606924b..33f7627 100644
--- a/client/nbproject/private/private.xml
+++ b/client/nbproject/private/private.xml
@@ -5,8 +5,9 @@
file:/K:/OJ/client/src/client/service/web/Webservice.java
- file:/K:/OJ/client/src/client/test/Test1.java
+ file:/K:/OJ/client/src/client/view/frame/LoginFrame.java
file:/K:/OJ/client/nbproject/jaxws-build.xml
+ file:/K:/OJ/client/build/generated-sources/jax-ws/edu/dhu/ws/OJWS.java