Merge pull request #205 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit '753889e8ae408061a2e17300c0300a59d93e78c5': 无JIRA任务调整源码目录结构符合maven默认配置
6 years ago · 064c3eb614
4656 changed files with 63 additions and 63 deletions
--- a/designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj
+++ b/designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj
--- a/designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
+++ b/designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
--- a/designer-base/src/main/java/com/fr/common/inputevent/InputEventBaseOnOS.java
+++ b/designer-base/src/main/java/com/fr/common/inputevent/InputEventBaseOnOS.java
--- a/designer-base/src/main/java/com/fr/common/inputevent/package.html
+++ b/designer-base/src/main/java/com/fr/common/inputevent/package.html
--- a/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
+++ b/designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
--- a/designer-base/src/main/java/com/fr/design/DesignState.java
+++ b/designer-base/src/main/java/com/fr/design/DesignState.java
--- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
+++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
--- a/designer-base/src/main/java/com/fr/design/Exception/ValidationException.java
+++ b/designer-base/src/main/java/com/fr/design/Exception/ValidationException.java
--- a/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
+++ b/designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
--- a/designer-base/src/main/java/com/fr/design/RestartHelper.java
+++ b/designer-base/src/main/java/com/fr/design/RestartHelper.java
--- a/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/CheckBoxAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/CheckBoxAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/HyperlinkPluginAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/HyperlinkPluginAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/JTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/JTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/MenuAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/MenuAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/TemplateComponentAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/TemplateComponentAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/TemplateComponentActionInterface.java
+++ b/designer-base/src/main/java/com/fr/design/actions/TemplateComponentActionInterface.java
--- a/designer-base/src/main/java/com/fr/design/actions/ToggleButtonUpdateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/ToggleButtonUpdateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/UndoableAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/UndoableAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
+++ b/designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
--- a/designer-base/src/main/java/com/fr/design/actions/core/WorkBookSupportable.java
+++ b/designer-base/src/main/java/com/fr/design/actions/core/WorkBookSupportable.java
--- a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
--- a/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
+++ b/designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineContext.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineContext.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineListener.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineListener.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
--- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
--- a/designer-base/src/main/java/com/fr/design/actions/tabledata/TableDataAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/tabledata/TableDataAction.java
--- a/designer-base/src/main/java/com/fr/design/bbs/BBSLoginUtils.java
+++ b/designer-base/src/main/java/com/fr/design/bbs/BBSLoginUtils.java
--- a/designer-base/src/main/java/com/fr/design/bbs/package.html
+++ b/designer-base/src/main/java/com/fr/design/bbs/package.html
--- a/designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java
+++ b/designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java
--- a/designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java
+++ b/designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java
--- a/designer-base/src/main/java/com/fr/design/beans/GroupModel.java
+++ b/designer-base/src/main/java/com/fr/design/beans/GroupModel.java
--- a/designer-base/src/main/java/com/fr/design/beans/location/Absorptionline.java
+++ b/designer-base/src/main/java/com/fr/design/beans/location/Absorptionline.java
--- a/designer-base/src/main/java/com/fr/design/beans/location/MoveUtils.java
+++ b/designer-base/src/main/java/com/fr/design/beans/location/MoveUtils.java
--- a/designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java
+++ b/designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java
--- a/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
+++ b/designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
--- a/designer-base/src/main/java/com/fr/design/border/package.html
+++ b/designer-base/src/main/java/com/fr/design/border/package.html
--- a/designer-base/src/main/java/com/fr/design/bridge/DesignToolbarProvider.java
+++ b/designer-base/src/main/java/com/fr/design/bridge/DesignToolbarProvider.java
--- a/designer-base/src/main/java/com/fr/design/bridge/package.html
+++ b/designer-base/src/main/java/com/fr/design/bridge/package.html
--- a/designer-base/src/main/java/com/fr/design/cell/FloatElementsProvider.java
+++ b/designer-base/src/main/java/com/fr/design/cell/FloatElementsProvider.java
--- a/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java
+++ b/designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java
--- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttrSingleConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttrSingleConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
+++ b/designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
--- a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/DSColumnSimpleLiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnSimpleLiteConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/HighLightConditionAction.java
+++ b/designer-base/src/main/java/com/fr/design/condition/HighLightConditionAction.java
--- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java
+++ b/designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java
--- a/designer-base/src/main/java/com/fr/design/constants/KeyWords.java
+++ b/designer-base/src/main/java/com/fr/design/constants/KeyWords.java
--- a/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java
+++ b/designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java
--- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
+++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
--- a/Show More
+++ b/Show More