Merge pull request #185 from rheimus/master

Sync changes

Author: rheimus

src/main/java/com/superzanti/serversync/client/ClientWorker.java

@@ -5,14 +5,17 @@
 import com.superzanti.serversync.SyncConfig;
 import com.superzanti.serversync.config.IgnoredFilesMatcher;
 import com.superzanti.serversync.filemanager.FileManager;
-import com.superzanti.serversync.util.enums.EFileProccessingStatus;
 import com.superzanti.serversync.server.Server;
 import com.superzanti.serversync.util.Logger;
+import com.superzanti.serversync.util.enums.EFileProccessingStatus;
 
 import java.io.IOException;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
@@ -37,7 +40,6 @@ public class ClientWorker implements Runnable {
     private List<String> managedDirectories = new ArrayList<>(0);
 
     private SyncConfig config = SyncConfig.getConfig();
-    private FileManager fileManager = new FileManager();
 
     @Override
     public void run() {

src/main/java/com/superzanti/serversync/gui/GUI_Client.java

@@ -130,9 +130,6 @@ TitledBorder.LEADING, TitledBorder.TOP, null, new Color(255, 255, 255)
 
         add(root);
 
-        // Listeners
-        B_sync.addActionListener(e -> publishSyncPressed());
-
         TF_ipAddress.addKeyListener(new KeyListener() {
 
             @Override
@@ -161,7 +158,6 @@ public void keyTyped(java.awt.event.KeyEvent e) {
             public void keyReleased(java.awt.event.KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_ENTER) {
                     requestFocus();
-                    publishSyncPressed();
                 }
             }
 
@@ -249,44 +245,14 @@ public void updateFileProgress(String message, int progress) {
     public void enableSyncButton() {
         SwingUtilities.invokeLater(() -> {
             B_sync.setEnabled(true);
-            B_sync.setText("Sync");
+            B_sync.setText(ServerSync.strings.getString("go_button"));
         });
     }
 
     public void disableSyncButton() {
         SwingUtilities.invokeLater(() -> B_sync.setEnabled(false));
     }
 
-    public void toggleSyncButton() {
-        SwingUtilities.invokeLater(() -> {
-            if (B_sync.isEnabled()) {
-                B_sync.setEnabled(false);
-            } else {
-                B_sync.setEnabled(true);
-                B_sync.setText("Sync");
-            }
-        });
-    }
-
-    public interface SyncPressedListener {
-        void onSyncPressed();
-    }
-
-    private SyncPressedListener listener;
-
-    public void setSyncPressedListener(SyncPressedListener listener) {
-        this.listener = listener;
-    }
-
-    private boolean publishSyncPressed() {
-        if (this.listener != null) {
-            this.listener.onSyncPressed();
-            return true;
-        }
-
-        return false;
-    }
-
     public String getIPAddress() {
         return this.TF_ipAddress.getText();
     }

src/main/java/com/superzanti/serversync/gui/GUI_Client_Mock.java

@@ -28,10 +28,6 @@ public void enableSyncButton() {
     public void disableSyncButton() {
     }
 
-    @Override
-    public void toggleSyncButton() {
-    }
-
     @Override
     public String getIPAddress() {
         return SyncConfig.getConfig().SERVER_IP;

src/main/resources/assets/serversync/lang/MessagesBundle.properties

@@ -0,0 +1,33 @@
+title=ServerSync
+server_address=IP Address
+server_port=Port
+go_button=Sync
+button_tooltip=Synchronize client & server
+console_title=Information
+ignoring=Ignoring
+delete_success=deleted
+message_file_failed_to_sync=One or more files failed to sync!
+message_file_failed_to_delete=One or more files failed to delete!
+message_file_failed_to_access=Failed to access file
+message_attempting_sync_retry=Attempting to retry sync...
+message_attempting_delete_retry=Attempting to retry delete...
+message_manual_action_required=Failed to process files, manual action required!
+message_client_refused_file=Refused file
+connection_message=Connecting to server
+connection_failed_host=Could not connect to host
+connection_failed_server=Could not connect to server at
+connection_attempt_server=Establishing a socket connection to the server...
+update_not_needed=No update needed, for a full log check the logs folder in the minecraft directory
+update_happened=Files updated
+update_start=Starting Update Process
+update_complete=Update Complete! Have a nice day!
+update_success=Successfully updated
+update_error=Errors occurred, please check ip/port details are correct. For a detailed log check the logs folder in your minecraft directory
+delete_start=Starting deletion process
+debug_IO_streams=Creating input/output streams...
+debug_IO_streams_failed=Failed to obtain input/output streams from client
+debug_server_exit=Telling server to exit...
+debug_server_close=Closing connections...
+debug_server_close_success=All of ServerSync's sockets to the server have been closed
+server_message_file_missing=File: %s has gone missing!
+server_message_file_permission_denied=File: %s says permission denied