Browse Source

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

* commit '6bdda893cd33630756183127b0fccedc84d24dcc':
  REPORT-9480 & REPORT-9159
  REPORT-9480 & REPORT-9159
  REPORT-9480 & REPORT-9159
  REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
  REPORT-9480 & REPORT-9159 解决切换目录窗口被挡住问题
  REPORT-9582 【阻塞】【10.0二轮回归】设计器菜单栏-服务器-控件管理添加预定义控件异常
  move
  REPORT-9480 & REPORT-9159
  REPORT-8947 调整水印代码
  REPORT-8947 调整水印代码
  REPORT-8947 10.0水印导出的pdf,水印字体变小且字体模糊锯齿严重=>字体大小校正
  无JIRA任务 增加设计器的单独的语言等级配置
master
xiaoxia 6 years ago
parent
commit
40a41adbe9
  1. 18
      designer-base/src/main/java/com/fr/design/DesignerEnvManager.java
  2. 3
      designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java
  3. 3
      designer-base/src/main/java/com/fr/start/Demo.java
  4. 76
      designer-base/src/main/java/com/fr/start/ServerStarter.java
  5. 0
      designer-base/src/main/resources/com/fr/aspectj/designerbase/AlphaFineReminder.aj
  6. 0
      designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj
  7. 0
      designer-base/src/main/resources/com/fr/common/inputevent/package.html
  8. 0
      designer-base/src/main/resources/com/fr/design/bbs/package.html
  9. 0
      designer-base/src/main/resources/com/fr/design/border/package.html
  10. 0
      designer-base/src/main/resources/com/fr/design/bridge/package.html
  11. 0
      designer-base/src/main/resources/com/fr/design/constants/package.html
  12. 0
      designer-base/src/main/resources/com/fr/design/data/package.html
  13. 0
      designer-base/src/main/resources/com/fr/design/data/tabledata/gui/CONTENT.txt
  14. 0
      designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN1.txt
  15. 0
      designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN2.txt
  16. 0
      designer-base/src/main/resources/com/fr/design/dialog/package.html
  17. 0
      designer-base/src/main/resources/com/fr/design/editor/package.html
  18. 0
      designer-base/src/main/resources/com/fr/design/event/package.html
  19. 0
      designer-base/src/main/resources/com/fr/design/extra/modal-dialog.css
  20. 0
      designer-base/src/main/resources/com/fr/design/extra/package.html
  21. 0
      designer-base/src/main/resources/com/fr/design/file/package.html
  22. 0
      designer-base/src/main/resources/com/fr/design/foldablepane/package.html
  23. 0
      designer-base/src/main/resources/com/fr/design/formula/package.html
  24. 0
      designer-base/src/main/resources/com/fr/design/fun/package.html
  25. 0
      designer-base/src/main/resources/com/fr/design/gui/autocomplete/CompletionXml.dtd
  26. 0
      designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_left.png
  27. 0
      designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_right.png
  28. 0
      designer-base/src/main/resources/com/fr/design/gui/autocomplete/bullet_black.png
  29. 0
      designer-base/src/main/resources/com/fr/design/gui/autocomplete/osx_sizegrip.png
  30. 0
      designer-base/src/main/resources/com/fr/design/gui/package.html
  31. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/io/package.html
  32. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/print/package.html
  33. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png
  34. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html
  35. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html
  36. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex
  37. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex
  38. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex
  39. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex
  40. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex
  41. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex
  42. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex
  43. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex
  44. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex
  45. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex
  46. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex
  47. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex
  48. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex
  49. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex
  50. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex
  51. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex
  52. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex
  53. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex
  54. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex
  55. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex
  56. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex
  57. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex
  58. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex
  59. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex
  60. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex
  61. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex
  62. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex
  63. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex
  64. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex
  65. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex
  66. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex
  67. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex
  68. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex
  69. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex
  70. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex
  71. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex
  72. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex
  73. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html
  74. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html
  75. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html
  76. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html
  77. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rtextarea/package.html
  78. 0
      designer-base/src/main/resources/com/fr/design/gui/syntax/util/package.html
  79. 0
      designer-base/src/main/resources/com/fr/design/icon/package.html
  80. 0
      designer-base/src/main/resources/com/fr/design/images/arrow/arrow_down.png
  81. 0
      designer-base/src/main/resources/com/fr/design/images/arrow/arrow_up.png
  82. 0
      designer-base/src/main/resources/com/fr/design/images/bbs.png
  83. 0
      designer-base/src/main/resources/com/fr/design/images/browser/360.png
  84. 0
      designer-base/src/main/resources/com/fr/design/images/browser/back.png
  85. 0
      designer-base/src/main/resources/com/fr/design/images/browser/chrome.png
  86. 0
      designer-base/src/main/resources/com/fr/design/images/browser/firefox.png
  87. 0
      designer-base/src/main/resources/com/fr/design/images/browser/forward.png
  88. 0
      designer-base/src/main/resources/com/fr/design/images/browser/go.png
  89. 0
      designer-base/src/main/resources/com/fr/design/images/browser/home.png
  90. 0
      designer-base/src/main/resources/com/fr/design/images/browser/ie.png
  91. 0
      designer-base/src/main/resources/com/fr/design/images/browser/reload.png
  92. 0
      designer-base/src/main/resources/com/fr/design/images/browser/stop.png
  93. 0
      designer-base/src/main/resources/com/fr/design/images/bug.png
  94. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/add.png
  95. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/add_over.png
  96. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/add_press.png
  97. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/addicon.png
  98. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/additicon_grey.png
  99. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/anab24.png
  100. 0
      designer-base/src/main/resources/com/fr/design/images/buttonicon/anas.png
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -67,6 +67,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
private static final int MAX_SHOW_NUM = 10;
private static final String VERSION_80 = "80";
private static final int CACHINGTEMPLATE_LIMIT = 5;
private static final String WEB_NAME = "webapps";
private static DesignerEnvManager designerEnvManager; // gui.
private String activationKey = null;
@ -200,10 +201,10 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
if (designerEnvManager == null || designerEnvManager.nameEnvMap.size() > 0) {
return;
}
String installHome = StableUtils.getInstallHome();
String installHome = StableUtils.getInstallHome();
if (installHome != null && !".".equals(installHome)) {
String name = Inter.getLocText("FR-Engine_DEFAULT");
String envPath = StableUtils.pathJoin(installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME);
String envPath = designerEnvManager.getDefaultenvPath(installHome);
designerEnvManager.putEnv(name, LocalDesignerWorkspaceInfo.create(name, envPath));
designerEnvManager.setCurEnvName(name);
}
@ -486,8 +487,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
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());
String defaultEnvPath = getDefaultenvPath(StableUtils.getInstallHome());
return ComparatorUtils.equals(defaultEnvPath, current.getPath());
}
/**
@ -495,7 +496,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
*/
public DesignerWorkspaceInfo getDefaultConfig() {
String installHome = StableUtils.getInstallHome();
String defaultenvPath = StableUtils.pathJoin(installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME);
String defaultenvPath = getDefaultenvPath(installHome);
defaultenvPath = new File(defaultenvPath).getPath();
Iterator<Entry<String, DesignerWorkspaceInfo>> entryIt = nameEnvMap.entrySet().iterator();
while (entryIt.hasNext()) {
@ -516,7 +517,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
*/
public String getDefaultEnvName() {
String installHome = StableUtils.getInstallHome();
String defaultenvPath = StableUtils.pathJoin(new String[]{installHome, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME});
String defaultenvPath = getDefaultenvPath(installHome);
defaultenvPath = new File(defaultenvPath).getPath();
if (nameEnvMap.size() >= 0) {
Iterator<Entry<String, DesignerWorkspaceInfo>> entryIt = nameEnvMap.entrySet().iterator();
@ -531,6 +532,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
return Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"});
}
private String getDefaultenvPath(String installHome){
//这里需要转成反斜杠和生成默认路径一致
return new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath();
}
/**
* 设置当前环境为默认
*/

3
designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java

@ -32,6 +32,7 @@ public class WatermarkPreviewPane extends JPanel {
super.paint(g);
Graphics2D g2d = (Graphics2D)g;
g2d.drawImage(UIConstants.WATERMARK_BACKGROUND, 0, 0, this.getWidth(), this.getHeight(), null);
new WatermarkPainter(watermark).paint(g2d, this.getWidth(), this.getHeight());
WatermarkPainter painter = WatermarkPainter.createPainter(watermark);
painter.paint(g2d, this.getWidth(), this.getHeight());
}
}

3
designer-base/src/main/java/com/fr/start/Demo.java

@ -22,9 +22,6 @@ public class Demo {
} else {
executorPath = StableUtils.pathJoin(installHome, "bin", "designer.exe demo");
}
if (!new java.io.File(executorPath).exists()) {
FRContext.getLogger().error(executorPath + " can not be found.");
}
if (OperatingSystem.isMacOS()) {
ProcessBuilder builder = new ProcessBuilder();

76
designer-base/src/main/java/com/fr/start/ServerStarter.java

@ -22,6 +22,7 @@ import com.fr.stable.StringUtils;
import com.fr.start.server.FineEmbedServer;
import com.fr.workspace.WorkContext;
import javax.swing.*;
import java.awt.*;
import java.io.IOException;
@ -39,35 +40,16 @@ public class ServerStarter {
if (!WorkContext.getCurrent().isLocal()) {
//有问题,这里拿不到远程的http端口
browser(WorkContext.getCurrent().getPath());
return;
}
if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
else if (ComparatorUtils.equals(StableUtils.getInstallHome(), ".")) {//august:供代码使用
String web = GeneralContext.getCurrentAppNameOfEnv();
browserURLWithLocalEnv("http://localhost:" + DesignerEnvManager.getEnvManager().getEmbedServerPort() + "/" + web + "/" + ServerConfig.getInstance().getServletName());
return;
}
DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
if (!envManager.isCurrentEnvDefault()) {
InformationPane inf = new InformationPane(envManager.getDefaultEnvName());
inf.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
@Override
public void doOk() {
try {
WorkContext.switchTo(DesignerWorkspaceGenerator.generate(DesignerEnvManager.getEnvManager().getDefaultConfig()));
TemplateTreePane.getInstance().refreshDockingView();
TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage());
}
initDemoServerAndBrowser();
}
}).setVisible(true);
} else {
}else{
initDemoServerAndBrowser();
}
}
private static void initDemoServerAndBrowser() {
@ -123,50 +105,6 @@ public class ServerStarter {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
}
private static class InformationPane extends BasicPane {
private static final long serialVersionUID = 1L;
private static final int FREE_STYLE_TOP = 15;
private static final int FREE_STYLE_OTHER = 5;
InformationPane(String message) {
init(message);
}
private void init(String message) {
this.setLayout(new BorderLayout(10, 10));
this.setBorder(BorderFactory.createEmptyBorder(FREE_STYLE_TOP, FREE_STYLE_OTHER, FREE_STYLE_OTHER, FREE_STYLE_OTHER));
String text;
if (!ComparatorUtils.equals(message, Inter.getLocText(new String[]{"Default", "Utils-Report_Runtime_Env"}))) {
text = Inter.getLocText("FR-Designer_Open") +
ProductConstants.APP_NAME +
Inter.getLocText("FR-Designer_Utils-OpenDemoEnv") +
message + Inter.getLocText("FR-Designer_Utils-switch");
} else {
text = Inter.getLocText("FR-Designer_Open") +
ProductConstants.APP_NAME +
Inter.getLocText("FR-Designer_Utils-NewDemoEnv") +
message + Inter.getLocText("FR-Designer_Utils-switch");
}
UITextArea a = new UITextArea(text);
a.setFont(new Font("Dialog", Font.PLAIN, 12));
a.setEditable(false);
a.setBackground(this.getBackground());
a.setLineWrap(true);
this.add(a);
}
@Override
protected String title4PopupWindow() {
return Inter.getLocText("FR-Designer_Tooltips");
}
}
}

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

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

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

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

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

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

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

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

0
designer-base/src/main/java/com/fr/design/data/tabledata/gui/CONTENT.txt → designer-base/src/main/resources/com/fr/design/data/tabledata/gui/CONTENT.txt

0
designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN1.txt → designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN1.txt

0
designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN2.txt → designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN2.txt

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

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

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

0
designer-base/src/main/java/com/fr/design/extra/modal-dialog.css → designer-base/src/main/resources/com/fr/design/extra/modal-dialog.css

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

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

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

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

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

0
designer-base/src/main/java/com/fr/design/gui/autocomplete/CompletionXml.dtd → designer-base/src/main/resources/com/fr/design/gui/autocomplete/CompletionXml.dtd

0
designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_left.png → designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_left.png

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 345 B

0
designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_right.png → designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_right.png

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

0
designer-base/src/main/java/com/fr/design/gui/autocomplete/bullet_black.png → designer-base/src/main/resources/com/fr/design/gui/autocomplete/bullet_black.png

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 221 B

0
designer-base/src/main/java/com/fr/design/gui/autocomplete/osx_sizegrip.png → designer-base/src/main/resources/com/fr/design/gui/autocomplete/osx_sizegrip.png

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

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

0
designer-base/src/main/java/com/fr/design/gui/syntax/io/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/io/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/print/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/print/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rtextarea/package.html

0
designer-base/src/main/java/com/fr/design/gui/syntax/util/package.html → designer-base/src/main/resources/com/fr/design/gui/syntax/util/package.html

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

0
designer-base/src/main/java/com/fr/design/images/arrow/arrow_down.png → designer-base/src/main/resources/com/fr/design/images/arrow/arrow_down.png

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

0
designer-base/src/main/java/com/fr/design/images/arrow/arrow_up.png → designer-base/src/main/resources/com/fr/design/images/arrow/arrow_up.png

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

0
designer-base/src/main/java/com/fr/design/images/bbs.png → designer-base/src/main/resources/com/fr/design/images/bbs.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/360.png → designer-base/src/main/resources/com/fr/design/images/browser/360.png

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/back.png → designer-base/src/main/resources/com/fr/design/images/browser/back.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/chrome.png → designer-base/src/main/resources/com/fr/design/images/browser/chrome.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/firefox.png → designer-base/src/main/resources/com/fr/design/images/browser/firefox.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/forward.png → designer-base/src/main/resources/com/fr/design/images/browser/forward.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/go.png → designer-base/src/main/resources/com/fr/design/images/browser/go.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/home.png → designer-base/src/main/resources/com/fr/design/images/browser/home.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/ie.png → designer-base/src/main/resources/com/fr/design/images/browser/ie.png

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/reload.png → designer-base/src/main/resources/com/fr/design/images/browser/reload.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
designer-base/src/main/java/com/fr/design/images/browser/stop.png → designer-base/src/main/resources/com/fr/design/images/browser/stop.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
designer-base/src/main/java/com/fr/design/images/bug.png → designer-base/src/main/resources/com/fr/design/images/bug.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
designer-base/src/main/java/com/fr/design/images/buttonicon/add.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/add.png

Before

Width:  |  Height:  |  Size: 160 B

After

Width:  |  Height:  |  Size: 160 B

0
designer-base/src/main/java/com/fr/design/images/buttonicon/add_over.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/add_over.png

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

0
designer-base/src/main/java/com/fr/design/images/buttonicon/add_press.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/add_press.png

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 306 B

0
designer-base/src/main/java/com/fr/design/images/buttonicon/addicon.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/addicon.png

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

0
designer-base/src/main/java/com/fr/design/images/buttonicon/additicon_grey.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/additicon_grey.png

Before

Width:  |  Height:  |  Size: 208 B

After

Width:  |  Height:  |  Size: 208 B

0
designer-base/src/main/java/com/fr/design/images/buttonicon/anab24.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/anab24.png

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 695 B

0
designer-base/src/main/java/com/fr/design/images/buttonicon/anas.png → designer-base/src/main/resources/com/fr/design/images/buttonicon/anas.png

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 454 B

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

Loading…
Cancel
Save