From 322f1ad52fc3bbe99e13f95fe71a3a59e85a1f92 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Paour <paour@users.sourceforge.net>
Date: Sat, 19 Jul 2003 18:54:31 +0000
Subject: [PATCH] Better handling of null username or password.

---
 com/gallery/GalleryRemote/model/Gallery.java             | 8 ++++----
 com/gallery/GalleryRemote/prefs/GalleryEditorDialog.java | 1 -
 com/gallery/GalleryRemote/prefs/URLPanel.java            | 8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/com/gallery/GalleryRemote/model/Gallery.java b/com/gallery/GalleryRemote/model/Gallery.java
index 8e03aa7..c10d2cd 100644
--- a/com/gallery/GalleryRemote/model/Gallery.java
+++ b/com/gallery/GalleryRemote/model/Gallery.java
@@ -370,8 +370,8 @@ boolean replace(StringBuffer sb, String token, String value) {
 	*/
 
 	public void setUsername( String username ) {
-		if ( username != null && username.length() > 0
-				&& ! username.equals( this.username ) ) {
+		if ( /*username != null && username.length() > 0
+				&&*/ ! username.equals( this.username ) ) {
 
 			this.username = username;
 
@@ -383,8 +383,8 @@ public void setUsername( String username ) {
 
 	public void setPassword( String password ) {
 		//Log.log(Log.TRACE, MODULE, "setpassword: " + password);
-		if ( password != null && password.length() > 0
-				&& ! password.equals( this.password ) ) {
+		if ( /*password != null && password.length() > 0
+				&&*/ ! password.equals( this.password ) ) {
 
 			this.password = password;
 
diff --git a/com/gallery/GalleryRemote/prefs/GalleryEditorDialog.java b/com/gallery/GalleryRemote/prefs/GalleryEditorDialog.java
index 07e5a6c..c6e2f30 100644
--- a/com/gallery/GalleryRemote/prefs/GalleryEditorDialog.java
+++ b/com/gallery/GalleryRemote/prefs/GalleryEditorDialog.java
@@ -8,7 +8,6 @@
 import java.awt.*;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
-import java.net.MalformedURLException;
 
 /**
  * Created by IntelliJ IDEA.
diff --git a/com/gallery/GalleryRemote/prefs/URLPanel.java b/com/gallery/GalleryRemote/prefs/URLPanel.java
index cb20c2b..718a3ea 100644
--- a/com/gallery/GalleryRemote/prefs/URLPanel.java
+++ b/com/gallery/GalleryRemote/prefs/URLPanel.java
@@ -152,13 +152,17 @@ public void resetUIState() {
 
 			if (selectedGallery.getType() == Gallery.TYPE_STANDALONE) {
 				sb.append("Gallery URL: ").append(selectedGallery.getStUrlString()).append("<br>");
-				sb.append("Username: ").append(selectedGallery.getUsername()).append("<br>");
 			} else if (selectedGallery.getType() == Gallery.TYPE_POSTNUKE) {
 				sb.append("PostNuke login URL: ").append(selectedGallery.getPnLoginUrlString()).append("<br>");
 				sb.append("PostNuke Gallery URL: ").append(selectedGallery.getPnGalleryUrlString()).append("<br>");
-				sb.append("Username: ").append(selectedGallery.getUsername()).append("<br>");
 			}
 
+			String username = selectedGallery.getUsername();
+			if (username == null || username.length() == 0) {
+				username = "&lt;Not set&gt;";
+			}
+			sb.append("Username: ").append(username).append("<br>");
+
 			sb.append("</HTML>");
 
 			jModify.setEnabled(true);