Browse Source

Merge pull request #1558 in BA/design from ~XIAOXIA/design:feature/9.0 to feature/9.0

* commit '7cc051b6e1f131b6fe46041cc1ef0edcd7b53493':
  rt
  rt
  打包失败
superman 8 years ago
parent
commit
d83d453b31
  1. 11
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

11
designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@ -664,7 +664,9 @@ public class AlphaFineDialog extends UIDialog {
searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1); searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() + 1);
} else if (e.getKeyCode() == KeyEvent.VK_UP) { } else if (e.getKeyCode() == KeyEvent.VK_UP) {
searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() - 1); searchResultList.setSelectedIndex(searchResultList.getSelectedIndex() - 1);
} else escAlphaFineDialog(e); } else {
escAlphaFineDialog(e);
}
} }
}); });
@ -794,7 +796,7 @@ public class AlphaFineDialog extends UIDialog {
* @param index * @param index
* @param selectedValue * @param selectedValue
*/ */
private void rebuildShowMoreList(int index, MoreModel selectedValue) { private void rebuildShowMoreList(final int index, final MoreModel selectedValue) {
if ((selectedValue).getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowLess"))) { if ((selectedValue).getContent().equals(Inter.getLocText("FR-Designer_AlphaFine_ShowLess"))) {
splitLabel.setIcon(new ImageIcon(getClass().getResource(AlphaFineConstants.IMAGE_URL + "bigloading.gif"))); splitLabel.setIcon(new ImageIcon(getClass().getResource(AlphaFineConstants.IMAGE_URL + "bigloading.gif")));
if (this.searchWorker != null && !this.searchWorker.isDone()) { if (this.searchWorker != null && !this.searchWorker.isDone()) {
@ -804,8 +806,9 @@ public class AlphaFineDialog extends UIDialog {
this.searchWorker = new SwingWorker() { this.searchWorker = new SwingWorker() {
@Override @Override
protected Object doInBackground() throws Exception { protected Object doInBackground() throws Exception {
for (int i = 0; i < getMoreResult(selectedValue).size(); i++) { SearchResult moreResults = getMoreResult(selectedValue);
searchListModel.add(index + AlphaFineConstants.SHOW_SIZE + 1 + i, getMoreResult(selectedValue).get(i)); for (int i = 0; i < moreResults.size(); i++) {
searchListModel.add(index + AlphaFineConstants.SHOW_SIZE + 1 + i, moreResults.get(i));
} }
return null; return null;
} }

Loading…
Cancel
Save