merge.

[coroid/inqubus.git] / frontend / src / saccubus / properties / BasicSetting.java

diff --git a/frontend/src/saccubus/properties/BasicSetting.java b/frontend/src/saccubus/properties/BasicSetting.java
index 0c9393e..1253830 100644 (file)
--- a/frontend/src/saccubus/properties/BasicSetting.java
+++ b/frontend/src/saccubus/properties/BasicSetting.java
@@ -2,6 +2,7 @@
 package saccubus.properties;
 
 import java.util.Properties;
+import saccubus.converter.profile.User;
 
 /**
  * \8aî\96{\90Ý\92è.
@@ -14,26 +15,20 @@ public class BasicSetting {
     private static final String PROP_USE_PROXY = "UseProxy";
     private static final String PROP_PROXY = "Proxy";
     private static final String PROP_PROXY_PORT = "ProxyPort";
-    private final String mail;
-    private final String password;
+    private final User user;
     private final boolean proxyUse;
     private final String proxyHost;
     private final int proxyPort;
 
     public BasicSetting(String mail, String password, boolean proxyUse, String proxyHost, int proxyPort) {
-        this.mail = mail;
-        this.password = password;
+        this.user = new User(mail, password);
         this.proxyUse = proxyUse;
         this.proxyHost = proxyHost;
         this.proxyPort = proxyPort;
     }
 
-    public String getMail() {
-        return mail;
-    }
-
-    public String getPassword() {
-        return password;
+    public User getUser() {
+        return user;
     }
 
     public String getProxyHost() {
@@ -49,8 +44,8 @@ public class BasicSetting {
     }
 
     public void save(Properties prop) {
-        prop.setProperty(PROP_MAILADDR, getMail());
-        prop.setProperty(PROP_PASSWORD, getPassword());
+        prop.setProperty(PROP_MAILADDR, getUser().getMail());
+        prop.setProperty(PROP_PASSWORD, getUser().getPassword());
         prop.setProperty(PROP_USE_PROXY, Boolean.toString(isProxyUse()));
         prop.setProperty(PROP_PROXY, getProxyHost());
         prop.setProperty(PROP_PROXY_PORT, Integer.toString(getProxyPort()));