From 5f1db1fef65901570ec9f05e5ac900ed0951dba0 Mon Sep 17 00:00:00 2001
From: Valentin Martinet <vmartinet@java.net>
Date: Mon, 21 Dec 2009 23:37:02 +0000
Subject: [PATCH] Removes temporary useless constructor and fixes mistake (bad
 dialog file) on Windows/Linux for the Whiteboard plugin.

---
 .../util/swing/GenericFileDialog.java         | 23 ++++++++--
 .../util/swing/SipCommFileChooserImpl.java    | 43 ++++---------------
 2 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/src/net/java/sip/communicator/util/swing/GenericFileDialog.java b/src/net/java/sip/communicator/util/swing/GenericFileDialog.java
index 87647e86d..7c7cc64d3 100644
--- a/src/net/java/sip/communicator/util/swing/GenericFileDialog.java
+++ b/src/net/java/sip/communicator/util/swing/GenericFileDialog.java
@@ -7,6 +7,9 @@
 package net.java.sip.communicator.util.swing;
 
 import java.awt.*;
+
+import javax.swing.JFileChooser;
+
 import net.java.sip.communicator.util.*;
 
 
@@ -32,10 +35,10 @@ public class GenericFileDialog
 	public static SipCommFileChooser create(
 			Frame parent, String title, int fileOperation)
 	{
-		
+		int operation = -1;
+	
 		if(OSUtils.IS_MAC)
 		{
-			int operation = -1;
 			if(fileOperation == SipCommFileChooser.LOAD_FILE_OPERATION)
 				operation = FileDialog.LOAD;
 			else if(fileOperation == SipCommFileChooser.SAVE_FILE_OPERATION)
@@ -54,7 +57,21 @@ else if(fileOperation == SipCommFileChooser.SAVE_FILE_OPERATION)
 		}
 		else
 		{
-			return new SipCommFileChooserImpl();
+			if(fileOperation == SipCommFileChooser.LOAD_FILE_OPERATION)
+				operation = JFileChooser.OPEN_DIALOG;
+			else if(fileOperation == SipCommFileChooser.SAVE_FILE_OPERATION)
+				operation = JFileChooser.SAVE_DIALOG;
+			else
+				try 
+				{
+					throw new Exception("UnknownFileOperation");
+				} 
+				catch (Exception e) 
+				{
+					e.printStackTrace();
+				}
+				
+			return new SipCommFileChooserImpl(title, operation);
 		}
 	}
 	
diff --git a/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java b/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
index fe676379f..66b774cb9 100644
--- a/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
+++ b/src/net/java/sip/communicator/util/swing/SipCommFileChooserImpl.java
@@ -28,10 +28,15 @@ public class SipCommFileChooserImpl
 	
 	/**
 	 * Constructor
+	 * 
+	 * @param title title for this dialog
+	 * @param operation 'Save file' or 'Load file' operation
 	 */
-	public SipCommFileChooserImpl()
+	public SipCommFileChooserImpl(String title, int operation)
 	{
 		super();
+		this.setDialogTitle(title);
+		this.setDialogType(operation);
 	}
 	
 	/**
@@ -39,43 +44,13 @@ public SipCommFileChooserImpl()
 	 * 
 	 * @param path
 	 */
-	public SipCommFileChooserImpl(Component pparent, String path)
+	public SipCommFileChooserImpl(
+			Component pparent, String path, String title, int operation)
 	{
-		this();
+		this(title, operation);
 		this.setStartPath(path);
 		this.parent = pparent;
 	}
-	
-	/**
-	 * Constructor
-	 * 
-	 * @param path
-	 * @param fileOperation
-	 */
-	public SipCommFileChooserImpl(Component parent, String path, int fileOperation)
-	{
-		this(parent, path);
-		
-		if(fileOperation == SipCommFileChooser.LOAD_FILE_OPERATION)
-		{
-			this.setDialogType(JFileChooser.OPEN_DIALOG);
-		}
-		else if(fileOperation == SipCommFileChooser.SAVE_FILE_OPERATION)
-		{
-			this.setDialogType(JFileChooser.SAVE_DIALOG);
-		}
-		else
-		{
-			try 
-			{
-				throw new Exception("UnknownFileOperation");
-			} 
-			catch (Exception e) 
-			{
-				e.printStackTrace();
-			}
-		}
-	}
 
 	/**
 	 * Returns the selected file by the user from the dialog.