From 4c835e61e8ea2d5af2acf0c85c3c1f0d06f419df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 26 Oct 2011 17:19:55 -0400
Subject: [PATCH] Documentation.
---
src/com/gitblit/client/GitblitManager.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/client/GitblitManager.java b/src/com/gitblit/client/GitblitManager.java
index 43cdab3..524c213 100644
--- a/src/com/gitblit/client/GitblitManager.java
+++ b/src/com/gitblit/client/GitblitManager.java
@@ -29,6 +29,7 @@
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
+import java.net.ConnectException;
import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -64,6 +65,7 @@
import org.eclipse.jgit.util.FS;
import com.gitblit.Constants;
+import com.gitblit.GitBlitException.ForbiddenException;
import com.gitblit.utils.StringUtils;
/**
@@ -272,7 +274,19 @@
registrations.put(reg.name, reg);
rebuildRecentMenu();
} catch (Throwable t) {
- Utils.showException(GitblitManager.this, t);
+ Throwable cause = t.getCause();
+ if (cause instanceof ConnectException) {
+ JOptionPane.showMessageDialog(GitblitManager.this, cause.getMessage(),
+ Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
+ } else if (cause instanceof ForbiddenException) {
+ JOptionPane
+ .showMessageDialog(
+ GitblitManager.this,
+ "This Gitblit server does not allow RPC Management or Administration",
+ Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
+ } else {
+ Utils.showException(GitblitManager.this, t);
+ }
} finally {
setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
}
@@ -338,7 +352,7 @@
StoredConfig config = getConfig();
config.setString("servers", reg.name, "url", reg.url);
config.setString("servers", reg.name, "account", reg.account);
- // FIXME this is pretty lame
+ // FIXME this is pretty lame
config.setString("servers", reg.name, "password",
Base64.encodeBytes(new String(reg.password).getBytes("UTF-8")));
config.setString("servers", reg.name, "lastLogin", dateFormat.format(reg.lastLogin));
--
Gitblit v1.9.1