Browse Source

Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)

* commit 'f8448b25db0039c07da08cee7f12449a4410461b':
  无JIRA任务 调整源码目录结构符合maven默认配置
  REPORT-9360【10.0一轮回归】模板名有特殊符号无法预览
  REPORT-9512 & REPORT-9297
  .
  finally
master
yaoh.wu 6 years ago
parent
commit
2b0e056d57
  1. 0
      designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj
  2. 0
      designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
  3. 0
      designer-base/src/main/java/com/fr/common/inputevent/InputEventBaseOnOS.java
  4. 0
      designer-base/src/main/java/com/fr/common/inputevent/package.html
  5. 0
      designer-base/src/main/java/com/fr/design/DesignModelAdapter.java
  6. 0
      designer-base/src/main/java/com/fr/design/DesignState.java
  7. 16
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  8. 0
      designer-base/src/main/java/com/fr/design/Exception/ValidationException.java
  9. 0
      designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java
  10. 0
      designer-base/src/main/java/com/fr/design/RestartHelper.java
  11. 0
      designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java
  12. 0
      designer-base/src/main/java/com/fr/design/actions/CheckBoxAction.java
  13. 0
      designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java
  14. 0
      designer-base/src/main/java/com/fr/design/actions/HyperlinkPluginAction.java
  15. 0
      designer-base/src/main/java/com/fr/design/actions/JTemplateAction.java
  16. 0
      designer-base/src/main/java/com/fr/design/actions/MenuAction.java
  17. 0
      designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java
  18. 0
      designer-base/src/main/java/com/fr/design/actions/TemplateComponentAction.java
  19. 0
      designer-base/src/main/java/com/fr/design/actions/TemplateComponentActionInterface.java
  20. 0
      designer-base/src/main/java/com/fr/design/actions/ToggleButtonUpdateAction.java
  21. 0
      designer-base/src/main/java/com/fr/design/actions/UndoableAction.java
  22. 0
      designer-base/src/main/java/com/fr/design/actions/UpdateAction.java
  23. 0
      designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java
  24. 0
      designer-base/src/main/java/com/fr/design/actions/community/BugAction.java
  25. 0
      designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java
  26. 0
      designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java
  27. 0
      designer-base/src/main/java/com/fr/design/actions/community/SignAction.java
  28. 0
      designer-base/src/main/java/com/fr/design/actions/community/UpAction.java
  29. 0
      designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java
  30. 0
      designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java
  31. 0
      designer-base/src/main/java/com/fr/design/actions/core/WorkBookSupportable.java
  32. 0
      designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
  33. 0
      designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
  34. 0
      designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
  35. 0
      designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java
  36. 0
      designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
  37. 0
      designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java
  38. 0
      designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java
  39. 0
      designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java
  40. 0
      designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java
  41. 0
      designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java
  42. 0
      designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java
  43. 0
      designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java
  44. 0
      designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java
  45. 0
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  46. 0
      designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
  47. 0
      designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java
  48. 14
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  49. 0
      designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java
  50. 0
      designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java
  51. 0
      designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
  52. 0
      designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
  53. 0
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java
  54. 0
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  55. 0
      designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
  56. 0
      designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java
  57. 0
      designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
  58. 0
      designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java
  59. 0
      designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java
  60. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java
  61. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
  62. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
  63. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineContext.java
  64. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineListener.java
  65. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java
  66. 0
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
  67. 0
      designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java
  68. 0
      designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java
  69. 0
      designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java
  70. 0
      designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java
  71. 0
      designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java
  72. 0
      designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java
  73. 0
      designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java
  74. 0
      designer-base/src/main/java/com/fr/design/actions/tabledata/TableDataAction.java
  75. 0
      designer-base/src/main/java/com/fr/design/bbs/BBSLoginUtils.java
  76. 0
      designer-base/src/main/java/com/fr/design/bbs/package.html
  77. 0
      designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java
  78. 0
      designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java
  79. 0
      designer-base/src/main/java/com/fr/design/beans/GroupModel.java
  80. 0
      designer-base/src/main/java/com/fr/design/beans/location/Absorptionline.java
  81. 0
      designer-base/src/main/java/com/fr/design/beans/location/MoveUtils.java
  82. 0
      designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java
  83. 0
      designer-base/src/main/java/com/fr/design/border/UITitledBorder.java
  84. 0
      designer-base/src/main/java/com/fr/design/border/package.html
  85. 0
      designer-base/src/main/java/com/fr/design/bridge/DesignToolbarProvider.java
  86. 0
      designer-base/src/main/java/com/fr/design/bridge/package.html
  87. 0
      designer-base/src/main/java/com/fr/design/cell/FloatElementsProvider.java
  88. 0
      designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java
  89. 0
      designer-base/src/main/java/com/fr/design/condition/ConditionAttrSingleConditionPane.java
  90. 0
      designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java
  91. 0
      designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java
  92. 0
      designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java
  93. 0
      designer-base/src/main/java/com/fr/design/condition/DSColumnSimpleLiteConditionPane.java
  94. 0
      designer-base/src/main/java/com/fr/design/condition/HighLightConditionAction.java
  95. 0
      designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
  96. 0
      designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java
  97. 0
      designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java
  98. 0
      designer-base/src/main/java/com/fr/design/constants/KeyWords.java
  99. 0
      designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java
  100. 0
      designer-base/src/main/java/com/fr/design/constants/UIConstants.java
  101. Some files were not shown because too many files have changed in this diff Show More

0
designer-base/src/com/fr/aspectj/designerbase/AlphaFineReminder.aj → designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj

0
designer-base/src/com/fr/aspectj/designerbase/TemplateProcessTracker.aj → designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj

0
designer-base/src/com/fr/common/inputevent/InputEventBaseOnOS.java → designer-base/src/main/java/com/fr/common/inputevent/InputEventBaseOnOS.java

0
designer-base/src/com/fr/common/inputevent/package.html → designer-base/src/main/java/com/fr/common/inputevent/package.html

0
designer-base/src/com/fr/design/DesignModelAdapter.java → designer-base/src/main/java/com/fr/design/DesignModelAdapter.java

0
designer-base/src/com/fr/design/DesignState.java → designer-base/src/main/java/com/fr/design/DesignState.java

16
designer-base/src/com/fr/design/DesignerEnvManager.java → designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@ -35,10 +35,12 @@ import com.fr.stable.xml.XMLTools;
import com.fr.stable.xml.XMLWriter;
import com.fr.stable.xml.XMLableReader;
import com.fr.workspace.WorkContext;
import com.fr.workspace.connect.AuthException;
import javax.swing.*;
import javax.swing.SwingWorker;
import javax.swing.SwingWorker.StateValue;
import java.awt.*;
import java.awt.Color;
import java.awt.Rectangle;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
@ -476,7 +478,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
* @return 是默认则返回true
*/
public boolean isCurrentEnvDefault() {
DesignerWorkspaceInfo current = this.getWorkspaceInfo(curEnvName);
String defaultEnvPath = StableUtils.pathJoin(new String[]{StableUtils.getInstallHome(), ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
return ComparatorUtils.equals(new File(defaultEnvPath).getPath(), current.getPath());
@ -530,7 +532,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
if (isCurrentEnvDefault()) {
return;
}
WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()));
try {
WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()));
} catch (AuthException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
/**
@ -708,7 +714,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
* @param info 对应的环境信息
*/
public void putEnv(String name, DesignerWorkspaceInfo info) {
this.nameEnvMap.put(name, info);
}

0
designer-base/src/com/fr/design/Exception/ValidationException.java → designer-base/src/main/java/com/fr/design/Exception/ValidationException.java

0
designer-base/src/com/fr/design/ExtraDesignClassManager.java → designer-base/src/main/java/com/fr/design/ExtraDesignClassManager.java

0
designer-base/src/com/fr/design/RestartHelper.java → designer-base/src/main/java/com/fr/design/RestartHelper.java

0
designer-base/src/com/fr/design/actions/AllowAuthorityEditAction.java → designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java

0
designer-base/src/com/fr/design/actions/CheckBoxAction.java → designer-base/src/main/java/com/fr/design/actions/CheckBoxAction.java

0
designer-base/src/com/fr/design/actions/ExitAuthorityEditAction.java → designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

0
designer-base/src/com/fr/design/actions/HyperlinkPluginAction.java → designer-base/src/main/java/com/fr/design/actions/HyperlinkPluginAction.java

0
designer-base/src/com/fr/design/actions/JTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/JTemplateAction.java

0
designer-base/src/com/fr/design/actions/MenuAction.java → designer-base/src/main/java/com/fr/design/actions/MenuAction.java

0
designer-base/src/com/fr/design/actions/TableDataSourceAction.java → designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

0
designer-base/src/com/fr/design/actions/TemplateComponentAction.java → designer-base/src/main/java/com/fr/design/actions/TemplateComponentAction.java

0
designer-base/src/com/fr/design/actions/TemplateComponentActionInterface.java → designer-base/src/main/java/com/fr/design/actions/TemplateComponentActionInterface.java

0
designer-base/src/com/fr/design/actions/ToggleButtonUpdateAction.java → designer-base/src/main/java/com/fr/design/actions/ToggleButtonUpdateAction.java

0
designer-base/src/com/fr/design/actions/UndoableAction.java → designer-base/src/main/java/com/fr/design/actions/UndoableAction.java

0
designer-base/src/com/fr/design/actions/UpdateAction.java → designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

0
designer-base/src/com/fr/design/actions/community/BBSAction.java → designer-base/src/main/java/com/fr/design/actions/community/BBSAction.java

0
designer-base/src/com/fr/design/actions/community/BugAction.java → designer-base/src/main/java/com/fr/design/actions/community/BugAction.java

0
designer-base/src/com/fr/design/actions/community/NeedAction.java → designer-base/src/main/java/com/fr/design/actions/community/NeedAction.java

0
designer-base/src/com/fr/design/actions/community/QuestionAction.java → designer-base/src/main/java/com/fr/design/actions/community/QuestionAction.java

0
designer-base/src/com/fr/design/actions/community/SignAction.java → designer-base/src/main/java/com/fr/design/actions/community/SignAction.java

0
designer-base/src/com/fr/design/actions/community/UpAction.java → designer-base/src/main/java/com/fr/design/actions/community/UpAction.java

0
designer-base/src/com/fr/design/actions/community/VideoAction.java → designer-base/src/main/java/com/fr/design/actions/community/VideoAction.java

0
designer-base/src/com/fr/design/actions/core/ActionFactory.java → designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java

0
designer-base/src/com/fr/design/actions/core/WorkBookSupportable.java → designer-base/src/main/java/com/fr/design/actions/core/WorkBookSupportable.java

0
designer-base/src/com/fr/design/actions/edit/CopyAction.java → designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java

0
designer-base/src/com/fr/design/actions/edit/CutAction.java → designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java

0
designer-base/src/com/fr/design/actions/edit/PasteAction.java → designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java

0
designer-base/src/com/fr/design/actions/edit/RedoAction.java → designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java

0
designer-base/src/com/fr/design/actions/edit/UndoAction.java → designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

0
designer-base/src/com/fr/design/actions/file/CloseCurrentTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/file/CloseCurrentTemplateAction.java

0
designer-base/src/com/fr/design/actions/file/CloseTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/file/CloseTemplateAction.java

0
designer-base/src/com/fr/design/actions/file/EditEnvAction.java → designer-base/src/main/java/com/fr/design/actions/file/EditEnvAction.java

0
designer-base/src/com/fr/design/actions/file/ExitDesignerAction.java → designer-base/src/main/java/com/fr/design/actions/file/ExitDesignerAction.java

0
designer-base/src/com/fr/design/actions/file/LocalePane.java → designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java

0
designer-base/src/com/fr/design/actions/file/OpenRecentReportMenuDef.java → designer-base/src/main/java/com/fr/design/actions/file/OpenRecentReportMenuDef.java

0
designer-base/src/com/fr/design/actions/file/OpenTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java

0
designer-base/src/com/fr/design/actions/file/PreferenceAction.java → designer-base/src/main/java/com/fr/design/actions/file/PreferenceAction.java

0
designer-base/src/com/fr/design/actions/file/PreferencePane.java → designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

0
designer-base/src/com/fr/design/actions/file/SaveAsTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

0
designer-base/src/com/fr/design/actions/file/SaveTemplateAction.java → designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

14
designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java → designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@ -10,7 +10,6 @@ import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
import com.fr.design.mainframe.TemplatePane;
import com.fr.design.menu.KeySetUtils;
import com.fr.design.menu.MenuDef;
import com.fr.design.menu.SeparatorDef;
@ -20,6 +19,8 @@ import com.fr.general.Inter;
import com.fr.stable.EnvChangedListener;
import com.fr.workspace.WorkContext;
import com.fr.workspace.WorkContextCallback;
import com.fr.workspace.Workspace;
import com.fr.workspace.connect.AuthException;
import javax.swing.JOptionPane;
import java.awt.event.ActionEvent;
@ -103,7 +104,16 @@ public class SwitchExistEnv extends MenuDef {
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
final String envName = getName();
DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(envName);
WorkContext.switchTo(DesignerWorkspaceGenerator.generate(selectedEnv), new WorkContextCallback() {
Workspace workspace;
try {
workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
} catch (AuthException exception) {
JOptionPane.showMessageDialog(
DesignerContext.getDesignerFrame(),
Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Connect_Auth_Failed"}));
return;
}
WorkContext.switchTo(workspace, new WorkContextCallback() {
@Override
public void success() {
DesignerEnvManager.getEnvManager().setCurEnvName(envName);

0
designer-base/src/com/fr/design/actions/file/WebPreviewUtils.java → designer-base/src/main/java/com/fr/design/actions/file/WebPreviewUtils.java

0
designer-base/src/com/fr/design/actions/help/AboutAction.java → designer-base/src/main/java/com/fr/design/actions/help/AboutAction.java

0
designer-base/src/com/fr/design/actions/help/AboutDialog.java → designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java

0
designer-base/src/com/fr/design/actions/help/AboutPane.java → designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

0
designer-base/src/com/fr/design/actions/help/FeedBackAction.java → designer-base/src/main/java/com/fr/design/actions/help/FeedBackAction.java

0
designer-base/src/com/fr/design/actions/help/FeedBackPane.java → designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java

0
designer-base/src/com/fr/design/actions/help/ForumAction.java → designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java

0
designer-base/src/com/fr/design/actions/help/SupportQQAction.java → designer-base/src/main/java/com/fr/design/actions/help/SupportQQAction.java

0
designer-base/src/com/fr/design/actions/help/SystemInfoPane.java → designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java

0
designer-base/src/com/fr/design/actions/help/TutorialAction.java → designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

0
designer-base/src/com/fr/design/actions/help/WebDemoAction.java → designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java

0
designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineAction.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java

0
designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

0
designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

0
designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineContext.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineContext.java

0
designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineListener.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineListener.java

0
designer-base/src/com/fr/design/actions/help/alphafine/RemindDialog.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindDialog.java

0
designer-base/src/com/fr/design/actions/help/alphafine/RemindPane.java → designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java

0
designer-base/src/com/fr/design/actions/server/ConnectionListAction.java → designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java

0
designer-base/src/com/fr/design/actions/server/FunctionManagerAction.java → designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java

0
designer-base/src/com/fr/design/actions/server/GlobalParameterAction.java → designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java

0
designer-base/src/com/fr/design/actions/server/GlobalTableDataAction.java → designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

0
designer-base/src/com/fr/design/actions/server/PlatformManagerAction.java → designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java

0
designer-base/src/com/fr/design/actions/server/PluginManagerAction.java → designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java

0
designer-base/src/com/fr/design/actions/server/ProcedureListAction.java → designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java

0
designer-base/src/com/fr/design/actions/tabledata/TableDataAction.java → designer-base/src/main/java/com/fr/design/actions/tabledata/TableDataAction.java

0
designer-base/src/com/fr/design/bbs/BBSLoginUtils.java → designer-base/src/main/java/com/fr/design/bbs/BBSLoginUtils.java

0
designer-base/src/com/fr/design/bbs/package.html → designer-base/src/main/java/com/fr/design/bbs/package.html

0
designer-base/src/com/fr/design/beans/BasicBeanPane.java → designer-base/src/main/java/com/fr/design/beans/BasicBeanPane.java

0
designer-base/src/com/fr/design/beans/FurtherBasicBeanPane.java → designer-base/src/main/java/com/fr/design/beans/FurtherBasicBeanPane.java

0
designer-base/src/com/fr/design/beans/GroupModel.java → designer-base/src/main/java/com/fr/design/beans/GroupModel.java

0
designer-base/src/com/fr/design/beans/location/Absorptionline.java → designer-base/src/main/java/com/fr/design/beans/location/Absorptionline.java

0
designer-base/src/com/fr/design/beans/location/MoveUtils.java → designer-base/src/main/java/com/fr/design/beans/location/MoveUtils.java

0
designer-base/src/com/fr/design/border/UIRoundedBorder.java → designer-base/src/main/java/com/fr/design/border/UIRoundedBorder.java

0
designer-base/src/com/fr/design/border/UITitledBorder.java → designer-base/src/main/java/com/fr/design/border/UITitledBorder.java

0
designer-base/src/com/fr/design/border/package.html → designer-base/src/main/java/com/fr/design/border/package.html

0
designer-base/src/com/fr/design/bridge/DesignToolbarProvider.java → designer-base/src/main/java/com/fr/design/bridge/DesignToolbarProvider.java

0
designer-base/src/com/fr/design/bridge/package.html → designer-base/src/main/java/com/fr/design/bridge/package.html

0
designer-base/src/com/fr/design/cell/FloatElementsProvider.java → designer-base/src/main/java/com/fr/design/cell/FloatElementsProvider.java

0
designer-base/src/com/fr/design/condition/CellHighlightAddMenuDef.java → designer-base/src/main/java/com/fr/design/condition/CellHighlightAddMenuDef.java

0
designer-base/src/com/fr/design/condition/ConditionAttrSingleConditionPane.java → designer-base/src/main/java/com/fr/design/condition/ConditionAttrSingleConditionPane.java

0
designer-base/src/com/fr/design/condition/ConditionAttributesPane.java → designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

0
designer-base/src/com/fr/design/condition/ContinuousTreeSelectionModel.java → designer-base/src/main/java/com/fr/design/condition/ContinuousTreeSelectionModel.java

0
designer-base/src/com/fr/design/condition/DSColumnLiteConditionPane.java → designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java

0
designer-base/src/com/fr/design/condition/DSColumnSimpleLiteConditionPane.java → designer-base/src/main/java/com/fr/design/condition/DSColumnSimpleLiteConditionPane.java

0
designer-base/src/com/fr/design/condition/HighLightConditionAction.java → designer-base/src/main/java/com/fr/design/condition/HighLightConditionAction.java

0
designer-base/src/com/fr/design/condition/LiteConditionPane.java → designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java

0
designer-base/src/com/fr/design/condition/ObjectLiteConditionPane.java → designer-base/src/main/java/com/fr/design/condition/ObjectLiteConditionPane.java

0
designer-base/src/com/fr/design/condition/SingleConditionPane.java → designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java

0
designer-base/src/com/fr/design/constants/KeyWords.java → designer-base/src/main/java/com/fr/design/constants/KeyWords.java

0
designer-base/src/com/fr/design/constants/LayoutConstants.java → designer-base/src/main/java/com/fr/design/constants/LayoutConstants.java

0
designer-base/src/com/fr/design/constants/UIConstants.java → designer-base/src/main/java/com/fr/design/constants/UIConstants.java

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save