James Moger
2011-10-28 ac7f1753d3f742e0af8dd5e142b4eac9d9d2fbba
src/com/gitblit/client/GitblitPanel.java
@@ -58,6 +58,7 @@
import com.gitblit.client.ClosableTabComponent.CloseTabListener;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.SettingModel;
import com.gitblit.models.SyndicatedEntryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -75,6 +76,8 @@
   private final int margin = 5;
   private final Insets insets = new Insets(margin, margin, margin, margin);
   private final RegistrationsDialog.RegistrationListener listener;
   private GitblitClient gitblit;
@@ -96,14 +99,6 @@
   private JButton delRepository;
   private NameRenderer nameRenderer;
   private IndicatorsRenderer typeRenderer;
   private DefaultTableCellRenderer ownerRenderer;
   private DefaultTableCellRenderer sizeRenderer;
   private TableRowSorter<RepositoriesTableModel> defaultRepositoriesSorter;
   private TableRowSorter<UsersTableModel> defaultUsersSorter;
@@ -118,17 +113,24 @@
   private HeaderPanel settingsHeader;
   public GitblitPanel(GitblitRegistration reg) {
      this(reg.url, reg.account, reg.password);
   }
   private StatusPanel statusPanel;
   public GitblitPanel(String url, String account, char[] password) {
      this.gitblit = new GitblitClient(url, account, password);
   private SyndicatedEntryTableModel syndicationModel;
   private HeaderPanel feedsHeader;
   private JTable syndicationEntriesTable;
   public GitblitPanel(GitblitRegistration reg, RegistrationsDialog.RegistrationListener listener) {
      this.gitblit = new GitblitClient(reg);
      this.listener = listener;
      tabs = new JTabbedPane(JTabbedPane.BOTTOM);
      tabs.addTab(Translation.get("gb.repositories"), createRepositoriesPanel());
      tabs.addTab(Translation.get("gb.recentCommits"), createFeedsPanel());
      tabs.addTab(Translation.get("gb.users"), createUsersPanel());
      tabs.addTab(Translation.get("gb.settings"), createSettingsPanel());
      tabs.addTab(Translation.get("gb.status"), createStatusPanel());
      setLayout(new BorderLayout());
      add(tabs, BorderLayout.CENTER);
@@ -180,20 +182,28 @@
         }
      });
      nameRenderer = new NameRenderer();
      typeRenderer = new IndicatorsRenderer();
      final JButton subscribeRepository = new JButton(Translation.get("gb.subscribe") + "...");
      subscribeRepository.setEnabled(false);
      subscribeRepository.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            subscribeRepository(getSelectedRepositories().get(0));
         }
      });
      sizeRenderer = new DefaultTableCellRenderer();
      NameRenderer nameRenderer = new NameRenderer(true);
      IndicatorsRenderer typeRenderer = new IndicatorsRenderer();
      DefaultTableCellRenderer sizeRenderer = new DefaultTableCellRenderer();
      sizeRenderer.setHorizontalAlignment(SwingConstants.RIGHT);
      sizeRenderer.setForeground(new Color(0, 0x80, 0));
      ownerRenderer = new DefaultTableCellRenderer();
      DefaultTableCellRenderer ownerRenderer = new DefaultTableCellRenderer();
      ownerRenderer.setForeground(Color.gray);
      ownerRenderer.setHorizontalAlignment(SwingConstants.CENTER);
      repositoriesModel = new RepositoriesTableModel();
      defaultRepositoriesSorter = new TableRowSorter<RepositoriesTableModel>(repositoriesModel);
      repositoriesTable = Utils.newTable(repositoriesModel);
      repositoriesTable = Utils.newTable(repositoriesModel, Utils.DATE_FORMAT);
      repositoriesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
      repositoriesTable.setRowSorter(defaultRepositoriesSorter);
      repositoriesTable.getRowSorter().toggleSortOrder(
@@ -214,6 +224,7 @@
            boolean selected = repositoriesTable.getSelectedRow() > -1;
            browseRepository.setEnabled(singleSelection);
            delRepository.setEnabled(selected);
            subscribeRepository.setEnabled(singleSelection);
            if (selected) {
               int viewRow = repositoriesTable.getSelectedRow();
               int modelRow = repositoriesTable.convertRowIndexToModel(viewRow);
@@ -261,6 +272,7 @@
      repositoryControls.add(createRepository);
      repositoryControls.add(editRepository);
      repositoryControls.add(delRepository);
      repositoryControls.add(subscribeRepository);
      JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)) {
@@ -287,6 +299,94 @@
         repositoriesTable.getColumn(name).setMinWidth(maxWidth);
         repositoriesTable.getColumn(name).setMaxWidth(maxWidth);
      }
   }
   private JPanel createFeedsPanel() {
      JButton refreshFeeds = new JButton(Translation.get("gb.refresh"));
      refreshFeeds.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            refreshFeeds();
         }
      });
      final JButton viewCommit = new JButton(Translation.get("gb.view"));
      viewCommit.setEnabled(false);
      viewCommit.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            viewCommit();
         }
      });
      final JButton viewCommitDiff = new JButton(Translation.get("gb.commitdiff"));
      viewCommitDiff.setEnabled(false);
      viewCommitDiff.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            viewCommitDiff();
         }
      });
      final JButton viewTree = new JButton(Translation.get("gb.tree"));
      viewTree.setEnabled(false);
      viewTree.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            viewTree();
         }
      });
      JPanel controls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
      controls.add(refreshFeeds);
      controls.add(viewCommit);
      controls.add(viewCommitDiff);
      controls.add(viewTree);
      NameRenderer nameRenderer = new NameRenderer();
      syndicationModel = new SyndicatedEntryTableModel();
      feedsHeader = new HeaderPanel(Translation.get("gb.recentCommits"), "feed_16x16.png");
      syndicationEntriesTable = Utils.newTable(syndicationModel, Utils.DATE_FORMAT);
      String name = syndicationEntriesTable
            .getColumnName(SyndicatedEntryTableModel.Columns.Author.ordinal());
      syndicationEntriesTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
      syndicationEntriesTable.getColumn(name).setCellRenderer(nameRenderer);
      syndicationEntriesTable.addMouseListener(new MouseAdapter() {
         public void mouseClicked(MouseEvent e) {
            if (e.getClickCount() == 2) {
               if (e.isControlDown()) {
                  viewCommitDiff();
               } else {
                  viewCommit();
               }
            }
         }
      });
      syndicationEntriesTable.getSelectionModel().addListSelectionListener(
            new ListSelectionListener() {
               @Override
               public void valueChanged(ListSelectionEvent e) {
                  if (e.getValueIsAdjusting()) {
                     return;
                  }
                  boolean singleSelection = syndicationEntriesTable.getSelectedRowCount() == 1;
                  viewCommit.setEnabled(singleSelection);
                  viewCommitDiff.setEnabled(singleSelection);
                  viewTree.setEnabled(singleSelection);
               }
            });
      JPanel panel = new JPanel(new BorderLayout(5, 5)) {
         private static final long serialVersionUID = 1L;
         @Override
         public Insets getInsets() {
            return insets;
         }
      };
      panel.add(feedsHeader, BorderLayout.NORTH);
      panel.add(new JScrollPane(syndicationEntriesTable), BorderLayout.CENTER);
      panel.add(controls, BorderLayout.SOUTH);
      return panel;
   }
   private JPanel createUsersPanel() {
@@ -320,9 +420,10 @@
         }
      });
      NameRenderer nameRenderer = new NameRenderer();
      usersModel = new UsersTableModel();
      defaultUsersSorter = new TableRowSorter<UsersTableModel>(usersModel);
      usersTable = Utils.newTable(usersModel);
      usersTable = Utils.newTable(usersModel, Utils.DATE_FORMAT);
      String name = usersTable.getColumnName(UsersTableModel.Columns.Name.ordinal());
      usersTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
      usersTable.getColumn(name).setCellRenderer(nameRenderer);
@@ -411,10 +512,11 @@
         }
      });
      NameRenderer nameRenderer = new NameRenderer();
      final SettingPanel settingPanel = new SettingPanel();
      settingsModel = new SettingsTableModel();
      defaultSettingsSorter = new TableRowSorter<SettingsTableModel>(settingsModel);
      settingsTable = Utils.newTable(settingsModel);
      settingsTable = Utils.newTable(settingsModel, Utils.DATE_FORMAT);
      settingsTable.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());
      String name = settingsTable.getColumnName(UsersTableModel.Columns.Name.ordinal());
      settingsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
@@ -482,11 +584,32 @@
      return settingsPanel;
   }
   private JPanel createStatusPanel() {
      JButton refreshStatus = new JButton(Translation.get("gb.refresh"));
      refreshStatus.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
            refreshStatus();
         }
      });
      JPanel controls = new JPanel();
      controls.add(refreshStatus);
      JPanel panel = new JPanel(new BorderLayout());
      statusPanel = new StatusPanel();
      panel.add(statusPanel, BorderLayout.CENTER);
      panel.add(controls, BorderLayout.SOUTH);
      return panel;
   }
   public void login() throws IOException {
      gitblit.login();
      updateRepositoriesTable();
      Utils.packColumns(repositoriesTable, 2);
      Utils.packColumns(repositoriesTable, 5);
      updateFeedsTable();
      Utils.packColumns(syndicationEntriesTable, 5);
      if (gitblit.allowManagement()) {
         updateUsersTable();
@@ -497,21 +620,25 @@
         editRepository.setVisible(false);
         delRepository.setVisible(false);
         while (tabs.getTabCount() > 1) {
         while (tabs.getTabCount() > 2) {
            // remove all management/administration tabs
            tabs.removeTabAt(1);
            tabs.removeTabAt(2);
         }
      }
      if (gitblit.allowAdministration()) {
         updateSettingsTable();
         updateStatusPanel();
         Utils.packColumns(settingsTable, 5);
      } else {
         // remove the settings tab
         String settingsTitle = Translation.get("gb.settings");
         for (int i = 0; i < tabs.getTabCount(); i++) {
            if (tabs.getTitleAt(i).equals(settingsTitle)) {
               tabs.removeTabAt(i);
               break;
         String[] titles = { Translation.get("gb.settings"), Translation.get("gb.status") };
         for (String title : titles) {
            for (int i = 0; i < tabs.getTabCount(); i++) {
               if (tabs.getTitleAt(i).equals(title)) {
                  tabs.removeTabAt(i);
                  break;
               }
            }
         }
      }
@@ -525,6 +652,14 @@
            + gitblit.getRepositories().size() + ")");
   }
   private void updateFeedsTable() {
      syndicationModel.entries.clear();
      syndicationModel.entries.addAll(gitblit.getSyndicatedEntries());
      syndicationModel.fireTableDataChanged();
      feedsHeader.setText(Translation.get("gb.recentCommits") + " ("
            + gitblit.getSyndicatedEntries().size() + ")");
   }
   private void updateUsersTable() {
      usersModel.list.clear();
      usersModel.list.addAll(gitblit.getUsers());
@@ -536,6 +671,10 @@
      settingsModel.setSettings(gitblit.getSettings());
      settingsModel.fireTableDataChanged();
      settingsHeader.setText(Translation.get("gb.settings"));
   }
   private void updateStatusPanel() {
      statusPanel.setStatus(gitblit.url, gitblit.getStatus());
   }
   private void filterRepositories(final String fragment) {
@@ -656,6 +795,7 @@
      dialog.setLocationRelativeTo(GitblitPanel.this);
      dialog.setUsers(null, gitblit.getUsernames(), null);
      dialog.setRepositories(gitblit.getRepositories());
      dialog.setFederationSets(gitblit.getFederationSets(), null);
      dialog.setVisible(true);
      final RepositoryModel newRepository = dialog.getRepository();
      final List<String> permittedUsers = dialog.getPermittedUsers();
@@ -778,6 +918,89 @@
            }
         };
         worker.execute();
      }
   }
   protected void subscribeRepository(final RepositoryModel repository) {
      if (repository == null) {
         return;
      }
      // TODO this is lame. need better ui.
      if (gitblit.isSubscribed(repository, null)) {
         // unsubscribe
         String msg = MessageFormat.format("Do you want to unsubscribe from {0}?",
               repository.name);
         String[] options = { "no", "yes" };
         int result = JOptionPane.showOptionDialog(GitblitPanel.this, msg, "Unsubscribe?",
               JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options,
               options[0]);
         if (result == 1) {
            if (gitblit.unsubscribe(repository, null)) {
               updateFeedsTable();
               updateRepositoriesTable();
               listener.saveRegistration(repository.name, gitblit.reg);
            }
         }
      } else {
         // subscribe
         String msg = MessageFormat.format("Do you want to subscribe to {0}?", repository.name);
         String[] options = { "no", "yes" };
         int result = JOptionPane.showOptionDialog(GitblitPanel.this, msg, "Subscribe?",
               JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options,
               options[0]);
         if (result == 1) {
            if (gitblit.subscribe(repository, null)) {
               updateRepositoriesTable();
               listener.saveRegistration(repository.name, gitblit.reg);
            }
         }
      }
   }
   protected void refreshFeeds() {
      // TODO change request type here
      GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_USERS) {
         @Override
         protected Boolean doRequest() throws IOException {
            gitblit.refreshSubscribedFeeds();
            return true;
         }
         @Override
         protected void onSuccess() {
            updateFeedsTable();
         }
      };
      worker.execute();
   }
   protected SyndicatedEntryModel getSelectedSyndicatedEntry() {
      int viewRow = syndicationEntriesTable.getSelectedRow();
      int modelRow = syndicationEntriesTable.convertRowIndexToModel(viewRow);
      SyndicatedEntryModel entry = syndicationModel.get(modelRow);
      return entry;
   }
   protected void viewCommit() {
      SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
      browse(entry.link);
   }
   protected void viewCommitDiff() {
      SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
      browse(entry.link.replace("/commit/", "/commitdiff/"));
   }
   protected void viewTree() {
      SyndicatedEntryModel entry = getSelectedSyndicatedEntry();
      browse(entry.link.replace("/commit/", "/tree/"));
   }
   protected void browse(String url) {
      try {
         Desktop.getDesktop().browse(new URI(url));
      } catch (Exception x) {
         x.printStackTrace();
      }
   }
@@ -933,6 +1156,22 @@
      worker.execute();
   }
   protected void refreshStatus() {
      GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_STATUS) {
         @Override
         protected Boolean doRequest() throws IOException {
            gitblit.refreshStatus();
            return true;
         }
         @Override
         protected void onSuccess() {
            updateStatusPanel();
         }
      };
      worker.execute();
   }
   protected void editSetting(final SettingModel settingModel) {
      final JTextField textField = new JTextField(settingModel.currentValue);
      JPanel editPanel = new JPanel(new GridLayout(0, 1));
@@ -948,8 +1187,8 @@
      if (settingModel.currentValue.equals(settingModel.defaultValue)) {
         options = new String[] { Translation.get("gb.cancel"), Translation.get("gb.save") };
      } else {
         options = new String[] { Translation.get("gb.cancel"), Translation.get("gb.setDefault"),
               Translation.get("gb.save") };
         options = new String[] { Translation.get("gb.cancel"),
               Translation.get("gb.setDefault"), Translation.get("gb.save") };
      }
      String defaultOption = options[0];
      int selection = JOptionPane.showOptionDialog(GitblitPanel.this, settingPanel,