Browse Source

Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0

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

161
designer-base/src/com/fr/design/style/color/ColorSelectConfigManager.java

@ -1,161 +0,0 @@
package com.fr.design.style.color;
import com.fr.base.FRContext;
import com.fr.file.XMLFileManager;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import com.fr.stable.EnvChangedListener;
import com.fr.stable.xml.XMLPrintWriter;
import com.fr.stable.xml.XMLTools;
import com.fr.stable.xml.XMLableReader;
import java.awt.*;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
/**
* 最近使用颜色
*
* @author focus
*/
public class ColorSelectConfigManager extends XMLFileManager implements ColorSelectConfigManagerProvider {
// 最近使用的颜色个数
private int colorNums = 20;
private static ColorSelectConfigManagerProvider configManager = null;
private static ColorSelectConfigManager colorSelectConfigManager = null;
private boolean init = true;
// 最近使用颜色
private List<Color> colors = new ArrayList<Color>();
private static final String RECENT_COLOR_TAG = "RecentColors";
private static final String COLOR_TAG = "Color";
static {
GeneralContext.addEnvChangedListener(new EnvChangedListener() {
public void envChanged() {
ColorSelectConfigManager.envChanged();
}
});
}
private static void envChanged() {
configManager = null;
}
public Color[] getColors() {
//初次打开软件时从xml文件中获取历史颜色信息
if (init) {
ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
this.colors = manager.getColorsFromFile();
init = false;
}
if (colors == null) {
colors = new ArrayList<Color>();
}
return colors.toArray(new Color[colors.size()]);
}
public int getColorNum() {
return colorNums;
}
public void setColorNum(int colorNums) {
this.colorNums = colorNums;
}
public synchronized static ColorSelectConfigManager getInstance() {
if (colorSelectConfigManager == null) {
colorSelectConfigManager = new ColorSelectConfigManager();
}
return colorSelectConfigManager;
}
/**
* 添加颜色到最近使用队列中
*
* @param color 颜色
*/
public void addToColorQueue(Color color) {
if(color == null){
return;
}
// 过滤重复的最近使用颜色
// 因为有个后进先出的问题,最近使用的颜色需要放到最前面所以没用set
if (colors.contains(color)) {
colors.remove(color);
}
colors.add(color);
/*@author yaohwu*/
//将历史颜色信息保存到xml文件中去
ColorSelectConfigManagerProvider manager = ColorSelectConfigManager.getProviderInstance();
if (colors != null && !colors.isEmpty()) {
manager.setColorsToFile(colors);
}
}
/**
* 读取配置文件流
*
* @param input
* @throws Exception 异常
*/
@Override
public void readFromInputStream(InputStream input) throws Exception {
ColorSelectConfigManager manager = new ColorSelectConfigManager();
XMLTools.readInputStreamXML(manager, input);
configManager = manager;
}
/**
* 获取配置管理接口
*
* @return 配置管理接口ConfigManagerProvider
*/
public synchronized static ColorSelectConfigManagerProvider getProviderInstance() {
if (configManager == null) {
configManager = new ColorSelectConfigManager();
configManager.readXMLFile();
}
return configManager;
}
public String fileName() {
return "recentcolors.xml";
}
public void readXML(XMLableReader reader) {
String name = reader.getTagName();
if (reader.isChildNode()) {
if (ComparatorUtils.equals(COLOR_TAG, name)) {
Color color = null;
colors.add(reader.getAttrAsColor("colors", color));
}
}
}
public void writeXML(XMLPrintWriter writer) {
writer.startTAG(RECENT_COLOR_TAG);
if (this.colors != null && !this.colors.isEmpty()) {
for (int i = 0; i < this.colors.size(); i++) {
writer.startTAG(COLOR_TAG);
writer.attr("colors", colors.get(i).getRGB());
writer.end();
}
}
writer.end();
}
public List<Color> getColorsFromFile() {
return this.colors;
}
public void setColorsToFile(List<Color> colors) {
this.colors = colors;
}
}

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

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

@ -13,6 +13,7 @@ import com.fr.design.env.DesignerWorkspaceInfo;
import com.fr.design.env.DesignerWorkspaceType; import com.fr.design.env.DesignerWorkspaceType;
import com.fr.design.env.LocalDesignerWorkspaceInfo; import com.fr.design.env.LocalDesignerWorkspaceInfo;
import com.fr.design.env.RemoteDesignerWorkspaceInfo; import com.fr.design.env.RemoteDesignerWorkspaceInfo;
import com.fr.design.style.color.ColorSelectConfigManager;
import com.fr.file.FILEFactory; import com.fr.file.FILEFactory;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.FRLogFormatter; import com.fr.general.FRLogFormatter;
@ -129,7 +130,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
//记录当前激活码的在线激活状态. //记录当前激活码的在线激活状态.
private int activeKeyStatus = -1; private int activeKeyStatus = -1;
private boolean joinProductImprove = true; private boolean joinProductImprove = true;
//最近使用的颜色
private ColorSelectConfigManager configManager = new ColorSelectConfigManager();
/** /**
* alphafine * alphafine
*/ */
@ -190,6 +192,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
return designerEnvManager; return designerEnvManager;
} }
public ColorSelectConfigManager getColorConfigManager(){
return this.configManager;
}
public static void checkNameEnvMap() { public static void checkNameEnvMap() {
if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) { if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
return; return;
@ -1299,6 +1305,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} }
} }
private void readRecentColor(XMLableReader reader){
reader.readXMLObject(this.configManager);
}
/** /**
* Read XML.<br> * Read XML.<br>
* The method will be invoked when read data from XML file.<br> * The method will be invoked when read data from XML file.<br>
@ -1350,7 +1360,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
readHttpsParas(reader); readHttpsParas(reader);
} else if (name.equals("AlphaFineConfigManager")) { } else if (name.equals("AlphaFineConfigManager")) {
readAlphaFineAttr(reader); readAlphaFineAttr(reader);
} else { } else if (name.equals("RecentColors")) {
readRecentColor(reader);
}
else {
readLayout(reader, name); readLayout(reader, name);
} }
} }
@ -1542,6 +1555,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
writeActiveStatus(writer); writeActiveStatus(writer);
writeHttpsParas(writer); writeHttpsParas(writer);
writeAlphaFineAttr(writer); writeAlphaFineAttr(writer);
writeRecentColor(writer);
writer.end(); writer.end();
} }
@ -1551,6 +1565,12 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
} }
} }
private void writeRecentColor(XMLPrintWriter writer) {
if (this.configManager != null) {
this.configManager.writeXML(writer);
}
}
public String getUUID() { public String getUUID() {
return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid; return StringUtils.isEmpty(uuid) ? UUID.randomUUID().toString() : uuid;
} }

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

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

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

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

Loading…
Cancel
Save