midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* [ 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/org/compiere/apps/AGlassPane.java
View File

@ -98,7 +98,7 @@ public class AGlassPane extends JPanel implements MouseListener, ActionListener
{ {
log.config("Time=" + time); log.config("Time=" + time);
// should we display a progress bar? // should we display a progress bar?
if (time < 2 || CConnection.get().isTerminalServer()) if (time < 2 )
{ {
m_timermax = 0; m_timermax = 0;
if (isVisible()) if (isVisible())

12
client/src/org/compiere/apps/ALogin.java
View File

@ -365,7 +365,7 @@ public final class ALogin extends CDialog
m_cc.testAppsServer(); m_cc.testAppsServer();
if (m_cc.getAppsServerException() != null) if (m_cc.getAppsServerException() != null)
{ {
if (m_cc.isRMIoverHTTP()) if (m_cc.isServerObjects())
{ {
m_cc.getAppsServerException().printStackTrace(); m_cc.getAppsServerException().printStackTrace();
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
@ -379,13 +379,11 @@ public final class ALogin extends CDialog
//Check connection //Check connection
DB.setDBTarget(m_cc); DB.setDBTarget(m_cc);
//wan //wan or vpn ( remote connection )
if (m_cc.isRMIoverHTTP()) return; if (m_cc.isServerObjects()) return;
//vpn or direct //direct
if (m_cc.isServerObjects() == false DB.connect();
|| m_cc.isAppsServerOK(false) == false)
DB.connect();
} }
/** /**

3
client/src/org/compiere/apps/AWindow.java
View File

@ -105,8 +105,7 @@ public class AWindow extends CFrame
*/ */
public void setBusy (boolean busy) public void setBusy (boolean busy)
{ {
if (busy == m_glassPane.isVisible() if (busy == m_glassPane.isVisible())
|| CConnection.get().isTerminalServer())
return; return;
log.config(getName() + " - " + busy); log.config(getName() + " - " + busy);
m_glassPane.setMessage(null); m_glassPane.setMessage(null);