fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

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

research/10.0
alex.sung 6 years ago
parent
ef46f377b2
commit
614d504347
9 changed files with 34 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
  2. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java
  3. 6
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
  4. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ComplementAdviceManager.java
  5. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java
  6. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
  7. 25
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java
  8. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java
  9. 7
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SimilarSearchManeger.java

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineConstants.java
Unescape View File

@ -1,5 +1,6 @@
package com.fr.design.mainframe.alphafine;
import com.fr.base.extension.FileExtension;
import com.fr.general.CloudCenter;
import java.awt.Color;
import java.awt.Dimension;
@ -123,5 +124,8 @@ public class AlphaFineConstants {
public static final String CHINESE_CHARACTERS = "[\\u4e00-\\u9fa5]";
public static final String FIRST_PAGE = "-1";
public static final FileExtension[] FILE_EXTENSIONS= new FileExtension[]{FileExtension.CPT, FileExtension.FRM};
}

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java
Unescape View File

@ -35,7 +35,7 @@ public class CellModelHelper {
case ROBOT:
case RECOMMEND_ROBOT:
cellModel = SimilarSearchManeger.getModelFromCloud(object.optJSONObject(RESULT));
break;
}
return cellModel;
}

6
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java
Unescape View File

@ -64,7 +64,7 @@ public class ContentCellRender implements ListCellRenderer<Object> {
}
} else {
titleLabel.setText(dealWithModelName(model.getName(), segmentationResult));
titleLabel.setText(highLightModelName(model.getName(), segmentationResult));
String iconUrl = CELL_PATH + model.getType().getTypeValue() + SUFFIX;
if (value instanceof RobotModel && ((RobotModel) value).isHotItemModel()) {
titleLabel.setIcon(null);
@ -104,7 +104,7 @@ public class ContentCellRender implements ListCellRenderer<Object> {
* @param strings
* @return
*/
public String dealWithModelName(String modelName, String[] strings) {
public String highLightModelName(String modelName, String[] strings) {
if (strings == null) {
return modelName;
}
@ -127,4 +127,6 @@ public class ContentCellRender implements ListCellRenderer<Object> {
return modelName.substring(index, index + string.length());
}
}

8
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ComplementAdviceManager.java
Unescape View File

@ -9,7 +9,7 @@ import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONArray;
import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.json.JSONTokener;
import com.fr.json.JSONUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.StringUtils;
import java.io.IOException;
@ -50,9 +50,8 @@ public class ComplementAdviceManager {
try {
String result = HttpToolbox.get(url);
AlphaFineHelper.checkCancel();
Object json = new JSONTokener(result).nextValue();
if (json instanceof JSONArray) {
JSONArray jsonArray = new JSONArray(result);
JSONArray jsonArray = (JSONArray)JSONUtils.jsonDecode(result);
if(jsonArray != null){
for (int i = 0; i < jsonArray.length(); i++) {
AlphaFineHelper.checkCancel();
JSONObject jsonObject = jsonArray.optJSONObject(i);
@ -64,6 +63,7 @@ public class ComplementAdviceManager {
allModelList.add(robotModel);
}
}
}
}
} catch (JSONException e) {

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java
Unescape View File

@ -13,7 +13,7 @@ import com.fr.json.JSONArray;
import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.log.FineLoggerFactory;
import com.fr.third.org.apache.commons.lang3.ArrayUtils;
import com.fr.stable.ArrayUtils;
import java.io.IOException;
@ -61,7 +61,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainDocument()) {
SearchResult searchResult = new SearchResult();
for (int j = 0; j < searchText.length; j++) {
String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j] + "-1";
String url = AlphaFineConstants.DOCUMENT_SEARCH_URL + searchText[j] + AlphaFineConstants.FIRST_PAGE;
try {
String result = HttpToolbox.get(url);
AlphaFineHelper.checkCancel();

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
Unescape View File

@ -73,7 +73,7 @@ public class FileSearchManager implements AlphaFineSearchProvider {
return lessModelList;
}
AlphaFineHelper.checkCancel();
fileNodes = FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, new FileExtension[]{FileExtension.CPT, FileExtension.FRM}, true);
fileNodes = FRContext.getFileNodes().list(ProjectConstants.REPORTLETS_NAME, AlphaFineConstants.FILE_EXTENSIONS, true);
isContainCpt = true;
isContainFrm = true;
doSearch(this.searchText);

25
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java
Unescape View File

@ -14,7 +14,6 @@ import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONArray;
import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.json.JSONTokener;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.CodeUtils;
import com.fr.stable.StringUtils;
@ -61,19 +60,16 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
try {
String result = HttpToolbox.get(AlphaFineConstants.SEARCH_API + CodeUtils.cjkEncode(searchText[j]));
AlphaFineHelper.checkCancel();
Object json = new JSONTokener(result).nextValue();
if (json instanceof JSONObject) {
JSONObject jsonObject = new JSONObject(result);
if (jsonObject.optString("status").equals("success")) {
JSONArray jsonArray = jsonObject.optJSONArray("result");
if (jsonArray != null && jsonArray.length() > 0) {
for (int i = 0; i < jsonArray.length(); i++) {
AlphaFineHelper.checkCancel();
AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson((JSONObject) jsonArray.get(i));
if (alphaCellModel != null && !alreadyContain(alphaCellModel)) {
this.recommendModelList.add(alphaCellModel);
}
JSONObject jsonObject = new JSONObject(result);
if (jsonObject.optString("status").equals("success")) {
JSONArray jsonArray = jsonObject.optJSONArray("result");
if (jsonArray != null && jsonArray.length() > 0) {
for (int i = 0; i < jsonArray.length(); i++) {
AlphaFineHelper.checkCancel();
AlphaCellModel alphaCellModel = CellModelHelper.getModelFromJson((JSONObject) jsonArray.get(i));
if (alphaCellModel != null && !alreadyContain(alphaCellModel)) {
this.recommendModelList.add(alphaCellModel);
}
}
}
@ -94,6 +90,7 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
}
complementAdviceModelList = ComplementAdviceManager.getInstance().getAllSearchResult(searchText);
moreModelList.clear();
if (recommendModelList.size() > 0) {
if (complementAdviceModelList.size() == 0) {
if (recommendModelList.size() > AlphaFineConstants.SHOW_SIZE - 2) {

8
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SegmentationManager.java
Unescape View File

@ -4,6 +4,7 @@ import com.fr.design.mainframe.alphafine.AlphaFineConstants;
import com.fr.stable.StringUtils;
import com.fr.third.ibm.icu.text.BreakIterator;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
@ -18,7 +19,7 @@ public class SegmentationManager {
public static SegmentationManager getInstance() {
if (segmentationManager == null) {
synchronized (SegmentationManager.class){
synchronized (SegmentationManager.class) {
if (segmentationManager == null) {
segmentationManager = new SegmentationManager();
}
@ -50,6 +51,7 @@ public class SegmentationManager {
/**
* 对字符串进行分词
*
* @param searchText
* @return
*/
@ -67,9 +69,7 @@ public class SegmentationManager {
BreakIterator itor = BreakIterator.getWordInstance();
itor.setText(searchText);
int start = itor.first();
for (int end = itor.next();
end != BreakIterator.DONE;
start = end, end = itor.next()) {
for (int end = itor.next(); end != BreakIterator.DONE; start = end, end = itor.next()) {
String temp = searchText.substring(start, end);
if (!StringUtils.isEmpty(temp)) {
result.add(temp);

7
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/SimilarSearchManeger.java
Unescape View File

@ -12,7 +12,7 @@ import com.fr.general.http.HttpToolbox;
import com.fr.json.JSONArray;
import com.fr.json.JSONException;
import com.fr.json.JSONObject;
import com.fr.json.JSONTokener;
import com.fr.json.JSONUtils;
import com.fr.log.FineLoggerFactory;
import java.io.IOException;
import com.fr.third.org.apache.commons.codec.digest.DigestUtils;
@ -47,9 +47,8 @@ public class SimilarSearchManeger implements AlphaFineSearchProvider {
try {
String result = HttpToolbox.get(url);
AlphaFineHelper.checkCancel();
Object json = new JSONTokener(result).nextValue();
if (json instanceof JSONArray) {
JSONArray jsonArray = new JSONArray(result);
JSONArray jsonArray = (JSONArray)JSONUtils.jsonDecode(result);
if(jsonArray != null){
if (jsonArray.length() != 0) {
for (int i = 0; i < jsonArray.length(); i++) {
JSONObject jsonObject = jsonArray.optJSONObject(i);

Write Preview
Loading…
Cancel
Save