From 97de741c06dd99c88fcca760e1b1b366518548f9 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Wed, 8 Apr 2015 20:45:54 +0100
Subject: [PATCH] Move SettingsLoader to a better place

---
 .../sheepit/client/{standalone/swing => }/SettingsLoader.java   | 2 +-
 src/com/sheepit/client/standalone/Worker.java                   | 2 +-
 src/com/sheepit/client/standalone/swing/activity/Settings.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/com/sheepit/client/{standalone/swing => }/SettingsLoader.java (99%)

diff --git a/src/com/sheepit/client/standalone/swing/SettingsLoader.java b/src/com/sheepit/client/SettingsLoader.java
similarity index 99%
rename from src/com/sheepit/client/standalone/swing/SettingsLoader.java
rename to src/com/sheepit/client/SettingsLoader.java
index 6a1f070..9ca4bcd 100644
--- a/src/com/sheepit/client/standalone/swing/SettingsLoader.java
+++ b/src/com/sheepit/client/SettingsLoader.java
@@ -1,4 +1,4 @@
-package com.sheepit.client.standalone.swing;
+package com.sheepit.client;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/com/sheepit/client/standalone/Worker.java
index 06858a7..93e8fb0 100644
--- a/src/com/sheepit/client/standalone/Worker.java
+++ b/src/com/sheepit/client/standalone/Worker.java
@@ -38,11 +38,11 @@ import com.sheepit.client.Configuration.ComputeType;
 import com.sheepit.client.Gui;
 import com.sheepit.client.Log;
 import com.sheepit.client.Pair;
+import com.sheepit.client.SettingsLoader;
 import com.sheepit.client.ShutdownHook;
 import com.sheepit.client.hardware.gpu.GPU;
 import com.sheepit.client.hardware.gpu.GPUDevice;
 import com.sheepit.client.network.ProxyAuthenticator;
-import com.sheepit.client.standalone.swing.SettingsLoader;
 
 public class Worker {
 	@Option(name = "-server", usage = "Render-farm server, default https://www.sheepit-renderfarm.com", metaVar = "URL", required = false)
diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java
index 0365a79..3c6b8a2 100644
--- a/src/com/sheepit/client/standalone/swing/activity/Settings.java
+++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java
@@ -19,10 +19,10 @@ import javax.swing.JPasswordField;
 import javax.swing.JTextField;
 import com.sheepit.client.Configuration;
 import com.sheepit.client.Configuration.ComputeType;
+import com.sheepit.client.SettingsLoader;
 import com.sheepit.client.hardware.gpu.GPU;
 import com.sheepit.client.hardware.gpu.GPUDevice;
 import com.sheepit.client.standalone.GuiSwing;
-import com.sheepit.client.standalone.swing.SettingsLoader;
 
 public class Settings implements Activity {
 	private static final String DUMMY_CACHE_DIR = "Auto detected";