* [ 1852099 ] Simplication of Connection Profile

This commit is contained in:
Heng Sin Low 2007-12-25 09:16:29 +00:00
parent a4140ab3b7
commit b7c53ab760
3 changed files with 7 additions and 10 deletions

View File

@ -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())

View File

@ -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,12 +379,10 @@ 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)
//direct
DB.connect();
}

View File

@ -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);