Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

Author: NeonAngelThreads

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.angellock.impl</groupId>
     <artifactId>DolphinBot</artifactId>
-    <version>1.2.2-RELEASE-full</version>
+    <version>1.2.3-BETA-full</version>
     <packaging>
         jar
     </packaging>

src/main/java/org/angellock/impl/AbstractRobot.java

@@ -234,7 +234,7 @@ public void scheduleReconnect() {
     }
 
     public void scheduleConnect(int wait) {
-        this.reconnectScheduler.schedule(() -> this.connect(), 0, TimeUnit.SECONDS);
+        this.reconnectScheduler.schedule(() -> this.connect(), wait, TimeUnit.SECONDS);
     }
 
     public void setBypassed(boolean bypassed) {

src/main/java/org/angellock/impl/dolphin/DolphinWindow.java

@@ -12,14 +12,26 @@ public class DolphinWindow {
     private JButton restartButton;
     private JTable table1;
     private JButton open_folder;
-    private JButton add_bot;
+    private JButton add_bot = new JButton();
     private JEditorPane hFdFsdFsEditorPane;
     private JButton settings;
     private JButton start_all;
     private JButton stop_all;
     private JButton restart_all;
 
-    public DolphinWindow() {
+    private JFrame frame;
+
+    public DolphinWindow(JFrame frame) {
+        this.frame = frame;
+    }
+
+    public void initWindow() {
+        this.frame.setSize(800, 600);
+        this.frame.setContentPane(mainWindow);
+        this.frame.setVisible(true);
+    }
+    public DolphinWindow(JPanel mainWindow) {
+        this.mainWindow = mainWindow;
         add_bot.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

src/main/java/org/angellock/impl/dolphin/GUIWindowManager.java

@@ -10,18 +10,17 @@
 import java.util.List;
 
 public class GUIWindowManager {
-    private JFrame mainWindow;
     private final BotManager botManager;
-    private final DolphinWindow window = new DolphinWindow();
+    private DolphinWindow window;
     public GUIWindowManager(BotManager botManager) {
         this.botManager = botManager;
-
-        this.mainWindow = new JFrame("DolphinBot " + Start.getArchiveVersion());
+        JFrame frame = new JFrame("DolphinBot " + Start.getArchiveVersion());
+        this.window = new DolphinWindow(frame);
     }
 
     // manager.getBots()
     public void startGUI(){
         System.out.println(botManager.getBots().toString());
-        window.getTabbedPane1().setVisible(true);
+        window.initWindow();
     }
 }

src/main/resources/bot.profiles.json

@@ -1,7 +1,7 @@
 {
   "profiles": {
     "bot#1": {
-      "name": "DolphinTest",
+      "name": "DolphinTest调试",
       "password": "default_password",
       "owner": [
         "Melibertan"
@@ -14,7 +14,7 @@
     },
     "bot#2": {
       "name": "DolphinThread1",
-      "password": "pwd_here",
+      "password": "default_password",
       "owner": [
         "Melibertan"
       ],