From 6e92753da58a65ff37670be0e01eaba377254a91 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 23 May 2017 15:06:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F=20?= =?UTF-8?q?=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/alphafine/AlphaFineHelper.java | 5 ----- .../mainframe/alphafine/cell/CellModelHelper.java | 10 +++++----- .../cell/{cellModel => model}/ActionModel.java | 2 +- .../cell/{cellModel => model}/AlphaCellModel.java | 2 +- .../cell/{cellModel => model}/DocumentModel.java | 2 +- .../cell/{cellModel => model}/FileModel.java | 2 +- .../cell/{cellModel => model}/MoreModel.java | 2 +- .../cell/{cellModel => model}/PluginModel.java | 2 +- .../{cellRender => render}/ContentCellRender.java | 6 +++--- .../{cellRender => render}/TitleCellRender.java | 4 ++-- .../alphafine/component/AlphaFineDialog.java | 14 +++++++------- .../ActionPreviewPane.java | 2 +- .../DocumentPreviewPane.java | 2 +- .../{previewPane => preview}/FilePreviewPane.java | 2 +- .../PluginPreviewPane.java | 2 +- .../manager}/ActionSearchManager.java | 7 +++---- .../manager}/AlphaFineSearchProcessor.java | 2 +- .../manager}/AlphaSearchManager.java | 4 ++-- .../manager}/DocumentSearchManager.java | 6 +++--- .../manager}/FileSearchManager.java | 7 +++---- .../manager}/PluginSearchManager.java | 8 +++----- .../manager}/RecentSearchManager.java | 6 +++--- .../manager}/RecommendSearchManager.java | 6 +++--- 23 files changed, 48 insertions(+), 57 deletions(-) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/ActionModel.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/AlphaCellModel.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/DocumentModel.java (97%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/FileModel.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/MoreModel.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellModel => model}/PluginModel.java (98%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellRender => render}/ContentCellRender.java (90%) rename designer/src/com/fr/design/mainframe/alphafine/cell/{cellRender => render}/TitleCellRender.java (93%) rename designer/src/com/fr/design/mainframe/alphafine/{previewPane => preview}/ActionPreviewPane.java (70%) rename designer/src/com/fr/design/mainframe/alphafine/{previewPane => preview}/DocumentPreviewPane.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/{previewPane => preview}/FilePreviewPane.java (91%) rename designer/src/com/fr/design/mainframe/alphafine/{previewPane => preview}/PluginPreviewPane.java (98%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/ActionSearchManager.java (94%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/AlphaFineSearchProcessor.java (87%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/AlphaSearchManager.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/DocumentSearchManager.java (94%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/FileSearchManager.java (96%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/PluginSearchManager.java (94%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/RecentSearchManager.java (98%) rename designer/src/com/fr/design/mainframe/alphafine/{searchManager => search/manager}/RecommendSearchManager.java (92%) diff --git a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java index 0e90194dfb..60ef8a8ef0 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java +++ b/designer/src/com/fr/design/mainframe/alphafine/AlphaFineHelper.java @@ -1,14 +1,9 @@ package com.fr.design.mainframe.alphafine; -import com.fr.base.FRContext; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.mainframe.alphafine.cell.cellModel.*; import com.fr.design.mainframe.alphafine.component.AlphaFineDialog; -import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; -import java.io.File; - /** * Created by XiaXiang on 2017/5/8. */ 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 e5d6664d8f..e8380cb816 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/CellModelHelper.java @@ -1,11 +1,11 @@ package com.fr.design.mainframe.alphafine.cell; import com.fr.design.mainframe.alphafine.CellType; -import com.fr.design.mainframe.alphafine.cell.cellModel.*; -import com.fr.design.mainframe.alphafine.searchManager.ActionSearchManager; -import com.fr.design.mainframe.alphafine.searchManager.DocumentSearchManager; -import com.fr.design.mainframe.alphafine.searchManager.FileSearchManager; -import com.fr.design.mainframe.alphafine.searchManager.PluginSearchManager; +import com.fr.design.mainframe.alphafine.cell.model.*; +import com.fr.design.mainframe.alphafine.search.manager.ActionSearchManager; +import com.fr.design.mainframe.alphafine.search.manager.DocumentSearchManager; +import com.fr.design.mainframe.alphafine.search.manager.FileSearchManager; +import com.fr.design.mainframe.alphafine.search.manager.PluginSearchManager; import com.fr.json.JSONObject; /** diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java index 6c9a4efa2b..f0f0e32f67 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/ActionModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/ActionModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.CellType; import com.fr.general.FRLogger; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/AlphaCellModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/AlphaCellModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java index 18cd2d843c..082f1f8e72 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/AlphaCellModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/AlphaCellModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.CellType; import com.fr.json.JSONException; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java similarity index 97% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java index 63771ddfdd..b9237c671f 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/DocumentModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/FileModel.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/FileModel.java index 851b0e2a71..8b9acea9b8 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/FileModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/FileModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.CellType; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/MoreModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/MoreModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java index c9449c1101..de9b4fd2e5 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/MoreModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/MoreModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.CellType; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java b/designer/src/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java similarity index 98% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java index c737ea6be9..c8c4d65dc2 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellModel/PluginModel.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/model/PluginModel.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.cell.cellModel; +package com.fr.design.mainframe.alphafine.cell.model; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java similarity index 90% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java index e580847e80..ba23714212 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/ContentCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/render/ContentCellRender.java @@ -1,9 +1,9 @@ -package com.fr.design.mainframe.alphafine.cell.cellRender; +package com.fr.design.mainframe.alphafine.cell.render; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.design.mainframe.alphafine.cell.cellModel.AlphaCellModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import javax.swing.*; import java.awt.*; diff --git a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java b/designer/src/com/fr/design/mainframe/alphafine/cell/render/TitleCellRender.java similarity index 93% rename from designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java rename to designer/src/com/fr/design/mainframe/alphafine/cell/render/TitleCellRender.java index b95d877f4f..84784ecdb3 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/cell/cellRender/TitleCellRender.java +++ b/designer/src/com/fr/design/mainframe/alphafine/cell/render/TitleCellRender.java @@ -1,8 +1,8 @@ -package com.fr.design.mainframe.alphafine.cell.cellRender; +package com.fr.design.mainframe.alphafine.cell.render; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import javax.swing.*; import java.awt.*; 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 0da64af97a..fca60441a5 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java +++ b/designer/src/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java @@ -10,17 +10,17 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.cell.CellModelHelper; -import com.fr.design.mainframe.alphafine.cell.cellRender.ContentCellRender; -import com.fr.design.mainframe.alphafine.cell.cellModel.*; +import com.fr.design.mainframe.alphafine.cell.render.ContentCellRender; +import com.fr.design.mainframe.alphafine.cell.model.*; import com.fr.design.mainframe.alphafine.listener.ComponentHandler; import com.fr.design.mainframe.alphafine.listener.DocumentAdapter; import com.fr.design.mainframe.alphafine.model.SearchListModel; import com.fr.design.mainframe.alphafine.model.SearchResult; -import com.fr.design.mainframe.alphafine.previewPane.DocumentPreviewPane; -import com.fr.design.mainframe.alphafine.previewPane.FilePreviewPane; -import com.fr.design.mainframe.alphafine.previewPane.PluginPreviewPane; -import com.fr.design.mainframe.alphafine.searchManager.*; -import com.fr.design.mainframe.alphafine.searchManager.RecentSearchManager; +import com.fr.design.mainframe.alphafine.preview.DocumentPreviewPane; +import com.fr.design.mainframe.alphafine.preview.FilePreviewPane; +import com.fr.design.mainframe.alphafine.preview.PluginPreviewPane; +import com.fr.design.mainframe.alphafine.manager.*; +import com.fr.design.mainframe.alphafine.search.manager.*; import com.fr.file.FileNodeFILE; import com.fr.file.filetree.FileNode; import com.fr.form.main.Form; diff --git a/designer/src/com/fr/design/mainframe/alphafine/previewPane/ActionPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java similarity index 70% rename from designer/src/com/fr/design/mainframe/alphafine/previewPane/ActionPreviewPane.java rename to designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java index 156432147c..ec2d6ca38e 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/previewPane/ActionPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/ActionPreviewPane.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.previewPane; +package com.fr.design.mainframe.alphafine.preview; /** * Created by XiaXiang on 2017/5/5. diff --git a/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java rename to designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java index 155ab84900..8464a8e416 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/previewPane/DocumentPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/DocumentPreviewPane.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.previewPane; +package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.itextarea.UITextArea; diff --git a/designer/src/com/fr/design/mainframe/alphafine/previewPane/FilePreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/FilePreviewPane.java similarity index 91% rename from designer/src/com/fr/design/mainframe/alphafine/previewPane/FilePreviewPane.java rename to designer/src/com/fr/design/mainframe/alphafine/preview/FilePreviewPane.java index 97aee06edf..50938d48a5 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/previewPane/FilePreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/FilePreviewPane.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.previewPane; +package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.ilable.UILabel; diff --git a/designer/src/com/fr/design/mainframe/alphafine/previewPane/PluginPreviewPane.java b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java similarity index 98% rename from designer/src/com/fr/design/mainframe/alphafine/previewPane/PluginPreviewPane.java rename to designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java index 5ae2f5c004..6b8af31cbf 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/previewPane/PluginPreviewPane.java +++ b/designer/src/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.previewPane; +package com.fr.design.mainframe.alphafine.preview; import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.alphafine.AlphaFineConstants; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java similarity index 94% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java index e13466b65f..c3908681a6 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/ActionSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/ActionSearchManager.java @@ -1,16 +1,15 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.ActionModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.ActionModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.toolbar.UpdateActionManager; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.json.JSONObject; import java.util.List; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaFineSearchProcessor.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java similarity index 87% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaFineSearchProcessor.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java index 3883fbac8f..26ed7c128d 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaFineSearchProcessor.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaFineSearchProcessor.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.mainframe.alphafine.model.SearchResult; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaSearchManager.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaSearchManager.java index 915db8ae20..e84ebded59 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/AlphaSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/AlphaSearchManager.java @@ -1,6 +1,6 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.Inter; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java similarity index 94% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java index c16189345d..8065554bcc 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/DocumentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/DocumentSearchManager.java @@ -1,10 +1,10 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; -import com.fr.design.mainframe.alphafine.cell.cellModel.DocumentModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.DocumentModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.FRLogger; import com.fr.general.Inter; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java similarity index 96% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java index 55784d1818..84c9a502ac 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/FileSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/FileSearchManager.java @@ -1,4 +1,4 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.base.Env; import com.fr.base.FRContext; @@ -6,13 +6,12 @@ import com.fr.design.DesignerEnvManager; 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.cellModel.FileModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.FileModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.file.filetree.FileNode; import com.fr.general.FRLogger; import com.fr.general.Inter; -import com.fr.json.JSONObject; import com.fr.stable.StableUtils; import com.fr.stable.project.ProjectConstants; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java similarity index 94% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java index dfbbf44b47..7e4f6b3589 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/PluginSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/PluginSearchManager.java @@ -1,19 +1,17 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.DesignerEnvManager; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.CellType; -import com.fr.design.mainframe.alphafine.cell.cellModel.PluginModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +import com.fr.design.mainframe.alphafine.cell.model.PluginModel; +import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; -import com.fr.json.JSONException; import com.fr.json.JSONObject; -import com.fr.plugin.chart.designer.other.HyperlinkMapFactory; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java similarity index 98% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java index 6066543d68..7971f7f9e4 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecentSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecentSearchManager.java @@ -1,11 +1,11 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.base.FRContext; import com.fr.base.Utils; import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.cell.CellModelHelper; -import com.fr.design.mainframe.alphafine.cell.cellModel.AlphaCellModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +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.file.XMLFileManager; import com.fr.general.ComparatorUtils; diff --git a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecommendSearchManager.java b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java similarity index 92% rename from designer/src/com/fr/design/mainframe/alphafine/searchManager/RecommendSearchManager.java rename to designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java index f8126ce968..9e23558556 100644 --- a/designer/src/com/fr/design/mainframe/alphafine/searchManager/RecommendSearchManager.java +++ b/designer/src/com/fr/design/mainframe/alphafine/search/manager/RecommendSearchManager.java @@ -1,8 +1,8 @@ -package com.fr.design.mainframe.alphafine.searchManager; +package com.fr.design.mainframe.alphafine.search.manager; import com.fr.design.mainframe.alphafine.cell.CellModelHelper; -import com.fr.design.mainframe.alphafine.cell.cellModel.AlphaCellModel; -import com.fr.design.mainframe.alphafine.cell.cellModel.MoreModel; +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.general.FRLogger; import com.fr.general.Inter;