* [ 1852099 ] Simplication of Connection Profile
This commit is contained in:
parent
a4140ab3b7
commit
b7c53ab760
|
@ -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())
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue