Browse Source

bug fix 代码质量

master
XiaXiang 7 years ago
parent
commit
b923aea003
  1. 4
      designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java
  2. 4
      designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java
  3. 4
      designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java
  4. 14
      designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
  5. 4
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

4
designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java

@ -61,8 +61,8 @@ public abstract class AlphaCellModel implements Comparable {
this.description = description; this.description = description;
} }
public boolean hasNoResult() { public boolean hasAction() {
return false; return true;
} }
public boolean isNeedToSendToServer() { public boolean isNeedToSendToServer() {

4
designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java

@ -60,8 +60,8 @@ public class MoreModel extends AlphaCellModel {
} }
@Override @Override
public boolean hasNoResult() { public boolean hasAction() {
return true; return false;
} }
@Override @Override

4
designer/src/com/fr/design/mainframe/alphafine/cell/model/NoResultModel.java

@ -28,8 +28,8 @@ public class NoResultModel extends AlphaCellModel {
} }
@Override @Override
public boolean hasNoResult() { public boolean hasAction() {
return true; return false;
} }
@Override @Override

14
designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java

@ -26,18 +26,18 @@ public class ContentCellRender implements ListCellRenderer<Object> {
AlphaCellModel model = (AlphaCellModel) value; AlphaCellModel model = (AlphaCellModel) value;
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());
panel.setBackground(null); panel.setBackground(null);
if (isSelected && !model.hasNoResult()) {
panel.setBackground(AlphaFineConstants.BLUE);
}
panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); panel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
titleLabel.setText(" " + model.getName()); titleLabel.setText(" " + model.getName());
String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png";
if (model.hasNoResult()) { if (model.hasAction()) {
titleLabel.setIcon(null); if (isSelected) {
titleLabel.setForeground(AlphaFineConstants.MEDIUM_GRAY); panel.setBackground(AlphaFineConstants.BLUE);
} else { }
titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl))); titleLabel.setIcon(new ImageIcon(IOUtils.readImage(iconUrl)));
titleLabel.setForeground(AlphaFineConstants.BLACK); titleLabel.setForeground(AlphaFineConstants.BLACK);
} else {
titleLabel.setIcon(null);
titleLabel.setForeground(AlphaFineConstants.MEDIUM_GRAY);
} }
titleLabel.setFont(AlphaFineConstants.MEDIUM_FONT); titleLabel.setFont(AlphaFineConstants.MEDIUM_FONT);
String description = model.getDescription(); String description = model.getDescription();

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

@ -829,7 +829,7 @@ public class AlphaFineDialog extends UIDialog {
int previousIndex = getSelectedIndex(); int previousIndex = getSelectedIndex();
super.setSelectedIndex(index); super.setSelectedIndex(index);
AlphaCellModel cellModel = getSelectedValue(); AlphaCellModel cellModel = getSelectedValue();
if (cellModel != null && cellModel.hasNoResult()) { if (cellModel != null && !cellModel.hasAction()) {
if (previousIndex <= getSelectedIndex()) { if (previousIndex <= getSelectedIndex()) {
setSelectedIndex(index + 1); setSelectedIndex(index + 1);
} else { } else {
@ -869,7 +869,7 @@ public class AlphaFineDialog extends UIDialog {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
int selectedIndex = getSelectedIndex(); int selectedIndex = getSelectedIndex();
AlphaCellModel selectedValue = getSelectedValue(); AlphaCellModel selectedValue = getSelectedValue();
if (e.getClickCount() == 2 && !selectedValue.hasNoResult()) { if (e.getClickCount() == 2 && selectedValue.hasAction()) {
doNavigate(); doNavigate();
saveHistory(selectedValue); saveHistory(selectedValue);
} else if (e.getClickCount() == 1) { } else if (e.getClickCount() == 1) {

Loading…
Cancel
Save