diff --git a/Common/dist/Common.jar b/Common/dist/Common.jar index 44942a2..be2d03d 100644 Binary files a/Common/dist/Common.jar and b/Common/dist/Common.jar differ diff --git a/JuderUI/nbproject/private/private.properties b/JuderUI/nbproject/private/private.properties index 58ee606..593ef09 100644 --- a/JuderUI/nbproject/private/private.properties +++ b/JuderUI/nbproject/private/private.properties @@ -3,5 +3,5 @@ do.depend=false do.jar=true javac.debug=true javadoc.preview=true -project.Judger=K:\\OJ\\Judger +project.Judger=D:\\SchoolStudy\\ojrepull\\DHUOJ\\Judger user.properties.file=C:\\Users\\tange\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties diff --git a/Judger/dist/Judger.jar b/Judger/dist/Judger.jar index 90f966a..e322e92 100644 Binary files a/Judger/dist/Judger.jar and b/Judger/dist/Judger.jar differ diff --git a/client/build/built-jar.properties b/client/build/built-jar.properties index 27de08f..970722c 100644 --- a/client/build/built-jar.properties +++ b/client/build/built-jar.properties @@ -1,10 +1,10 @@ -#Sat, 13 Jan 2024 19:28:41 +0800 +#Sat, 13 Jan 2024 20:25:29 +0800 -K\:\\OJ\\client= +D\:\\SchoolStudy\\ojrepull\\DHUOJ\\client= -K\:\\OJ\\Common= +D\:\\SchoolStudy\\ojrepull\\DHUOJ\\Common= -K\:\\OJ\\Judger= +D\:\\SchoolStudy\\ojrepull\\DHUOJ\\Judger= -K\:\\OJ\\clientUpdater= +D\:\\SchoolStudy\\ojrepull\\DHUOJ\\clientUpdater= diff --git a/client/build/classes/client/util/Config.class b/client/build/classes/client/util/Config.class index 2d4253f..8752aaf 100644 Binary files a/client/build/classes/client/util/Config.class and b/client/build/classes/client/util/Config.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$1.class b/client/build/classes/client/view/frame/LoginFrame$1.class index 0915e63..36923b9 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$1.class and b/client/build/classes/client/view/frame/LoginFrame$1.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$2.class b/client/build/classes/client/view/frame/LoginFrame$2.class index 8d666ff..318879c 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$2.class and b/client/build/classes/client/view/frame/LoginFrame$2.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$3.class b/client/build/classes/client/view/frame/LoginFrame$3.class index eb04090..70baf05 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$3.class and b/client/build/classes/client/view/frame/LoginFrame$3.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$4.class b/client/build/classes/client/view/frame/LoginFrame$4.class index 04b6998..390a8bc 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$4.class and b/client/build/classes/client/view/frame/LoginFrame$4.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$5.class b/client/build/classes/client/view/frame/LoginFrame$5.class index 790a033..ec59fa6 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$5.class and b/client/build/classes/client/view/frame/LoginFrame$5.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$6.class b/client/build/classes/client/view/frame/LoginFrame$6.class index e0130c8..d9daad9 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$6.class and b/client/build/classes/client/view/frame/LoginFrame$6.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$7.class b/client/build/classes/client/view/frame/LoginFrame$7.class index de19a55..b905e12 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$7.class and b/client/build/classes/client/view/frame/LoginFrame$7.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame$8.class b/client/build/classes/client/view/frame/LoginFrame$8.class index 64852e0..e74ae5a 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame$8.class and b/client/build/classes/client/view/frame/LoginFrame$8.class differ diff --git a/client/build/classes/client/view/frame/LoginFrame.class b/client/build/classes/client/view/frame/LoginFrame.class index 074d0ab..9aee178 100644 Binary files a/client/build/classes/client/view/frame/LoginFrame.class and b/client/build/classes/client/view/frame/LoginFrame.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$1.class b/client/build/classes/client/view/frame/MainFrame$1.class index 2342147..66f9729 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$1.class and b/client/build/classes/client/view/frame/MainFrame$1.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$10.class b/client/build/classes/client/view/frame/MainFrame$10.class index ccb6c15..da78540 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$10.class and b/client/build/classes/client/view/frame/MainFrame$10.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$11.class b/client/build/classes/client/view/frame/MainFrame$11.class index 954f154..629c25c 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$11.class and b/client/build/classes/client/view/frame/MainFrame$11.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$12.class b/client/build/classes/client/view/frame/MainFrame$12.class index 45ee34d..33675bf 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$12.class and b/client/build/classes/client/view/frame/MainFrame$12.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$2.class b/client/build/classes/client/view/frame/MainFrame$2.class index dc2e65d..25e4de4 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$2.class and b/client/build/classes/client/view/frame/MainFrame$2.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$3.class b/client/build/classes/client/view/frame/MainFrame$3.class index 0926c6a..fd69d84 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$3.class and b/client/build/classes/client/view/frame/MainFrame$3.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$4.class b/client/build/classes/client/view/frame/MainFrame$4.class index 3c20378..9c6ff95 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$4.class and b/client/build/classes/client/view/frame/MainFrame$4.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$5.class b/client/build/classes/client/view/frame/MainFrame$5.class index 02c0d54..c8f9318 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$5.class and b/client/build/classes/client/view/frame/MainFrame$5.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$6.class b/client/build/classes/client/view/frame/MainFrame$6.class index 11e2c8f..751ae72 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$6.class and b/client/build/classes/client/view/frame/MainFrame$6.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$7.class b/client/build/classes/client/view/frame/MainFrame$7.class index 63169e1..0dba6af 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$7.class and b/client/build/classes/client/view/frame/MainFrame$7.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$8.class b/client/build/classes/client/view/frame/MainFrame$8.class index d36b1db..cd25556 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$8.class and b/client/build/classes/client/view/frame/MainFrame$8.class differ diff --git a/client/build/classes/client/view/frame/MainFrame$9.class b/client/build/classes/client/view/frame/MainFrame$9.class index 38f7439..c0f7697 100644 Binary files a/client/build/classes/client/view/frame/MainFrame$9.class and b/client/build/classes/client/view/frame/MainFrame$9.class differ diff --git a/client/build/classes/client/view/frame/MainFrame.class b/client/build/classes/client/view/frame/MainFrame.class index 4b2329e..7e24cf7 100644 Binary files a/client/build/classes/client/view/frame/MainFrame.class and b/client/build/classes/client/view/frame/MainFrame.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$1.class b/client/build/classes/client/view/panel/CodePanel$1.class index 6f99400..6786ea7 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$1.class and b/client/build/classes/client/view/panel/CodePanel$1.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$2.class b/client/build/classes/client/view/panel/CodePanel$2.class index 366bfad..43f059f 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$2.class and b/client/build/classes/client/view/panel/CodePanel$2.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$3.class b/client/build/classes/client/view/panel/CodePanel$3.class index 8a795e9..4e79f4b 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$3.class and b/client/build/classes/client/view/panel/CodePanel$3.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$4.class b/client/build/classes/client/view/panel/CodePanel$4.class index 607cf88..fb909a5 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$4.class and b/client/build/classes/client/view/panel/CodePanel$4.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$5.class b/client/build/classes/client/view/panel/CodePanel$5.class index 36d0700..24a610d 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$5.class and b/client/build/classes/client/view/panel/CodePanel$5.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$6.class b/client/build/classes/client/view/panel/CodePanel$6.class index 8249b65..6a53998 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$6.class and b/client/build/classes/client/view/panel/CodePanel$6.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$7.class b/client/build/classes/client/view/panel/CodePanel$7.class index df7d692..b0eb3a3 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$7.class and b/client/build/classes/client/view/panel/CodePanel$7.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$Timers$1.class b/client/build/classes/client/view/panel/CodePanel$Timers$1.class index 44abe03..32bc050 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$Timers$1.class and b/client/build/classes/client/view/panel/CodePanel$Timers$1.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$Timers$2.class b/client/build/classes/client/view/panel/CodePanel$Timers$2.class index 6aa8ef6..e68b1d2 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$Timers$2.class and b/client/build/classes/client/view/panel/CodePanel$Timers$2.class differ diff --git a/client/build/classes/client/view/panel/CodePanel$Timers.class b/client/build/classes/client/view/panel/CodePanel$Timers.class index ab530fb..afe38bb 100644 Binary files a/client/build/classes/client/view/panel/CodePanel$Timers.class and b/client/build/classes/client/view/panel/CodePanel$Timers.class differ diff --git a/client/build/classes/client/view/panel/CodePanel.class b/client/build/classes/client/view/panel/CodePanel.class index 5ac0790..39fd8c3 100644 Binary files a/client/build/classes/client/view/panel/CodePanel.class and b/client/build/classes/client/view/panel/CodePanel.class differ diff --git a/client/config/Config.properties b/client/config/Config.properties index 2d72e84..ed4d6b9 100644 --- a/client/config/Config.properties +++ b/client/config/Config.properties @@ -1,14 +1,14 @@ -#update Config.properties -#Sat Jan 13 19:28:55 CST 2024 +#update config/config.properties +#Sat Jan 13 20:25:41 CST 2024 isCppRelative=true isJavaRelative=true Username=felix -MinGWDir=C\:\\Program Files (x86)\\CodeBlocks\\MinGW\\bin +MinGWDir=D\:\\SchoolStudy\\OJ_netbeans\\OJ\\client\\MinGW\\bin URLip=106.15.36.190 relativeCCompilerDir=\\MinGW\\bin JavaRelative=-1 JavaCompileDir= Debug=1 -MinGWRelative=2 +MinGWRelative=1 relativeCppCompilerDir=\\MinGW\\bin URLport=80 diff --git a/client/log/exception/20240112.log b/client/log/exception/20240112.log deleted file mode 100644 index b55e150..0000000 --- a/client/log/exception/20240112.log +++ /dev/null @@ -1,3 +0,0 @@ -20:59:06 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null -20:59:06 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null -20:59:06 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null diff --git a/client/log/exception/20240113.log b/client/log/exception/20240113.log index 77bb8bb..d2a4a5f 100644 --- a/client/log/exception/20240113.log +++ b/client/log/exception/20240113.log @@ -1,3 +1,24 @@ -19:28:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null -19:28:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null -19:28:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +01:52:18 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +01:52:18 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +01:52:18 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:08:36 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:08:36 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:08:36 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:17:42 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:17:42 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:17:42 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:23:13 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:23:13 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +02:23:13 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +08:59:46 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +08:59:46 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +08:59:46 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:26:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:26:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:26:53 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:47:54 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:47:54 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +09:47:54 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +20:25:39 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +20:25:39 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null +20:25:39 class java.io.FileNotFoundExceptionhttp://106.15.36.190:80/oj/SoftwareVersionMAction!DownLoad.action?versionId=null diff --git a/client/log/info/20240112.log b/client/log/info/20240112.log deleted file mode 100644 index e69de29..0000000 diff --git a/client/nbproject/private/private.properties b/client/nbproject/private/private.properties index d5348bf..b613d5f 100644 --- a/client/nbproject/private/private.properties +++ b/client/nbproject/private/private.properties @@ -3,4 +3,4 @@ do.depend=false do.jar=true javac.debug=true javadoc.preview=true -user.properties.file=C:\\Users\\tange\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties +user.properties.file=C:\\Users\\dell\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties diff --git a/client/nbproject/private/private.xml b/client/nbproject/private/private.xml index 606924b..cd01ed1 100644 --- a/client/nbproject/private/private.xml +++ b/client/nbproject/private/private.xml @@ -3,10 +3,6 @@ - - file:/K:/OJ/client/src/client/service/web/Webservice.java - file:/K:/OJ/client/src/client/test/Test1.java - file:/K:/OJ/client/nbproject/jaxws-build.xml - + diff --git a/client/src/client/util/Config.java b/client/src/client/util/Config.java index 4fcf380..2e83358 100644 --- a/client/src/client/util/Config.java +++ b/client/src/client/util/Config.java @@ -63,7 +63,7 @@ public class Config { public static void save(){ try { FileOutputStream fos = new FileOutputStream(common.FileFinder.findFile("config/config.properties")); - prop.store(fos, "update Config.properties"); + prop.store(fos, "update config/config.properties"); fos.close(); } catch (FileNotFoundException ex) { Logger.getLogger(Config.class.getName()).log(Level.SEVERE, null, ex); diff --git a/client/src/client/view/frame/LoginFrame.java b/client/src/client/view/frame/LoginFrame.java index f989842..7f06c04 100644 --- a/client/src/client/view/frame/LoginFrame.java +++ b/client/src/client/view/frame/LoginFrame.java @@ -31,6 +31,7 @@ import java.util.List; import javax.xml.namespace.QName; import org.apache.cxf.endpoint.Client; import org.apache.cxf.service.factory.ServiceConstructionException; + /** * * @author ytxlo diff --git a/client/src/client/view/frame/MainFrame.java b/client/src/client/view/frame/MainFrame.java index c21e1f4..a697414 100644 --- a/client/src/client/view/frame/MainFrame.java +++ b/client/src/client/view/frame/MainFrame.java @@ -86,9 +86,9 @@ public class MainFrame extends JFrame implements ColorChange { private JPanel NorthPanel; private JLabel jl_south; - private JMenu JM_CompileInfo; - private JMenuItem cCPlus_CompileInfo; - private JMenuItem java_CompileInfo; +// private JMenu JM_CompileInfo; +// private JMenuItem cCPlus_CompileInfo; +// private JMenuItem java_CompileInfo; private JMenuItem JM_return; private JMenuItem JM_UpdateProblem; private JMenuItem JM_UpdateStatus; @@ -150,8 +150,10 @@ public class MainFrame extends JFrame implements ColorChange { this.TP_Main = new JTabbedPane(); this.JPT_Result = new JPanel(); this.JPT_Submit = new JPanel(); - this.cCPlus_CompileInfo = new JMenuItem("C/C++"); - this.java_CompileInfo = new JMenuItem("Java"); + +// this.cCPlus_CompileInfo = new JMenuItem("C/C++"); +// this.java_CompileInfo = new JMenuItem("Java"); + this.JB_return = new JButton(); //this.JCB_Model = new JComboBox(); this.UpdateProblem = new JButton(); @@ -172,7 +174,7 @@ public class MainFrame extends JFrame implements ColorChange { this.freshMenu = new JMenu("ͬ"); this.systemMenu = new JMenu("ϵͳ"); - this.JM_CompileInfo = new JMenu(""); +// this.JM_CompileInfo = new JMenu(""); this.JM_return = new JMenuItem("ؿб"); this.JM_UpdateProblem = new JMenuItem("ȫĿ"); @@ -203,27 +205,29 @@ public class MainFrame extends JFrame implements ColorChange { this.NorthPanel.add(this.TP_time, BorderLayout.EAST); this.NorthPanel.add(this.jl_south, BorderLayout.WEST); - JM_CompileInfo.add(cCPlus_CompileInfo); - cCPlus_CompileInfo.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - NewCompileSetting config = new NewCompileSetting("c", MainFrame.this, true); - config.setVisible(true); - } - }); - JM_CompileInfo.add(java_CompileInfo); - java_CompileInfo.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - NewCompileSetting config = new NewCompileSetting("java", MainFrame.this, true); - config.setVisible(true); - } - }); +// JM_CompileInfo.add(cCPlus_CompileInfo); +// cCPlus_CompileInfo.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// NewCompileSetting config = new NewCompileSetting("c", MainFrame.this, true); +// config.setVisible(true); +// } +// }); +// JM_CompileInfo.add(java_CompileInfo); +// java_CompileInfo.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// NewCompileSetting config = new NewCompileSetting("java", MainFrame.this, true); +// config.setVisible(true); +// } +// }); + freshMenu.add(JM_UpdateProblem); freshMenu.add(JM_UpdateStatus); freshMenu.add(JM_UpdateExam); //freshMenu.add(JM_return); - systemMenu.add(JM_CompileInfo); + // systemMenu.add(JM_CompileInfo); + systemMenu.add(JM_Exit); menubar.setLayout(new FlowLayout(FlowLayout.LEFT)); MenuPanel.add(this.menubar, BorderLayout.WEST); @@ -316,6 +320,7 @@ public class MainFrame extends JFrame implements ColorChange { // // config.setVisible(true); // } // }); + this.JB_return.setText("ؿб"); this.JB_return.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(ActionEvent evt) { diff --git a/client/src/client/view/panel/CodePanel.java b/client/src/client/view/panel/CodePanel.java index 91bd2d6..236e040 100644 --- a/client/src/client/view/panel/CodePanel.java +++ b/client/src/client/view/panel/CodePanel.java @@ -178,7 +178,6 @@ public class CodePanel extends JPanel implements ActionListener { this.jLabel5 = new JLabel("ѧ"); this.jLabel6 = new JLabel("н:"); this.jLabel7 = new JLabel(":"); - //this.jLabel7 = new JLabel(""); this.jpanel1 = new JPanel(); this.jpanel2 = new JPanel(); this.jpanel3 = new JPanel(); @@ -201,12 +200,12 @@ public class CodePanel extends JPanel implements ActionListener { JEP_Code.setCodeFoldingEnabled(true); JEP_Code.setFont(new Font("YaHei Consolas Hybrid", Font.PLAIN, fontsize)); RTextScrollPane codePanel = new RTextScrollPane(JEP_Code); - //codePanel.setBorder(BorderFactory.createEmptyBorder()); + this.Top_code.setLayout(new BorderLayout()); this.jSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT); - //this.jSplitPane.setDividerLocation(0.7); + this.jSplitPane.setResizeWeight(0.8); this.jSplitPane.setDividerSize(7); this.jSplitPane.setOneTouchExpandable(true); @@ -456,6 +455,8 @@ public class CodePanel extends JPanel implements ActionListener { } else if ("C++".equals(lan)) { language = "C++"; JEP_Code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_CPLUSPLUS); + } else if ("python".equals(lan)){ + JEP_Code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_PYTHON); } } @@ -1099,6 +1100,22 @@ public class CodePanel extends JPanel implements ActionListener { return false; } } + + if (language.toLowerCase().equals("python")) { + tmp = Config.getCompilerDir("python"); + if (tmp == null || "".equals(tmp) || !FileFinder.isExistFile(tmp + File.separator + "javac.exe")) { + //ñ + Object t = this.getParent(); + while (!(t instanceof MainFrame)) { + t = ((Component) t).getParent(); + } + JOptionPane.showMessageDialog(this, "ñ"); + NewCompileSetting window = new NewCompileSetting(language, (MainFrame) t, true); + window.setVisible(true); + return false; + } + } + return true; } diff --git a/client/test/output/Main.cpp b/client/test/output/Main.cpp new file mode 100644 index 0000000..daf821e --- /dev/null +++ b/client/test/output/Main.cpp @@ -0,0 +1,18 @@ +#include +int main() +{ + double a,b,c; + while(scanf("%lf%lf", &a, &b) != EOF) + { + if (b!=0) + { + c=a/b; + printf("%.2f\n", c); + } + else + printf("error\n"); + } + + return 0; +} + diff --git a/client/test/output/Main.o b/client/test/output/Main.o new file mode 100644 index 0000000..c98f02d Binary files /dev/null and b/client/test/output/Main.o differ diff --git a/client/xml/1000000000/26-580.xml b/client/xml/1000000000/26-580.xml index db3542d..f29a693 100644 --- a/client/xml/1000000000/26-580.xml +++ b/client/xml/1000000000/26-580.xml @@ -23,7 +23,7 @@ int main() 992628 - + AC 3020,3021,3022,3023, diff --git a/client/xml/1000000000/26-581.xml b/client/xml/1000000000/26-581.xml new file mode 100644 index 0000000..acb3b4b --- /dev/null +++ b/client/xml/1000000000/26-581.xml @@ -0,0 +1,35 @@ + + +true + + + #include <stdio.h> +int main() +{ + double a = 0.01,b=0.01,c=0.01; + + while(scanf("%lf%lf", &a, &b) != EOF) + { + if (b!=0) + { + c=a/b; + printf("%.2f\n", c); + } + else + printf("error\n"); + } + printf("\n"); + return 0; +} + + 836152 + + AC + 3024,3025,3026,3027, + + 49.0 + ACнȷ + + 51 + + diff --git a/client/xml/1000000000/examlist.dat b/client/xml/1000000000/examlist.dat index 395c603..a7c626b 100644 Binary files a/client/xml/1000000000/examlist.dat and b/client/xml/1000000000/examlist.dat differ diff --git a/client/xml/1000000000/examproblems_26.dat b/client/xml/1000000000/examproblems_26.dat index 991bded..4db257f 100644 Binary files a/client/xml/1000000000/examproblems_26.dat and b/client/xml/1000000000/examproblems_26.dat differ diff --git a/client/xml/1000000000/problem_26-580.dat b/client/xml/1000000000/problem_26-580.dat index f745dd9..0fe6cd9 100644 Binary files a/client/xml/1000000000/problem_26-580.dat and b/client/xml/1000000000/problem_26-580.dat differ diff --git a/client/xml/1000000000/problem_26-581.dat b/client/xml/1000000000/problem_26-581.dat new file mode 100644 index 0000000..7dbcf0f Binary files /dev/null and b/client/xml/1000000000/problem_26-581.dat differ diff --git a/client/xml/1000000000/studentExamDetail_26.dat b/client/xml/1000000000/studentExamDetail_26.dat index 56748f7..25a5467 100644 Binary files a/client/xml/1000000000/studentExamDetail_26.dat and b/client/xml/1000000000/studentExamDetail_26.dat differ diff --git a/clientUpdater/dist/clientUpdater.jar b/clientUpdater/dist/clientUpdater.jar index 6a9bafb..fcff6c6 100644 Binary files a/clientUpdater/dist/clientUpdater.jar and b/clientUpdater/dist/clientUpdater.jar differ