opendev/gerrit
Code Issues Proposed changes

Merge "Highlight filter string in ProjectListPopup"

Browse Source
This commit is contained in:
David Pursehouse
2012-12-12 06:51:21 -08:00
committed by Gerrit Code Review
parent ece4cb4a51 c81927ac4c
commit acba255c42
2 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/HighlightingProjectsTable.java Normal file
View File

@@ -0,0 +1,37 @@
// Copyright (C) 2012 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.client.ui;
import com.google.gerrit.client.projects.ProjectInfo;
import com.google.gerrit.client.projects.ProjectMap;
import com.google.gwt.user.client.ui.InlineHTML;
public class HighlightingProjectsTable extends ProjectsTable {
private String toHighlight;
public void display(final ProjectMap projects, final String toHighlight) {
this.toHighlight = toHighlight;
super.display(projects);
}
@Override
protected void populate(final int row, final ProjectInfo k) {
table.setWidget(row, 1,
new InlineHTML(Util.highlight(k.name(), toHighlight)));
table.setText(row, 2, k.description());
setRowItem(row, k);
}
}

6
gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectListPopup.java
View File

@@ -37,7 +37,7 @@ import com.google.gwtexpui.user.client.PluginSafeDialogBox;
/** It creates a popup containing all the projects. */
public class ProjectListPopup {
private ProjectsTable projectsTab;
private HighlightingProjectsTable projectsTab;
private PluginSafeDialogBox popup;
private NpTextBox filterTxt;
private HorizontalPanel filterPanel;
@@ -117,7 +117,7 @@ public class ProjectListPopup {
});
filterPanel.add(filterTxt);
projectsTab = new ProjectsTable() {
projectsTab = new HighlightingProjectsTable() {
@Override
protected void movePointerTo(final int row, final boolean scroll) {
super.movePointerTo(row, scroll);
@@ -191,7 +191,7 @@ public class ProjectListPopup {
}
private void display(final ProjectMap result) {
projectsTab.display(result);
projectsTab.display(result, subname);
if (firstPopupLoad) { // Display was delayed until table was loaded
firstPopupLoad = false;
displayPopup();