diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index bd6ffec8d..2e6ff3701 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -52,6 +52,7 @@ import java.io.StringReader; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -75,7 +76,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { private Rectangle windowBounds = null; // window bounds. private String DialogCurrentDirectory = null; private String CurrentDirectoryPrefix = null; - private List recentOpenedFilePathList = new ArrayList(); + private Map> recentOpenedFileListMap = new HashMap<>(); + private List tempRecentOpenedFilePathList = new ArrayList(); private boolean showPaintToolBar = true; private int maxNumberOrPreviewRow = 200; // name和Env的键值对 @@ -193,7 +195,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { return designerEnvManager; } - public ColorSelectConfigManager getColorConfigManager(){ + public ColorSelectConfigManager getColorConfigManager() { return this.configManager; } @@ -201,7 +203,7 @@ 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 = designerEnvManager.getDefaultenvPath(installHome); @@ -339,7 +341,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } // 清空前一个版本中的工作目录和最近打开 nameEnvMap = new ListMap(); - recentOpenedFilePathList = new ArrayList(); curEnvName = null; designerEnvManager.saveXMLFile(); } @@ -533,10 +534,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } - private String getDefaultenvPath(String installHome){ + private String getDefaultenvPath(String installHome) { //这里需要转成反斜杠和生成默认路径一致 - return new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath(); + return new File(StableUtils.pathJoin(installHome, WEB_NAME, ProjectConstants.WEBAPP_NAME, ProjectConstants.WEBINF_NAME)).getPath(); } + /** * 设置当前环境为默认 */ @@ -825,7 +827,17 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * 返回最近打开的文件路径列表 */ public List getRecentOpenedFilePathList() { - return this.recentOpenedFilePathList; + + if (StringUtils.isEmpty(getCurEnvName())) { + return tempRecentOpenedFilePathList; + } else { + if (!recentOpenedFileListMap.containsKey(getCurEnvName())) { + recentOpenedFileListMap.put(getCurEnvName(), tempRecentOpenedFilePathList); + } + } + + + return recentOpenedFileListMap.get(getCurEnvName()); } /** @@ -835,11 +847,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { */ public void addRecentOpenedFilePath(String filePath) { // 先删除. - if (this.recentOpenedFilePathList.contains(filePath)) { - this.recentOpenedFilePathList.remove(filePath); + if (getRecentOpenedFilePathList().contains(filePath)) { + getRecentOpenedFilePathList().remove(filePath); } - this.recentOpenedFilePathList.add(0, filePath); + getRecentOpenedFilePathList().add(0, filePath); checkRecentOpenedFileNum(); } @@ -850,19 +862,21 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * @param newPath 新的路径 */ public void replaceRecentOpenedFilePath(String oldPath, String newPath) { - if (this.recentOpenedFilePathList.contains(oldPath)) { - int index = recentOpenedFilePathList.indexOf(oldPath); - this.recentOpenedFilePathList.remove(oldPath); - this.recentOpenedFilePathList.add(index, newPath); + List list = getRecentOpenedFilePathList(); + if (list.contains(oldPath)) { + int index = getRecentOpenedFilePathList().indexOf(oldPath); + list.remove(oldPath); + list.add(index, newPath); } } private void checkRecentOpenedFileNum() { - if (this.recentOpenedFilePathList == null) { + List list = getRecentOpenedFilePathList(); + if (list == null) { return; } - while (this.recentOpenedFilePathList.size() > MAX_SHOW_NUM) { - this.recentOpenedFilePathList.remove(this.recentOpenedFilePathList.size() - 1); + while (list.size() > MAX_SHOW_NUM) { + list.remove(list.size() - 1); } } @@ -872,8 +886,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * @param filePath 文件路径 */ public void removeRecentOpenedFilePath(String filePath) { - if (this.recentOpenedFilePathList.contains(filePath)) { - this.recentOpenedFilePathList.remove(filePath); + if (getRecentOpenedFilePathList().contains(filePath)) { + getRecentOpenedFilePathList().remove(filePath); } } @@ -1311,7 +1325,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { } } - private void readRecentColor(XMLableReader reader){ + private void readRecentColor(XMLableReader reader) { reader.readXMLObject(this.configManager); } @@ -1332,7 +1346,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { this.readAttributes(reader); } else if (name.equals("ReportPaneAttributions")) { this.readReportPaneAttributions(reader); - } else if ("RecentOpenedFilePathList".equals(name) || "ResentOpenedFilePathList".equals(name)) { + } else if ("RecentOpenedFilePath".equals(name)) { this.readRecentOpenFileList(reader); } else if ("EnvConfigMap".equals(name)) { this.readEnvConfigMap(reader); @@ -1368,8 +1382,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { readAlphaFineAttr(reader); } else if (name.equals("RecentColors")) { readRecentColor(reader); - } - else { + } else { readLayout(reader, name); } } @@ -1518,21 +1531,32 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { private void readRecentOpenFileList(XMLableReader reader) { reader.readXMLObject(new XMLReadable() { - @Override public void readXML(XMLableReader reader) { if (reader.isAttr()) { - DesignerEnvManager.this.recentOpenedFilePathList.clear(); + DesignerEnvManager.this.recentOpenedFileListMap.clear(); } if (reader.isChildNode()) { - String tmpVal; String name = reader.getTagName(); - // alex:以前一直是写ResentOpenedFilePath - if ("ResentOpenedFilePath".equals(name) || "Path".equals(name)) { // description. - if ((tmpVal = reader.getElementValue()) != null) { - DesignerEnvManager.this.recentOpenedFilePathList.add(tmpVal); - } + if ("Env".equals(name)) { + final String envName = reader.getAttrAsString("name", StringUtils.EMPTY); + final List recentOpenedFileList = new ArrayList<>(); + reader.readXMLObject(new XMLReadable() { + @Override + public void readXML(XMLableReader reader) { + if (reader.isChildNode()) { + String n = reader.getTagName(); + if ("Path".equals(n)) { + String path = reader.getElementValue(); + if (StringUtils.isNotEmpty(path)) { + recentOpenedFileList.add(path); + } + } + } + } + }); + DesignerEnvManager.this.recentOpenedFileListMap.put(envName, recentOpenedFileList); } } } @@ -1623,10 +1647,15 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { private void writeRecentOpenFileAndEnvList(XMLPrintWriter writer) { checkRecentOpenedFileNum(); - writer.startTAG("RecentOpenedFilePathList"); - int resentOpenedFilePathCount = Math.min(12, this.recentOpenedFilePathList.size()); - for (int i = 0; i < resentOpenedFilePathCount; i++) { - writer.startTAG("Path").textNode(recentOpenedFilePathList.get(i)).end(); + writer.startTAG("RecentOpenedFilePath"); + for (Entry> entry : recentOpenedFileListMap.entrySet()) { + writer.startTAG("Env").attr("name", entry.getKey()); + List paths = entry.getValue(); + int count = Math.min(12, paths.size()); + for (int i = 0; i < count; i++) { + writer.startTAG("Path").textNode(paths.get(i)).end(); + } + writer.end(); } writer.end(); diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java index ebe5f1b55..8d9715222 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java @@ -18,6 +18,7 @@ import com.fr.stable.StableUtils; import com.fr.stable.bridge.StableFactory; import com.fr.stable.project.ProjectConstants; import com.fr.workspace.WorkContext; +import com.fr.workspace.resource.WorkResourceOutputStream; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -233,11 +234,9 @@ public class LocalePane extends BasicPane { properties.setProperty(GeneralUtils.objectToString(customTableModel.getValueAt(j, 0)), GeneralUtils.objectToString(customTableModel.getValueAt(j, i))); } - OutputStream out = null; try { - out = FRContext.getCommonOperator().writeBean(PREFIX + fileName + ".properties", ProjectConstants.LOCALE_NAME); + OutputStream out = new WorkResourceOutputStream(StableUtils.pathJoin(ProjectConstants.LOCALE_NAME, PREFIX + fileName + ".properties")); properties.store(out, null); - out.flush(); out.close(); } catch (Exception e) { diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index f378d7f5e..a07f42852 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -38,7 +38,7 @@ public class SwitchExistEnv extends MenuDef { JTemplate t = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (t != null) { GeneralContext.addEnvWillChangedListener( - t.getFullPathName(), + t.getPath(), new EnvChangedListener() { public void envChanged() { SwitchExistEnv.this.clearShortCuts(); diff --git a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java index 635ba239a..9e45309ff 100644 --- a/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java +++ b/designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java @@ -105,7 +105,7 @@ public abstract class DesignTableDataManager { public static void closeTemplate(JTemplate template) { if (template != null) { - dsListenersMap.remove(template.getFullPathName()); + dsListenersMap.remove(template.getPath()); } } @@ -164,7 +164,7 @@ public abstract class DesignTableDataManager { JTemplate template = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); String key = StringUtils.EMPTY; if (template != null) { - key = template.getFullPathName(); + key = template.getPath(); } List dsListeners = dsListenersMap.get(key); if (dsListeners == null) { diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java index 8954f483b..25fc10225 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java @@ -8,7 +8,7 @@ import com.fr.stable.xml.XMLableReader; import com.fr.workspace.connect.WorkspaceConnection; public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { - + private String name; private WorkspaceConnection connection; @@ -55,8 +55,10 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { String url = reader.getAttrAsString("url", StringUtils.EMPTY); String username = reader.getAttrAsString("username", StringUtils.EMPTY); //密码解密 - String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(" ","\r\n")); - this.connection = new WorkspaceConnection(url, username, password); + String password = SecurityToolbox.defaultDecrypt(reader.getAttrAsString("password", StringUtils.EMPTY).replaceAll(" ", "\r\n")); + String certPath = reader.getAttrAsString("certPath", StringUtils.EMPTY); + String certSecretKey = reader.getAttrAsString("certSecretKey", StringUtils.EMPTY); + this.connection = new WorkspaceConnection(url, username, password, certPath, certSecretKey); } } } @@ -70,16 +72,18 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo { writer.attr("url", connection.getUrl()); writer.attr("username", connection.getUserName()); writer.attr("password", SecurityToolbox.defaultEncrypt(connection.getPassword())); + writer.attr("certPath", connection.getCertPath()); + writer.attr("certSecretKey", connection.getCertSecretKey()); writer.end(); } } - + @Override public Object clone() throws CloneNotSupportedException { - RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo)super.clone(); + RemoteDesignerWorkspaceInfo object = (RemoteDesignerWorkspaceInfo) super.clone(); - object.connection = (WorkspaceConnection)StableUtils.cloneObject(this.connection); - return object; + object.connection = (WorkspaceConnection) StableUtils.cloneObject(this.connection); + return object; } } diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java index a2b8bd94f..c3d2e91c2 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java @@ -1,6 +1,6 @@ package com.fr.design.env; -import com.fr.env.operator.decision.DecisionOperator; +import com.fr.workspace.server.authority.decision.DecisionOperator; import com.fr.locale.InterProviderFactory; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; diff --git a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java index 4974e53e4..cff8675c4 100644 --- a/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java +++ b/designer-base/src/main/java/com/fr/design/file/HistoryTemplateListPane.java @@ -114,7 +114,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C public void closeSelectedReport(JTemplate selected) { DesignModuleFactory.clearChartPropertyPane(); DesignTableDataManager.closeTemplate(selected); - GeneralContext.removeEnvWillChangedListener(selected.getFullPathName()); + GeneralContext.removeEnvWillChangedListener(selected.getPath()); if (contains(selected) == -1) { return; } @@ -139,7 +139,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C public void closeVirtualSelectedReport(JTemplate selected) { DesignModuleFactory.clearChartPropertyPane(); DesignTableDataManager.closeTemplate(selected); - GeneralContext.removeEnvWillChangedListener(selected.getFullPathName()); + GeneralContext.removeEnvWillChangedListener(selected.getPath()); if (contains(selected) == -1) { return; } @@ -185,7 +185,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C if (editingTemplate == null) { return; } - DesignerEnvManager.getEnvManager().addRecentOpenedFilePath(editingTemplate.getFullPathName()); + DesignerEnvManager.getEnvManager().addRecentOpenedFilePath(editingTemplate.getPath()); ((HistoryListDataMode) list.getModel()).add(editingTemplate); } @@ -246,7 +246,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C */ public int contains(String filename) { for (int i = 0; i < historyList.size(); i++) { - String historyPath = historyList.get(i).getFullPathName(); + String historyPath = historyList.get(i).getPath(); if (ComparatorUtils.equals(historyPath, filename)) { return i; } @@ -261,7 +261,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C * @return 是则返回TRUE */ public boolean isCurrentEditingFile(String filename) { - String editingFileName = editingTemplate.getFullPathName(); + String editingFileName = editingTemplate.getPath(); return ComparatorUtils.equals(filename, editingFileName); } diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 0ce0917a6..5deef13df 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -218,7 +218,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { MutilTempalteTabPane.getInstance().setSelectedIndex(index - 1); } JTemplate selectedfile = MutilTempalteTabPane.getInstance().getSelectedFile(); - if (!HistoryTemplateListPane.getInstance().isCurrentEditingFile(selectedfile.getFullPathName())) { + if (!HistoryTemplateListPane.getInstance().isCurrentEditingFile(selectedfile.getPath())) { //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样 DesignerContext.getDesignerFrame().activateJTemplate(selectedfile); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 575aea91b..c683488e8 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java @@ -40,7 +40,6 @@ import com.fr.design.write.submit.DBManipulationInWidgetEventPane; import com.fr.design.write.submit.DBManipulationPane; import com.fr.file.FILE; import com.fr.file.FILEChooserPane; -import com.fr.file.FileNodeFILE; import com.fr.file.MemFILE; import com.fr.form.ui.NoneWidget; import com.fr.form.ui.Widget; @@ -50,19 +49,14 @@ import com.fr.log.FineLoggerFactory; import com.fr.report.cell.Elem; import com.fr.report.cell.cellattr.CellImage; import com.fr.stable.ArrayUtils; -import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; import com.fr.stable.StringUtils; import com.fr.stable.core.UUID; -import com.fr.stable.project.ProjectConstants; -import com.fr.workspace.WorkContext; import javax.swing.*; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.undo.UndoManager; import java.awt.*; -import java.io.ByteArrayOutputStream; -import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Set; @@ -204,16 +198,8 @@ public abstract class JTemplate> return -1; } - public String getFullPathName() { - String editingFileName = getEditingFILE().getPath(); - if (editingFileName.startsWith(ProjectConstants.REPORTLETS_NAME)) { - editingFileName = ((FileNodeFILE) getEditingFILE()).getEnvPath() + File.separator + editingFileName; - } - if (OperatingSystem.isWindows()) { - return editingFileName.replaceAll("/", "\\\\"); - } else { - return editingFileName.replaceAll("\\\\", "/"); - } + public String getPath() { + return getEditingFILE().getPath(); } protected abstract JComponent createCenterPane(); @@ -581,7 +567,7 @@ public abstract class JTemplate> * @return */ public boolean saveAsTemplate(boolean isShowLoc, String fileName) { - String oldName = this.getFullPathName(); + String oldName = this.getPath(); // alex:如果是SaveAs的话需要让用户来选择路径了 FILEChooserPane fileChooser = getFILEChooserPane(isShowLoc); fileChooser.setFileNameTextField(fileName, this.suffix()); @@ -620,7 +606,7 @@ public abstract class JTemplate> collectInfo(); } //更换最近打开 - DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getFullPathName()); + DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath()); return result; } @@ -656,9 +642,7 @@ public abstract class JTemplate> return false; } try { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - this.getTarget().export(out); - WorkContext.getWorkResource().write(editingFILE.getPath(), out.toByteArray()); + this.getTarget().export(editingFILE.asOutputStream()); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java index 25570ee94..d472cc062 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/JVirtualTemplate.java @@ -37,7 +37,7 @@ public class JVirtualTemplate extends JTemplate { } @Override - public String getFullPathName() { + public String getPath() { String editingFileName = getEditingFILE().getPath(); if (editingFileName.startsWith(ProjectConstants.REPORTLETS_NAME)) { editingFileName = ((FileNodeFILE) getEditingFILE()).getEnvPath() + File.separator + editingFileName; @@ -258,7 +258,7 @@ public class JVirtualTemplate extends JTemplate { @Override public Icon getIcon() { - if (getFullPathName().endsWith("cpt")) { + if (getPath().endsWith("cpt")) { return BaseUtils.readIcon("/com/fr/design/images/buttonicon/newcpts.png"); } else { return BaseUtils.readIcon("/com/fr/web/images/form/new_form3.png"); diff --git a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java index e8cb2a207..c6fea8618 100644 --- a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java @@ -6,7 +6,7 @@ import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.remote.ui.AuthorityManagerPane; -import com.fr.env.operator.authority.AuthorityOperator; +import com.fr.workspace.server.authority.AuthorityOperator; import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; import com.fr.report.DesignAuthority; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index 03e6d4457..23bf0f150 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -18,7 +18,7 @@ import com.fr.design.remote.RemoteDesignAuthorityCreator; import com.fr.design.remote.ui.list.AuthorityList; import com.fr.design.remote.ui.list.AuthorityListCellRenderer; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.log.FineLoggerFactory; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java index 781f1cfca..816fabb47 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/UserManagerPane.java @@ -13,8 +13,8 @@ import com.fr.design.remote.ui.list.AddedMemberListCellRender; import com.fr.design.remote.ui.list.AddingMemberList; import com.fr.design.remote.ui.list.AddingMemberListCellRender; import com.fr.design.remote.ui.list.MemberListSelectedChangeListener; -import com.fr.env.RemoteDesignMember; -import com.fr.env.operator.decision.DecisionOperator; +import com.fr.workspace.server.authority.RemoteDesignMember; +import com.fr.workspace.server.authority.decision.DecisionOperator; import com.fr.general.Inter; import com.fr.stable.StringUtils; import com.fr.third.guava.collect.ImmutableList; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java index a2631d66f..423533a78 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberList.java @@ -1,6 +1,6 @@ package com.fr.design.remote.ui.list; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import javax.swing.DefaultListModel; import java.awt.Point; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java index 39dd08fb0..64a5a6332 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddedMemberListCellRender.java @@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list; import com.fr.base.BaseUtils; import com.fr.design.gui.ilable.UILabel; import com.fr.design.remote.button.IconButton; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import javax.swing.BorderFactory; import javax.swing.JList; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java index 136d77cc1..d1b906d23 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberList.java @@ -1,6 +1,6 @@ package com.fr.design.remote.ui.list; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import javax.swing.DefaultListModel; import java.awt.Point; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java index 0668d67f1..94749d531 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/AddingMemberListCellRender.java @@ -3,7 +3,7 @@ package com.fr.design.remote.ui.list; import com.fr.base.BaseUtils; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import javax.swing.BorderFactory; import javax.swing.JList; diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java b/designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java index 9476c1593..60e44af99 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/list/MemberList.java @@ -1,7 +1,7 @@ package com.fr.design.remote.ui.list; -import com.fr.env.RemoteDesignMember; +import com.fr.workspace.server.authority.RemoteDesignMember; import javax.swing.DefaultListModel; import javax.swing.JList; diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java index 3c2d20704..8e9eb853e 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkPreviewPane.java +++ b/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()); } } diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index a07e9996c..68945319f 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -270,8 +270,13 @@ public class RemoteEnvPane extends BasicBeanPane { : new RemoteEnvURL(connection.getUrl()); String username = fromNullable(connection.getUserName()).or(StringUtils.EMPTY); String pwd = fromNullable(connection.getPassword()).or(StringUtils.EMPTY); + String certPath = fromNullable(connection.getCertPath()).or(StringUtils.EMPTY); + String certSecretKey = fromNullable(connection.getCertSecretKey()).or(StringUtils.EMPTY); this.usernameInput.setText(username); this.passwordInput.setText(pwd); + this.certPathInput.setText(certPath); + this.certSecretKeyInput.setText(certSecretKey); + } fillRemoteEnvURLField(); @@ -290,7 +295,9 @@ public class RemoteEnvPane extends BasicBeanPane { WorkspaceConnection connection = new WorkspaceConnection( this.remoteEnvURL.getURL(), this.usernameInput.getText(), - new String(this.passwordInput.getPassword())); + new String(this.passwordInput.getPassword()), + this.certPathInput.getText(), + new String(this.certSecretKeyInput.getPassword())); return RemoteDesignerWorkspaceInfo.create(connection); } @@ -478,7 +485,11 @@ public class RemoteEnvPane extends BasicBeanPane { final RemoteDesignerWorkspaceInfo remoteEnv = updateBean(); - return WorkContext.getConnector().testConnection(remoteEnv.getConnection()); + WorkspaceConnection connection = remoteEnv.getConnection(); + DesignerEnvManager.getEnvManager().setCertificatePath(connection.getCertPath()); + DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey()); + + return WorkContext.getConnector().testConnection(connection); } @Override diff --git a/designer-base/src/main/java/com/fr/file/FILEFactory.java b/designer-base/src/main/java/com/fr/file/FILEFactory.java index 634759b23..f5d690b21 100644 --- a/designer-base/src/main/java/com/fr/file/FILEFactory.java +++ b/designer-base/src/main/java/com/fr/file/FILEFactory.java @@ -35,7 +35,7 @@ public class FILEFactory { } else if (path.startsWith(FILE_PREFIX)) { return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length()))); } else { - return new FileFILE(new java.io.File(path)); + return new FileNodeFILE(new FileNode(path, WorkContext.getWorkResource().isDirectory(path))); } } @@ -52,7 +52,7 @@ public class FILEFactory { } else if (path.startsWith(FILE_PREFIX)) { return new FileFILE(new java.io.File(path.substring(FILE_PREFIX.length()))); } else { - return new FileFILE(new java.io.File(path)); + return new FileNodeFILE(new FileNode(path, WorkContext.getWorkResource().isDirectory(path))); } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java index c77ce334f..55aa49158 100644 --- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java +++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java @@ -8,6 +8,7 @@ import com.fr.design.gui.itree.filetree.FileTreeIcon; import com.fr.file.filetree.FileNode; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; +import com.fr.workspace.resource.WorkResourceOutputStream; import com.fr.log.FineLoggerFactory; import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; @@ -198,7 +199,6 @@ public class FileNodeFILE implements FILE { return FRContext.getFileNodes().listWebRootFile(rootFilePath); } else { return FRContext.getFileNodes().list(rootFilePath); - } } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); @@ -338,10 +338,7 @@ public class FileNodeFILE implements FILE { if (!envPath.startsWith(ProjectConstants.REPORTLETS_NAME)) { return null; } - return FRContext.getCommonOperator().writeBean( - envPath.substring(ProjectConstants.REPORTLETS_NAME.length() + 1), - ProjectConstants.REPORTLETS_NAME - ); + return new WorkResourceOutputStream(envPath); } /** diff --git a/designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj b/designer-base/src/main/resources/com/fr/aspectj/designerbase/AlphaFineReminder.aj similarity index 100% rename from designer-base/src/main/java/com/fr/aspectj/designerbase/AlphaFineReminder.aj rename to designer-base/src/main/resources/com/fr/aspectj/designerbase/AlphaFineReminder.aj diff --git a/designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj b/designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj similarity index 100% rename from designer-base/src/main/java/com/fr/aspectj/designerbase/TemplateProcessTracker.aj rename to designer-base/src/main/resources/com/fr/aspectj/designerbase/TemplateProcessTracker.aj diff --git a/designer-base/src/main/java/com/fr/common/inputevent/package.html b/designer-base/src/main/resources/com/fr/common/inputevent/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/common/inputevent/package.html rename to designer-base/src/main/resources/com/fr/common/inputevent/package.html diff --git a/designer-base/src/main/java/com/fr/design/bbs/package.html b/designer-base/src/main/resources/com/fr/design/bbs/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/bbs/package.html rename to designer-base/src/main/resources/com/fr/design/bbs/package.html diff --git a/designer-base/src/main/java/com/fr/design/border/package.html b/designer-base/src/main/resources/com/fr/design/border/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/border/package.html rename to designer-base/src/main/resources/com/fr/design/border/package.html diff --git a/designer-base/src/main/java/com/fr/design/bridge/package.html b/designer-base/src/main/resources/com/fr/design/bridge/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/bridge/package.html rename to designer-base/src/main/resources/com/fr/design/bridge/package.html diff --git a/designer-base/src/main/java/com/fr/design/constants/package.html b/designer-base/src/main/resources/com/fr/design/constants/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/constants/package.html rename to designer-base/src/main/resources/com/fr/design/constants/package.html diff --git a/designer-base/src/main/java/com/fr/design/data/package.html b/designer-base/src/main/resources/com/fr/design/data/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/data/package.html rename to designer-base/src/main/resources/com/fr/design/data/package.html diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/gui/CONTENT.txt b/designer-base/src/main/resources/com/fr/design/data/tabledata/gui/CONTENT.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/data/tabledata/gui/CONTENT.txt rename to designer-base/src/main/resources/com/fr/design/data/tabledata/gui/CONTENT.txt diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN1.txt b/designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN1.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN1.txt rename to designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN1.txt diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN2.txt b/designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN2.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/data/tabledata/gui/EXPLAN2.txt rename to designer-base/src/main/resources/com/fr/design/data/tabledata/gui/EXPLAN2.txt diff --git a/designer-base/src/main/java/com/fr/design/dialog/package.html b/designer-base/src/main/resources/com/fr/design/dialog/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/dialog/package.html rename to designer-base/src/main/resources/com/fr/design/dialog/package.html diff --git a/designer-base/src/main/java/com/fr/design/editor/package.html b/designer-base/src/main/resources/com/fr/design/editor/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/editor/package.html rename to designer-base/src/main/resources/com/fr/design/editor/package.html diff --git a/designer-base/src/main/java/com/fr/design/event/package.html b/designer-base/src/main/resources/com/fr/design/event/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/event/package.html rename to designer-base/src/main/resources/com/fr/design/event/package.html diff --git a/designer-base/src/main/java/com/fr/design/extra/modal-dialog.css b/designer-base/src/main/resources/com/fr/design/extra/modal-dialog.css similarity index 100% rename from designer-base/src/main/java/com/fr/design/extra/modal-dialog.css rename to designer-base/src/main/resources/com/fr/design/extra/modal-dialog.css diff --git a/designer-base/src/main/java/com/fr/design/extra/package.html b/designer-base/src/main/resources/com/fr/design/extra/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/extra/package.html rename to designer-base/src/main/resources/com/fr/design/extra/package.html diff --git a/designer-base/src/main/java/com/fr/design/file/package.html b/designer-base/src/main/resources/com/fr/design/file/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/file/package.html rename to designer-base/src/main/resources/com/fr/design/file/package.html diff --git a/designer-base/src/main/java/com/fr/design/foldablepane/package.html b/designer-base/src/main/resources/com/fr/design/foldablepane/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/foldablepane/package.html rename to designer-base/src/main/resources/com/fr/design/foldablepane/package.html diff --git a/designer-base/src/main/java/com/fr/design/formula/package.html b/designer-base/src/main/resources/com/fr/design/formula/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/formula/package.html rename to designer-base/src/main/resources/com/fr/design/formula/package.html diff --git a/designer-base/src/main/java/com/fr/design/fun/package.html b/designer-base/src/main/resources/com/fr/design/fun/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/fun/package.html rename to designer-base/src/main/resources/com/fr/design/fun/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/CompletionXml.dtd b/designer-base/src/main/resources/com/fr/design/gui/autocomplete/CompletionXml.dtd similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/autocomplete/CompletionXml.dtd rename to designer-base/src/main/resources/com/fr/design/gui/autocomplete/CompletionXml.dtd diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_left.png b/designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_left.png rename to designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_left.png diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_right.png b/designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/autocomplete/arrow_right.png rename to designer-base/src/main/resources/com/fr/design/gui/autocomplete/arrow_right.png diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/bullet_black.png b/designer-base/src/main/resources/com/fr/design/gui/autocomplete/bullet_black.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/autocomplete/bullet_black.png rename to designer-base/src/main/resources/com/fr/design/gui/autocomplete/bullet_black.png diff --git a/designer-base/src/main/java/com/fr/design/gui/autocomplete/osx_sizegrip.png b/designer-base/src/main/resources/com/fr/design/gui/autocomplete/osx_sizegrip.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/autocomplete/osx_sizegrip.png rename to designer-base/src/main/resources/com/fr/design/gui/autocomplete/osx_sizegrip.png diff --git a/designer-base/src/main/java/com/fr/design/gui/package.html b/designer-base/src/main/resources/com/fr/design/gui/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/package.html rename to designer-base/src/main/resources/com/fr/design/gui/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/io/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/io/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/io/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/io/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/print/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/print/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/print/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/print/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/folding/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ActionScriptTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/AssemblerX86TokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSSTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/CTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ClojureTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/DtdTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FortranTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/HtaccessTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JSPTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaScriptTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JavaTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/JsonTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LatexTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LispTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/LuaTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MakefileTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/NSISTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PHPTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PerlTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PlainTextTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PropertiesFileTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/PythonTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/RubyTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SASTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/SQLTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/TclTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/VisualBasicTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/XMLTokenMaker.flex diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/parser/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/templates/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rtextarea/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rtextarea/package.html diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/util/package.html b/designer-base/src/main/resources/com/fr/design/gui/syntax/util/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/gui/syntax/util/package.html rename to designer-base/src/main/resources/com/fr/design/gui/syntax/util/package.html diff --git a/designer-base/src/main/java/com/fr/design/icon/package.html b/designer-base/src/main/resources/com/fr/design/icon/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/icon/package.html rename to designer-base/src/main/resources/com/fr/design/icon/package.html diff --git a/designer-base/src/main/java/com/fr/design/images/arrow/arrow_down.png b/designer-base/src/main/resources/com/fr/design/images/arrow/arrow_down.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/arrow/arrow_down.png rename to designer-base/src/main/resources/com/fr/design/images/arrow/arrow_down.png diff --git a/designer-base/src/main/java/com/fr/design/images/arrow/arrow_up.png b/designer-base/src/main/resources/com/fr/design/images/arrow/arrow_up.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/arrow/arrow_up.png rename to designer-base/src/main/resources/com/fr/design/images/arrow/arrow_up.png diff --git a/designer-base/src/main/java/com/fr/design/images/bbs.png b/designer-base/src/main/resources/com/fr/design/images/bbs.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/bbs.png rename to designer-base/src/main/resources/com/fr/design/images/bbs.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/360.png b/designer-base/src/main/resources/com/fr/design/images/browser/360.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/360.png rename to designer-base/src/main/resources/com/fr/design/images/browser/360.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/back.png b/designer-base/src/main/resources/com/fr/design/images/browser/back.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/back.png rename to designer-base/src/main/resources/com/fr/design/images/browser/back.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/chrome.png b/designer-base/src/main/resources/com/fr/design/images/browser/chrome.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/chrome.png rename to designer-base/src/main/resources/com/fr/design/images/browser/chrome.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/firefox.png b/designer-base/src/main/resources/com/fr/design/images/browser/firefox.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/firefox.png rename to designer-base/src/main/resources/com/fr/design/images/browser/firefox.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/forward.png b/designer-base/src/main/resources/com/fr/design/images/browser/forward.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/forward.png rename to designer-base/src/main/resources/com/fr/design/images/browser/forward.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/go.png b/designer-base/src/main/resources/com/fr/design/images/browser/go.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/go.png rename to designer-base/src/main/resources/com/fr/design/images/browser/go.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/home.png b/designer-base/src/main/resources/com/fr/design/images/browser/home.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/home.png rename to designer-base/src/main/resources/com/fr/design/images/browser/home.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/ie.png b/designer-base/src/main/resources/com/fr/design/images/browser/ie.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/ie.png rename to designer-base/src/main/resources/com/fr/design/images/browser/ie.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/reload.png b/designer-base/src/main/resources/com/fr/design/images/browser/reload.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/reload.png rename to designer-base/src/main/resources/com/fr/design/images/browser/reload.png diff --git a/designer-base/src/main/java/com/fr/design/images/browser/stop.png b/designer-base/src/main/resources/com/fr/design/images/browser/stop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/browser/stop.png rename to designer-base/src/main/resources/com/fr/design/images/browser/stop.png diff --git a/designer-base/src/main/java/com/fr/design/images/bug.png b/designer-base/src/main/resources/com/fr/design/images/bug.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/bug.png rename to designer-base/src/main/resources/com/fr/design/images/bug.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/add.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/add.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/add.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/add_over.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/add_over.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/add_over.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/add_over.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/add_press.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/add_press.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/add_press.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/add_press.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/addicon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/addicon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/addicon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/addicon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/additicon_grey.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/additicon_grey.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/additicon_grey.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/additicon_grey.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/anab24.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/anab24.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/anab24.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/anab24.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/anas.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/anas.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/anas.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/anas.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/arrow.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/arrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/arrow.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/arrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/arrowdown.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/arrowdown.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/arrowdown.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/arrowdown.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/arrowup.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/arrowup.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/arrowup.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/arrowup.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/bind_ds_column.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/bind_ds_column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/bind_ds_column.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/bind_ds_column.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/button_0.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/button_0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/button_0.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/button_0.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/card_layout_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/card_layout_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/card_layout_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/cell.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/cell.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/cell.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/cell.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/cell_group.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/cell_group.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/cell_group.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/cell_group.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/close_icon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/close_icon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/close_icon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/close_icon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/column.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/column.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/column.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/config.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/config.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/config.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/config.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/cube.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/cube.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/cube.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/cube.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/delete.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/delete.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/downSelected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/downSelected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/downSelected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/downSelected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column_index.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column_index.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column_index.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column_index.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column_name.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column_name.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/ds_column_name.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/ds_column_name.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/dscolumn.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/dscolumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/dscolumn.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/dscolumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/editn.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/editn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/editn.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/editn.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/editp.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/editp.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/editp.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/editp.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/hiden.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/hiden.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/hiden.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/hiden.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/hidep.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/hidep.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/hidep.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/hidep.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/history.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/history.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/history.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/history.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/layout_absolute_new.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/layout_absolute_new.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/layout_absolute_new.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/layout_absolute_new.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/leftNormal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/leftNormal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/leftNormal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/leftNormal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_cover.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_cover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_cover.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_cover.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_covered.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_covered.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_covered.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_covered.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_icon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_icon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_icon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_icon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_press.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_press.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_press.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_press.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/list_pressed.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/list_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/list_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/list_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/minus.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/minus.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/minus.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/minus.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/more.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/more.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/more.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/more.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/more2.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/more2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/more2.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/more2.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/more3.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/more3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/more3.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/more3.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/more4.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/more4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/more4.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/more4.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/mouseoverclose icon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/mouseoverclose icon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/mouseoverclose icon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/mouseoverclose icon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/new_form3.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/new_form3.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form3.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/newcpts.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/newcpts.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/open.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/open.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/open.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/open.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/pageb24.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/pageb24.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/pageb24.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/pageb24.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/pages.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/pages.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/pages.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/pages.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/parameter.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/parameter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/parameter.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/parameter.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/plus.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/plus.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/plus.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/plus.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/popdownarrow.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/popdownarrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/popdownarrow.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/popdownarrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/popuparrow.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/popuparrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/popuparrow.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/popuparrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/pressclose icon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/pressclose icon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/pressclose icon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/pressclose icon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/prevew_down_icon.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/prevew_down_icon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/prevew_down_icon.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/prevew_down_icon.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/prewidget.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/prewidget.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/prewidget.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/prewidget.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/redo.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/redo.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/redo.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/refresh.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/refresh.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/refresh.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/report_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/report_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/report_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/run24.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/run24.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/run24.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/run24.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/runs.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/runs.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/runs.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/runs.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/save.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/save.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/save.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/select.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/select.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/select.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/select.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/select_item.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/select_item.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/select_item.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/select_item.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/setting.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/setting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/setting.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/setting.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/switchShortCuts.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/switchShortCuts.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/switchShortCuts.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/switchShortCuts.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_bool.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_bool.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_bool.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_bool.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_cursor.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_cursor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_cursor.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_cursor.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_date.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_date.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_date.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_date.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_double.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_double.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_double.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_double.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_formula.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_formula.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_formula.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_formula.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_int.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_int.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_int.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_int.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_none.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_none.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_none.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_none.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/type_string.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/type_string.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/type_string.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/type_string.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/undo.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/undo.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/undo.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/viewn.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/viewn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/viewn.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/viewn.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/viewp.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/viewp.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/viewp.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/viewp.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/warn.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/warn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/warn.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/warn.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/button_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/button_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/button_group_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/button_group_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/button_group_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/check_box_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/check_box_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/check_box_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/checkbox_group_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/checkbox_group_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/checkbox_group_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/combo_box_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/combo_box_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_box_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/combo_check_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/combo_check_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/combo_check_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/comboboxtree.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/comboboxtree.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/comboboxtree.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/date_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/date_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/date_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/files_up.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/files_up.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/files_up.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/files_up.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/label_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/label_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/label_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/number_field_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/number_field_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/number_field_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/password_field_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/password_field_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/password_field_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/text_area_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/text_area_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_area_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/text_field_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/text_field_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/text_field_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widget/tree_16.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widget/tree_16.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widget/tree_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/widgets.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/widgets.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/widgets.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/widgets.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/writeb24.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/writeb24.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/writeb24.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/writeb24.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/writes.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/writes.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/writes.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/writes.png diff --git a/designer-base/src/main/java/com/fr/design/images/buttonicon/yes.png b/designer-base/src/main/resources/com/fr/design/images/buttonicon/yes.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/buttonicon/yes.png rename to designer-base/src/main/resources/com/fr/design/images/buttonicon/yes.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/average.png b/designer-base/src/main/resources/com/fr/design/images/calculate/average.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/average.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/average.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/count.png b/designer-base/src/main/resources/com/fr/design/images/calculate/count.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/count.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/count.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/max.png b/designer-base/src/main/resources/com/fr/design/images/calculate/max.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/max.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/max.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/min.png b/designer-base/src/main/resources/com/fr/design/images/calculate/min.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/min.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/min.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/none.png b/designer-base/src/main/resources/com/fr/design/images/calculate/none.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/none.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/none.png diff --git a/designer-base/src/main/java/com/fr/design/images/calculate/sum.png b/designer-base/src/main/resources/com/fr/design/images/calculate/sum.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calculate/sum.png rename to designer-base/src/main/resources/com/fr/design/images/calculate/sum.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_add.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_add.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_add.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_add_click.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_add_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_add_click.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_add_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_add_hover.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_add_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_add_hover.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_add_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_reduce.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_reduce.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_reduce.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_reduce.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_reduce_click.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_reduce_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_reduce_click.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_reduce_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/month_reduce_hover.png b/designer-base/src/main/resources/com/fr/design/images/calender/month_reduce_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/month_reduce_hover.png rename to designer-base/src/main/resources/com/fr/design/images/calender/month_reduce_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_add.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_add.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_add.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_add_click.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_add_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_add_click.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_add_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_add_hover.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_add_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_add_hover.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_add_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_reduce.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_reduce.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_reduce.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_reduce.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_reduce_click.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_reduce_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_reduce_click.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_reduce_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/calender/year_reduce_hover.png b/designer-base/src/main/resources/com/fr/design/images/calender/year_reduce_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/calender/year_reduce_hover.png rename to designer-base/src/main/resources/com/fr/design/images/calender/year_reduce_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/4.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/4.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/4.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/5.png b/designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/AreaPlot/type/5.png rename to designer-base/src/main/resources/com/fr/design/images/chart/AreaPlot/type/5.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/4.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/4.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/4.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/5.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/5.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/5.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/6.png b/designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/6.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BarPlot/type/6.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BarPlot/type/6.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/BubblePlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/BubblePlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChangeChart.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChangeChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChangeChart.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChangeChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/cross.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/cross.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/cross.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/cross.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/external.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/external.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/external.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/external.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/inside.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/inside.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartAxisLineStyle/inside.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartAxisLineStyle/inside.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartData.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartData.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartData.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_bottom.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_bottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_bottom.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_bottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_left.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_left.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_left.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_right.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_right.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_right.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_top.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_top.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_top.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_top.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_top_right.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_top_right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartLegend/layout_top_right.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartLegend/layout_top_right.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartStyle.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartStyle.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartStyle.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartStyle.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ChartType.png b/designer-base/src/main/resources/com/fr/design/images/chart/ChartType.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ChartType.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ChartType.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/4.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/4.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/4.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/5.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/5.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/5.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/6.png b/designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/6.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ColumnPlot/type/6.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ColumnPlot/type/6.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/ConditionAttr.png b/designer-base/src/main/resources/com/fr/design/images/chart/ConditionAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/ConditionAttr.png rename to designer-base/src/main/resources/com/fr/design/images/chart/ConditionAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/CustomPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/CustomPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/DonutPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/DonutPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/FunnelPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/FunnelPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/FunnelPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/FunnelPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/GanttPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/GanttPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/GanttPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/GanttPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/GisMapPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/GisMapPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/InterAttr.png b/designer-base/src/main/resources/com/fr/design/images/chart/InterAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/InterAttr.png rename to designer-base/src/main/resources/com/fr/design/images/chart/InterAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/LinePlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/LinePlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MapPlot/type/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MapPlot/type/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/MeterPlot/type/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/MeterPlot/type/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/PiePlot/type/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/type/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/PiePlot/type/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/PiePlot/type/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/RadarPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/RadarPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/RadarPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/RadarPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/RangePlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/RangePlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/RangePlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/RangePlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/StockPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/StockPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/StockPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/StockPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/1.png b/designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/1.png rename to designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/2.png b/designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/2.png rename to designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/3.png b/designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/layout/3.png rename to designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/layout/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/type/0.png b/designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/type/0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/XYScatterPlot/type/0.png rename to designer-base/src/main/resources/com/fr/design/images/chart/XYScatterPlot/type/0.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/default.png b/designer-base/src/main/resources/com/fr/design/images/chart/default.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/default.png rename to designer-base/src/main/resources/com/fr/design/images/chart/default.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/link.png b/designer-base/src/main/resources/com/fr/design/images/chart/link.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/link.png rename to designer-base/src/main/resources/com/fr/design/images/chart/link.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/moved.png b/designer-base/src/main/resources/com/fr/design/images/chart/moved.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/moved.png rename to designer-base/src/main/resources/com/fr/design/images/chart/moved.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/normal.png b/designer-base/src/main/resources/com/fr/design/images/chart/normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/normal.png rename to designer-base/src/main/resources/com/fr/design/images/chart/normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/chart/pressed.png b/designer-base/src/main/resources/com/fr/design/images/chart/pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/chart/pressed.png rename to designer-base/src/main/resources/com/fr/design/images/chart/pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/condition/bracket.png b/designer-base/src/main/resources/com/fr/design/images/condition/bracket.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/condition/bracket.png rename to designer-base/src/main/resources/com/fr/design/images/condition/bracket.png diff --git a/designer-base/src/main/java/com/fr/design/images/condition/unBracket.png b/designer-base/src/main/resources/com/fr/design/images/condition/unBracket.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/condition/unBracket.png rename to designer-base/src/main/resources/com/fr/design/images/condition/unBracket.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/addPopup.png b/designer-base/src/main/resources/com/fr/design/images/control/addPopup.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/addPopup.png rename to designer-base/src/main/resources/com/fr/design/images/control/addPopup.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/arrow_down.png b/designer-base/src/main/resources/com/fr/design/images/control/arrow_down.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/arrow_down.png rename to designer-base/src/main/resources/com/fr/design/images/control/arrow_down.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/bar-light.png b/designer-base/src/main/resources/com/fr/design/images/control/bar-light.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/bar-light.png rename to designer-base/src/main/resources/com/fr/design/images/control/bar-light.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/bar.png b/designer-base/src/main/resources/com/fr/design/images/control/bar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/bar.png rename to designer-base/src/main/resources/com/fr/design/images/control/bar.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/barl.png b/designer-base/src/main/resources/com/fr/design/images/control/barl.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/barl.png rename to designer-base/src/main/resources/com/fr/design/images/control/barl.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/barm.png b/designer-base/src/main/resources/com/fr/design/images/control/barm.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/barm.png rename to designer-base/src/main/resources/com/fr/design/images/control/barm.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/clear.png b/designer-base/src/main/resources/com/fr/design/images/control/clear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/clear.png rename to designer-base/src/main/resources/com/fr/design/images/control/clear.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/close.png b/designer-base/src/main/resources/com/fr/design/images/control/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/close.png rename to designer-base/src/main/resources/com/fr/design/images/control/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/close_rollover.png b/designer-base/src/main/resources/com/fr/design/images/control/close_rollover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/close_rollover.png rename to designer-base/src/main/resources/com/fr/design/images/control/close_rollover.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/closet.png b/designer-base/src/main/resources/com/fr/design/images/control/closet.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/closet.png rename to designer-base/src/main/resources/com/fr/design/images/control/closet.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/combobox.png b/designer-base/src/main/resources/com/fr/design/images/control/combobox.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/combobox.png rename to designer-base/src/main/resources/com/fr/design/images/control/combobox.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/control-center2.png b/designer-base/src/main/resources/com/fr/design/images/control/control-center2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/control-center2.png rename to designer-base/src/main/resources/com/fr/design/images/control/control-center2.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/copy.png b/designer-base/src/main/resources/com/fr/design/images/control/copy.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/copy.png rename to designer-base/src/main/resources/com/fr/design/images/control/copy.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/dot-line.png b/designer-base/src/main/resources/com/fr/design/images/control/dot-line.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/dot-line.png rename to designer-base/src/main/resources/com/fr/design/images/control/dot-line.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/dot.png b/designer-base/src/main/resources/com/fr/design/images/control/dot.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/dot.png rename to designer-base/src/main/resources/com/fr/design/images/control/dot.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/dotv.png b/designer-base/src/main/resources/com/fr/design/images/control/dotv.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/dotv.png rename to designer-base/src/main/resources/com/fr/design/images/control/dotv.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/down.png b/designer-base/src/main/resources/com/fr/design/images/control/down.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/down.png rename to designer-base/src/main/resources/com/fr/design/images/control/down.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/down_arrow.png b/designer-base/src/main/resources/com/fr/design/images/control/down_arrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/down_arrow.png rename to designer-base/src/main/resources/com/fr/design/images/control/down_arrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/downdis.png b/designer-base/src/main/resources/com/fr/design/images/control/downdis.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/downdis.png rename to designer-base/src/main/resources/com/fr/design/images/control/downdis.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/downnor.png b/designer-base/src/main/resources/com/fr/design/images/control/downnor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/downnor.png rename to designer-base/src/main/resources/com/fr/design/images/control/downnor.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/downpre.png b/designer-base/src/main/resources/com/fr/design/images/control/downpre.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/downpre.png rename to designer-base/src/main/resources/com/fr/design/images/control/downpre.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/east_arrow.png b/designer-base/src/main/resources/com/fr/design/images/control/east_arrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/east_arrow.png rename to designer-base/src/main/resources/com/fr/design/images/control/east_arrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/edit.png b/designer-base/src/main/resources/com/fr/design/images/control/edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/edit.png rename to designer-base/src/main/resources/com/fr/design/images/control/edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/edit_white.png b/designer-base/src/main/resources/com/fr/design/images/control/edit_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/edit_white.png rename to designer-base/src/main/resources/com/fr/design/images/control/edit_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/help_close.png b/designer-base/src/main/resources/com/fr/design/images/control/help_close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/help_close.png rename to designer-base/src/main/resources/com/fr/design/images/control/help_close.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/help_open.png b/designer-base/src/main/resources/com/fr/design/images/control/help_open.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/help_open.png rename to designer-base/src/main/resources/com/fr/design/images/control/help_open.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/icon_thumb_normal.png b/designer-base/src/main/resources/com/fr/design/images/control/icon_thumb_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/icon_thumb_normal.png rename to designer-base/src/main/resources/com/fr/design/images/control/icon_thumb_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/left.png b/designer-base/src/main/resources/com/fr/design/images/control/left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/left.png rename to designer-base/src/main/resources/com/fr/design/images/control/left.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/leftleft.png b/designer-base/src/main/resources/com/fr/design/images/control/leftleft.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/leftleft.png rename to designer-base/src/main/resources/com/fr/design/images/control/leftleft.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/leftnor.png b/designer-base/src/main/resources/com/fr/design/images/control/leftnor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/leftnor.png rename to designer-base/src/main/resources/com/fr/design/images/control/leftnor.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/leftpre.png b/designer-base/src/main/resources/com/fr/design/images/control/leftpre.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/leftpre.png rename to designer-base/src/main/resources/com/fr/design/images/control/leftpre.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/lock.png b/designer-base/src/main/resources/com/fr/design/images/control/lock.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/lock.png rename to designer-base/src/main/resources/com/fr/design/images/control/lock.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/more.png b/designer-base/src/main/resources/com/fr/design/images/control/more.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/more.png rename to designer-base/src/main/resources/com/fr/design/images/control/more.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/newEdit.png b/designer-base/src/main/resources/com/fr/design/images/control/newEdit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/newEdit.png rename to designer-base/src/main/resources/com/fr/design/images/control/newEdit.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/refresh.png b/designer-base/src/main/resources/com/fr/design/images/control/refresh.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/refresh.png rename to designer-base/src/main/resources/com/fr/design/images/control/refresh.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/remove.png b/designer-base/src/main/resources/com/fr/design/images/control/remove.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/remove.png rename to designer-base/src/main/resources/com/fr/design/images/control/remove.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/right.png b/designer-base/src/main/resources/com/fr/design/images/control/right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/right.png rename to designer-base/src/main/resources/com/fr/design/images/control/right.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/rightnor.png b/designer-base/src/main/resources/com/fr/design/images/control/rightnor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/rightnor.png rename to designer-base/src/main/resources/com/fr/design/images/control/rightnor.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/rightpre.png b/designer-base/src/main/resources/com/fr/design/images/control/rightpre.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/rightpre.png rename to designer-base/src/main/resources/com/fr/design/images/control/rightpre.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/rightright.png b/designer-base/src/main/resources/com/fr/design/images/control/rightright.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/rightright.png rename to designer-base/src/main/resources/com/fr/design/images/control/rightright.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/sortAsc.png b/designer-base/src/main/resources/com/fr/design/images/control/sortAsc.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/sortAsc.png rename to designer-base/src/main/resources/com/fr/design/images/control/sortAsc.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/end.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/end.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/end.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/end.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/end_not.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/end_not.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/end_not.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/end_not.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/first.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/first.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/first.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/first.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/first_not.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/first_not.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/first_not.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/first_not.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/next.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/next.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/next.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/next.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/next_not.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/next_not.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/next_not.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/next_not.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/prev.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/prev.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/prev.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/prev.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/prev_not.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/prev_not.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/prev_not.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/prev_not.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/tab/remove.png b/designer-base/src/main/resources/com/fr/design/images/control/tab/remove.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/tab/remove.png rename to designer-base/src/main/resources/com/fr/design/images/control/tab/remove.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/to_bottom.png b/designer-base/src/main/resources/com/fr/design/images/control/to_bottom.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/to_bottom.png rename to designer-base/src/main/resources/com/fr/design/images/control/to_bottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/to_top.png b/designer-base/src/main/resources/com/fr/design/images/control/to_top.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/to_top.png rename to designer-base/src/main/resources/com/fr/design/images/control/to_top.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/unlock.png b/designer-base/src/main/resources/com/fr/design/images/control/unlock.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/unlock.png rename to designer-base/src/main/resources/com/fr/design/images/control/unlock.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/up.png b/designer-base/src/main/resources/com/fr/design/images/control/up.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/up.png rename to designer-base/src/main/resources/com/fr/design/images/control/up.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/up_arrow.png b/designer-base/src/main/resources/com/fr/design/images/control/up_arrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/up_arrow.png rename to designer-base/src/main/resources/com/fr/design/images/control/up_arrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/updis.png b/designer-base/src/main/resources/com/fr/design/images/control/updis.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/updis.png rename to designer-base/src/main/resources/com/fr/design/images/control/updis.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/upnor.png b/designer-base/src/main/resources/com/fr/design/images/control/upnor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/upnor.png rename to designer-base/src/main/resources/com/fr/design/images/control/upnor.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/uppre.png b/designer-base/src/main/resources/com/fr/design/images/control/uppre.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/uppre.png rename to designer-base/src/main/resources/com/fr/design/images/control/uppre.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/warn.png b/designer-base/src/main/resources/com/fr/design/images/control/warn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/warn.png rename to designer-base/src/main/resources/com/fr/design/images/control/warn.png diff --git a/designer-base/src/main/java/com/fr/design/images/control/west_arrow.png b/designer-base/src/main/resources/com/fr/design/images/control/west_arrow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/control/west_arrow.png rename to designer-base/src/main/resources/com/fr/design/images/control/west_arrow.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/baobiaozhuti_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/baobiaozhuti_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/canshujiemian_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/canshujiemian_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/edit.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/edit.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/edit_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/edit_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/edit_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/edit_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/edit_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/edit_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/edit_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/edit_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/form.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/form.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/form.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/form.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/form_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/form_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/form_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/form_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/form_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/form_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/form_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/form_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/left.gif b/designer-base/src/main/resources/com/fr/design/images/custombtn/left.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/left.gif rename to designer-base/src/main/resources/com/fr/design/images/custombtn/left.gif diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/page.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/page.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/page.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/page.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/page_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/page_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/page_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/page_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/page_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/page_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/page_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/page_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/preview.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/preview.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/preview.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/preview.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/preview_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/preview_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/preview_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/preview_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/preview_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/preview_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/preview_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/preview_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/right.gif b/designer-base/src/main/resources/com/fr/design/images/custombtn/right.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/right.gif rename to designer-base/src/main/resources/com/fr/design/images/custombtn/right.gif diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/setting.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/setting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/setting.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/setting.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/setting_click.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/setting_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/setting_click.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/setting_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/custombtn/setting_hover.png b/designer-base/src/main/resources/com/fr/design/images/custombtn/setting_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/custombtn/setting_hover.png rename to designer-base/src/main/resources/com/fr/design/images/custombtn/setting_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/chart.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/chart.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/files.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/files.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/files.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/files.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/form.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/form.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/form.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/form.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/guide.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/guide.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/guide.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/guide.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/0.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/0.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/0.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/0.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/1.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/1.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/1.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/1.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/1.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/1.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/1.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/10.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/10.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/10.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/10.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/10.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/10.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/10.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/10.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/11.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/11.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/11.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/11.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/11.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/11.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/11.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/11.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/12.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/12.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/12.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/12.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/12.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/12.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/12.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/12.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/13.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/13.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/13.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/13.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/13.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/13.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/13.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/13.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/14.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/14.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/14.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/14.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/14.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/14.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/14.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/14.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/15.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/15.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/15.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/15.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/15.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/15.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/15.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/15.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/16.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/16.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/16.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/16.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/16.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/16.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/16.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/17.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/17.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/17.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/17.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/17.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/17.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/17.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/17.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/18.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/18.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/18.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/18.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/18.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/18.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/18.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/18.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/19.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/19.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/19.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/19.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/19.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/19.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/19.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/19.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/2.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/2.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/2.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/2.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/2.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/2.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/2.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/20.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/20.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/20.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/20.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/21.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/21.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/21.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/21.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/22.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/22.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/22.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/22.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/23.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/23.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/23.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/23.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/24.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/24.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/24.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/24.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/25.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/25.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/25.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/25.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/26.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/26.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/26.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/26.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/27.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/27.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/27.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/27.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/28.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/28.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/28.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/28.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/29.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/29.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/29.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/29.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/3.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/3.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/3.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/3.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/3.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/3.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/3.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/30.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/30.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/30.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/30.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/31.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/31.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/31.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/31.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/32.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/32.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/32.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/32.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/33.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/33.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/33.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/33.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/34.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/34.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/34.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/34.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/35.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/35.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/35.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/35.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/36.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/36.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/36.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/36.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/37.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/37.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/37.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/37.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/38.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/38.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/38.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/38.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/39.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/39.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/39.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/39.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/4.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/4.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/4.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/4.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/4.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/4.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/4.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/40.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/40.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/40.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/40.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/41.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/41.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/41.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/41.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/42.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/42.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/42.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/42.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/43.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/43.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/43.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/43.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/44.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/44.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/44.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/44.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/45.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/45.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/45.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/45.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/46.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/46.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/46.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/46.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/47.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/47.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/47.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/47.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/48.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/48.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/48.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/48.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/49.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/49.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/49.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/49.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/5.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/5.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/5.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/5.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/5.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/5.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/5.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/50.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/50.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/50.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/50.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/52.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/52.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/52.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/52.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/54.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/54.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/54.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/54.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/55.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/55.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/55.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/55.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/56.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/56.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/56.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/56.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/57.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/57.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/57.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/57.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/6.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/6.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/6.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/6.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/6.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/6.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/6.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/6.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/7.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/7.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/7.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/7.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/7.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/7.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/7.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/7.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/8.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/8.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/8.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/8.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/8.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/8.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/8.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/8.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/9.gif b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/9.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/9.gif rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/9.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/9.png b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/9.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/9.png rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/9.png diff --git a/designer-base/src/main/java/com/fr/design/images/dashboard/img/Thumbs.db b/designer-base/src/main/resources/com/fr/design/images/dashboard/img/Thumbs.db similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dashboard/img/Thumbs.db rename to designer-base/src/main/resources/com/fr/design/images/dashboard/img/Thumbs.db diff --git a/designer-base/src/main/java/com/fr/design/images/data/arrow_branch.png b/designer-base/src/main/resources/com/fr/design/images/data/arrow_branch.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/arrow_branch.png rename to designer-base/src/main/resources/com/fr/design/images/data/arrow_branch.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/add.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/add.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/add.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/distanceconnect.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/distanceconnect.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/distanceconnect.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/groupAscColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/groupAscColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/groupAscColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/groupAscColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/groupColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/groupColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/groupColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/groupColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/groupDescColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/groupDescColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/groupDescColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/groupDescColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/localconnect.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/localconnect.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/localconnect.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/modify.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/modify.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/modify.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/modify.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/normalColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/normalColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/normalColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/normalColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/selectColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/selectColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/selectColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/selectColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/sortAscColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/sortAscColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/sortAscColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/sortAscColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/sortColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/sortColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/sortColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/sortColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/sortDescColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/sortDescColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/sortDescColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/sortDescColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/bind/summaryColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/bind/summaryColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/bind/summaryColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/bind/summaryColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/black_search.png b/designer-base/src/main/resources/com/fr/design/images/data/black_search.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/black_search.png rename to designer-base/src/main/resources/com/fr/design/images/data/black_search.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/comb_widget.png b/designer-base/src/main/resources/com/fr/design/images/data/comb_widget.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/comb_widget.png rename to designer-base/src/main/resources/com/fr/design/images/data/comb_widget.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/convertEmbedded.png b/designer-base/src/main/resources/com/fr/design/images/data/convertEmbedded.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/convertEmbedded.png rename to designer-base/src/main/resources/com/fr/design/images/data/convertEmbedded.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/cube.png b/designer-base/src/main/resources/com/fr/design/images/data/cube.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/cube.png rename to designer-base/src/main/resources/com/fr/design/images/data/cube.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/custom_widget.png b/designer-base/src/main/resources/com/fr/design/images/data/custom_widget.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/custom_widget.png rename to designer-base/src/main/resources/com/fr/design/images/data/custom_widget.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dataDictionary.png b/designer-base/src/main/resources/com/fr/design/images/data/dataDictionary.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dataDictionary.png rename to designer-base/src/main/resources/com/fr/design/images/data/dataDictionary.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dataTable.png b/designer-base/src/main/resources/com/fr/design/images/data/dataTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dataTable.png rename to designer-base/src/main/resources/com/fr/design/images/data/dataTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/database.png b/designer-base/src/main/resources/com/fr/design/images/data/database.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/database.png rename to designer-base/src/main/resources/com/fr/design/images/data/database.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/datakubiao.png b/designer-base/src/main/resources/com/fr/design/images/data/datakubiao.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/datakubiao.png rename to designer-base/src/main/resources/com/fr/design/images/data/datakubiao.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/datasource.png b/designer-base/src/main/resources/com/fr/design/images/data/datasource.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/datasource.png rename to designer-base/src/main/resources/com/fr/design/images/data/datasource.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/default_widget.png b/designer-base/src/main/resources/com/fr/design/images/data/default_widget.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/default_widget.png rename to designer-base/src/main/resources/com/fr/design/images/data/default_widget.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/diy.png b/designer-base/src/main/resources/com/fr/design/images/data/diy.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/diy.png rename to designer-base/src/main/resources/com/fr/design/images/data/diy.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/XML.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/XML.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/XML.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/XML.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/classTableData.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/classTableData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/classTableData.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/classTableData.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/dataTable.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/dataTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/dataTable.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/dataTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/database.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/database.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/database.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/database.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/excel.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/excel.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/excel.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/excel.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/relation_table_data.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/relation_table_data.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/relation_table_data.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/relation_table_data.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/serverclasstabledata.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/serverclasstabledata.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/serverclasstabledata.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/serverclasstabledata.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/serverdatabase.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/serverdatabase.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatabase.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/serverdatatable.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatatable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/serverdatatable.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/serverdatatable.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/table_proc.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/table_proc.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/table_proc.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/table_proc.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/dock/table_text.png b/designer-base/src/main/resources/com/fr/design/images/data/dock/table_text.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/dock/table_text.png rename to designer-base/src/main/resources/com/fr/design/images/data/dock/table_text.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/editQuery.png b/designer-base/src/main/resources/com/fr/design/images/data/editQuery.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/editQuery.png rename to designer-base/src/main/resources/com/fr/design/images/data/editQuery.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/field.png b/designer-base/src/main/resources/com/fr/design/images/data/field.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/field.png rename to designer-base/src/main/resources/com/fr/design/images/data/field.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/file.png b/designer-base/src/main/resources/com/fr/design/images/data/file.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/file.png rename to designer-base/src/main/resources/com/fr/design/images/data/file.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/multi.png b/designer-base/src/main/resources/com/fr/design/images/data/multi.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/multi.png rename to designer-base/src/main/resources/com/fr/design/images/data/multi.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/newQuery.png b/designer-base/src/main/resources/com/fr/design/images/data/newQuery.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/newQuery.png rename to designer-base/src/main/resources/com/fr/design/images/data/newQuery.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/private.png b/designer-base/src/main/resources/com/fr/design/images/data/private.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/private.png rename to designer-base/src/main/resources/com/fr/design/images/data/private.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/public.png b/designer-base/src/main/resources/com/fr/design/images/data/public.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/public.png rename to designer-base/src/main/resources/com/fr/design/images/data/public.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/sap.png b/designer-base/src/main/resources/com/fr/design/images/data/sap.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/sap.png rename to designer-base/src/main/resources/com/fr/design/images/data/sap.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/search.png b/designer-base/src/main/resources/com/fr/design/images/data/search.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/search.png rename to designer-base/src/main/resources/com/fr/design/images/data/search.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/classTableData.png b/designer-base/src/main/resources/com/fr/design/images/data/source/classTableData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/classTableData.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/classTableData.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/clear.png b/designer-base/src/main/resources/com/fr/design/images/data/source/clear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/clear.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/clear.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/dataDictionary.png b/designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/dataDictionary.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/delete.png b/designer-base/src/main/resources/com/fr/design/images/data/source/delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/delete.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/hibernateTableData.png b/designer-base/src/main/resources/com/fr/design/images/data/source/hibernateTableData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/hibernateTableData.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/hibernateTableData.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/hoverDown.png b/designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/hoverDown.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/hoverDown20.png b/designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown20.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/hoverDown20.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown20.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/hoverDown@2x.png b/designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/hoverDown@2x.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/hoverDown@2x.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/hoverUp20.png b/designer-base/src/main/resources/com/fr/design/images/data/source/hoverUp20.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/hoverUp20.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/hoverUp20.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/jdbcDataquery.png b/designer-base/src/main/resources/com/fr/design/images/data/source/jdbcDataquery.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/jdbcDataquery.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/jdbcDataquery.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/jdbcTableData.png b/designer-base/src/main/resources/com/fr/design/images/data/source/jdbcTableData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/jdbcTableData.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/jdbcTableData.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/moveDown.png b/designer-base/src/main/resources/com/fr/design/images/data/source/moveDown.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/moveDown.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/moveDown.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/moveUp.png b/designer-base/src/main/resources/com/fr/design/images/data/source/moveUp.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/moveUp.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/moveUp.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/newDatabase.png b/designer-base/src/main/resources/com/fr/design/images/data/source/newDatabase.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/newDatabase.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/newDatabase.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/newDatasource.png b/designer-base/src/main/resources/com/fr/design/images/data/source/newDatasource.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/newDatasource.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/newDatasource.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/normalDown.png b/designer-base/src/main/resources/com/fr/design/images/data/source/normalDown.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/normalDown.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/normalDown.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/normalDown20.png b/designer-base/src/main/resources/com/fr/design/images/data/source/normalDown20.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/normalDown20.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/normalDown20.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/normalDown@2x.png b/designer-base/src/main/resources/com/fr/design/images/data/source/normalDown@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/normalDown@2x.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/normalDown@2x.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/normalUp20.png b/designer-base/src/main/resources/com/fr/design/images/data/source/normalUp20.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/normalUp20.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/normalUp20.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/rename.png b/designer-base/src/main/resources/com/fr/design/images/data/source/rename.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/rename.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/rename.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/scaleDown.png b/designer-base/src/main/resources/com/fr/design/images/data/source/scaleDown.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/scaleDown.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/scaleDown.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/scaleUp.png b/designer-base/src/main/resources/com/fr/design/images/data/source/scaleUp.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/scaleUp.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/scaleUp.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/schema.png b/designer-base/src/main/resources/com/fr/design/images/data/source/schema.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/schema.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/schema.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/Thumbs.db b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/Thumbs.db similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/Thumbs.db rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/Thumbs.db diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/accept.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/accept.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/accept.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/accept.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/bullet_key.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/bullet_key.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/bullet_key.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/bullet_key.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/bullet_pink.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/bullet_pink.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/bullet_pink.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/bullet_pink.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/cart_add.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/cart_add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/cart_add.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/cart_add.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/cart_delete.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/cart_delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/cart_delete.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/cart_delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/chart_organisation.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/chart_organisation.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/chart_organisation.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/chart_organisation.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_connect.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_connect.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_connect.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_connect.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_gear.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_gear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_gear.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_gear.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_lightning.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_lightning.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_lightning.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_lightning.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_save.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_save.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_save.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_save.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_table.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_table.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_table.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_table.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_tables.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_tables.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/database_tables.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/database_tables.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/filter.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/filter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/filter.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/filter.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_database.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_database.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_database.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_database.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_page.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_page.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_page.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_page.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_table.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_table.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/folder_table.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/folder_table.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_edit.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_edit.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_gear.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_gear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_gear.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_gear.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_save.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_save.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_save.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_save.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_white_database.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_white_database.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/page_white_database.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/page_white_database.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_error.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_error.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_error.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_error.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_gear.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_gear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_gear.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_gear.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_link.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_link.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_link.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_link.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_multiple.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_multiple.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_multiple.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_multiple.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_relationship.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_relationship.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_relationship.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_relationship.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_row_delete.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_row_delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_row_delete.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_row_delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_row_insert.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_row_insert.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_row_insert.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_row_insert.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_sort.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_sort.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/table_sort.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/table_sort.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/textfield.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/textfield.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/textfield.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/textfield.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/wizard.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/wizard.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/wizard.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/wizard.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/wrench.png b/designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/wrench.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/selectwizard/wrench.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/selectwizard/wrench.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlAscColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlAscColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlAscColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlAscColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlConditionColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlConditionColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlConditionColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlConditionColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlDescColumn.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlDescColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlDescColumn.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlDescColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlTable.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlTable.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/sqlViewTable.png b/designer-base/src/main/resources/com/fr/design/images/data/source/sqlViewTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/sqlViewTable.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/sqlViewTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/table.png b/designer-base/src/main/resources/com/fr/design/images/data/source/table.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/table.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/table.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/textDatasource.png b/designer-base/src/main/resources/com/fr/design/images/data/source/textDatasource.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/textDatasource.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/textDatasource.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/source/view.png b/designer-base/src/main/resources/com/fr/design/images/data/source/view.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/source/view.png rename to designer-base/src/main/resources/com/fr/design/images/data/source/view.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/store_procedure.png b/designer-base/src/main/resources/com/fr/design/images/data/store_procedure.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/store_procedure.png rename to designer-base/src/main/resources/com/fr/design/images/data/store_procedure.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/string.png b/designer-base/src/main/resources/com/fr/design/images/data/string.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/string.png rename to designer-base/src/main/resources/com/fr/design/images/data/string.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/table.png b/designer-base/src/main/resources/com/fr/design/images/data/table.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/table.png rename to designer-base/src/main/resources/com/fr/design/images/data/table.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/table2.png b/designer-base/src/main/resources/com/fr/design/images/data/table2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/table2.png rename to designer-base/src/main/resources/com/fr/design/images/data/table2.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/tables.png b/designer-base/src/main/resources/com/fr/design/images/data/tables.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/tables.png rename to designer-base/src/main/resources/com/fr/design/images/data/tables.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/text.png b/designer-base/src/main/resources/com/fr/design/images/data/text.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/text.png rename to designer-base/src/main/resources/com/fr/design/images/data/text.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/today.gif b/designer-base/src/main/resources/com/fr/design/images/data/today.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/today.gif rename to designer-base/src/main/resources/com/fr/design/images/data/today.gif diff --git a/designer-base/src/main/java/com/fr/design/images/data/tree.png b/designer-base/src/main/resources/com/fr/design/images/data/tree.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/tree.png rename to designer-base/src/main/resources/com/fr/design/images/data/tree.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/user_widget.png b/designer-base/src/main/resources/com/fr/design/images/data/user_widget.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/user_widget.png rename to designer-base/src/main/resources/com/fr/design/images/data/user_widget.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/views.png b/designer-base/src/main/resources/com/fr/design/images/data/views.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/views.png rename to designer-base/src/main/resources/com/fr/design/images/data/views.png diff --git a/designer-base/src/main/java/com/fr/design/images/data/xml.png b/designer-base/src/main/resources/com/fr/design/images/data/xml.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/data/xml.png rename to designer-base/src/main/resources/com/fr/design/images/data/xml.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/H0.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/H0.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H0.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/H1.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/H1.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H1.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/H2.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/H2.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H2.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/H3.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/H3.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H3.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/H4.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/H4.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/H4.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/V0.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/V0.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V0.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/V1.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/V1.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V1.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/V2.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/V2.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V2.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/V3.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/V3.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V3.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/appfit/V4.png b/designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/appfit/V4.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/appfit/V4.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/column.png b/designer-base/src/main/resources/com/fr/design/images/dialog/column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/column.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/column.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/function.gif b/designer-base/src/main/resources/com/fr/design/images/dialog/function.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/function.gif rename to designer-base/src/main/resources/com/fr/design/images/dialog/function.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/parameter.gif b/designer-base/src/main/resources/com/fr/design/images/dialog/parameter.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/parameter.gif rename to designer-base/src/main/resources/com/fr/design/images/dialog/parameter.gif diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/table.png b/designer-base/src/main/resources/com/fr/design/images/dialog/table.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/table.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/table.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/variable.png b/designer-base/src/main/resources/com/fr/design/images/dialog/variable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/variable.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/variable.png diff --git a/designer-base/src/main/java/com/fr/design/images/dialog/watermark/watermark_background.png b/designer-base/src/main/resources/com/fr/design/images/dialog/watermark/watermark_background.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dialog/watermark/watermark_background.png rename to designer-base/src/main/resources/com/fr/design/images/dialog/watermark/watermark_background.png diff --git a/designer-base/src/main/java/com/fr/design/images/dock/desktop.png b/designer-base/src/main/resources/com/fr/design/images/dock/desktop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dock/desktop.png rename to designer-base/src/main/resources/com/fr/design/images/dock/desktop.png diff --git a/designer-base/src/main/java/com/fr/design/images/dock/project.png b/designer-base/src/main/resources/com/fr/design/images/dock/project.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dock/project.png rename to designer-base/src/main/resources/com/fr/design/images/dock/project.png diff --git a/designer-base/src/main/java/com/fr/design/images/dock/projectVer.png b/designer-base/src/main/resources/com/fr/design/images/dock/projectVer.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dock/projectVer.png rename to designer-base/src/main/resources/com/fr/design/images/dock/projectVer.png diff --git a/designer-base/src/main/java/com/fr/design/images/dock/properties.png b/designer-base/src/main/resources/com/fr/design/images/dock/properties.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/dock/properties.png rename to designer-base/src/main/resources/com/fr/design/images/dock/properties.png diff --git a/designer-base/src/main/java/com/fr/design/images/docking/close.gif b/designer-base/src/main/resources/com/fr/design/images/docking/close.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/close.gif rename to designer-base/src/main/resources/com/fr/design/images/docking/close.gif diff --git a/designer-base/src/main/java/com/fr/design/images/docking/down.gif b/designer-base/src/main/resources/com/fr/design/images/docking/down.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/down.gif rename to designer-base/src/main/resources/com/fr/design/images/docking/down.gif diff --git a/designer-base/src/main/java/com/fr/design/images/docking/left.gif b/designer-base/src/main/resources/com/fr/design/images/docking/left.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/left.gif rename to designer-base/src/main/resources/com/fr/design/images/docking/left.gif diff --git a/designer-base/src/main/java/com/fr/design/images/docking/left.png b/designer-base/src/main/resources/com/fr/design/images/docking/left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/left.png rename to designer-base/src/main/resources/com/fr/design/images/docking/left.png diff --git a/designer-base/src/main/java/com/fr/design/images/docking/right.gif b/designer-base/src/main/resources/com/fr/design/images/docking/right.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/right.gif rename to designer-base/src/main/resources/com/fr/design/images/docking/right.gif diff --git a/designer-base/src/main/java/com/fr/design/images/docking/right.png b/designer-base/src/main/resources/com/fr/design/images/docking/right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/right.png rename to designer-base/src/main/resources/com/fr/design/images/docking/right.png diff --git a/designer-base/src/main/java/com/fr/design/images/docking/up.gif b/designer-base/src/main/resources/com/fr/design/images/docking/up.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/docking/up.gif rename to designer-base/src/main/resources/com/fr/design/images/docking/up.gif diff --git a/designer-base/src/main/java/com/fr/design/images/edit/deleteRow.png b/designer-base/src/main/resources/com/fr/design/images/edit/deleteRow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/edit/deleteRow.png rename to designer-base/src/main/resources/com/fr/design/images/edit/deleteRow.png diff --git a/designer-base/src/main/java/com/fr/design/images/edit/format.png b/designer-base/src/main/resources/com/fr/design/images/edit/format.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/edit/format.png rename to designer-base/src/main/resources/com/fr/design/images/edit/format.png diff --git a/designer-base/src/main/java/com/fr/design/images/edit/insertRow_B.png b/designer-base/src/main/resources/com/fr/design/images/edit/insertRow_B.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/edit/insertRow_B.png rename to designer-base/src/main/resources/com/fr/design/images/edit/insertRow_B.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/asc.png b/designer-base/src/main/resources/com/fr/design/images/expand/asc.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/asc.png rename to designer-base/src/main/resources/com/fr/design/images/expand/asc.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/asc_selected.png b/designer-base/src/main/resources/com/fr/design/images/expand/asc_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/asc_selected.png rename to designer-base/src/main/resources/com/fr/design/images/expand/asc_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/cellAttr.gif b/designer-base/src/main/resources/com/fr/design/images/expand/cellAttr.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/cellAttr.gif rename to designer-base/src/main/resources/com/fr/design/images/expand/cellAttr.gif diff --git a/designer-base/src/main/java/com/fr/design/images/expand/des.png b/designer-base/src/main/resources/com/fr/design/images/expand/des.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/des.png rename to designer-base/src/main/resources/com/fr/design/images/expand/des.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/des_selected.png b/designer-base/src/main/resources/com/fr/design/images/expand/des_selected.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/des_selected.png rename to designer-base/src/main/resources/com/fr/design/images/expand/des_selected.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/landspace.png b/designer-base/src/main/resources/com/fr/design/images/expand/landspace.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/landspace.png rename to designer-base/src/main/resources/com/fr/design/images/expand/landspace.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/landspace_selected@1x.png b/designer-base/src/main/resources/com/fr/design/images/expand/landspace_selected@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/landspace_selected@1x.png rename to designer-base/src/main/resources/com/fr/design/images/expand/landspace_selected@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/none16x16.png b/designer-base/src/main/resources/com/fr/design/images/expand/none16x16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/none16x16.png rename to designer-base/src/main/resources/com/fr/design/images/expand/none16x16.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/none16x16_selected@1x.png b/designer-base/src/main/resources/com/fr/design/images/expand/none16x16_selected@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/none16x16_selected@1x.png rename to designer-base/src/main/resources/com/fr/design/images/expand/none16x16_selected@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/vertical.png b/designer-base/src/main/resources/com/fr/design/images/expand/vertical.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/vertical.png rename to designer-base/src/main/resources/com/fr/design/images/expand/vertical.png diff --git a/designer-base/src/main/java/com/fr/design/images/expand/vertical_selected@1x.png b/designer-base/src/main/resources/com/fr/design/images/expand/vertical_selected@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/expand/vertical_selected@1x.png rename to designer-base/src/main/resources/com/fr/design/images/expand/vertical_selected@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/disk.gif b/designer-base/src/main/resources/com/fr/design/images/file/disk.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/disk.gif rename to designer-base/src/main/resources/com/fr/design/images/file/disk.gif diff --git a/designer-base/src/main/java/com/fr/design/images/file/disk.png b/designer-base/src/main/resources/com/fr/design/images/file/disk.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/disk.png rename to designer-base/src/main/resources/com/fr/design/images/file/disk.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/fold.png b/designer-base/src/main/resources/com/fr/design/images/file/fold.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/fold.png rename to designer-base/src/main/resources/com/fr/design/images/file/fold.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/folder.gif b/designer-base/src/main/resources/com/fr/design/images/file/folder.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/folder.gif rename to designer-base/src/main/resources/com/fr/design/images/file/folder.gif diff --git a/designer-base/src/main/java/com/fr/design/images/file/gifFile.gif b/designer-base/src/main/resources/com/fr/design/images/file/gifFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/gifFile.gif rename to designer-base/src/main/resources/com/fr/design/images/file/gifFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/file/jpgFile.gif b/designer-base/src/main/resources/com/fr/design/images/file/jpgFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/jpgFile.gif rename to designer-base/src/main/resources/com/fr/design/images/file/jpgFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/file/newfolder.png b/designer-base/src/main/resources/com/fr/design/images/file/newfolder.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/newfolder.png rename to designer-base/src/main/resources/com/fr/design/images/file/newfolder.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/nostar.png b/designer-base/src/main/resources/com/fr/design/images/file/nostar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/nostar.png rename to designer-base/src/main/resources/com/fr/design/images/file/nostar.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/pngFile.png b/designer-base/src/main/resources/com/fr/design/images/file/pngFile.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/pngFile.png rename to designer-base/src/main/resources/com/fr/design/images/file/pngFile.png diff --git a/designer-base/src/main/java/com/fr/design/images/file/star.png b/designer-base/src/main/resources/com/fr/design/images/file/star.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/file/star.png rename to designer-base/src/main/resources/com/fr/design/images/file/star.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/Button.gif b/designer-base/src/main/resources/com/fr/design/images/form/Button.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/Button.gif rename to designer-base/src/main/resources/com/fr/design/images/form/Button.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/CheckBox.gif b/designer-base/src/main/resources/com/fr/design/images/form/CheckBox.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/CheckBox.gif rename to designer-base/src/main/resources/com/fr/design/images/form/CheckBox.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/Choice.gif b/designer-base/src/main/resources/com/fr/design/images/form/Choice.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/Choice.gif rename to designer-base/src/main/resources/com/fr/design/images/form/Choice.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/List.gif b/designer-base/src/main/resources/com/fr/design/images/form/List.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/List.gif rename to designer-base/src/main/resources/com/fr/design/images/form/List.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/RadioButton.gif b/designer-base/src/main/resources/com/fr/design/images/form/RadioButton.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/RadioButton.gif rename to designer-base/src/main/resources/com/fr/design/images/form/RadioButton.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/TextField.gif b/designer-base/src/main/resources/com/fr/design/images/form/TextField.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/TextField.gif rename to designer-base/src/main/resources/com/fr/design/images/form/TextField.gif diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_border.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_border_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_left.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_left_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_right.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/bottom_right_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_close.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_close.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_close.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_close_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_max.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_max.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_max.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_max.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_max_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_min.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_min.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_min.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_min.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/control_min_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/controls.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/controls.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/controls.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/controls.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/controls_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/controls_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/controls_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/controls_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/left_border.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/left_border.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/left_border.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/left_border.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/left_border_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/right_border.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/right_border.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/right_border.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/right_border.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/right_border_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/title_pane.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_border.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_border.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_border.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_border.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_border_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_left.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_left.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_left.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_left_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_right.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_right.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_right.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/beans/adapters/container/top_right_.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/bottom_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/bottom_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/bottom_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/bottom_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/center_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/center_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/center_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/center_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/cursor/add.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/add.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/cursor/add.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/add.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/cursor/connectorcursor.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/connectorcursor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/cursor/connectorcursor.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/connectorcursor.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/cursor/move.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/move.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/cursor/move.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/cursor/move.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/drop_down.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/drop_down.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/drop_down.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/drop_down.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/drop_over.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/drop_over.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/drop_over.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/drop_over.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/drop_up.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/drop_up.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/drop_up.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/drop_up.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/holder.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/holder.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/holder.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/holder.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/left_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/left_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/left_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/left_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/middle_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/middle_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/middle_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/middle_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/properties/minus.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/properties/minus.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/properties/minus.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/properties/minus.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/properties/plus.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/properties/plus.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/properties/plus.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/properties/plus.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/right_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/right_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/right_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/right_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/same_height.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/same_height.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/same_height.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/same_height.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/same_width.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/same_width.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/same_width.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/same_width.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/designer/top_align.png b/designer-base/src/main/resources/com/fr/design/images/form/designer/top_align.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/designer/top_align.png rename to designer-base/src/main/resources/com/fr/design/images/form/designer/top_align.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/hover.png b/designer-base/src/main/resources/com/fr/design/images/form/hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/hover.png rename to designer-base/src/main/resources/com/fr/design/images/form/hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/parameter.png b/designer-base/src/main/resources/com/fr/design/images/form/parameter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/parameter.png rename to designer-base/src/main/resources/com/fr/design/images/form/parameter.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/Chart-Map.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/Chart-Map.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/Chart-Map.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/Chart-Map.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Area.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Area.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Area.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Area.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Bar.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Bar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Bar.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Bar.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Column.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Column.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Column.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Comb_Chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Donut.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Donut.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Donut.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Donut.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Funnel.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Funnel.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Funnel.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Funnel.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Gantt.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Gantt.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Gantt.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Gantt.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Gis.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Gis.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Gis.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Gis.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Line.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Line.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Line.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Line.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Meter.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Meter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Meter.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Meter.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Pie.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Pie.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Pie.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Pie.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Radar.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Radar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Radar.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Radar.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Range_Chart.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Range_Chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Range_Chart.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Range_Chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Stock.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Stock.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-Stock.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-Stock.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-XYScatter.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-XYScatter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ChartF-XYScatter.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ChartF-XYScatter.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/Chart_BubbleChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/Chart_BubbleChart.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/Chart_BubbleChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/FR-Chart-Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/FR-Chart-Chart_BubbleChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/FR-Chart-Chart_BubbleChart.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/FR-Chart-Chart_BubbleChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/default.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/default.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/default.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/default.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ec_columns.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ec_columns.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ec_columns.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ec_columns.png diff --git a/designer-base/src/main/java/com/fr/design/images/form/toolbar/ec_frozen.png b/designer-base/src/main/resources/com/fr/design/images/form/toolbar/ec_frozen.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/form/toolbar/ec_frozen.png rename to designer-base/src/main/resources/com/fr/design/images/form/toolbar/ec_frozen.png diff --git a/designer-base/src/main/java/com/fr/design/images/gc.png b/designer-base/src/main/resources/com/fr/design/images/gc.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gc.png rename to designer-base/src/main/resources/com/fr/design/images/gc.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/close-rolver.png b/designer-base/src/main/resources/com/fr/design/images/general/close-rolver.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/close-rolver.png rename to designer-base/src/main/resources/com/fr/design/images/general/close-rolver.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/close.png b/designer-base/src/main/resources/com/fr/design/images/general/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/close.png rename to designer-base/src/main/resources/com/fr/design/images/general/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/mini-rolver.png b/designer-base/src/main/resources/com/fr/design/images/general/mini-rolver.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/mini-rolver.png rename to designer-base/src/main/resources/com/fr/design/images/general/mini-rolver.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/mini.png b/designer-base/src/main/resources/com/fr/design/images/general/mini.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/mini.png rename to designer-base/src/main/resources/com/fr/design/images/general/mini.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/resize-rolver.png b/designer-base/src/main/resources/com/fr/design/images/general/resize-rolver.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/resize-rolver.png rename to designer-base/src/main/resources/com/fr/design/images/general/resize-rolver.png diff --git a/designer-base/src/main/java/com/fr/design/images/general/resize.png b/designer-base/src/main/resources/com/fr/design/images/general/resize.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/general/resize.png rename to designer-base/src/main/resources/com/fr/design/images/general/resize.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/blank.gif b/designer-base/src/main/resources/com/fr/design/images/gui/blank.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/blank.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/blank.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/bmpFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/bmpFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/bmpFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/bmpFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/cell.gif b/designer-base/src/main/resources/com/fr/design/images/gui/cell.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/cell.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/cell.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/cht.png b/designer-base/src/main/resources/com/fr/design/images/gui/cht.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/cht.png rename to designer-base/src/main/resources/com/fr/design/images/gui/cht.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/chtlocked.png b/designer-base/src/main/resources/com/fr/design/images/gui/chtlocked.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/chtlocked.png rename to designer-base/src/main/resources/com/fr/design/images/gui/chtlocked.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/classFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/classFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/classFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/classFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/close.png b/designer-base/src/main/resources/com/fr/design/images/gui/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/close.png rename to designer-base/src/main/resources/com/fr/design/images/gui/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/color/background.png b/designer-base/src/main/resources/com/fr/design/images/gui/color/background.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/color/background.png rename to designer-base/src/main/resources/com/fr/design/images/gui/color/background.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/color/foreground.png b/designer-base/src/main/resources/com/fr/design/images/gui/color/foreground.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/color/foreground.png rename to designer-base/src/main/resources/com/fr/design/images/gui/color/foreground.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/color/foreground2.png b/designer-base/src/main/resources/com/fr/design/images/gui/color/foreground2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/color/foreground2.png rename to designer-base/src/main/resources/com/fr/design/images/gui/color/foreground2.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPicker16.png b/designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPicker16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPicker16.png rename to designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPicker16.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPicker18.png b/designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPicker18.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPicker18.png rename to designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPicker18.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPickerFrame.png b/designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPickerFrame.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/colorPicker/colorPickerFrame.png rename to designer-base/src/main/resources/com/fr/design/images/gui/colorPicker/colorPickerFrame.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/cptFile.png b/designer-base/src/main/resources/com/fr/design/images/gui/cptFile.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/cptFile.png rename to designer-base/src/main/resources/com/fr/design/images/gui/cptFile.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/documentFolderClose.gif b/designer-base/src/main/resources/com/fr/design/images/gui/documentFolderClose.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/documentFolderClose.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/documentFolderClose.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder.gif b/designer-base/src/main/resources/com/fr/design/images/gui/folder.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/folder.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder.png b/designer-base/src/main/resources/com/fr/design/images/gui/folder.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder.png rename to designer-base/src/main/resources/com/fr/design/images/gui/folder.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder/expanded.png b/designer-base/src/main/resources/com/fr/design/images/gui/folder/expanded.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder/expanded.png rename to designer-base/src/main/resources/com/fr/design/images/gui/folder/expanded.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder/foldered.png b/designer-base/src/main/resources/com/fr/design/images/gui/folder/foldered.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder/foldered.png rename to designer-base/src/main/resources/com/fr/design/images/gui/folder/foldered.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder/hovered_expanded.png b/designer-base/src/main/resources/com/fr/design/images/gui/folder/hovered_expanded.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder/hovered_expanded.png rename to designer-base/src/main/resources/com/fr/design/images/gui/folder/hovered_expanded.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/folder/hovered_foldered.png b/designer-base/src/main/resources/com/fr/design/images/gui/folder/hovered_foldered.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/folder/hovered_foldered.png rename to designer-base/src/main/resources/com/fr/design/images/gui/folder/hovered_foldered.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/frm.png b/designer-base/src/main/resources/com/fr/design/images/gui/frm.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/frm.png rename to designer-base/src/main/resources/com/fr/design/images/gui/frm.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/frmlocked.png b/designer-base/src/main/resources/com/fr/design/images/gui/frmlocked.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/frmlocked.png rename to designer-base/src/main/resources/com/fr/design/images/gui/frmlocked.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/gifFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/gifFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/gifFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/gifFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/htmlFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/htmlFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/htmlFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/htmlFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/jarFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/jarFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/jarFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/jarFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/javaFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/javaFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/javaFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/javaFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/jpgFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/jpgFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/jpgFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/jpgFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/jsFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/jsFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/jsFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/jsFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/jspFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/jspFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/jspFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/jspFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/locked.gif b/designer-base/src/main/resources/com/fr/design/images/gui/locked.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/locked.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/locked.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/minimize.gif b/designer-base/src/main/resources/com/fr/design/images/gui/minimize.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/minimize.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/minimize.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/pngFile.png b/designer-base/src/main/resources/com/fr/design/images/gui/pngFile.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/pngFile.png rename to designer-base/src/main/resources/com/fr/design/images/gui/pngFile.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/popup.gif b/designer-base/src/main/resources/com/fr/design/images/gui/popup.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/popup.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/popup.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/popupCenter.png b/designer-base/src/main/resources/com/fr/design/images/gui/popupCenter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/popupCenter.png rename to designer-base/src/main/resources/com/fr/design/images/gui/popupCenter.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/popupLarge.gif b/designer-base/src/main/resources/com/fr/design/images/gui/popupLarge.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/popupLarge.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/popupLarge.gif diff --git a/designer-base/src/main/java/com/fr/design/images/gui/tab_add_click.png b/designer-base/src/main/resources/com/fr/design/images/gui/tab_add_click.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/tab_add_click.png rename to designer-base/src/main/resources/com/fr/design/images/gui/tab_add_click.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/tab_add_hover.png b/designer-base/src/main/resources/com/fr/design/images/gui/tab_add_hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/tab_add_hover.png rename to designer-base/src/main/resources/com/fr/design/images/gui/tab_add_hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/tab_add_normal.png b/designer-base/src/main/resources/com/fr/design/images/gui/tab_add_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/tab_add_normal.png rename to designer-base/src/main/resources/com/fr/design/images/gui/tab_add_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/tab_delete.png b/designer-base/src/main/resources/com/fr/design/images/gui/tab_delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/tab_delete.png rename to designer-base/src/main/resources/com/fr/design/images/gui/tab_delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/textFile.png b/designer-base/src/main/resources/com/fr/design/images/gui/textFile.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/textFile.png rename to designer-base/src/main/resources/com/fr/design/images/gui/textFile.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/warning.png b/designer-base/src/main/resources/com/fr/design/images/gui/warning.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/warning.png rename to designer-base/src/main/resources/com/fr/design/images/gui/warning.png diff --git a/designer-base/src/main/java/com/fr/design/images/gui/xmlFile.gif b/designer-base/src/main/resources/com/fr/design/images/gui/xmlFile.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/gui/xmlFile.gif rename to designer-base/src/main/resources/com/fr/design/images/gui/xmlFile.gif diff --git a/designer-base/src/main/java/com/fr/design/images/help.png b/designer-base/src/main/resources/com/fr/design/images/help.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/help.png rename to designer-base/src/main/resources/com/fr/design/images/help.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon0.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon0.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon0.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon0.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon1.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon1.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon1.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon1.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon10.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon10.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon10.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon10.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon11.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon11.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon11.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon11.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon12.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon12.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon12.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon12.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon13.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon13.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon13.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon13.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon14.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon14.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon14.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon14.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon2.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon2.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon2.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon2.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon3.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon3.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon3.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon3.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon4.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon4.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon4.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon4.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon5.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon5.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon5.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon5.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon6.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon6.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon6.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon6.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon7.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon7.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon7.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon7.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon8.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon8.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon8.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon8.png diff --git a/designer-base/src/main/java/com/fr/design/images/load/busy-icon9.png b/designer-base/src/main/resources/com/fr/design/images/load/busy-icon9.png old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/load/busy-icon9.png rename to designer-base/src/main/resources/com/fr/design/images/load/busy-icon9.png diff --git a/designer-base/src/main/java/com/fr/design/images/log/clear.png b/designer-base/src/main/resources/com/fr/design/images/log/clear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/log/clear.png rename to designer-base/src/main/resources/com/fr/design/images/log/clear.png diff --git a/designer-base/src/main/java/com/fr/design/images/log/selectedall.png b/designer-base/src/main/resources/com/fr/design/images/log/selectedall.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/log/selectedall.png rename to designer-base/src/main/resources/com/fr/design/images/log/selectedall.png diff --git a/designer-base/src/main/java/com/fr/design/images/log/setting.png b/designer-base/src/main/resources/com/fr/design/images/log/setting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/log/setting.png rename to designer-base/src/main/resources/com/fr/design/images/log/setting.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/ComboBoxFocus.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/ComboBoxFocus.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/ComboBoxFocus.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/ComboBoxFocus.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/ComputerIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/ComputerIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/ComputerIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/ComputerIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/DirectoryIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/DirectoryIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/DirectoryIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/DirectoryIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/ErrorIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/ErrorIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/ErrorIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/ErrorIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/FileDetailsIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileDetailsIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/FileDetailsIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileDetailsIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/FileIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/FileIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/FileListIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileListIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/FileListIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileListIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/FloppyIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FloppyIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/FloppyIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/FloppyIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/HarddiskIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/HarddiskIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/HarddiskIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/HarddiskIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/HomeFolderIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/HomeFolderIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/HomeFolderIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/HomeFolderIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/InformationIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/InformationIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/InformationIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/InformationIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/Information_Icon_Error_32x32.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/Information_Icon_Error_32x32.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/Information_Icon_Error_32x32.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/Information_Icon_Error_32x32.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/Information_Icon_OK_32x32.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/Information_Icon_OK_32x32.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/Information_Icon_OK_32x32.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/Information_Icon_OK_32x32.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/InternalFrameIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/InternalFrameIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/InternalFrameIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/InternalFrameIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/NewFolderIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/NewFolderIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/NewFolderIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/NewFolderIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/ParentDirectoryIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/QuestionIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/QuestionIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/QuestionIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/QuestionIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeFolderClosedIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeFolderOpenedIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeLeafIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeLeafIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeMinusIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeMinusIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/TreeMinusIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeMinusIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/TreePlusIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreePlusIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/TreePlusIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreePlusIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/WarningIcon.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/WarningIcon.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/WarningIcon.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/WarningIcon.png diff --git a/designer-base/src/main/java/com/fr/design/images/lookandfeel/brightmask.png b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/brightmask.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/lookandfeel/brightmask.png rename to designer-base/src/main/resources/com/fr/design/images/lookandfeel/brightmask.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/bringForward.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/bringForward.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/bringForward.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/bringForward.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/bringToFront.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/bringToFront.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/bringToFront.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/bringToFront.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/copy.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/copy.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/copy.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/cut.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/cut.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/cut.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/directShare.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/directShare.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/directShare.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/directShare.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/formatBrush.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/formatBrush.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/merge.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/merge.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/merge.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/merge.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/modifyShare.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/modifyShare.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/modifyShare.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/modifyShare.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/paste.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/paste.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/paste.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/pluralundo.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/pluralundo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/pluralundo.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/pluralundo.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/redo.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/redo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/redo.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/redo.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/sendBackward.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/sendBackward.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/sendBackward.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/sendBackward.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/sendToBack.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/sendToBack.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/sendToBack.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/sendToBack.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/share.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/share.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/share.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/share.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/undo.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/undo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/undo.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/undo.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_edit/unmerge.png b/designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_edit/unmerge.png rename to designer-base/src/main/resources/com/fr/design/images/m_edit/unmerge.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/close.png b/designer-base/src/main/resources/com/fr/design/images/m_file/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/close.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/crossTable.png b/designer-base/src/main/resources/com/fr/design/images/m_file/crossTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/crossTable.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/crossTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/csv.png b/designer-base/src/main/resources/com/fr/design/images/m_file/csv.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/csv.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/csv.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/design.png b/designer-base/src/main/resources/com/fr/design/images/m_file/design.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/design.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/design.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/design_large.png b/designer-base/src/main/resources/com/fr/design/images/m_file/design_large.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/design_large.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/design_large.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/edit.png b/designer-base/src/main/resources/com/fr/design/images/m_file/edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/edit.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/excel.png b/designer-base/src/main/resources/com/fr/design/images/m_file/excel.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/excel.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/excel.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/export.png b/designer-base/src/main/resources/com/fr/design/images/m_file/export.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/export.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/export.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/formExport.png b/designer-base/src/main/resources/com/fr/design/images/m_file/formExport.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/formExport.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/formExport.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/groupTable.png b/designer-base/src/main/resources/com/fr/design/images/m_file/groupTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/groupTable.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/groupTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/help.png b/designer-base/src/main/resources/com/fr/design/images/m_file/help.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/help.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/help.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/html.png b/designer-base/src/main/resources/com/fr/design/images/m_file/html.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/html.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/html.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/hyperLink.png b/designer-base/src/main/resources/com/fr/design/images/m_file/hyperLink.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/hyperLink.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/hyperLink.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/import.png b/designer-base/src/main/resources/com/fr/design/images/m_file/import.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/import.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/import.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/merge.png b/designer-base/src/main/resources/com/fr/design/images/m_file/merge.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/merge.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/merge.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/new.png b/designer-base/src/main/resources/com/fr/design/images/m_file/new.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/new.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/new.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/open.png b/designer-base/src/main/resources/com/fr/design/images/m_file/open.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/open.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/open.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/pageSetup.png b/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/pageSetup.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/pdf.png b/designer-base/src/main/resources/com/fr/design/images/m_file/pdf.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/pdf.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/pdf.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/preview.png b/designer-base/src/main/resources/com/fr/design/images/m_file/preview.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/preview.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/preview.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/print.png b/designer-base/src/main/resources/com/fr/design/images/m_file/print.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/print.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/print.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/save.png b/designer-base/src/main/resources/com/fr/design/images/m_file/save.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/save.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/save.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/saveAs.png b/designer-base/src/main/resources/com/fr/design/images/m_file/saveAs.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/saveAs.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/saveAs.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/svg.png b/designer-base/src/main/resources/com/fr/design/images/m_file/svg.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/svg.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/svg.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/switch.png b/designer-base/src/main/resources/com/fr/design/images/m_file/switch.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/switch.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/switch.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/text.png b/designer-base/src/main/resources/com/fr/design/images/m_file/text.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/text.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/text.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/view_folder.png b/designer-base/src/main/resources/com/fr/design/images/m_file/view_folder.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/view_folder.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/view_folder.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/web.png b/designer-base/src/main/resources/com/fr/design/images/m_file/web.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/web.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/web.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_file/word.png b/designer-base/src/main/resources/com/fr/design/images/m_file/word.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_file/word.png rename to designer-base/src/main/resources/com/fr/design/images/m_file/word.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/allborders.png b/designer-base/src/main/resources/com/fr/design/images/m_format/allborders.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/allborders.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/allborders.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/border.png b/designer-base/src/main/resources/com/fr/design/images/m_format/border.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/border.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/border.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/bottom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/bottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/bottom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/bottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cell.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cell.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cell.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cell.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellWriteAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellWriteAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellWriteAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellWriteAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bold.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bold.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bold_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bold_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bold_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bottom_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bottom_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/bottom_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/bottom_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/centerAlignment.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/centerAlignment.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/centerAlignment.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/centerAlignment.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/default.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/default.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/default.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/default.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/defaultAlignment.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/defaultAlignment.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/defaultAlignment.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/defaultAlignment.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/generalAlignment.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/generalAlignment.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/generalAlignment.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/generalAlignment.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_center_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_center_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_left_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_left_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_right_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_right_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/h_s_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/h_s_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/horizontal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/horizontal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/horizontal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/horizontal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/in_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/in_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/in_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/in_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/italic.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/italic.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/italic_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/italic_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/italic_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/leftAlignment.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/leftAlignment.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/leftAlignment.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/leftAlignment.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/left_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/left_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/left_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/left_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/otherset.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/otherset.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/otherset.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/otherset.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/out_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/out_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/out_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/out_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/rightAlignment.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/rightAlignment.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/rightAlignment.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/rightAlignment.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/right_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/right_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/right_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/right_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/shadow.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/shadow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/shadow.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/shadow.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/strikethrough.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/strikethrough.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/strikethrough.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/strikethrough.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/sub.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/sub.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/sub.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/sub.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/sup.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/sup.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/sup.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/sup.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/top_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/top_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/top_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/top_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/underline.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/underline.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/underline_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/underline_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/underline_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_center_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_center_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_down_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_down_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_normal.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_normal.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_pressed.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_pressed.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/v_top_pressed.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/v_top_pressed.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/vertical_white.png b/designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/vertical_white.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/cellstyle/vertical_white.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/cellstyle/vertical_white.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/doublebottom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/doublebottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/doublebottom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/doublebottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/editChart.png b/designer-base/src/main/resources/com/fr/design/images/m_format/editChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/editChart.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/editChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/highlight.png b/designer-base/src/main/resources/com/fr/design/images/m_format/highlight.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/highlight.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/highlight.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/in.png b/designer-base/src/main/resources/com/fr/design/images/m_format/in.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/in.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/in.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/left.png b/designer-base/src/main/resources/com/fr/design/images/m_format/left.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/left.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/left.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/modified.png b/designer-base/src/main/resources/com/fr/design/images/m_format/modified.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/modified.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/modified.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/noboder.png b/designer-base/src/main/resources/com/fr/design/images/m_format/noboder.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/noboder.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/noboder.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/note.png b/designer-base/src/main/resources/com/fr/design/images/m_format/note.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/note.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/note.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/out.png b/designer-base/src/main/resources/com/fr/design/images/m_format/out.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/out.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/out.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/outsideborders.png b/designer-base/src/main/resources/com/fr/design/images/m_format/outsideborders.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/outsideborders.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/outsideborders.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/right.png b/designer-base/src/main/resources/com/fr/design/images/m_format/right.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/right.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/right.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/shape.png b/designer-base/src/main/resources/com/fr/design/images/m_format/shape.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/shape.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/shape.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/thickbottom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/thickbottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/thickbottom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/thickbottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/thickoutsideborders.png b/designer-base/src/main/resources/com/fr/design/images/m_format/thickoutsideborders.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/thickoutsideborders.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/thickoutsideborders.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/topanddoublebotttom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/topanddoublebotttom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/topanddoublebotttom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/topanddoublebotttom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/topandthickbottom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/topandthickbottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/topandthickbottom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/topandthickbottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_format/topbottom.png b/designer-base/src/main/resources/com/fr/design/images/m_format/topbottom.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_format/topbottom.png rename to designer-base/src/main/resources/com/fr/design/images/m_format/topbottom.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/back.png b/designer-base/src/main/resources/com/fr/design/images/m_help/back.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/back.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/back.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/demo.png b/designer-base/src/main/resources/com/fr/design/images/m_help/demo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/demo.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/demo.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/feedback.png b/designer-base/src/main/resources/com/fr/design/images/m_help/feedback.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/feedback.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/feedback.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/forum.png b/designer-base/src/main/resources/com/fr/design/images/m_help/forum.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/forum.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/forum.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/forward.png b/designer-base/src/main/resources/com/fr/design/images/m_help/forward.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/forward.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/forward.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/help.png b/designer-base/src/main/resources/com/fr/design/images/m_help/help.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/help.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/help.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/preview_analy.png b/designer-base/src/main/resources/com/fr/design/images/m_help/preview_analy.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/preview_analy.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/preview_analy.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/preview_form.png b/designer-base/src/main/resources/com/fr/design/images/m_help/preview_form.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/preview_form.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/preview_form.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/preview_page.png b/designer-base/src/main/resources/com/fr/design/images/m_help/preview_page.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/preview_page.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/preview_page.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/preview_write.png b/designer-base/src/main/resources/com/fr/design/images/m_help/preview_write.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/preview_write.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/preview_write.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/product_forum.png b/designer-base/src/main/resources/com/fr/design/images/m_help/product_forum.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/product_forum.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/product_forum.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_help/support_qq.png b/designer-base/src/main/resources/com/fr/design/images/m_help/support_qq.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_help/support_qq.png rename to designer-base/src/main/resources/com/fr/design/images/m_help/support_qq.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/Pivottable.gif b/designer-base/src/main/resources/com/fr/design/images/m_insert/Pivottable.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/Pivottable.gif rename to designer-base/src/main/resources/com/fr/design/images/m_insert/Pivottable.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/account.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/account.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/account.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/account.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/accountTitle.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/accountTitle.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/accountTitle.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/accountTitle.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/barcode.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/barcode.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/barcode.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/barcode.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/bias.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/bias.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/bias.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/bias.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/bindCell.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindCell.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/bindCell.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/bindCell.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/bindColumn.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/bindColumn.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/bindColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/blank.gif b/designer-base/src/main/resources/com/fr/design/images/m_insert/blank.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/blank.gif rename to designer-base/src/main/resources/com/fr/design/images/m_insert/blank.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/boolean.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/boolean.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/boolean.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/boolean.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/cell.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/cell.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/cell.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/cell.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/cellPop.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/cellPop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/cellPop.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/cellPop.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/chart.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/chart.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/composite.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/composite.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/composite.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/composite.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/compositePop.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/compositePop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/compositePop.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/compositePop.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/crossTable.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/crossTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/crossTable.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/crossTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/date.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/date.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/date.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/date.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/default.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/default.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/default.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/default.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/expandCell.gif b/designer-base/src/main/resources/com/fr/design/images/m_insert/expandCell.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/expandCell.gif rename to designer-base/src/main/resources/com/fr/design/images/m_insert/expandCell.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/float.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/float.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/float.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/float.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/floatPop.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/floatPop.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/floatPop.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/formula.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/formula.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/formula.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/formula.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/groupTable.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/groupTable.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/groupTable.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/groupTable.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/hyperLink.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/hyperLink.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/image.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/image.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/image.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/image.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/insertColumn.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/insertColumn.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/insertRow.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/insertRow.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/newchart.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/newchart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/newchart.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/newchart.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/richtext.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/richtext.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/richtext.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/richtext.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape_issosceles_triangle.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape_issosceles_triangle.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape_issosceles_triangle.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape_issosceles_triangle.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape_line.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape_line.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape_line.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape_line.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape_oval.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape_oval.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape_oval.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape_oval.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape_rectangle.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape_rectangle.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape_rectangle.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape_rectangle.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/shape_rounded_rectangle.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/shape_rounded_rectangle.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/shape_rounded_rectangle.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/shape_rounded_rectangle.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/subReport.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/subReport.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/subReport.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/subReport.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/text.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/text.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/text.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/text.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_insert/textBox.png b/designer-base/src/main/resources/com/fr/design/images/m_insert/textBox.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_insert/textBox.png rename to designer-base/src/main/resources/com/fr/design/images/m_insert/textBox.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/allow_authority_edit.png b/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/allow_authority_edit.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/attributes.png b/designer-base/src/main/resources/com/fr/design/images/m_report/attributes.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/attributes.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/attributes.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/background.png b/designer-base/src/main/resources/com/fr/design/images/m_report/background.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/background.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/background.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/bindData.png b/designer-base/src/main/resources/com/fr/design/images/m_report/bindData.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/bindData.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/bindData.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/close.png b/designer-base/src/main/resources/com/fr/design/images/m_report/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/close.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/close_over.png b/designer-base/src/main/resources/com/fr/design/images/m_report/close_over.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/close_over.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/close_over.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/close_press.png b/designer-base/src/main/resources/com/fr/design/images/m_report/close_press.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/close_press.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/close_press.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/delete.png b/designer-base/src/main/resources/com/fr/design/images/m_report/delete.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/delete.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/delete.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/deleteColumn.png b/designer-base/src/main/resources/com/fr/design/images/m_report/deleteColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/deleteColumn.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/deleteColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/deleteRow.png b/designer-base/src/main/resources/com/fr/design/images/m_report/deleteRow.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/deleteRow.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/deleteRow.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/exit_authority_edit.png b/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/exit_authority_edit.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/exportAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_report/exportAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/exportAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/exportAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/footer.png b/designer-base/src/main/resources/com/fr/design/images/m_report/footer.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/footer.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/footer.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/header.png b/designer-base/src/main/resources/com/fr/design/images/m_report/header.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/header.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/header.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/linearAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/linearAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/linearAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/mobile.png b/designer-base/src/main/resources/com/fr/design/images/m_report/mobile.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/mobile.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/mobile.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/p.gif b/designer-base/src/main/resources/com/fr/design/images/m_report/p.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/p.gif rename to designer-base/src/main/resources/com/fr/design/images/m_report/p.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/p.png b/designer-base/src/main/resources/com/fr/design/images/m_report/p.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/p.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/p.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/parameter.png b/designer-base/src/main/resources/com/fr/design/images/m_report/parameter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/parameter.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/parameter.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/process.gif b/designer-base/src/main/resources/com/fr/design/images/m_report/process.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/process.gif rename to designer-base/src/main/resources/com/fr/design/images/m_report/process.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/qb.png b/designer-base/src/main/resources/com/fr/design/images/m_report/qb.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/qb.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/qb.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/reportEngineAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/reportEngineAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/reportEngineAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/reportWorkFlowAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_report/reportWorkFlowAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/reportWorkFlowAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/reportWorkFlowAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/reportWriteAttr.png b/designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/reportWriteAttr.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/reportWriteAttr.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/tree.png b/designer-base/src/main/resources/com/fr/design/images/m_report/tree.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/tree.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/tree.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/watermark.png b/designer-base/src/main/resources/com/fr/design/images/m_report/watermark.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/watermark.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/watermark.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_report/webreportattribute.png b/designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_report/webreportattribute.png rename to designer-base/src/main/resources/com/fr/design/images/m_report/webreportattribute.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/cache.png b/designer-base/src/main/resources/com/fr/design/images/m_web/cache.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/cache.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/cache.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/connection.png b/designer-base/src/main/resources/com/fr/design/images/m_web/connection.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/connection.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/connection.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/datasource.png b/designer-base/src/main/resources/com/fr/design/images/m_web/datasource.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/datasource.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/datasource.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/edit.png b/designer-base/src/main/resources/com/fr/design/images/m_web/edit.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/edit.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/edit.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/face.gif b/designer-base/src/main/resources/com/fr/design/images/m_web/face.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/face.gif rename to designer-base/src/main/resources/com/fr/design/images/m_web/face.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/formula.png b/designer-base/src/main/resources/com/fr/design/images/m_web/formula.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/formula.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/formula.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/function.png b/designer-base/src/main/resources/com/fr/design/images/m_web/function.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/function.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/function.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/log.png b/designer-base/src/main/resources/com/fr/design/images/m_web/log.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/log.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/log.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/privilegeManager.gif b/designer-base/src/main/resources/com/fr/design/images/m_web/privilegeManager.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/privilegeManager.gif rename to designer-base/src/main/resources/com/fr/design/images/m_web/privilegeManager.gif diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/reportletdemo.png b/designer-base/src/main/resources/com/fr/design/images/m_web/reportletdemo.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/reportletdemo.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/reportletdemo.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/schedule.png b/designer-base/src/main/resources/com/fr/design/images/m_web/schedule.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/schedule.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/schedule.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/server.png b/designer-base/src/main/resources/com/fr/design/images/m_web/server.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/server.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/server.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/style.png b/designer-base/src/main/resources/com/fr/design/images/m_web/style.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/style.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/style.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_web/sync.png b/designer-base/src/main/resources/com/fr/design/images/m_web/sync.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_web/sync.png rename to designer-base/src/main/resources/com/fr/design/images/m_web/sync.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/cascade.png b/designer-base/src/main/resources/com/fr/design/images/m_window/cascade.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/cascade.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/cascade.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/formdesign.png b/designer-base/src/main/resources/com/fr/design/images/m_window/formdesign.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/formdesign.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/formdesign.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/frozen.png b/designer-base/src/main/resources/com/fr/design/images/m_window/frozen.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/frozen.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/frozen.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/generaldesign.png b/designer-base/src/main/resources/com/fr/design/images/m_window/generaldesign.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/generaldesign.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/generaldesign.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/next.png b/designer-base/src/main/resources/com/fr/design/images/m_window/next.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/next.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/next.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/previous.png b/designer-base/src/main/resources/com/fr/design/images/m_window/previous.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/previous.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/previous.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/title_hor.png b/designer-base/src/main/resources/com/fr/design/images/m_window/title_hor.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/title_hor.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/title_hor.png diff --git a/designer-base/src/main/java/com/fr/design/images/m_window/title_ver.png b/designer-base/src/main/resources/com/fr/design/images/m_window/title_ver.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/m_window/title_ver.png rename to designer-base/src/main/resources/com/fr/design/images/m_window/title_ver.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/attribute.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/attribute.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/attribute.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/attribute.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/class.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/class.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/class.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/class.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/datasource.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/datasource.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/datasource.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/datasource.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/fpt.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/fpt.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/fpt.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/fpt.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/jar.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/jar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/jar.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/jar.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/java.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/java.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/java.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/java.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/server.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/server.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/server.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/server.png diff --git a/designer-base/src/main/java/com/fr/design/images/mainframe/xml.png b/designer-base/src/main/resources/com/fr/design/images/mainframe/xml.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/mainframe/xml.png rename to designer-base/src/main/resources/com/fr/design/images/mainframe/xml.png diff --git a/designer-base/src/main/java/com/fr/design/images/minimize.gif b/designer-base/src/main/resources/com/fr/design/images/minimize.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/minimize.gif rename to designer-base/src/main/resources/com/fr/design/images/minimize.gif diff --git a/designer-base/src/main/java/com/fr/design/images/need.png b/designer-base/src/main/resources/com/fr/design/images/need.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/need.png rename to designer-base/src/main/resources/com/fr/design/images/need.png diff --git a/designer-base/src/main/java/com/fr/design/images/parameter.png b/designer-base/src/main/resources/com/fr/design/images/parameter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/parameter.png rename to designer-base/src/main/resources/com/fr/design/images/parameter.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/Chart-Map/Chart-Map-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-4.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Area/ChartF-Area-5.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-4.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-5.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Bar/ChartF-Bar-6.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-4.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-5.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Column/ChartF-Column-6.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Comb_Chart/ChartF-Comb_Chart-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Donut/ChartF-Donut-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gantt/ChartF-Gantt-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Gis/ChartF-Gis-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-4.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Line/ChartF-Line-5.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Meter/ChartF-Meter-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-4.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Pie/ChartF-Pie-5.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Radar/ChartF-Radar-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Range_Chart/ChartF-Range_Chart-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-Stock/ChartF-Stock-3.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-1.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png b/designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png rename to designer-base/src/main/resources/com/fr/design/images/poly/ChartF-XYScatter/ChartF-XYScatter-2.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/Chart_BubbleChart/Chart_BubbleChart-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png b/designer-base/src/main/resources/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png rename to designer-base/src/main/resources/com/fr/design/images/poly/Chart_BubbleChart/FR-Chart-Chart_BubbleChart-0.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/normal.png b/designer-base/src/main/resources/com/fr/design/images/poly/normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/normal.png rename to designer-base/src/main/resources/com/fr/design/images/poly/normal.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart-Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart-Map.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-Map.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart-SVG_MAP.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Area.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Area.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Area.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Area.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Bar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Bar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Bar.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Bar.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Column.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Column.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Column.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Comb_Chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Donut.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Donut.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Donut.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Funnel.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Funnel.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Funnel.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Gantt.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Gantt.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gantt.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Gis.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Gis.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Gis.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Line.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Line.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Line.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Line.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Meter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Meter.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Meter.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Pie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Pie.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Pie.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Radar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Radar.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Radar.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Range_Chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Stock.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-Stock.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-Stock.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/ChartF-XYScatter.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Chart_BubbleChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Bit_Map.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-Chart_BubbleChart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Chart_BubbleChart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-Chart_BubbleChart.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-Chart_BubbleChart.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-ThreeD_Custom_Chart.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-ThreeD_Custom_Chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart-ThreeD_Custom_Chart.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart-ThreeD_Custom_Chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart_Bit_Map.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart_Bit_Map.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/FR-Chart_Bit_Map.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/FR-Chart_Bit_Map.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewArea.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBar.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewColumn.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewLine.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewPie.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_VerticalLine.png diff --git a/designer-base/src/main/java/com/fr/design/images/poly/toolbar/Poly-Report_Block.png b/designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/poly/toolbar/Poly-Report_Block.png rename to designer-base/src/main/resources/com/fr/design/images/poly/toolbar/Poly-Report_Block.png diff --git a/designer-base/src/main/java/com/fr/design/images/questions.png b/designer-base/src/main/resources/com/fr/design/images/questions.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/questions.png rename to designer-base/src/main/resources/com/fr/design/images/questions.png diff --git a/designer-base/src/main/java/com/fr/design/images/report/form.png b/designer-base/src/main/resources/com/fr/design/images/report/form.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/report/form.png rename to designer-base/src/main/resources/com/fr/design/images/report/form.png diff --git a/designer-base/src/main/java/com/fr/design/images/report/groupReport.png b/designer-base/src/main/resources/com/fr/design/images/report/groupReport.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/report/groupReport.png rename to designer-base/src/main/resources/com/fr/design/images/report/groupReport.png diff --git a/designer-base/src/main/java/com/fr/design/images/report/position.png b/designer-base/src/main/resources/com/fr/design/images/report/position.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/report/position.png rename to designer-base/src/main/resources/com/fr/design/images/report/position.png diff --git a/designer-base/src/main/java/com/fr/design/images/reportcolumns/col.png b/designer-base/src/main/resources/com/fr/design/images/reportcolumns/col.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/reportcolumns/col.png rename to designer-base/src/main/resources/com/fr/design/images/reportcolumns/col.png diff --git a/designer-base/src/main/java/com/fr/design/images/reportcolumns/col_en.png b/designer-base/src/main/resources/com/fr/design/images/reportcolumns/col_en.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/reportcolumns/col_en.png rename to designer-base/src/main/resources/com/fr/design/images/reportcolumns/col_en.png diff --git a/designer-base/src/main/java/com/fr/design/images/reportcolumns/row.png b/designer-base/src/main/resources/com/fr/design/images/reportcolumns/row.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/reportcolumns/row.png rename to designer-base/src/main/resources/com/fr/design/images/reportcolumns/row.png diff --git a/designer-base/src/main/java/com/fr/design/images/reportcolumns/row_en.png b/designer-base/src/main/resources/com/fr/design/images/reportcolumns/row_en.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/reportcolumns/row_en.png rename to designer-base/src/main/resources/com/fr/design/images/reportcolumns/row_en.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/change.png b/designer-base/src/main/resources/com/fr/design/images/server/change.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/change.png rename to designer-base/src/main/resources/com/fr/design/images/server/change.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/manage.png b/designer-base/src/main/resources/com/fr/design/images/server/manage.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/manage.png rename to designer-base/src/main/resources/com/fr/design/images/server/manage.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/platform_16_16.png b/designer-base/src/main/resources/com/fr/design/images/server/platform_16_16.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/platform_16_16.png rename to designer-base/src/main/resources/com/fr/design/images/server/platform_16_16.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/plugin.png b/designer-base/src/main/resources/com/fr/design/images/server/plugin.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/plugin.png rename to designer-base/src/main/resources/com/fr/design/images/server/plugin.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/printerconf.png b/designer-base/src/main/resources/com/fr/design/images/server/printerconf.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/printerconf.png rename to designer-base/src/main/resources/com/fr/design/images/server/printerconf.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/start.png b/designer-base/src/main/resources/com/fr/design/images/server/start.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/start.png rename to designer-base/src/main/resources/com/fr/design/images/server/start.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/stop.png b/designer-base/src/main/resources/com/fr/design/images/server/stop.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/stop.png rename to designer-base/src/main/resources/com/fr/design/images/server/stop.png diff --git a/designer-base/src/main/java/com/fr/design/images/server/view.png b/designer-base/src/main/resources/com/fr/design/images/server/view.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/server/view.png rename to designer-base/src/main/resources/com/fr/design/images/server/view.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/fs.png b/designer-base/src/main/resources/com/fr/design/images/serverM/fs.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/fs.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/fs.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/org.png b/designer-base/src/main/resources/com/fr/design/images/serverM/org.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/org.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/org.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/organization.png b/designer-base/src/main/resources/com/fr/design/images/serverM/organization.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/organization.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/organization.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/role.png b/designer-base/src/main/resources/com/fr/design/images/serverM/role.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/role.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/role.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/roleAdd.png b/designer-base/src/main/resources/com/fr/design/images/serverM/roleAdd.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/roleAdd.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/roleAdd.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/roleRemove.png b/designer-base/src/main/resources/com/fr/design/images/serverM/roleRemove.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/roleRemove.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/roleRemove.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/rtr.png b/designer-base/src/main/resources/com/fr/design/images/serverM/rtr.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/rtr.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/rtr.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/use.png b/designer-base/src/main/resources/com/fr/design/images/serverM/use.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/use.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/use.png diff --git a/designer-base/src/main/java/com/fr/design/images/serverM/user.png b/designer-base/src/main/resources/com/fr/design/images/serverM/user.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/serverM/user.png rename to designer-base/src/main/resources/com/fr/design/images/serverM/user.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/addpolysheet.png b/designer-base/src/main/resources/com/fr/design/images/sheet/addpolysheet.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/addpolysheet.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/addpolysheet.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/left_hover@1x.png b/designer-base/src/main/resources/com/fr/design/images/sheet/left_hover@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/left_hover@1x.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/left_hover@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/left_normal@1x.png b/designer-base/src/main/resources/com/fr/design/images/sheet/left_normal@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/left_normal@1x.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/left_normal@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/left_right_btn.png b/designer-base/src/main/resources/com/fr/design/images/sheet/left_right_btn.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/left_right_btn.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/left_right_btn.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/polysheet.png b/designer-base/src/main/resources/com/fr/design/images/sheet/polysheet.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/polysheet.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/polysheet.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/right_hover@1x.png b/designer-base/src/main/resources/com/fr/design/images/sheet/right_hover@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/right_hover@1x.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/right_hover@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/sheet/right_normal@1x.png b/designer-base/src/main/resources/com/fr/design/images/sheet/right_normal@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/sheet/right_normal@1x.png rename to designer-base/src/main/resources/com/fr/design/images/sheet/right_normal@1x.png diff --git a/designer-base/src/main/java/com/fr/design/images/signature.png b/designer-base/src/main/resources/com/fr/design/images/signature.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/signature.png rename to designer-base/src/main/resources/com/fr/design/images/signature.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/chart.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/chart.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/chart.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/chart.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/chartChangeClose.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/chartChangeClose.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/chartChangeClose.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/chartChangeClose.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/close.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/close.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/close_tags.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/close_tags.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/close_tags.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/close_tags.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/closehover.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/closehover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/closehover.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/closehover.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/connector.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/connector.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/connector.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/connector.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/down.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/down.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/down.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/down.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/parameter-hover.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/parameter-hover.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/parameter-hover.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/parameter-hover.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/parametersetting.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/parametersetting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/parametersetting.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/parametersetting.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/pop.gif b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/pop.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/pop.gif rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/pop.gif diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/setting.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/setting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/setting.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/setting.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/toolbarbtnclear.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/toolbarbtnclear.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/toolbarbtnclear.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/toolbarbtnclear.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/toolbarbtnsetting.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/toolbarbtnsetting.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/toolbarbtnsetting.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/toolbarbtnsetting.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/up.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/up.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/up.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/up.png diff --git a/designer-base/src/main/java/com/fr/design/images/toolbarbtn/xiala.png b/designer-base/src/main/resources/com/fr/design/images/toolbarbtn/xiala.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/toolbarbtn/xiala.png rename to designer-base/src/main/resources/com/fr/design/images/toolbarbtn/xiala.png diff --git a/designer-base/src/main/java/com/fr/design/images/tree/close.png b/designer-base/src/main/resources/com/fr/design/images/tree/close.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/tree/close.png rename to designer-base/src/main/resources/com/fr/design/images/tree/close.png diff --git a/designer-base/src/main/java/com/fr/design/images/tree/open.png b/designer-base/src/main/resources/com/fr/design/images/tree/open.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/tree/open.png rename to designer-base/src/main/resources/com/fr/design/images/tree/open.png diff --git a/designer-base/src/main/java/com/fr/design/images/update.png b/designer-base/src/main/resources/com/fr/design/images/update.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/update.png rename to designer-base/src/main/resources/com/fr/design/images/update.png diff --git a/designer-base/src/main/java/com/fr/design/images/video.png b/designer-base/src/main/resources/com/fr/design/images/video.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/video.png rename to designer-base/src/main/resources/com/fr/design/images/video.png diff --git a/designer-base/src/main/java/com/fr/design/images/wait.gif b/designer-base/src/main/resources/com/fr/design/images/wait.gif similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/wait.gif rename to designer-base/src/main/resources/com/fr/design/images/wait.gif diff --git a/designer-base/src/main/java/com/fr/design/images/warnings/warning 2.png b/designer-base/src/main/resources/com/fr/design/images/warnings/warning 2.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/warnings/warning 2.png rename to designer-base/src/main/resources/com/fr/design/images/warnings/warning 2.png diff --git a/designer-base/src/main/java/com/fr/design/images/warnings/warning.png b/designer-base/src/main/resources/com/fr/design/images/warnings/warning.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/warnings/warning.png rename to designer-base/src/main/resources/com/fr/design/images/warnings/warning.png diff --git a/designer-base/src/main/java/com/fr/design/images/warnings/warning3.png b/designer-base/src/main/resources/com/fr/design/images/warnings/warning3.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/images/warnings/warning3.png rename to designer-base/src/main/resources/com/fr/design/images/warnings/warning3.png diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$$.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$$.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$$.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$$.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$page_number.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$page_number.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$page_number.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$page_number.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$$totalPage_number.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_authority.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_authority.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_authority.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_authority.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_username.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_username.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_username.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_username.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/$fr_userposition.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/NOFILTER.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/NOFILTER.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/NOFILTER.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/NOFILTER.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/NULL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/NULL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/NULL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/NULL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/contextPath.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/contextPath.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/contextPath.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/contextPath.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/curReport.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/curReport.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/curReport.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/curReport.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/formletName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/formletName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/formletName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/formletName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/fr_submitinfo.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/reportName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/reportName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/reportName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/reportName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverPort.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverPort.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverPort.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverPort.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverSchema.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverSchema.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverSchema.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverSchema.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverURL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverURL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/serverURL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/serverURL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/servletURL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/servletURL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/servletURL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/servletURL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/sessionID.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/sessionID.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/cn/sessionID.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/cn/sessionID.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$$.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$$.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$$.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$$.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$page_number.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$page_number.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$page_number.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$page_number.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$totalPage_number.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$totalPage_number.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$$totalPage_number.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$$totalPage_number.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_authority.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_authority.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_authority.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_authority.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_username.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_username.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_username.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_username.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_userposition.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_userposition.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/$fr_userposition.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/$fr_userposition.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/NOFILTER.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/NOFILTER.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/NOFILTER.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/NOFILTER.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/NULL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/NULL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/NULL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/NULL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/contextPath.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/contextPath.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/contextPath.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/contextPath.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/curReport.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/curReport.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/curReport.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/curReport.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/formletName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/formletName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/formletName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/formletName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/fr_submitinfo.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/fr_submitinfo.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/fr_submitinfo.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/fr_submitinfo.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/reportName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/reportName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/reportName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/reportName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverName.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverName.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverName.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverName.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverPort.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverPort.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverPort.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverPort.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverSchema.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverSchema.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverSchema.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverSchema.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverURL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverURL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/serverURL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/serverURL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/servletURL.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/servletURL.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/servletURL.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/servletURL.txt diff --git a/designer-base/src/main/java/com/fr/design/insert/formula/variable/en/sessionID.txt b/designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/sessionID.txt similarity index 100% rename from designer-base/src/main/java/com/fr/design/insert/formula/variable/en/sessionID.txt rename to designer-base/src/main/resources/com/fr/design/insert/formula/variable/en/sessionID.txt diff --git a/designer-base/src/main/java/com/fr/design/javascript/beautify/beautify.js b/designer-base/src/main/resources/com/fr/design/javascript/beautify/beautify.js old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/java/com/fr/design/javascript/beautify/beautify.js rename to designer-base/src/main/resources/com/fr/design/javascript/beautify/beautify.js diff --git a/designer-base/src/main/java/com/fr/design/javascript/package.html b/designer-base/src/main/resources/com/fr/design/javascript/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/javascript/package.html rename to designer-base/src/main/resources/com/fr/design/javascript/package.html diff --git a/designer-base/src/main/java/com/fr/design/layout/package.html b/designer-base/src/main/resources/com/fr/design/layout/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/layout/package.html rename to designer-base/src/main/resources/com/fr/design/layout/package.html diff --git a/designer-base/src/main/java/com/fr/design/menu/package.html b/designer-base/src/main/resources/com/fr/design/menu/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/menu/package.html rename to designer-base/src/main/resources/com/fr/design/menu/package.html diff --git a/designer-base/src/main/java/com/fr/design/module/package.html b/designer-base/src/main/resources/com/fr/design/module/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/module/package.html rename to designer-base/src/main/resources/com/fr/design/module/package.html diff --git a/designer-base/src/main/java/com/fr/design/object/package.html b/designer-base/src/main/resources/com/fr/design/object/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/object/package.html rename to designer-base/src/main/resources/com/fr/design/object/package.html diff --git a/designer-base/src/main/java/com/fr/design/preview/package.html b/designer-base/src/main/resources/com/fr/design/preview/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/preview/package.html rename to designer-base/src/main/resources/com/fr/design/preview/package.html diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_List_Folder_normal@1x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_List_Folder_normal@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_List_Folder_normal@1x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_List_Folder_normal@1x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_List_Folder_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_List_Folder_normal@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_List_Folder_normal@2x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_List_Folder_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Member_normal@1x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_normal@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Member_normal@1x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_normal@1x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Member_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_normal@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Member_normal@2x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Member_white@1x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_white@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Member_white@1x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_white@1x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Member_white@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_white@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Member_white@2x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Member_white@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_NewFolderIcon_normal.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_NewFolderIcon_normal.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_NewFolderIcon_normal.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_NewFolderIcon_normal.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_NewFolderIcon_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_NewFolderIcon_normal@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_NewFolderIcon_normal@2x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_NewFolderIcon_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@2x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@2x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@2x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@2x.png diff --git a/designer-base/src/main/java/com/fr/design/remote/images/icon_Remove_x.png b/designer-base/src/main/resources/com/fr/design/remote/images/icon_Remove_x.png similarity index 100% rename from designer-base/src/main/java/com/fr/design/remote/images/icon_Remove_x.png rename to designer-base/src/main/resources/com/fr/design/remote/images/icon_Remove_x.png diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/package.html b/designer-base/src/main/resources/com/fr/design/roleAuthority/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/roleAuthority/package.html rename to designer-base/src/main/resources/com/fr/design/roleAuthority/package.html diff --git a/designer-base/src/main/java/com/fr/design/scrollruler/package.html b/designer-base/src/main/resources/com/fr/design/scrollruler/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/scrollruler/package.html rename to designer-base/src/main/resources/com/fr/design/scrollruler/package.html diff --git a/designer-base/src/main/java/com/fr/design/selection/package.html b/designer-base/src/main/resources/com/fr/design/selection/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/selection/package.html rename to designer-base/src/main/resources/com/fr/design/selection/package.html diff --git a/designer-base/src/main/java/com/fr/design/style/package.html b/designer-base/src/main/resources/com/fr/design/style/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/style/package.html rename to designer-base/src/main/resources/com/fr/design/style/package.html diff --git a/designer-base/src/main/java/com/fr/design/utils/package.html b/designer-base/src/main/resources/com/fr/design/utils/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/utils/package.html rename to designer-base/src/main/resources/com/fr/design/utils/package.html diff --git a/designer-base/src/main/java/com/fr/design/web/package.html b/designer-base/src/main/resources/com/fr/design/web/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/design/web/package.html rename to designer-base/src/main/resources/com/fr/design/web/package.html diff --git a/designer-base/src/main/java/com/fr/env/package.html b/designer-base/src/main/resources/com/fr/env/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/env/package.html rename to designer-base/src/main/resources/com/fr/env/package.html diff --git a/designer-base/src/main/java/com/fr/file/filter/package.html b/designer-base/src/main/resources/com/fr/file/filter/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/file/filter/package.html rename to designer-base/src/main/resources/com/fr/file/filter/package.html diff --git a/designer-base/src/main/java/com/fr/file/package.html b/designer-base/src/main/resources/com/fr/file/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/file/package.html rename to designer-base/src/main/resources/com/fr/file/package.html diff --git a/designer-base/src/main/java/com/fr/start/package.html b/designer-base/src/main/resources/com/fr/start/package.html similarity index 100% rename from designer-base/src/main/java/com/fr/start/package.html rename to designer-base/src/main/resources/com/fr/start/package.html diff --git a/designer-chart/src/main/java/com/fr/aspectj/designerchart/TemplateProcessTracker.aj b/designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj similarity index 100% rename from designer-chart/src/main/java/com/fr/aspectj/designerchart/TemplateProcessTracker.aj rename to designer-chart/src/main/resources/com/fr/aspectj/designerchart/TemplateProcessTracker.aj diff --git a/designer-chart/src/main/java/com/fr/design/chart/package.html b/designer-chart/src/main/resources/com/fr/design/chart/package.html similarity index 100% rename from designer-chart/src/main/java/com/fr/design/chart/package.html rename to designer-chart/src/main/resources/com/fr/design/chart/package.html diff --git a/designer-chart/src/main/java/com/fr/design/images/EmptyChart.png b/designer-chart/src/main/resources/com/fr/design/images/EmptyChart.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/EmptyChart.png rename to designer-chart/src/main/resources/com/fr/design/images/EmptyChart.png diff --git a/designer-chart/src/main/java/com/fr/design/images/add.png b/designer-chart/src/main/resources/com/fr/design/images/add.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/add.png rename to designer-chart/src/main/resources/com/fr/design/images/add.png diff --git a/designer-chart/src/main/java/com/fr/design/images/chart.png b/designer-chart/src/main/resources/com/fr/design/images/chart.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/chart.png rename to designer-chart/src/main/resources/com/fr/design/images/chart.png diff --git a/designer-chart/src/main/java/com/fr/design/images/copyjs.png b/designer-chart/src/main/resources/com/fr/design/images/copyjs.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/copyjs.png rename to designer-chart/src/main/resources/com/fr/design/images/copyjs.png diff --git a/designer-chart/src/main/java/com/fr/design/images/del.png b/designer-chart/src/main/resources/com/fr/design/images/del.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/del.png rename to designer-chart/src/main/resources/com/fr/design/images/del.png diff --git a/designer-chart/src/main/java/com/fr/design/images/exportimg.png b/designer-chart/src/main/resources/com/fr/design/images/exportimg.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/exportimg.png rename to designer-chart/src/main/resources/com/fr/design/images/exportimg.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/area.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/area.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/area.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/bar.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/bar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/bar.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/bar.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/bubble.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/bubble.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/bubble.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/bubble.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/column.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/column.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/column.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/column.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/custom.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/custom.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/custom.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/drillmap.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/drillmap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/drillmap.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/drillmap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/funnel.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/funnel.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/funnel.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/funnel.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/gantt.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/gantt.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/gantt.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/gantt.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/gauge.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/gauge.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/gauge.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/gauge.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/heatmap.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/heatmap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/heatmap.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/heatmap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/line.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/line.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/line.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/map.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/map.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/map.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/multiPie.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/multiPie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/multiPie.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/multiPie.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/pie.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/pie.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/pie.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/radar.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/radar.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/radar.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/scatter.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/scatter.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/scatter.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/scatter.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/structure.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/structure.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/structure.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/structure.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/treeMap.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/treeMap.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/treeMap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/form/toolbar/wordcloud.png b/designer-chart/src/main/resources/com/fr/design/images/form/toolbar/wordcloud.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/form/toolbar/wordcloud.png rename to designer-chart/src/main/resources/com/fr/design/images/form/toolbar/wordcloud.png diff --git a/designer-chart/src/main/java/com/fr/design/images/newchart_normal.png b/designer-chart/src/main/resources/com/fr/design/images/newchart_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/newchart_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/newchart_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/newchart_over.png b/designer-chart/src/main/resources/com/fr/design/images/newchart_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/newchart_over.png rename to designer-chart/src/main/resources/com/fr/design/images/newchart_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/newchart_press.png b/designer-chart/src/main/resources/com/fr/design/images/newchart_press.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/newchart_press.png rename to designer-chart/src/main/resources/com/fr/design/images/newchart_press.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_Drill_Map.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_Drill_Map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_Drill_Map.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_Drill_Map.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBubble.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBubble.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBubble.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewBubble.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewCustom.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewCustom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewCustom.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewCustom.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewFunnel.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewFunnel.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewFunnel.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewFunnel.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGantt.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGantt.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGantt.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGantt.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGauge.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGauge.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGauge.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewGauge.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewHeatMap.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewHeatMap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewHeatMap.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewHeatMap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMap.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMap.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMultiPie.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMultiPie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMultiPie.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewMultiPie.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewRadar.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewRadar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewRadar.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewRadar.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewScatter.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewScatter.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewScatter.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewScatter.png diff --git a/designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewTreeMap.png b/designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewTreeMap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewTreeMap.png rename to designer-chart/src/main/resources/com/fr/design/images/poly/toolbar/Plugin-ChartF_NewTreeMap.png diff --git a/designer-chart/src/main/java/com/fr/design/images/splash4Chart.png b/designer-chart/src/main/resources/com/fr/design/images/splash4Chart.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/splash4Chart.png rename to designer-chart/src/main/resources/com/fr/design/images/splash4Chart.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/2_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/2_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/area/3_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/area/3_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/2_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/2_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_gary.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_gary.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_gary.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_gary.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/3_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/3_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/4_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/4_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/5_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/5_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bar/6_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bar/6_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/border.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/border.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/border.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/border.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/bubble/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/bubble/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/2_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/2_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/3_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/3_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/4_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/4_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/5_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/5_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/column/6_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/column/6_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/custom/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/custom/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/donut/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/donut/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/funnel/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/funnel/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gantt/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gantt/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/gis/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/gis/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/line/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/line/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/map/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/map/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/meter/2_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/meter/2_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/pie/1_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/pie/1_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/radar/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/radar/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/range/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/range/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/stock/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/stock/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_gray.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_gray.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_gray.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_gray.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_normal.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_normal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_normal.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_normal.png diff --git a/designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_over.png b/designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_over.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/toolbar/xyscatter/0_over.png rename to designer-chart/src/main/resources/com/fr/design/images/toolbar/xyscatter/0_over.png diff --git a/designer-chart/src/main/java/com/fr/design/images/us_emptydata.png b/designer-chart/src/main/resources/com/fr/design/images/us_emptydata.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/us_emptydata.png rename to designer-chart/src/main/resources/com/fr/design/images/us_emptydata.png diff --git a/designer-chart/src/main/java/com/fr/design/images/zh_emptydata.png b/designer-chart/src/main/resources/com/fr/design/images/zh_emptydata.png similarity index 100% rename from designer-chart/src/main/java/com/fr/design/images/zh_emptydata.png rename to designer-chart/src/main/resources/com/fr/design/images/zh_emptydata.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/images/area.png b/designer-chart/src/main/resources/com/fr/van/chart/area/images/area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/area/images/area.png rename to designer-chart/src/main/resources/com/fr/van/chart/area/images/area.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/images/custom.png b/designer-chart/src/main/resources/com/fr/van/chart/area/images/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/area/images/custom.png rename to designer-chart/src/main/resources/com/fr/van/chart/area/images/custom.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/images/percentStack.png b/designer-chart/src/main/resources/com/fr/van/chart/area/images/percentStack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/area/images/percentStack.png rename to designer-chart/src/main/resources/com/fr/van/chart/area/images/percentStack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/area/images/stack.png b/designer-chart/src/main/resources/com/fr/van/chart/area/images/stack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/area/images/stack.png rename to designer-chart/src/main/resources/com/fr/van/chart/area/images/stack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/background.png b/designer-chart/src/main/resources/com/fr/van/chart/background.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/background.png rename to designer-chart/src/main/resources/com/fr/van/chart/background.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/images/bar.png b/designer-chart/src/main/resources/com/fr/van/chart/bar/images/bar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bar/images/bar.png rename to designer-chart/src/main/resources/com/fr/van/chart/bar/images/bar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/images/custom.png b/designer-chart/src/main/resources/com/fr/van/chart/bar/images/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bar/images/custom.png rename to designer-chart/src/main/resources/com/fr/van/chart/bar/images/custom.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/images/percentstack.png b/designer-chart/src/main/resources/com/fr/van/chart/bar/images/percentstack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bar/images/percentstack.png rename to designer-chart/src/main/resources/com/fr/van/chart/bar/images/percentstack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bar/images/stack.png b/designer-chart/src/main/resources/com/fr/van/chart/bar/images/stack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bar/images/stack.png rename to designer-chart/src/main/resources/com/fr/van/chart/bar/images/stack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/images/bubble.png b/designer-chart/src/main/resources/com/fr/van/chart/bubble/images/bubble.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bubble/images/bubble.png rename to designer-chart/src/main/resources/com/fr/van/chart/bubble/images/bubble.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/images/force.png b/designer-chart/src/main/resources/com/fr/van/chart/bubble/images/force.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bubble/images/force.png rename to designer-chart/src/main/resources/com/fr/van/chart/bubble/images/force.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/bubble/images/large.png b/designer-chart/src/main/resources/com/fr/van/chart/bubble/images/large.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/bubble/images/large.png rename to designer-chart/src/main/resources/com/fr/van/chart/bubble/images/large.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/images/column.png b/designer-chart/src/main/resources/com/fr/van/chart/column/images/column.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/column/images/column.png rename to designer-chart/src/main/resources/com/fr/van/chart/column/images/column.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/images/custom.png b/designer-chart/src/main/resources/com/fr/van/chart/column/images/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/column/images/custom.png rename to designer-chart/src/main/resources/com/fr/van/chart/column/images/custom.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/images/percentstack.png b/designer-chart/src/main/resources/com/fr/van/chart/column/images/percentstack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/column/images/percentstack.png rename to designer-chart/src/main/resources/com/fr/van/chart/column/images/percentstack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/images/stack.png b/designer-chart/src/main/resources/com/fr/van/chart/column/images/stack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/column/images/stack.png rename to designer-chart/src/main/resources/com/fr/van/chart/column/images/stack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/column_area.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/column_area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/column_area.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/column_area.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/column_line.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/column_line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/column_line.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/column_line.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/area.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/area.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/area.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/bubble.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/bubble.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/bubble.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/bubble.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/column.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/column.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/column.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/column.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/cuvette.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/cuvette.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/cuvette.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/cuvette.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/different_pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/different_pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/different_pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/different_pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/line.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/line.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/line.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pointer_180.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pointer_180.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pointer_180.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pointer_180.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pointer_360.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pointer_360.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/pointer_360.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/pointer_360.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/radar.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/radar.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/radar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/ring.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/ring.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/ring.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/ring.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/same_pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/same_pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/same_pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/same_pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/scatter.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/scatter.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/scatter.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/scatter.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/area.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/area.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/area.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/bubble.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/bubble.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/bubble.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/bubble.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/column.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/column.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/column.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/column.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/cuvette.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/cuvette.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/cuvette.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/cuvette.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/different_pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/different_pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/different_pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/different_pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/line.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/line.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/line.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pointer_180.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pointer_180.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pointer_180.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pointer_180.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pointer_360.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pointer_360.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/pointer_360.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/pointer_360.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/radar.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/radar.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/radar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/ring.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/ring.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/ring.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/ring.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/same_pie.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/same_pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/same_pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/same_pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/scatter.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/scatter.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/scatter.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/scatter.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/slot.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/slot.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/slot.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/slot.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/stack_radar.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/stack_radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/selected/stack_radar.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/selected/stack_radar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/slot.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/slot.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/slot.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/slot.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/stack_radar.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/stack_radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/custom/icon/stack_radar.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/custom/icon/stack_radar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/images/stack_column_line.png b/designer-chart/src/main/resources/com/fr/van/chart/custom/images/stack_column_line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/custom/images/stack_column_line.png rename to designer-chart/src/main/resources/com/fr/van/chart/custom/images/stack_column_line.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/images/area-map.png b/designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/area-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/drillmap/images/area-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/area-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/images/custom-map.png b/designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/custom-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/drillmap/images/custom-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/custom-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/images/point-map.png b/designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/point-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/drillmap/images/point-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/drillmap/images/point-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/funnel/images/funnel.png b/designer-chart/src/main/resources/com/fr/van/chart/funnel/images/funnel.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/funnel/images/funnel.png rename to designer-chart/src/main/resources/com/fr/van/chart/funnel/images/funnel.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/images/gantt.png b/designer-chart/src/main/resources/com/fr/van/chart/gantt/images/gantt.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gantt/images/gantt.png rename to designer-chart/src/main/resources/com/fr/van/chart/gantt/images/gantt.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/images/cuvette.png b/designer-chart/src/main/resources/com/fr/van/chart/gauge/images/cuvette.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gauge/images/cuvette.png rename to designer-chart/src/main/resources/com/fr/van/chart/gauge/images/cuvette.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/images/pointer.png b/designer-chart/src/main/resources/com/fr/van/chart/gauge/images/pointer.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gauge/images/pointer.png rename to designer-chart/src/main/resources/com/fr/van/chart/gauge/images/pointer.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/images/pointer_180.png b/designer-chart/src/main/resources/com/fr/van/chart/gauge/images/pointer_180.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gauge/images/pointer_180.png rename to designer-chart/src/main/resources/com/fr/van/chart/gauge/images/pointer_180.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/images/ring.png b/designer-chart/src/main/resources/com/fr/van/chart/gauge/images/ring.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gauge/images/ring.png rename to designer-chart/src/main/resources/com/fr/van/chart/gauge/images/ring.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/images/slot.png b/designer-chart/src/main/resources/com/fr/van/chart/gauge/images/slot.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/gauge/images/slot.png rename to designer-chart/src/main/resources/com/fr/van/chart/gauge/images/slot.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/images/heatmap.png b/designer-chart/src/main/resources/com/fr/van/chart/heatmap/images/heatmap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/heatmap/images/heatmap.png rename to designer-chart/src/main/resources/com/fr/van/chart/heatmap/images/heatmap.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/images/custom.png b/designer-chart/src/main/resources/com/fr/van/chart/line/images/custom.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/line/images/custom.png rename to designer-chart/src/main/resources/com/fr/van/chart/line/images/custom.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/images/line.png b/designer-chart/src/main/resources/com/fr/van/chart/line/images/line.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/line/images/line.png rename to designer-chart/src/main/resources/com/fr/van/chart/line/images/line.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/images/stack.png b/designer-chart/src/main/resources/com/fr/van/chart/line/images/stack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/line/images/stack.png rename to designer-chart/src/main/resources/com/fr/van/chart/line/images/stack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/area-map.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/area-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/area-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/area-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/area.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/area.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/area.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/area.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/custom-map.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/custom-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/custom-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/custom-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/image.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/image.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/image.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/image.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/line-map.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/line-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/line-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/line-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/mapData.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/mapData.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/mapData.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/point-map.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/point-map.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/point-map.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/point-map.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/images/point.png b/designer-chart/src/main/resources/com/fr/van/chart/map/images/point.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/map/images/point.png rename to designer-chart/src/main/resources/com/fr/van/chart/map/images/point.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/multilayer/image/multiPie.png b/designer-chart/src/main/resources/com/fr/van/chart/multilayer/image/multiPie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/multilayer/image/multiPie.png rename to designer-chart/src/main/resources/com/fr/van/chart/multilayer/image/multiPie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/package.html b/designer-chart/src/main/resources/com/fr/van/chart/package.html similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/package.html rename to designer-chart/src/main/resources/com/fr/van/chart/package.html diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/images/different.png b/designer-chart/src/main/resources/com/fr/van/chart/pie/images/different.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/pie/images/different.png rename to designer-chart/src/main/resources/com/fr/van/chart/pie/images/different.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/images/pie.png b/designer-chart/src/main/resources/com/fr/van/chart/pie/images/pie.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/pie/images/pie.png rename to designer-chart/src/main/resources/com/fr/van/chart/pie/images/pie.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/pie/images/same.png b/designer-chart/src/main/resources/com/fr/van/chart/pie/images/same.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/pie/images/same.png rename to designer-chart/src/main/resources/com/fr/van/chart/pie/images/same.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/images/radar.png b/designer-chart/src/main/resources/com/fr/van/chart/radar/images/radar.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/radar/images/radar.png rename to designer-chart/src/main/resources/com/fr/van/chart/radar/images/radar.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/radar/images/stack.png b/designer-chart/src/main/resources/com/fr/van/chart/radar/images/stack.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/radar/images/stack.png rename to designer-chart/src/main/resources/com/fr/van/chart/radar/images/stack.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/images/large.png b/designer-chart/src/main/resources/com/fr/van/chart/scatter/images/large.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/scatter/images/large.png rename to designer-chart/src/main/resources/com/fr/van/chart/scatter/images/large.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/scatter/images/scatter.png b/designer-chart/src/main/resources/com/fr/van/chart/scatter/images/scatter.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/scatter/images/scatter.png rename to designer-chart/src/main/resources/com/fr/van/chart/scatter/images/scatter.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/images/horizontal.png b/designer-chart/src/main/resources/com/fr/van/chart/structure/images/horizontal.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/structure/images/horizontal.png rename to designer-chart/src/main/resources/com/fr/van/chart/structure/images/horizontal.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/images/radial.png b/designer-chart/src/main/resources/com/fr/van/chart/structure/images/radial.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/structure/images/radial.png rename to designer-chart/src/main/resources/com/fr/van/chart/structure/images/radial.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/images/vertical.png b/designer-chart/src/main/resources/com/fr/van/chart/structure/images/vertical.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/structure/images/vertical.png rename to designer-chart/src/main/resources/com/fr/van/chart/structure/images/vertical.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/treemap/images/treeMap.png b/designer-chart/src/main/resources/com/fr/van/chart/treemap/images/treeMap.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/treemap/images/treeMap.png rename to designer-chart/src/main/resources/com/fr/van/chart/treemap/images/treeMap.png diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/images/wordcloud.png b/designer-chart/src/main/resources/com/fr/van/chart/wordcloud/images/wordcloud.png similarity index 100% rename from designer-chart/src/main/java/com/fr/van/chart/wordcloud/images/wordcloud.png rename to designer-chart/src/main/resources/com/fr/van/chart/wordcloud/images/wordcloud.png diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java index 959644ec8..5cc2ead91 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java @@ -1,18 +1,5 @@ package com.fr.design.mainframe; -import java.awt.AlphaComposite; -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.Area; -import java.awt.geom.Rectangle2D; -import java.util.ArrayList; - -import javax.swing.JComponent; -import javax.swing.SwingUtilities; -import javax.swing.plaf.ComponentUI; - import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; @@ -30,12 +17,23 @@ import com.fr.design.designer.creator.XWFitLayout; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.utils.ComponentUtils; -import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.page.WatermarkPainter; import com.fr.report.core.ReportUtils; import com.fr.stable.ArrayUtils; +import javax.swing.JComponent; +import javax.swing.SwingUtilities; +import javax.swing.plaf.ComponentUI; +import java.awt.AlphaComposite; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.geom.Area; +import java.awt.geom.Rectangle2D; +import java.util.ArrayList; + /** * FormDesigner的UI类，是一个有状态的UI类，它根据FormDesigner的当前状态画出 * 具有所见即所得的设计界面，以及当前设计界面的一些辅助状态，比如选择标识、拖动区域 以及当前正在添加的组件 @@ -46,7 +44,6 @@ public class FormDesignerUI extends ComponentUI { private FormDesigner designer; private SelectionModel selectionModel; private Rectangle2D.Double back_or_selection_rect = new Rectangle2D.Double(0, 0, 0, 0); - private WatermarkPainter watermarkPainter; private float time; public FormDesignerUI() { @@ -119,11 +116,8 @@ public class FormDesignerUI extends ComponentUI { // 绘制水印 private void paintWatermark(Graphics2D g) { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(designer.getTarget()); - // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); - } - watermarkPainter.paint(g, 0, designer.getParaHeight(), designer.getArea().getBounds()); + WatermarkPainter painter = WatermarkPainter.createPainter(watermark, designer.getResolution()); + painter.paint(g, 0, designer.getParaHeight(), designer.getArea().getBounds()); } private int[] getActualLine(int i) { diff --git a/designer-form/src/main/java/com/fr/aspectj/designerform/TemplateProcessTracker.aj b/designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj similarity index 100% rename from designer-form/src/main/java/com/fr/aspectj/designerform/TemplateProcessTracker.aj rename to designer-form/src/main/resources/com/fr/aspectj/designerform/TemplateProcessTracker.aj diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/package.html b/designer-form/src/main/resources/com/fr/design/designer/creator/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/designer/creator/package.html rename to designer-form/src/main/resources/com/fr/design/designer/creator/package.html diff --git a/designer-form/src/main/java/com/fr/design/designer/package.html b/designer-form/src/main/resources/com/fr/design/designer/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/designer/package.html rename to designer-form/src/main/resources/com/fr/design/designer/package.html diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/package.html b/designer-form/src/main/resources/com/fr/design/designer/properties/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/designer/properties/package.html rename to designer-form/src/main/resources/com/fr/design/designer/properties/package.html diff --git a/designer-form/src/main/java/com/fr/design/form/images/add.png b/designer-form/src/main/resources/com/fr/design/form/images/add.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/add.png rename to designer-form/src/main/resources/com/fr/design/form/images/add.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/delete icon.png b/designer-form/src/main/resources/com/fr/design/form/images/delete icon.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/delete icon.png rename to designer-form/src/main/resources/com/fr/design/form/images/delete icon.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/delete_hover&click.png b/designer-form/src/main/resources/com/fr/design/form/images/delete_hover&click.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/delete_hover&click.png rename to designer-form/src/main/resources/com/fr/design/form/images/delete_hover&click.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/delete_normal.png b/designer-form/src/main/resources/com/fr/design/form/images/delete_normal.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/delete_normal.png rename to designer-form/src/main/resources/com/fr/design/form/images/delete_normal.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/download icon.png b/designer-form/src/main/resources/com/fr/design/form/images/download icon.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/download icon.png rename to designer-form/src/main/resources/com/fr/design/form/images/download icon.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/download.png b/designer-form/src/main/resources/com/fr/design/form/images/download.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/download.png rename to designer-form/src/main/resources/com/fr/design/form/images/download.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/install icon.png b/designer-form/src/main/resources/com/fr/design/form/images/install icon.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/install icon.png rename to designer-form/src/main/resources/com/fr/design/form/images/install icon.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/joption_failure.png b/designer-form/src/main/resources/com/fr/design/form/images/joption_failure.png old mode 100755 new mode 100644 similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/joption_failure.png rename to designer-form/src/main/resources/com/fr/design/form/images/joption_failure.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/joption_success.png b/designer-form/src/main/resources/com/fr/design/form/images/joption_success.png old mode 100755 new mode 100644 similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/joption_success.png rename to designer-form/src/main/resources/com/fr/design/form/images/joption_success.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/marked.png b/designer-form/src/main/resources/com/fr/design/form/images/marked.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/marked.png rename to designer-form/src/main/resources/com/fr/design/form/images/marked.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/refresh.png b/designer-form/src/main/resources/com/fr/design/form/images/refresh.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/refresh.png rename to designer-form/src/main/resources/com/fr/design/form/images/refresh.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/showmenu.png b/designer-form/src/main/resources/com/fr/design/form/images/showmenu.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/showmenu.png rename to designer-form/src/main/resources/com/fr/design/form/images/showmenu.png diff --git a/designer-form/src/main/java/com/fr/design/form/images/unmarked.png b/designer-form/src/main/resources/com/fr/design/form/images/unmarked.png similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/images/unmarked.png rename to designer-form/src/main/resources/com/fr/design/form/images/unmarked.png diff --git a/designer-form/src/main/java/com/fr/design/form/package.html b/designer-form/src/main/resources/com/fr/design/form/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/form/package.html rename to designer-form/src/main/resources/com/fr/design/form/package.html diff --git a/designer-form/src/main/java/com/fr/design/mainframe/package.html b/designer-form/src/main/resources/com/fr/design/mainframe/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/mainframe/package.html rename to designer-form/src/main/resources/com/fr/design/mainframe/package.html diff --git a/designer-form/src/main/java/com/fr/design/parameter/package.html b/designer-form/src/main/resources/com/fr/design/parameter/package.html similarity index 100% rename from designer-form/src/main/java/com/fr/design/parameter/package.html rename to designer-form/src/main/resources/com/fr/design/parameter/package.html diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java index 0956fbc18..6bf8a9185 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java @@ -22,16 +22,20 @@ import java.util.List; * Created by XiaXiang on 2017/3/27. */ public class ActionSearchManager implements AlphaFineSearchProvider { - private static ActionSearchManager actionSearchManager = null; + private static ActionSearchManager instance; private SearchResult filterModelList; private SearchResult lessModelList; private SearchResult moreModelList; - public synchronized static ActionSearchManager getInstance() { - if (actionSearchManager == null) { - actionSearchManager = new ActionSearchManager(); + public static ActionSearchManager getInstance() { + if (instance == null) { + synchronized (ActionSearchManager.class) { + if (instance == null) { + instance = new ActionSearchManager(); + } + } } - return actionSearchManager; + return instance; } /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java index 2fa777f03..a305d1341 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java @@ -8,28 +8,31 @@ import com.fr.design.mainframe.alphafine.cell.model.DocumentModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider; -import com.fr.log.FineLoggerFactory; import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; /** * Created by XiaXiang on 2017/3/27. */ public class DocumentSearchManager implements AlphaFineSearchProvider { - private static DocumentSearchManager documentSearchManager = null; + private static DocumentSearchManager instance; private SearchResult lessModelList; private SearchResult moreModelList; - public synchronized static DocumentSearchManager getInstance() { - if (documentSearchManager == null) { - documentSearchManager = new DocumentSearchManager(); - + public static DocumentSearchManager getInstance() { + if (instance == null) { + synchronized (DocumentSearchManager.class) { + if (instance == null) { + instance = new DocumentSearchManager(); + } + } } - return documentSearchManager; + return instance; } /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java index 82d98f962..0427a1393 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java @@ -35,7 +35,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { private static final String DS_NAME = "dsname=\""; private static final String FRM_PREFIX = "k:frm "; private static final String CPT_PREFIX = "k:cpt "; - private static FileSearchManager fileSearchManager = null; + private static FileSearchManager instance; private SearchResult filterModelList; private SearchResult lessModelList; private SearchResult moreModelList; @@ -47,15 +47,19 @@ public class FileSearchManager implements AlphaFineSearchProvider { private boolean isContainCpt = true; private boolean isContainFrm = true; - public synchronized static FileSearchManager getInstance() { - init(); - return fileSearchManager; + public static FileSearchManager getInstance() { + if (instance == null) { + synchronized (FileSearchManager.class) { + if (instance == null) { + instance = new FileSearchManager(); + } + } + } + return instance; } public synchronized static void init() { - if (fileSearchManager == null) { - fileSearchManager = new FileSearchManager(); - } + } /** @@ -114,7 +118,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { moreModelList.addAll(filterModelList.subList(AlphaFineConstants.SHOW_SIZE, filterModelList.size())); return moreModelList; } - + private void doSearch(String searchText, boolean needMore) { for (FileNode node : fileNodes) { boolean isAlreadyContain = false; @@ -230,7 +234,7 @@ public class FileSearchManager implements AlphaFineSearchProvider { * @throws Exception */ private void listAll(String rootFilePath, List nodeList, boolean recurse) throws Exception { - + FileNode[] fns = FRContext.getFileNodes().list(rootFilePath); for (int i = 0; i < fns.length; i++) { FileNode fileNode = fns[i]; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java index ab3ce080d..c0d6f796a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java @@ -9,12 +9,12 @@ import com.fr.design.mainframe.alphafine.cell.model.PluginModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider; import com.fr.general.ComparatorUtils; -import com.fr.log.FineLoggerFactory; import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; import com.fr.plugin.basic.version.Version; import com.fr.plugin.basic.version.VersionIntervalFactory; import com.fr.stable.StringUtils; @@ -26,20 +26,24 @@ import java.net.URLEncoder; * Created by XiaXiang on 2017/3/27. */ public class PluginSearchManager implements AlphaFineSearchProvider { - private static PluginSearchManager pluginSearchManager = null; + private static PluginSearchManager instance; private SearchResult lessModelList; private SearchResult moreModelList; - public synchronized static PluginSearchManager getInstance() { - if (pluginSearchManager == null) { - pluginSearchManager = new PluginSearchManager(); + public static PluginSearchManager getInstance() { + if (instance == null) { + synchronized (PluginSearchManager.class) { + if (instance == null) { + instance = new PluginSearchManager(); + } + } } - return pluginSearchManager; + return instance; } - private static boolean isCompatibleCurrentEnv(String envVersion){ + private static boolean isCompatibleCurrentEnv(String envVersion) { return VersionIntervalFactory.create(envVersion).contain(Version.currentEnvVersion()); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java index 38df0fa0c..64d22b99d 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java @@ -45,7 +45,7 @@ import java.util.List; */ public class RecentSearchManager implements AlphaFineSearchProvider { private static final int MAX_SIZE = 3; - private static RecentSearchManager recentSearchManager = null; + private static RecentSearchManager instance; IndexReader indexReader = null; IndexSearcher indexSearcher = null; //索引存储路径 @@ -59,11 +59,16 @@ public class RecentSearchManager implements AlphaFineSearchProvider { private SearchResult recentModelList; private SearchResult modelList; - public synchronized static RecentSearchManager getInstance() { - if (recentSearchManager == null) { - recentSearchManager = new RecentSearchManager(); + public static RecentSearchManager getInstance() { + if (instance == null) { + synchronized (RecentSearchManager.class) { + if (instance == null) { + instance = new RecentSearchManager(); + instance.initWriter(); + } + } } - return recentSearchManager; + return instance; } @Override @@ -94,17 +99,11 @@ public class RecentSearchManager implements AlphaFineSearchProvider { * 初始化indexWriter */ private void initWriter() { - if (indexWriter == null) { - try { - directory = FSDirectory.open(new File(path)); - } catch (IOException e) { - FineLoggerFactory.getLogger().error("cannot open directory " + path); - } - try { - indexWriter = new IndexWriter(directory, config); - } catch (IOException e) { - FineLoggerFactory.getLogger().error("not privilege to write to" + path); - } + try { + directory = FSDirectory.open(new File(path)); + indexWriter = new IndexWriter(directory, config); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); } } @@ -113,20 +112,18 @@ public class RecentSearchManager implements AlphaFineSearchProvider { * 初始化indexReader */ private void initReader() { - if (indexReader == null) { - try { - directory = FSDirectory.open(new File(path)); - indexReader = DirectoryReader.open(directory); - } catch (IOException e) { - FineLoggerFactory.getLogger().error("not privilege to read " + path); - } + try { + indexWriter.close(); + indexReader = DirectoryReader.open(directory); indexSearcher = new IndexSearcher(indexReader); + } catch (IOException e) { + FineLoggerFactory.getLogger().error(e.getMessage()); } - } /** * 添加模型 + * * @param searchKey * @param cellModel * @param searchCount @@ -146,6 +143,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider { /** * 写文档，建立索引 + * * @param doc */ private void writeDoc(Document doc) { @@ -160,12 +158,14 @@ public class RecentSearchManager implements AlphaFineSearchProvider { /** * 按序搜索 + * * @param key * @return */ private synchronized SearchResult searchBySort(String key) { recentModelList = new SearchResult(); try { + initReader(); IndexSearcher searcher = new IndexSearcher(indexReader); //构建排序字段 diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java index 2dc1ee9c0..4099cadbf 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java @@ -10,12 +10,12 @@ import com.fr.design.mainframe.alphafine.cell.model.AlphaCellModel; import com.fr.design.mainframe.alphafine.cell.model.MoreModel; import com.fr.design.mainframe.alphafine.model.SearchResult; import com.fr.design.mainframe.alphafine.search.manager.fun.AlphaFineSearchProvider; -import com.fr.log.FineLoggerFactory; import com.fr.general.Inter; import com.fr.general.http.HttpClient; import com.fr.json.JSONArray; import com.fr.json.JSONException; import com.fr.json.JSONObject; +import com.fr.log.FineLoggerFactory; import com.fr.stable.CodeUtils; import com.fr.stable.StringUtils; @@ -26,15 +26,19 @@ import java.util.List; * Created by XiaXiang on 2017/3/31. */ public class RecommendSearchManager implements AlphaFineSearchProvider { - private static RecommendSearchManager recommendSearchManager = null; + private static RecommendSearchManager instance; private SearchResult modelList; private SearchResult recommendModelList; - public synchronized static RecommendSearchManager getInstance() { - if (recommendSearchManager == null) { - recommendSearchManager = new RecommendSearchManager(); + public static RecommendSearchManager getInstance() { + if (instance == null) { + synchronized (RecentSearchManager.class) { + if (instance == null) { + instance = new RecommendSearchManager(); + } + } } - return recommendSearchManager; + return instance; } @Override diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java index 9beaab345..60631eded 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java @@ -1,15 +1,16 @@ package com.fr.design.mainframe.socketio; +import com.fr.config.RemoteConfigEvent; import com.fr.decision.webservice.utils.DecisionServiceConstants; +import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.loghandler.DesignerLogHandler; +import com.fr.workspace.server.socket.SocketInfoOperator; +import com.fr.event.EventDispatcher; +import com.fr.general.Inter; import com.fr.general.LogRecordTime; import com.fr.general.LogUtils; -import com.fr.general.http.HttpToolbox; -import com.fr.json.JSONException; -import com.fr.json.JSONObject; import com.fr.log.FineLoggerFactory; import com.fr.third.guava.base.Optional; -import com.fr.third.guava.primitives.Ints; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.base.WorkspaceConstants; @@ -18,6 +19,8 @@ import io.socket.client.IO; import io.socket.client.Socket; import io.socket.emitter.Emitter; +import javax.swing.JOptionPane; +import javax.swing.UIManager; import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; @@ -57,6 +60,21 @@ public class DesignerSocketIO { String uri = getSocketUri(current); socketIO = Optional.of(IO.socket(new URI(uri))); socketIO.get().on(WorkspaceConstants.WS_LOGRECORD, printLog); + socketIO.get().on(WorkspaceConstants.CONFIG_MODIFY, new Emitter.Listener() { + @Override + public void call(Object... objects) { + assert objects != null && objects.length == 1; + String param = (String) objects[0]; + EventDispatcher.fire(RemoteConfigEvent.EDIT, param); + } + }); + socketIO.get().on(Socket.EVENT_DISCONNECT, new Emitter.Listener() { + @Override + public void call(Object... objects) { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"Fine-Designer_Basic_Remote_Disconnected"}), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); + } + }); socketIO.get().connect(); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); @@ -65,24 +83,13 @@ public class DesignerSocketIO { private static String getSocketUri(Workspace current) throws IOException { URL url = new URL(current.getPath()); - int port = getPort(current); - return String.format("http://%s:%s%s?%s=%s", + int port = WorkContext.getCurrent().get(SocketInfoOperator.class).getPort(); + return String.format("%s://%s:%s%s?%s=%s", + url.getProtocol(), url.getHost(), port, WorkspaceConstants.WS_NAMESPACE, DecisionServiceConstants.WEB_SOCKET_TOKEN_NAME, RemoteCallClient.getInstance().getToken()); } - - private static int getPort(Workspace current) throws IOException { - String url = current.getPath() + WorkspaceConstants.CONTROLLER_PREFIX + WorkspaceConstants.CONTROLLER_SOCKETIO_PORT; - try { - String portStr = HttpToolbox.get(url); - JSONObject jsonObject = new JSONObject(portStr); - return Ints.tryParse(jsonObject.optString("data")); - } catch (JSONException e) { - FineLoggerFactory.getLogger().error(e.getMessage(), e); - throw new RuntimeException(e); - } - } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java index 2e445fe0b..c1a412d93 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java @@ -34,13 +34,16 @@ import com.fr.stable.Nameable; import javax.swing.*; public class WidgetEventPane extends ObjectUIControlPane { + private static final Selection NO_SELECTION = new CellSelection(-1, -1, -1, -1); - private Selection selection; + private Selection selection = NO_SELECTION; public WidgetEventPane(ElementCasePane pane) { super(pane); this.setNameListEditable(false); - selection = pane.getSelection(); + if(pane != null){ + selection = pane.getSelection(); + } setBorder(BorderFactory.createEmptyBorder(10, 0, 15, 0)); } diff --git a/designer-realize/src/main/java/com/fr/grid/GridUI.java b/designer-realize/src/main/java/com/fr/grid/GridUI.java index 8577212dc..45d8143c8 100644 --- a/designer-realize/src/main/java/com/fr/grid/GridUI.java +++ b/designer-realize/src/main/java/com/fr/grid/GridUI.java @@ -48,9 +48,20 @@ import com.fr.stable.script.CalculatorUtils; import com.fr.stable.unit.FU; import com.fr.third.antlr.ANTLRException; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; -import java.awt.*; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Composite; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.Stroke; import java.awt.geom.Area; import java.awt.geom.GeneralPath; import java.awt.geom.Line2D; @@ -98,7 +109,6 @@ public class GridUI extends ComponentUI { protected int resolution; private boolean isAuthority = false; - private WatermarkPainter watermarkPainter; public GridUI(int resolution) { super(); @@ -1104,12 +1114,8 @@ public class GridUI extends ComponentUI { // 绘制水印 private void paintWatermark(Graphics2D g2d, FineBook book) { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book); - - // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); - } - watermarkPainter.paint(g2d, gridSize.width, gridSize.height); + WatermarkPainter painter = WatermarkPainter.createPainter(watermark, resolution); + painter.paint(g2d, gridSize.width, gridSize.height); } diff --git a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java index 7b98269ea..ba6f79e71 100644 --- a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java +++ b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java @@ -10,7 +10,6 @@ import com.fr.base.ScreenResolution; import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.utils.ComponentUtils; import com.fr.general.Background; -import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.main.FineBook; import com.fr.page.PaperSettingProvider; @@ -56,7 +55,6 @@ public class PolyDesignUI extends ComponentUI { private PolyDesigner designer; private int resolution; private float time; - private WatermarkPainter watermarkPainter; public PolyDesignUI(int resolution) { if (resolution == 0){ @@ -112,12 +110,8 @@ public class PolyDesignUI extends ComponentUI { // 绘制水印 private void paintWatermark(Graphics2D g2d, FineBook book, int width, int height) { WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book); - - // 不要每次都 new 一个 WatermarkPainter - if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) { - watermarkPainter = new WatermarkPainter(watermark); - } - watermarkPainter.paint(g2d, width, height); + WatermarkPainter painter = WatermarkPainter.createPainter(watermark, resolution); + painter.paint(g2d, width, height); } private void paintAddedData(Graphics g) { diff --git a/designer-realize/src/main/java/com/fr/start/fx/FastGifImage.java b/designer-realize/src/main/java/com/fr/start/fx/FastGifImage.java index 69d74c8a4..9eb3ecef2 100644 --- a/designer-realize/src/main/java/com/fr/start/fx/FastGifImage.java +++ b/designer-realize/src/main/java/com/fr/start/fx/FastGifImage.java @@ -114,7 +114,7 @@ public class FastGifImage extends WritableImage { private static final class Animation { final WeakReference imageRef; final Timeline timeline; - final ImageLoader loader; + private ImageLoader loader; public Animation(final FastGifImage image, final ImageLoader loader) { this.loader = loader; @@ -141,6 +141,7 @@ public class FastGifImage extends WritableImage { public void stop() { timeline.stop(); + loader = null; } private void updateImage(final int frameIndex) { @@ -197,4 +198,11 @@ public class FastGifImage extends WritableImage { finishImage(new PrismImageLoader2(url, gifCount, (int) getRequestedWidth(), (int) getRequestedHeight(), isPreserveRatio(), isSmooth())); } + /** + * 销毁gif动画 + */ + public void destroy() { + animation.stop(); + } + } diff --git a/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java b/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java index 5b65ac882..e86384669 100644 --- a/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java +++ b/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java @@ -9,7 +9,6 @@ import javafx.application.Application; import javafx.application.Platform; import javafx.geometry.Rectangle2D; import javafx.scene.Scene; -import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.paint.Color; @@ -51,6 +50,7 @@ public class SplashFxWindow extends Application { private Text moduleInfo; private Text thanks; + private FastGifImage image; private List listeners = new ArrayList(); private static int uiScale(int i) { @@ -84,7 +84,7 @@ public class SplashFxWindow extends Application { public void start(Stage primaryStage) { AnchorPane root = new AnchorPane(); primaryStage.initStyle(StageStyle.TRANSPARENT); - Image image = new FastGifImage(SplashContext.SPLASH_PATH, FRAME_COUNT, WINDOW_WIDTH, WINDOW_HEIGHT); + image = new FastGifImage(SplashContext.SPLASH_PATH, FRAME_COUNT, WINDOW_WIDTH, WINDOW_HEIGHT); ImageView gif = new ImageView(image); @@ -129,6 +129,7 @@ public class SplashFxWindow extends Application { public void run() { try { ((Stage) moduleInfo.getScene().getWindow()).close(); + image.destroy(); fireSplashClose(); } catch (Exception e) { FRContext.getLogger().error(e.getMessage(), e); @@ -181,8 +182,10 @@ public class SplashFxWindow extends Application { }); } + /** * 添加一个动画状态监听 + * * @param listener */ public void addSplashActionListener(SplashFxActionListener listener) { diff --git a/designer-realize/src/main/java/com/fr/aspectj/designer/TemplateProcessTracker.aj b/designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj similarity index 100% rename from designer-realize/src/main/java/com/fr/aspectj/designer/TemplateProcessTracker.aj rename to designer-realize/src/main/resources/com/fr/aspectj/designer/TemplateProcessTracker.aj diff --git a/designer-realize/src/main/java/com/fr/design/actions/package.html b/designer-realize/src/main/resources/com/fr/design/actions/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/actions/package.html rename to designer-realize/src/main/resources/com/fr/design/actions/package.html diff --git a/designer-realize/src/main/java/com/fr/design/cell/editor/package.html b/designer-realize/src/main/resources/com/fr/design/cell/editor/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/cell/editor/package.html rename to designer-realize/src/main/resources/com/fr/design/cell/editor/package.html diff --git a/designer-realize/src/main/java/com/fr/design/condition/package.html b/designer-realize/src/main/resources/com/fr/design/condition/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/condition/package.html rename to designer-realize/src/main/resources/com/fr/design/condition/package.html diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/package.html b/designer-realize/src/main/resources/com/fr/design/dscolumn/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/dscolumn/package.html rename to designer-realize/src/main/resources/com/fr/design/dscolumn/package.html diff --git a/designer-realize/src/main/java/com/fr/design/expand/package.html b/designer-realize/src/main/resources/com/fr/design/expand/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/expand/package.html rename to designer-realize/src/main/resources/com/fr/design/expand/package.html diff --git a/designer-realize/src/main/java/com/fr/design/images/splash_10.gif b/designer-realize/src/main/resources/com/fr/design/images/splash_10.gif similarity index 100% rename from designer-realize/src/main/java/com/fr/design/images/splash_10.gif rename to designer-realize/src/main/resources/com/fr/design/images/splash_10.gif diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine1.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine1.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine1.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine1.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine1@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine2.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine2.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine2.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine2.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine2@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine3.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine3.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine3.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine3.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine3@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine4.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine4.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine4.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine4.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine4@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine5.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine5.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine5.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine5.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine5@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine_close.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine_close.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine_close.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine_close.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/alphafine_close@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigloading.gif b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigloading.gif similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigloading.gif rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigloading.gif diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigsearch.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigsearch.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigsearch.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigsearch.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/bigsearch@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/check.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/check.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/check.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/check.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/default_product.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/default_product.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/default_product.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/default_product.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/loading.gif b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/loading.gif similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/loading.gif rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/loading.gif diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/no_result.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/no_result.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/no_result.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/no_result.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/no_result@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/no_result@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/no_result@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/no_result@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/noresult.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/noresult.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/noresult.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/noresult.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/noresult@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/noresult@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/noresult@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/noresult@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/open.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/open.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/open.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/opening.gif b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/opening.gif similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/opening.gif rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/opening.gif diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/opening@2x.gif b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/opening@2x.gif similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/opening@2x.gif rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/opening@2x.gif diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/remind.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/remind.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/remind_close.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind_close.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/remind_close.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/remind_close.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected1.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected1.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected1.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected1.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected1@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected1@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected1@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected1@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected2.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected2.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected2.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected2.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected2@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected2@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected2@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected2@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected3.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected3.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected3.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected3.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected3@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected3@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected3@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected3@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected4.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected4.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected4.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected4.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected4@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected4@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected4@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected4@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected5.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected5.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected5.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected5.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected5@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected5@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/selected5@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/selected5@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/smallsearch.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/smallsearch.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/smallsearch@2x.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/uncheck.png b/designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/uncheck.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/alphafine/images/uncheck.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/alphafine/images/uncheck.png diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/bbs.properties b/designer-realize/src/main/resources/com/fr/design/mainframe/bbs/bbs.properties similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/bbs/bbs.properties rename to designer-realize/src/main/resources/com/fr/design/mainframe/bbs/bbs.properties diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/images/switch.png b/designer-realize/src/main/resources/com/fr/design/mainframe/bbs/images/switch.png similarity index 100% rename from designer-realize/src/main/java/com/fr/design/mainframe/bbs/images/switch.png rename to designer-realize/src/main/resources/com/fr/design/mainframe/bbs/images/switch.png diff --git a/designer-realize/src/main/java/com/fr/design/report/package.html b/designer-realize/src/main/resources/com/fr/design/report/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/report/package.html rename to designer-realize/src/main/resources/com/fr/design/report/package.html diff --git a/designer-realize/src/main/java/com/fr/design/report/share/shareToolTip.html b/designer-realize/src/main/resources/com/fr/design/report/share/shareToolTip.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/report/share/shareToolTip.html rename to designer-realize/src/main/resources/com/fr/design/report/share/shareToolTip.html diff --git a/designer-realize/src/main/java/com/fr/design/webattr/package.html b/designer-realize/src/main/resources/com/fr/design/webattr/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/webattr/package.html rename to designer-realize/src/main/resources/com/fr/design/webattr/package.html diff --git a/designer-realize/src/main/java/com/fr/design/widget/package.html b/designer-realize/src/main/resources/com/fr/design/widget/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/design/widget/package.html rename to designer-realize/src/main/resources/com/fr/design/widget/package.html diff --git a/designer-realize/src/main/java/com/fr/grid/event/package.html b/designer-realize/src/main/resources/com/fr/grid/event/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/grid/event/package.html rename to designer-realize/src/main/resources/com/fr/grid/event/package.html diff --git a/designer-realize/src/main/java/com/fr/grid/package.html b/designer-realize/src/main/resources/com/fr/grid/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/grid/package.html rename to designer-realize/src/main/resources/com/fr/grid/package.html diff --git a/designer-realize/src/main/java/com/fr/grid/selection/package.html b/designer-realize/src/main/resources/com/fr/grid/selection/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/grid/selection/package.html rename to designer-realize/src/main/resources/com/fr/grid/selection/package.html diff --git a/designer-realize/src/main/java/com/fr/poly/package.html b/designer-realize/src/main/resources/com/fr/poly/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/poly/package.html rename to designer-realize/src/main/resources/com/fr/poly/package.html diff --git a/designer-realize/src/main/java/com/fr/quickeditor/package.html b/designer-realize/src/main/resources/com/fr/quickeditor/package.html similarity index 100% rename from designer-realize/src/main/java/com/fr/quickeditor/package.html rename to designer-realize/src/main/resources/com/fr/quickeditor/package.html diff --git a/designer-realize/src/main/java/com/fr/start/jni/splash.dylib b/designer-realize/src/main/resources/com/fr/start/jni/splash.dylib old mode 100755 new mode 100644 similarity index 100% rename from designer-realize/src/main/java/com/fr/start/jni/splash.dylib rename to designer-realize/src/main/resources/com/fr/start/jni/splash.dylib diff --git a/pom.xml b/pom.xml index c3bed349c..3398bbd08 100644 --- a/pom.xml +++ b/pom.xml @@ -21,4 +21,16 @@ design 10.0-RELEASE-SNAPSHOT pom + + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + \ No newline at end of file