From ac7f1753d3f742e0af8dd5e142b4eac9d9d2fbba Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Oct 2011 21:41:31 -0400
Subject: [PATCH] Preserve feed selections when not saving passwords
---
src/com/gitblit/client/StatusPanel.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/client/StatusPanel.java b/src/com/gitblit/client/StatusPanel.java
index 0cc530e..797ae9b 100644
--- a/src/com/gitblit/client/StatusPanel.java
+++ b/src/com/gitblit/client/StatusPanel.java
@@ -42,6 +42,7 @@
private static final long serialVersionUID = 1L;
private final Insets insets = new Insets(5, 5, 5, 5);
private JLabel bootDate;
+ private JLabel url;
private JLabel servletContainer;
private JLabel heapMaximum;
private JLabel heapAllocated;
@@ -56,15 +57,16 @@
initialize();
}
- public StatusPanel(ServerStatus status) {
+ public StatusPanel(String url, ServerStatus status) {
this();
- setStatus(status);
+ setStatus(url, status);
}
private void initialize() {
version = new JLabel();
releaseDate = new JLabel();
bootDate = new JLabel();
+ url = new JLabel();
servletContainer = new JLabel();
heapMaximum = new JLabel();
@@ -72,7 +74,7 @@
heapUsed = new JLabel();
JPanel fieldsPanel = new JPanel(new GridLayout(0, 1, 0, 5)) {
-
+
private static final long serialVersionUID = 1L;
@Override
@@ -83,13 +85,14 @@
fieldsPanel.add(createFieldPanel("gb.version", version));
fieldsPanel.add(createFieldPanel("gb.releaseDate", releaseDate));
fieldsPanel.add(createFieldPanel("gb.bootDate", bootDate));
+ fieldsPanel.add(createFieldPanel("gb.url", url));
fieldsPanel.add(createFieldPanel("gb.servletContainer", servletContainer));
fieldsPanel.add(createFieldPanel("gb.heapUsed", heapUsed));
fieldsPanel.add(createFieldPanel("gb.heapAllocated", heapAllocated));
fieldsPanel.add(createFieldPanel("gb.heapMaximum", heapMaximum));
model = new PropertiesTableModel();
- JTable propertiesTable = Utils.newTable(model);
+ JTable propertiesTable = Utils.newTable(model, Utils.DATE_FORMAT);
String name = propertiesTable.getColumnName(PropertiesTableModel.Columns.Name.ordinal());
NameRenderer nameRenderer = new NameRenderer();
propertiesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
@@ -120,12 +123,13 @@
return insets;
}
- public void setStatus(ServerStatus status) {
+ public void setStatus(String url, ServerStatus status) {
headerPanel.setText(Translation.get("gb.status"));
version.setText(Constants.NAME + (status.isGO ? " GO v" : " WAR v") + status.version);
releaseDate.setText(status.releaseDate);
bootDate.setText(status.bootDate.toString() + " (" + TimeUtils.timeAgo(status.bootDate)
+ ")");
+ this.url.setText(url);
servletContainer.setText(status.servletContainer);
ByteFormat byteFormat = new ByteFormat();
heapMaximum.setText(byteFormat.format(status.heapMaximum));
--
Gitblit v1.9.1