Author: jflesch
Date: 2006-12-09 19:16:21 +0000 (Sat, 09 Dec 2006)
New Revision: 11320
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
Log:
Fix index renaming and add a cancel button to the automatic reconnection dialog
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2006-12-09 17:56:16 UTC (rev
11319)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2006-12-09 19:16:21 UTC (rev
11320)
@@ -11,7 +11,12 @@
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.WindowConstants;
+import javax.swing.JButton;
+import java.awt.BorderLayout;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+
import thaw.fcp.FCPClientHello;
import thaw.fcp.FCPConnection;
import thaw.fcp.FCPQueryManager;
@@ -23,7 +28,7 @@
* A "core" contains references to all the main parts of Thaw.
* The Core has all the functions needed to initialize Thaw / stop Thaw.
*/
-public class Core implements Observer {
+public class Core implements Observer, ActionListener {
private SplashScreen splashScreen = null;
private MainWindow mainWindow = null;
@@ -39,8 +44,10 @@
private static String lookAndFeel = null;
+ private JDialog warningDialog = null;
+
public final static int MAX_CONNECT_TRIES = 3;
- public final static int TIME_BETWEEN_EACH_TRY = 3000;
+ public final static int TIME_BETWEEN_EACH_TRY = 5000;
/**
@@ -411,23 +418,26 @@
int nmbReconnect = 0;
- final JDialog warningDialog = new
JDialog(getMainWindow().getMainFrame());
+ warningDialog = new
JDialog(getMainWindow().getMainFrame());
warningDialog.setTitle("Thaw - reconnection");
warningDialog.setModal(false);
- warningDialog.setSize(500, 40);
+ warningDialog.setSize(500, 100);
warningDialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
- final JPanel warningPanel = new JPanel();
+ final JPanel warningPanel = new JPanel(new
BorderLayout(10, 10));
+ final JLabel warningLabel = new
JLabel(I18n.getMessage("thaw.warning.autoreconnecting"),
+
SwingConstants.CENTER);
+ final JButton cancelButton = new
JButton(I18n.getMessage("thaw.common.cancel"));
+ cancelButton.addActionListener(this);
- final JLabel warningLabel = new
JLabel(I18n.getMessage("thaw.warning.autoreconnecting"),
- SwingConstants.CENTER);
- warningPanel.add(warningLabel);
+ warningPanel.add(warningLabel, BorderLayout.CENTER);
+ warningPanel.add(cancelButton, BorderLayout.SOUTH);
warningDialog.setContentPane(warningPanel);
warningDialog.setVisible(true);
for(nmbReconnect = 0;
- nmbReconnect < Core.MAX_CONNECT_TRIES ;
+ nmbReconnect < Core.MAX_CONNECT_TRIES &&
warningDialog != null ;
nmbReconnect++) {
try {
@@ -437,14 +447,18 @@
}
Logger.notice(this, "Trying to reconnect ... :
"+ Integer.toString(nmbReconnect));
+ if (warningDialog != null) {
+ if(initNodeConnection())
+ break;
+ }
+ }
- if(initNodeConnection())
- break;
+ if (warningDialog != null) {
+ warningDialog.setVisible(false);
+ warningDialog.dispose();
}
- warningDialog.setVisible(false);
-
if(nmbReconnect == Core.MAX_CONNECT_TRIES) {
while(!initNodeConnection()) {
final int ret =
JOptionPane.showOptionDialog((java.awt.Component)null,
@@ -469,4 +483,14 @@
}
}
+ public void actionPerformed(ActionEvent e) {
+ if (warningDialog == null)
+ return;
+
+ // we assume that the action comes from the button in the
reconnection dialog
+ warningDialog.setVisible(false);
+ warningDialog.dispose();
+ warningDialog = null;
+ }
+
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-12-09 17:56:16 UTC
(rev 11319)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-12-09 19:16:21 UTC
(rev 11320)
@@ -527,7 +527,8 @@
if(displayName != null)
toDisp = displayName;
- toDisp = realName;
+ else
+ toDisp = realName;
if (revision > 0)
toDisp += " (r"+Integer.toString(revision)+")";
