Author: alexlehm
Date: 2008-01-11 16:21:09 +0000 (Fri, 11 Jan 2008)
New Revision: 17011
Modified:
trunk/apps/Freemail/src/freemail/AccountManager.java
trunk/apps/Freemail/src/freemail/FreemailCli.java
trunk/apps/Freemail/src/freemail/FreemailPlugin.java
trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
Log:
used a java6 method in last commited fix
Modified: trunk/apps/Freemail/src/freemail/AccountManager.java
===================================================================
--- trunk/apps/Freemail/src/freemail/AccountManager.java 2008-01-11
15:28:37 UTC (rev 17010)
+++ trunk/apps/Freemail/src/freemail/AccountManager.java 2008-01-11
16:21:09 UTC (rev 17011)
@@ -89,7 +89,7 @@
public static void Create(String username) throws
IOException,IllegalArgumentException {
File datadir = new File(DATADIR);
String invalid=validateUsername(username);
- if(!invalid.isEmpty()) {
+ if(!invalid.equals("")) {
throw new IllegalArgumentException("The username may
not contain the character '"+invalid+"'");
}
if (!datadir.exists()) {
@@ -267,7 +267,7 @@
}
String invalid=validateShortAddress(alias);
- if(!invalid.isEmpty()) {
+ if(!invalid.equals("")) {
throw new IllegalArgumentException("The short address
may not contain the character '"+invalid+"'");
}
Modified: trunk/apps/Freemail/src/freemail/FreemailCli.java
===================================================================
--- trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-01-11 15:28:37 UTC
(rev 17010)
+++ trunk/apps/Freemail/src/freemail/FreemailCli.java 2008-01-11 16:21:09 UTC
(rev 17011)
@@ -166,7 +166,7 @@
continue;
if (!files[i].isDirectory()) continue;
-
if(!AccountManager.validateUsername(files[i].getName()).isEmpty()) {
+
if(!AccountManager.validateUsername(files[i].getName()).equals("")) {
System.out.println("Account name
"+files[i].getName()+" contains invalid chars, you may get problems accessing
the account.");
}
Modified: trunk/apps/Freemail/src/freemail/FreemailPlugin.java
===================================================================
--- trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-01-11
15:28:37 UTC (rev 17010)
+++ trunk/apps/Freemail/src/freemail/FreemailPlugin.java 2008-01-11
16:21:09 UTC (rev 17011)
@@ -103,7 +103,7 @@
if (!files[i].isDirectory()) continue;
String
invalid=AccountManager.validateUsername(files[i].getName());
- if(!invalid.isEmpty()) {
+ if(!invalid.equals("")) {
Logger.error(this,"Account name
"+files[i].getName()+" contains invalid chars (\""+invalid+"\"), you may get
problems accessing the account.");
}
Modified: trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java
===================================================================
--- trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java 2008-01-11
15:28:37 UTC (rev 17010)
+++ trunk/apps/Freemail/src/freemail/SingleAccountWatcher.java 2008-01-11
16:21:09 UTC (rev 17011)
@@ -88,7 +88,7 @@
Logger.normal(this,"Short Freemail address (*probably*
secure): <anything>@"+shortdomain);
String
invalid=AccountManager.validateUsername(shortdomain);
- if(!invalid.isEmpty()) {
+ if(!invalid.equals("")) {
Logger.normal(this,"Your short Freemail address
contains invalid characters (\""+invalid+"\"), others may have problems sending
you mail");
}
} else {
