Merge remote-tracking branch 'remotes/origin/master' into wmj

# Conflicts:
#	src/core/process/Process.java
#	src/core/process/ProcessManagement.java

src/core/process/C_TeacherSelectStudent.java

@@ -1,17 +1,18 @@
 package core.process;
-////
+
-////import java.util.ArrayList;
+import java.util.ArrayList;
-////import java.util.List;
+import java.util.List;
-////
+
-////public class Cls_TeacherSelectStudent extends Process {
+public class C_TeacherSelectStudent extends Process {
-////    List<String> list;
+    List<String> list;
-////
+
-////    public Cls_TeacherSelectStudent clone(){
+    public C_TeacherSelectStudent clone(){
-////        Cls_TeacherSelectStudent tst = new Cls_TeacherSelectStudent();
+        C_TeacherSelectStudent tst = new C_TeacherSelectStudent();
-////        tst.setInfo( this.getInfo());
+        tst.setInfo( this.getInfo());
-////        List<String> list = new ArrayList<>();
+        List<String> list = new ArrayList<>();
-////        for(String s:this.list){
+        for(String s:this.list){
-////            list.add(new String(s));
+            list.add(new String(s));
-////        }
+        }
-////    }
+        return null;
-////}
+    }
+}