diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 69de01d40..1fb6a94a8 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -14,7 +14,7 @@ import com.fr.design.env.DesignerWorkspaceType; import com.fr.design.env.LocalDesignerWorkspaceInfo; import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.onlineupdate.push.DesignerPushUpdateConfigManager; +import com.fr.design.update.push.DesignerPushUpdateConfigManager; import com.fr.design.style.color.ColorSelectConfigManager; import com.fr.design.utils.DesignUtils; import com.fr.file.FILEFactory; diff --git 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 index af7daef83..aa679de9b 100644 --- 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 @@ -23,7 +23,7 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.onlineupdate.push.DesignerPushUpdateManager; +import com.fr.design.update.push.DesignerPushUpdateManager; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.widget.FRWidgetFactory; import com.fr.general.ComparatorUtils; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 3885ff71d..cc5148256 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -49,7 +49,7 @@ import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.menu.ShortCut; import com.fr.design.menu.ToolBarDef; -import com.fr.design.onlineupdate.actions.SoftwareUpdateAction; +import com.fr.design.update.actions.SoftwareUpdateAction; import com.fr.design.remote.action.RemoteDesignAuthManagerAction; import com.fr.design.utils.ThemeUtils; import com.fr.general.ComparatorUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java b/designer-base/src/main/java/com/fr/design/update/actions/FileDownloader.java similarity index 95% rename from designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java rename to designer-base/src/main/java/com/fr/design/update/actions/FileDownloader.java index d076cc01e..556fa5113 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/FileDownloader.java +++ b/designer-base/src/main/java/com/fr/design/update/actions/FileDownloader.java @@ -1,9 +1,9 @@ -package com.fr.design.onlineupdate.actions; +package com.fr.design.update.actions; -import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.design.update.domain.UpdateConstants; import com.fr.locale.InterProviderFactory; import com.fr.log.FineLoggerFactory; -import com.fr.design.onlineupdate.domain.DownloadItem; +import com.fr.design.update.domain.DownloadItem; import com.fr.stable.ArrayUtils; import com.fr.stable.StableUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java similarity index 83% rename from designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java rename to designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java index 1b14f5f0b..cb412dcb1 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/actions/SoftwareUpdateAction.java +++ b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java @@ -1,10 +1,9 @@ -package com.fr.design.onlineupdate.actions; +package com.fr.design.update.actions; import com.fr.base.BaseUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.onlineupdate.ui.dialog.UpdateMainDialog; -import com.fr.locale.InterProviderFactory; +import com.fr.design.update.ui.dialog.UpdateMainDialog; import java.awt.event.ActionEvent; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java b/designer-base/src/main/java/com/fr/design/update/domain/DownloadItem.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java rename to designer-base/src/main/java/com/fr/design/update/domain/DownloadItem.java index 6871190aa..220f2602d 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/DownloadItem.java +++ b/designer-base/src/main/java/com/fr/design/update/domain/DownloadItem.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.domain; +package com.fr.design.update.domain; import com.fr.general.ComparatorUtils; import com.fr.json.JSONObject; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java b/designer-base/src/main/java/com/fr/design/update/domain/UpdateConstants.java similarity index 97% rename from designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java rename to designer-base/src/main/java/com/fr/design/update/domain/UpdateConstants.java index 293c5d1f0..737deafe6 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java +++ b/designer-base/src/main/java/com/fr/design/update/domain/UpdateConstants.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.domain; +package com.fr.design.update.domain; /** * Created by XINZAI on 2018/8/21. diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java b/designer-base/src/main/java/com/fr/design/update/domain/UpdateInfoCachePropertyManager.java similarity index 95% rename from designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java rename to designer-base/src/main/java/com/fr/design/update/domain/UpdateInfoCachePropertyManager.java index 7895c6913..32537fcf4 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateInfoCachePropertyManager.java +++ b/designer-base/src/main/java/com/fr/design/update/domain/UpdateInfoCachePropertyManager.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.domain; +package com.fr.design.update.domain; import com.fr.log.FineLoggerFactory; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java b/designer-base/src/main/java/com/fr/design/update/factory/DirectoryOperationFactory.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java rename to designer-base/src/main/java/com/fr/design/update/factory/DirectoryOperationFactory.java index 9d929c095..906b71412 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/factory/DirectoryOperationFactory.java +++ b/designer-base/src/main/java/com/fr/design/update/factory/DirectoryOperationFactory.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.factory; +package com.fr.design.update.factory; import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManager.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java similarity index 97% rename from designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManager.java rename to designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java index fd1d5fb90..9ea734e73 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManager.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateConfigManager.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLPrintWriter; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialog.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialog.java rename to designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java index 9178484f8..434c7fd1a 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.design.dialog.UIDialog; import com.fr.design.ui.ModernUIPane; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java rename to designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java index 6e787166e..09e16303a 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManager.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java @@ -1,8 +1,8 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.design.onlineupdate.ui.dialog.UpdateMainDialog; +import com.fr.design.update.ui.dialog.UpdateMainDialog; import com.fr.general.CloudCenter; import com.fr.general.GeneralContext; import com.fr.general.GeneralUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java rename to designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java index 6d7bd93a3..5d5e02a47 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/push/DesignerUpdateInfo.java +++ b/designer-base/src/main/java/com/fr/design/update/push/DesignerUpdateInfo.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.general.ComparatorUtils; import com.fr.json.JSONObject; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/EncodingDetect.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/EncodingDetect.java similarity index 99% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/EncodingDetect.java rename to designer-base/src/main/java/com/fr/design/update/ui/dialog/EncodingDetect.java index ecd63fa16..41bba0f4f 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/EncodingDetect.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/EncodingDetect.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.dialog; +package com.fr.design.update.ui.dialog; import java.io.File; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java similarity index 93% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java rename to designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java index c316311ab..402df06b8 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreDialog.java @@ -1,13 +1,12 @@ -package com.fr.design.onlineupdate.ui.dialog; +package com.fr.design.update.ui.dialog; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.onlineupdate.domain.UpdateConstants; -import com.fr.design.onlineupdate.factory.DirectoryOperationFactory; -import com.fr.design.onlineupdate.ui.widget.ColorfulCellRender; +import com.fr.design.update.domain.UpdateConstants; +import com.fr.design.update.factory.DirectoryOperationFactory; +import com.fr.design.update.ui.widget.ColorfulCellRender; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.locale.InterProviderFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.StableUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java rename to designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java index 680d3190d..cc2290216 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/RestoreResultDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java @@ -1,14 +1,13 @@ -package com.fr.design.onlineupdate.ui.dialog; +package com.fr.design.update.ui.dialog; import com.fr.base.FRContext; import com.fr.design.RestartHelper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.onlineupdate.domain.UpdateConstants; +import com.fr.design.update.domain.UpdateConstants; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; -import com.fr.locale.InterProviderFactory; import com.fr.stable.StableUtils; import com.fr.stable.StringUtils; import com.fr.stable.project.ProjectConstants; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java rename to designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java index 9e1f22b6b..5e5943051 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.dialog; +package com.fr.design.update.ui.dialog; import com.fr.base.FRContext; import com.fr.design.RestartHelper; @@ -11,17 +11,17 @@ import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.DesignerContext; -import com.fr.design.onlineupdate.actions.FileDownloader; -import com.fr.design.onlineupdate.domain.DownloadItem; -import com.fr.design.onlineupdate.domain.UpdateConstants; -import com.fr.design.onlineupdate.domain.UpdateInfoCachePropertyManager; -import com.fr.design.onlineupdate.factory.DirectoryOperationFactory; -import com.fr.design.onlineupdate.ui.widget.LoadingLabel; -import com.fr.design.onlineupdate.ui.widget.UpdateActionLabel; -import com.fr.design.onlineupdate.ui.widget.UpdateInfoTable; -import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableCellRender; -import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableModel; -import com.fr.design.onlineupdate.ui.widget.UpdateInfoTextAreaCellRender; +import com.fr.design.update.actions.FileDownloader; +import com.fr.design.update.domain.DownloadItem; +import com.fr.design.update.domain.UpdateConstants; +import com.fr.design.update.domain.UpdateInfoCachePropertyManager; +import com.fr.design.update.factory.DirectoryOperationFactory; +import com.fr.design.update.ui.widget.LoadingLabel; +import com.fr.design.update.ui.widget.UpdateActionLabel; +import com.fr.design.update.ui.widget.UpdateInfoTable; +import com.fr.design.update.ui.widget.UpdateInfoTableCellRender; +import com.fr.design.update.ui.widget.UpdateInfoTableModel; +import com.fr.design.update.ui.widget.UpdateInfoTextAreaCellRender; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.DateUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/ColorfulCellRender.java similarity index 97% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/ColorfulCellRender.java index 461489839..e5d644b20 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/ColorfulCellRender.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/ColorfulCellRender.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import javax.swing.JList; import javax.swing.JPanel; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/LoadingLabel.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/LoadingLabel.java index a21d67e46..f45f6d67f 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/LoadingLabel.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/LoadingLabel.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import com.fr.design.gui.ilable.UILabel; import com.fr.general.IOUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateActionLabel.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateActionLabel.java index 74c2b6ae5..efd10fb8b 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateActionLabel.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateActionLabel.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import com.fr.design.gui.ilable.UILabel; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTable.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTable.java index f94a514ad..c7690f3d5 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTable.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTable.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import javax.swing.JTable; import javax.swing.table.TableModel; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableCellRender.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableCellRender.java index 22c603c86..9a853762e 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableCellRender.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableCellRender.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import com.fr.general.ComparatorUtils; import com.fr.stable.StringUtils; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableModel.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableModel.java index 147f88a29..0fa128e36 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTableModel.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTableModel.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import javax.swing.table.AbstractTableModel; import java.util.List; diff --git a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTextAreaCellRender.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java rename to designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTextAreaCellRender.java index 1e3cebdf8..4f9836d4c 100644 --- a/designer-base/src/main/java/com/fr/design/onlineupdate/ui/widget/UpdateInfoTextAreaCellRender.java +++ b/designer-base/src/main/java/com/fr/design/update/ui/widget/UpdateInfoTextAreaCellRender.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.ui.widget; +package com.fr.design.update.ui.widget; import javax.swing.BorderFactory; import javax.swing.JTable; diff --git a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManagerTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java similarity index 98% rename from designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManagerTest.java rename to designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java index f9de98218..17831b0b7 100644 --- a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateConfigManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateConfigManagerTest.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.stable.StringUtils; import com.fr.stable.xml.XMLPrintWriter; diff --git a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialogTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java similarity index 95% rename from designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialogTest.java rename to designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java index 841a19429..ae3edf150 100644 --- a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateDialogTest.java +++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.design.DesignerEnvManager; import com.fr.json.JSONObject; diff --git a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManagerTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java similarity index 96% rename from designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManagerTest.java rename to designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java index 4e3f823e9..38491fbe2 100644 --- a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerPushUpdateManagerTest.java +++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateManagerTest.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.invoke.Reflect; import org.junit.Test; diff --git a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerUpdateInfoTest.java b/designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java similarity index 98% rename from designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerUpdateInfoTest.java rename to designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java index 5736793fd..14f986e8e 100644 --- a/designer-base/src/test/java/com/fr/design/onlineupdate/push/DesignerUpdateInfoTest.java +++ b/designer-base/src/test/java/com/fr/design/update/push/DesignerUpdateInfoTest.java @@ -1,4 +1,4 @@ -package com.fr.design.onlineupdate.push; +package com.fr.design.update.push; import com.fr.json.JSONObject; import com.fr.stable.StringUtils; diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java index 4e36ac20c..ff0bef064 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java @@ -55,7 +55,7 @@ import com.fr.design.mainframe.loghandler.DesignerLogAppender; import com.fr.design.mainframe.loghandler.LogMessageBar; import com.fr.design.mainframe.socketio.DesignerSocketIO; import com.fr.design.module.DesignModuleFactory; -import com.fr.design.onlineupdate.push.DesignerPushUpdateManager; +import com.fr.design.update.push.DesignerPushUpdateManager; import com.fr.design.parameter.FormParameterReader; import com.fr.design.parameter.ParameterPropertyPane; import com.fr.design.parameter.WorkBookParameterReader;