Browse Source

bug fix

master
XiaXiang 8 years ago
parent
commit
fae529f30b
  1. 7
      designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java
  2. 10
      designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java

7
designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java

@ -38,10 +38,9 @@ public class ActionSearchManager implements AlphaFineSearchProcessor {
if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainAction()) { if (DesignerEnvManager.getEnvManager().getAlphafineConfigManager().isContainAction()) {
List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions(); List<UpdateActionModel> updateActions = UpdateActionManager.getUpdateActionManager().getUpdateActions();
for (UpdateActionModel updateActionModel : updateActions) { for (UpdateActionModel updateActionModel : updateActions) {
UpdateAction updateAction = updateActionModel.getAction(); if (updateActionModel.getActionName() != null) {
if (updateAction.getName() != null) { if (updateActionModel.getActionName().toLowerCase().contains(searchText.toLowerCase()) || updateActionModel.getParentName().toLowerCase().contains(searchText.toLowerCase())) {
if (updateAction.getName().toLowerCase().contains(searchText.toLowerCase()) || updateActionModel.getParentName().toLowerCase().contains(searchText.toLowerCase())) { filterModelList.add(new ActionModel(updateActionModel.getActionName(), updateActionModel.getParentName(), updateActionModel.getAction()));
filterModelList.add(new ActionModel(updateAction.getName(), updateActionModel.getParentName(), updateAction));
} }
} }
} }

10
designer_base/src/com/fr/design/mainframe/toolbar/UpdateActionModel.java

@ -7,11 +7,13 @@ import com.fr.design.actions.UpdateAction;
*/ */
public class UpdateActionModel { public class UpdateActionModel {
private String parentName; private String parentName;
private String actionName;
private UpdateAction action; private UpdateAction action;
public UpdateActionModel(String parentName, UpdateAction action) { public UpdateActionModel(String parentName, UpdateAction action) {
this.parentName = parentName; this.parentName = parentName;
this.action = action; this.action = action;
this.actionName = action.getName();
} }
public String getParentName() { public String getParentName() {
@ -29,4 +31,12 @@ public class UpdateActionModel {
public void setAction(UpdateAction action) { public void setAction(UpdateAction action) {
this.action = action; this.action = action;
} }
public String getActionName() {
return actionName;
}
public void setActionName(String actionName) {
this.actionName = actionName;
}
} }

Loading…
Cancel
Save