Browse Source

解决冲突,并提升代码质量

research/10.0
alex.sung 6 years ago
parent
commit
3113347520
  1. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
  2. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java
  3. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java
  4. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java

@ -53,7 +53,7 @@ public class ContentCellRender implements ListCellRenderer<Object> {
if (model.hasAction()) {
if (isSelected) {
titleLabel.setText(" " + model.getName());
titleLabel.setText(StringUtils.BLANK + model.getName());
String iconUrl = SELECTED_PATH + model.getType().getTypeValue() + SUFFIX;
panel.setBackground(AlphaFineConstants.BLUE);
titleLabel.setForeground(Color.WHITE);

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java

@ -15,7 +15,7 @@ import com.fr.general.ComparatorUtils;
import com.fr.json.JSONObject;
import com.fr.stable.StringUtils;
import com.fr.third.org.apache.commons.lang3.ArrayUtils;
import com.fr.stable.ArrayUtils;
import java.util.List;

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java

@ -17,7 +17,7 @@ import com.fr.log.FineLoggerFactory;
import com.fr.plugin.basic.version.Version;
import com.fr.plugin.basic.version.VersionIntervalFactory;
import com.fr.stable.EncodeConstants;
import com.fr.third.org.apache.commons.lang3.ArrayUtils;
import com.fr.stable.ArrayUtils;
import java.io.IOException;
import java.io.UnsupportedEncodingException;

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java

@ -17,7 +17,7 @@ import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CodeUtils;
import com.fr.stable.StringUtils;
import com.fr.third.org.apache.commons.lang3.ArrayUtils;
import com.fr.stable.ArrayUtils;
import java.io.IOException;
import java.util.Iterator;

Loading…
Cancel
Save