From 0656c731f492d513346e4f5c5561b49af16a80e5 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 23 May 2017 10:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/mainframe/alphafine/CellType.java | 25 +++++++++++-------- .../alphafine/cell/CellModelHelper.java | 4 +-- .../alphafine/cell/cellModel/ActionModel.java | 2 +- .../cell/cellModel/DocumentModel.java | 2 +- .../alphafine/cell/cellModel/FileModel.java | 3 +-- .../alphafine/cell/cellModel/PluginModel.java | 8 ++---- .../cell/cellRender/ContentCellRender.java | 2 +- .../alphafine/component/AlphaFineDialog.java | 2 +- 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/designer/src/com/fr/design/mainframe/alphafine/CellType.java b/designer/src/com/fr/design/mainframe/alphafine/CellType.java index 016490e44..f1a6197ca 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/CellType.java +++ b/designer/src/com/fr/design/mainframe/alphafine/CellType.java @@ -4,30 +4,33 @@ package com.fr.design.mainframe.alphafine; * Created by XiaXiang on 2017/4/27. */ public enum CellType { - PLUGIN(0), DOCUMENT(1), FILE(2), ACTION(3), REUSE(4); + RECOMMEND(0), ACTION(1), DOCUMENT(2), FILE(3), PLUGIN(4), REUSE(5); - private int cellType; + private int typeValue; CellType(int type) { - this.cellType = type; + this.typeValue = type; } public static CellType parse(int cellType) { CellType type; switch (cellType) { case 0: - type = PLUGIN; + type = RECOMMEND; break; case 1: - type = DOCUMENT; + type = ACTION; break; case 2: - type = FILE; + type = DOCUMENT; break; case 3: - type = ACTION; + type = FILE; break; case 4: + type = PLUGIN; + break; + case 5: type = REUSE; break; default: @@ -36,12 +39,12 @@ public enum CellType { return type; } - public int getCellType() { - return cellType; + public int getTypeValue() { + return typeValue; } - public void setCellType(int cellType) { - this.cellType = cellType; + public void setTypeValue(int typeValue) { + this.typeValue = typeValue; } } diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java b/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java index f797e17c4..fdae19657 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java @@ -14,9 +14,9 @@ import com.fr.json.JSONObject; public class CellModelHelper { private static final String RESULT = "result"; public static AlphaCellModel jsonToModel(JSONObject object) { - int cellType = object.optInt("cellType"); + int typeValue = object.optInt("cellType"); AlphaCellModel cellModel = null; - switch (CellType.parse(cellType)) { + switch (CellType.parse(typeValue)) { case ACTION: cellModel = ActionSearchManager.getModelFromCloud(object.optString(RESULT)); break; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java index 9245e6af8..6c9a4efa2 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java @@ -55,7 +55,7 @@ public class ActionModel extends AlphaCellModel implements Serializable { public JSONObject ModelToJson() { JSONObject object = JSONObject.create(); try { - object.put("result", getAction().getClass().getName()).put("cellType", getType().getCellType()); + object.put("result", getAction().getClass().getName()).put("cellType", getType().getTypeValue()); } catch (JSONException e) { FRLogger.getLogger().error(e.getMessage()); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java index d70c8d48e..63771ddfd 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java @@ -39,7 +39,7 @@ public class DocumentModel extends AlphaCellModel { try { JSONObject modelObject = JSONObject.create(); modelObject.put("title", getName()).put("summary", getContent()).put("did", getDocumentId()); - object.put("result", modelObject).put("cellType", getType().getCellType()); + object.put("result", modelObject).put("cellType", getType().getTypeValue()); } catch (JSONException e) { FRLogger.getLogger().error("DocumentModel: " + e.getMessage()); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java index edb0af101..851b0e2a7 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java @@ -5,7 +5,6 @@ import com.fr.design.mainframe.alphafine.CellType; import com.fr.general.FRLogger; import com.fr.json.JSONException; import com.fr.json.JSONObject; -import org.apache.xerces.impl.xpath.regex.REUtil; /** * Created by XiaXiang on 2017/4/20. @@ -35,7 +34,7 @@ public class FileModel extends AlphaCellModel{ public JSONObject ModelToJson() { JSONObject object = JSONObject.create(); try { - object.put("result", getFilePath()).put("cellType", getType().getCellType()); + object.put("result", getFilePath()).put("cellType", getType().getTypeValue()); } catch (JSONException e) { FRLogger.getLogger().error(e.getMessage()); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java index d39021925..c737ea6be 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java @@ -2,14 +2,10 @@ package com.fr.design.mainframe.alphafine.cell.cellModel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; -import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.json.JSONException; import com.fr.json.JSONObject; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - /** * Created by XiaXiang on 2017/4/20. */ @@ -100,8 +96,8 @@ public class PluginModel extends AlphaCellModel { JSONObject object = JSONObject.create(); try { JSONObject modelObject = JSONObject.create(); - modelObject.put("name", getName()).put("description", getContent()).put("pic", getImageUrl()).put("version", getVersion()).put("jartime", getJartime()).put("type", getType().getCellType()).put("price", getPrice()).put("id", getPluginId()).put("link", getLink()); - object.put("result", modelObject).put("cellType", getType().getCellType()); + modelObject.put("name", getName()).put("description", getContent()).put("pic", getImageUrl()).put("version", getVersion()).put("jartime", getJartime()).put("type", getType().getTypeValue()).put("price", getPrice()).put("id", getPluginId()).put("link", getLink()); + object.put("result", modelObject).put("cellType", getType().getTypeValue()); } catch (JSONException e) { FRLogger.getLogger().error(e.getMessage()); } diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java index 6f9a967cb..e580847e8 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java @@ -32,7 +32,7 @@ public class ContentCellRender implements ListCellRenderer { panel.setBorder(BorderFactory.createEmptyBorder(0,15,0,0)); AlphaCellModel model = (AlphaCellModel) value; name.setText(model.getName()); - String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getCellType() + ".png"; + String iconUrl = "/com/fr/design/mainframe/alphafine/images/alphafine" + model.getType().getTypeValue() + ".png"; name.setIcon(new ImageIcon(getClass().getResource(iconUrl))); name.setFont(AlphaFineConstants.MEDIUM_FONT); name.setForeground(AlphaFineConstants.BLACK); diff --git a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java index bd01c9051..e17156260 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -579,7 +579,7 @@ public class AlphaFineDialog extends UIDialog { String activitykey = DesignerEnvManager.getEnvManager().getActivationKey(); String createTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(Calendar.getInstance().getTime()); String key = searchKey; - int resultkind = cellModel.getType().getCellType(); + int resultkind = cellModel.getType().getTypeValue(); String resultValue = CellModelHelper.getResultValueFromModel(cellModel); JSONObject object = JSONObject.create(); try {