diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/1.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/1.java deleted file mode 100644 index d5e51242cf..0000000000 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/1.java +++ /dev/null @@ -1,317 +0,0 @@ -//package com.fr.design.mainframe.alphafine.search.manager.impl; -// -//import com.fr.base.FRContext; -//import com.fr.base.Utils; -//import com.fr.design.actions.UpdateAction; -//import com.fr.design.mainframe.alphafine.AlphaFineConstants; -//import com.fr.design.mainframe.alphafine.AlphaFineHelper; -//import com.fr.design.mainframe.alphafine.CellType; -//import com.fr.design.mainframe.alphafine.cell.CellModelHelper; -//import com.fr.design.mainframe.alphafine.cell.model.ActionModel; -//import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; -//import com.fr.design.mainframe.alphafine.cell.model.MoreModel; -//import com.fr.design.mainframe.alphafine.model.SearchResult; -//import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider; -//import com.fr.design.mainframe.toolbar.UpdateActionManager; -//import com.fr.file.XMLFileManager; -//import com.fr.general.ComparatorUtils; -//import com.fr.general.FRLogger; -//import com.fr.general.IOUtils; -//import com.fr.general.Inter; -//import com.fr.json.JSONException; -//import com.fr.json.JSONObject; -//import com.fr.stable.ProductConstants; -//import com.fr.stable.StableUtils; -//import com.fr.stable.StringUtils; -//import com.fr.stable.project.ProjectConstants; -//import com.fr.stable.xml.XMLPrintWriter; -//import com.fr.stable.xml.XMLReadable; -//import com.fr.stable.xml.XMLTools; -//import com.fr.stable.xml.XMLableReader; -// -//import java.io.File; -//import java.io.FileOutputStream; -//import java.io.FileWriter; -//import java.io.IOException; -//import java.io.OutputStream; -//import java.io.StringReader; -//import java.util.Collections; -//import java.util.HashMap; -//import java.util.Iterator; -//import java.util.List; -//import java.util.Map; -// -///** -// * Created by XiaXiang on 2017/5/15. -// */ -//public class RecentSearchManager extends XMLFileManager implements AlphaFineSearchProvider { -// -// private static final String XML_TAG = "AFSearch_Recent"; -// private static final int MAX_SIZE = 3; -// private static RecentSearchManager recentSearchManager = null; -// private static File recentFile = null; -// private SearchResult modelList; -// private SearchResult recentModelList; -// private Map recentKVModelMap = new HashMap<>(); -// -// public synchronized static RecentSearchManager getInstance() { -// if (recentSearchManager == null) { -// recentSearchManager = new RecentSearchManager(); -// try { -// XMLTools.readFileXML(recentSearchManager, recentSearchManager.getRecentEnvFile()); -// } catch (Exception e) { -// FRContext.getLogger().error(e.getMessage(), e); -// } -// } -// return recentSearchManager; -// -// } -// -// @Override -// public void readXML(XMLableReader reader) { -// if (reader.isAttr()) { -// reader.readXMLObject(new XMLReadable() { -// public void readXML(XMLableReader reader) { -// if (reader.isChildNode()) { -// String nodeName = reader.getTagName(); -// if (nodeName.equals("RecentModelList")) { -// String key = reader.getAttrAsString("searchKey", StringUtils.EMPTY); -// final SearchResult list = new SearchResult(); -// reader.readXMLObject(new XMLReadable() { -// @Override -// public void readXML(XMLableReader reader) { -// readCellModel(reader, list); -// } -// } -// ); -// recentKVModelMap.put(key, list); -// } -// } -// } -// }); -// } -// -// } -// -// private void readCellModel(XMLableReader reader, List list) { -// if (reader.isChildNode()) { -// String nodeName = reader.getTagName(); -// if (nodeName.equals("model")) { -// String modelValue = reader.getAttrAsString("cellModel", StringUtils.EMPTY); -// addModelToList(list, modelValue); -// } -// } -// } -// -// -// private void addModelToList(List list, String modelValue) { -// try { -// AlphaCellModel model = CellModelHelper.getModelFromJson(new JSONObject(modelValue)); -// if (model != null) { -// list.add(model); -// } -// } catch (JSONException e) { -// FRLogger.getLogger().error(e.getMessage()); -// } -// } -// -// -// @Override -// public void writeXML(XMLPrintWriter writer) { -// writer.startTAG(XML_TAG); -// if (!recentKVModelMap.isEmpty()) { -// for (String key : recentKVModelMap.keySet()) { -// writer.startTAG("RecentModelList"); -// writer.attr("searchKey", key); -// for (AlphaCellModel model : recentKVModelMap.get(key)) { -// try { -// String modelValue = model.ModelToJson().toString(); -// writer.startTAG("model"); -// writer.attr("cellModel", modelValue); -// writer.end(); -// } catch (JSONException e) { -// FRLogger.getLogger().error(e.getMessage()); -// } -// } -// writer.end(); -// } -// } -// writer.end(); -// -// } -// -// @Override -// public String fileName() { -// return "AFSearch_Recent.xml"; -// } -// -// -// /** -// * 获取xml -// * -// * @return -// */ -// private File getRecentFile() { -// if (recentFile == null) { -// recentFile = new File(ProductConstants.getEnvHome() + File.separator + fileName()); -// } -// return recentFile; -// } -// -// private File getOldFile() { -// return new File(ProductConstants.getEnvHome() + File.separator + "AlphaFine_Recent.xml"); -// } -// -// private File getRecentEnvFile() { -// File envFile = getRecentFile(); -// File oldFile = getOldFile(); -// if (oldFile.exists()) { -// StableUtils.deleteFile(oldFile); -// } -// if (!envFile.exists()) { -// createRecentFile(envFile); -// } -// return envFile; -// } -// -// /** -// * 创建XML -// * -// * @param envFile -// */ -// private void createRecentFile(File envFile) { -// try { -// FileWriter fileWriter = new FileWriter(envFile); -// StringReader stringReader = new StringReader(""); -// Utils.copyCharTo(stringReader, fileWriter); -// stringReader.close(); -// fileWriter.close(); -// } catch (IOException e) { -// FRContext.getLogger().error(e.getMessage(), e); -// } -// } -// -// /** -// * 保存XML到设计器安装目录 -// */ -// public void saveXMLFile() { -// File xmlFile = this.getRecentEnvFile(); -// if (xmlFile == null) { -// return; -// } -// if (!xmlFile.getParentFile().exists()) {//建立目录. -// StableUtils.mkdirs(xmlFile.getParentFile()); -// } -// -// String tempName = xmlFile.getName() + ProjectConstants.TEMP_SUFFIX; -// File tempFile = new File(xmlFile.getParentFile(), tempName); -// -// writeTempFile(tempFile); -// IOUtils.renameTo(tempFile, xmlFile); -// } -// -// private void writeTempFile(File tempFile) { -// try { -// OutputStream fout = new FileOutputStream(tempFile); -// XMLTools.writeOutputStreamXML(this, fout); -// fout.flush(); -// fout.close(); -// } catch (Exception e) { -// FRContext.getLogger().error(e.getMessage()); -// } -// } -// -// -// public List getRecentModelList() { -// return recentModelList; -// } -// -// /** -// * 根据搜索字段获取对应的model列表 -// * -// * @param searchText -// * @return -// */ -// private synchronized SearchResult getRecentModelList(String searchText) { -// recentModelList = new SearchResult(); -// for (String key : recentKVModelMap.keySet()) { -// AlphaFineHelper.checkCancel(); -// if (ComparatorUtils.equals(key, searchText)) { -// recentModelList = recentKVModelMap.get(searchText); -// SearchResult resultModelList = recentModelList; -// Iterator modelIterator = resultModelList.iterator(); -// SearchResult searchResult = new SearchResult(); -// while (modelIterator.hasNext()) { -// AlphaCellModel model = modelIterator.next(); -// if (model.getType() == CellType.ACTION) { -// UpdateAction action = UpdateActionManager.getUpdateActionManager().getActionByName(model.getName()); -// if (action != null) { -// ((ActionModel) model).setAction(action); -// searchResult.add(model); -// } -// } else { -// searchResult.add(model); -// } -// -// } -// Collections.sort(searchResult); -// int size = searchResult.size(); -// if (size > MAX_SIZE) { -// SearchResult result = new SearchResult(); -// result.addAll(searchResult.subList(0, MAX_SIZE)); -// return result; -// } -// return searchResult; -// } -// } -// return recentModelList; -// } -// -// /** -// * 将搜索结果加入到当前MAP中 -// * -// * @param searchKey -// * @param cellModel -// */ -// public void addRecentModel(String searchKey, AlphaCellModel cellModel) { -// if (recentKVModelMap.keySet().contains(searchKey)) { -// List cellModels = recentKVModelMap.get(searchKey); -// int index = cellModels.indexOf(cellModel); -// if (index >= 0) { -// cellModels.get(index).addSearchCount(); -// } else { -// cellModels.add(cellModel); -// } -// //trimToSize(cellModels); -// } else { -// SearchResult list = new SearchResult(); -// list.add(cellModel); -// recentKVModelMap.put(searchKey, list); -// } -// } -// -// -// private synchronized void trimToSize(List cellModels) { -// if (cellModels.size() > AlphaFineConstants.MAX_FILE_SIZE) { -// cellModels.remove(0); -// } -// } -// -// -// @Override -// public synchronized SearchResult getLessSearchResult(String searchText) { -// this.modelList = new SearchResult(); -// recentModelList = getRecentModelList(searchText); -// if (recentModelList != null && recentModelList.size() > 0) { -// modelList.add(new MoreModel(Inter.getLocText("FR-Designer_AlphaFine_Latest"))); -// } -// modelList.addAll(recentModelList); -// return modelList; -// } -// -// @Override -// public SearchResult getMoreSearchResult(String searchText) { -// return new SearchResult(); -// } -// -//} diff --git a/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 7431f09abb..07f3b99a04 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -57,7 +57,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { public synchronized static RecentSearchManager getInstance() { if (recentSearchManager == null) { - return new RecentSearchManager(); + recentSearchManager = new RecentSearchManager(); } return recentSearchManager; } @@ -177,7 +177,6 @@ public class RecentSearchManager implements AlphaFineSearchProvider { //遍历结果 for (ScoreDoc scoreDoc : scores) { Document document = searcher.doc(scoreDoc.doc); - System.out.println(document.get("cellModel") + "\n" + document.get("searchCount") + "\n"); AlphaCellModel model = CellModelHelper.getModelFromJson(new JSONObject(document.get("cellModel"))); this.recentModelList.add(model);