From b7c53ab76018876cf0d3f02fbe0aacbb4a391f45 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 25 Dec 2007 09:16:29 +0000
Subject: [PATCH] * [ 1852099 ] Simplication of Connection Profile

---
 client/src/org/compiere/apps/AGlassPane.java |  2 +-
 client/src/org/compiere/apps/ALogin.java     | 12 +++++-------
 client/src/org/compiere/apps/AWindow.java    |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/client/src/org/compiere/apps/AGlassPane.java b/client/src/org/compiere/apps/AGlassPane.java
index 00601b2a74..19d7c38856 100644
--- a/client/src/org/compiere/apps/AGlassPane.java
+++ b/client/src/org/compiere/apps/AGlassPane.java
@@ -98,7 +98,7 @@ public class AGlassPane extends JPanel implements MouseListener, ActionListener
 	{
 		log.config("Time=" + time);
 		//  should we display a progress bar?
-		if (time < 2 || CConnection.get().isTerminalServer())
+		if (time < 2 )
 		{
 			m_timermax = 0;
 			if (isVisible())
diff --git a/client/src/org/compiere/apps/ALogin.java b/client/src/org/compiere/apps/ALogin.java
index 3e529129af..3a94e44add 100644
--- a/client/src/org/compiere/apps/ALogin.java
+++ b/client/src/org/compiere/apps/ALogin.java
@@ -365,7 +365,7 @@ public final class ALogin extends CDialog
 		m_cc.testAppsServer();
 		if (m_cc.getAppsServerException() != null)
 		{
-			if (m_cc.isRMIoverHTTP())
+			if (m_cc.isServerObjects())
 			{
 				m_cc.getAppsServerException().printStackTrace();
 				JOptionPane.showMessageDialog(null, 
@@ -379,13 +379,11 @@ public final class ALogin extends CDialog
 		//Check connection
 		DB.setDBTarget(m_cc);
 		
-		//wan
-		if (m_cc.isRMIoverHTTP()) return;
+		//wan or vpn ( remote connection )
+		if (m_cc.isServerObjects()) return;
 		
-		//vpn or direct
-		if (m_cc.isServerObjects() == false
-			|| m_cc.isAppsServerOK(false) == false)
-			DB.connect();
+		//direct
+		DB.connect();
 	}
 	
 	/**
diff --git a/client/src/org/compiere/apps/AWindow.java b/client/src/org/compiere/apps/AWindow.java
index e9c09cbfe9..98725c73f0 100644
--- a/client/src/org/compiere/apps/AWindow.java
+++ b/client/src/org/compiere/apps/AWindow.java
@@ -105,8 +105,7 @@ public class AWindow extends CFrame
 	 */
 	public void setBusy (boolean busy)
 	{
-		if (busy == m_glassPane.isVisible()
-			|| CConnection.get().isTerminalServer())
+		if (busy == m_glassPane.isVisible())
 			return;
 		log.config(getName() + " - " + busy);
 		m_glassPane.setMessage(null);