diff --git a/designer/src/com/fr/design/actions/utils/DeprecatedActionManager.java b/designer/src/com/fr/design/actions/utils/DeprecatedActionManager.java index ccd39d838..89bbd82bf 100644 --- a/designer/src/com/fr/design/actions/utils/DeprecatedActionManager.java +++ b/designer/src/com/fr/design/actions/utils/DeprecatedActionManager.java @@ -34,6 +34,7 @@ import com.fr.report.cell.cellattr.BarcodePresent; import com.fr.report.cell.cellattr.CurrencyLinePresent; import javax.swing.*; +import java.util.Set; /** * peter: 这个方法只是临时放在这边的, 等插件系统全部完善后,立刻删除. @@ -131,7 +132,7 @@ public class DeprecatedActionManager { presentMenu.addShortCut(barcodeAction); presentMenu.addShortCut(currencyLineAction); - PresentKindProvider[] providers = ExtraDesignClassManager.getInstance().getPresentKindProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(PresentKindProvider.MARK_STRING); for (PresentKindProvider provider : providers) { NewPresentAction action = new NewPresentAction(ePane, provider.title(), provider.kindOfPresent().getName()); action.setMnemonic(provider.mnemonic()); diff --git a/designer/src/com/fr/design/condition/HighLightConditionAttributesPane.java b/designer/src/com/fr/design/condition/HighLightConditionAttributesPane.java index 5bdaeb853..afcef383c 100644 --- a/designer/src/com/fr/design/condition/HighLightConditionAttributesPane.java +++ b/designer/src/com/fr/design/condition/HighLightConditionAttributesPane.java @@ -9,6 +9,7 @@ import com.fr.report.cell.cellattr.highlight.*; import javax.swing.*; import java.awt.*; import java.util.Iterator; +import java.util.Set; public class HighLightConditionAttributesPane extends ConditionAttributesPane { @@ -48,7 +49,7 @@ public class HighLightConditionAttributesPane extends ConditionAttributesPane providers = ExtraDesignClassManager.getInstance().getArray(HighlightProvider.MARK_STRING); for (HighlightProvider provider : providers) { classPaneMap.put(provider.classForHighlightAction(), provider.appearanceForCondition(this)); } diff --git a/designer/src/com/fr/design/condition/PaddingPane.java b/designer/src/com/fr/design/condition/PaddingPane.java index 89f0dd1e0..935f71d39 100644 --- a/designer/src/com/fr/design/condition/PaddingPane.java +++ b/designer/src/com/fr/design/condition/PaddingPane.java @@ -46,7 +46,7 @@ public class PaddingPane extends ConditionAttrSingleConditionPane extends Tar } private void addExtraCellEditor(Grid grid) { - ElementUIProvider[] providers = ExtraDesignClassManager.getInstance().getElementUIProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING); for (ElementUIProvider provider : providers) { CellEditor editor = null; Class clazz = provider.targetCellEditorClass(); diff --git a/designer/src/com/fr/design/mainframe/InformationCollector.java b/designer/src/com/fr/design/mainframe/InformationCollector.java index c528e84a0..a4b3fc6ab 100644 --- a/designer/src/com/fr/design/mainframe/InformationCollector.java +++ b/designer/src/com/fr/design/mainframe/InformationCollector.java @@ -35,8 +35,8 @@ import java.util.*; */ public class InformationCollector implements XMLReadable, XMLWriter { - //3天上传一次 - private static final long DELTA = 3 * 24 * 3600 * 1000L; + // 24小时上传一次 + private static final long DELTA = 24 * 3600 * 1000L; private static final long SEND_DELAY = 30 * 1000L; private static final String FILE_NAME = "fr.info"; private static final String XML_START_STOP_LIST = "StartStopList"; @@ -203,8 +203,6 @@ public class InformationCollector implements XMLReadable, XMLWriter { //服务器返回true, 说明已经获取成功, 清空当前记录的信息 if (success) { deleteLogDB(conn, table); - //收集设计器信息的服务器下线了, 目测还要一段时间, 不在那边一起setLastTime了. - this.lastTime = dateToString(); } } diff --git a/designer/src/com/fr/design/mainframe/JWorkBook.java b/designer/src/com/fr/design/mainframe/JWorkBook.java index 1455ee011..1e27feeb5 100644 --- a/designer/src/com/fr/design/mainframe/JWorkBook.java +++ b/designer/src/com/fr/design/mainframe/JWorkBook.java @@ -69,6 +69,7 @@ import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; /** * JWorkBook used to edit WorkBook. @@ -660,9 +661,10 @@ public class JWorkBook extends JTemplate { * */ public PreviewProvider[] supportPreview() { - return (PreviewProvider[])ArrayUtils.addAll(new PreviewProvider[]{ + Set set = ExtraDesignClassManager.getInstance().getArray(PreviewProvider.MARK_STRING); + return ArrayUtils.addAll(new PreviewProvider[]{ new PagePreview(), new WritePreview(), new ViewPreview() - }, ExtraDesignClassManager.getInstance().getPreviewProviders()); + }, set.toArray(new PreviewProvider[set.size()])); } /** diff --git a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java index 702b878a6..c56e6547f 100644 --- a/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java +++ b/designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java @@ -9,11 +9,9 @@ import com.fr.design.gui.ipasswordfield.UIPassWordField; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.ComparatorUtils; -import com.fr.general.FRFont; -import com.fr.general.FRLogger; -import com.fr.general.Inter; +import com.fr.general.*; import com.fr.general.http.HttpClient; +import com.fr.stable.EncodeConstants; import com.fr.stable.StringUtils; import javax.swing.*; @@ -24,8 +22,10 @@ import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URI; +import java.net.URLEncoder; /** * @author richie @@ -36,14 +36,10 @@ public class BBSLoginDialog extends UIDialog { private static final int DIALOG_WIDTH = 400; private static final int DIALOG_HEIGHT = 200; - private static final String URL = "http://bbs.finereport.com/member.php?mod=logging&action=login&loginsubmit=yes&infloat=yes&lssubmit=yes&inajax=1"; - private static final String PASSWORD_RESET_URL = "http://bbs.finereport.com/portal.php?mod=topic&topicid=2"; - private static final String REGISTER_URL = "http://bbs.finereport.com/member.php?mod=register"; private static final String LOGIN_SUCCESS_FLAG = "http://bbs.finereport.com"; private static final Font DEFAULT_FONT = FRFont.getInstance(FRFont.DEFAULT_FONTNAME, 0, 14); - private static final String TEST_CONNECTION_URL = "http://bbs.finereport.com/member.php?mod=logging&action=login&loginsubmit=yes&infloat=yes&lssubmit=yes&inajax=1&username=test&password=123456"; private static final int TIME_OUT = 10000; - + private static final int BUTTON_WIDTH = 90; private static final int V_GAP = 20; private static final int BUTTON_H_GAP = 155; @@ -56,212 +52,213 @@ public class BBSLoginDialog extends UIDialog { private UILabel userLabel; private UILabel passLabel; private UITextField nameField; - private UIPassWordField passField; + private UIPassWordField passField; private UIButton loginButton; private UILabel tipLabel; private BoxCenterAligmentPane passwordReset; private BoxCenterAligmentPane registerLabel; - + private KeyListener keyListener = new KeyAdapter() { - public void keyPressed(KeyEvent e){ - int code = e.getKeyCode(); - if(KeyEvent.VK_ESCAPE == code){ - BBSLoginDialog.this.setVisible(false); - return; - } - - if(KeyEvent.VK_ENTER == code){ - login(); - } - } - }; - + public void keyPressed(KeyEvent e) { + int code = e.getKeyCode(); + if (KeyEvent.VK_ESCAPE == code) { + BBSLoginDialog.this.setVisible(false); + return; + } + + if (KeyEvent.VK_ENTER == code) { + login(); + } + } + }; + // 用户登录状态label private UserInfoLabel userInfoLabel; - - public UILabel getTipLabel() { - return tipLabel; - } - public void setTipLabel(UILabel tipLabel) { - this.tipLabel = tipLabel; - } + public UILabel getTipLabel() { + return tipLabel; + } + + public void setTipLabel(UILabel tipLabel) { + this.tipLabel = tipLabel; + } - /** - * 构造函数 - * @param parent 父窗口 - * @param userInfoLabel 登录状态label - */ - public BBSLoginDialog(Frame parent,UserInfoLabel userInfoLabel) { + /** + * 构造函数 + * + * @param parent 父窗口 + * @param userInfoLabel 登录状态label + */ + public BBSLoginDialog(Frame parent, UserInfoLabel userInfoLabel) { super(parent); JPanel panel = (JPanel) getContentPane(); initComponents(panel); this.userInfoLabel = userInfoLabel; - setSize(new Dimension(DIALOG_WIDTH,DIALOG_HEIGHT)); + setSize(new Dimension(DIALOG_WIDTH, DIALOG_HEIGHT)); } private void initComponents(JPanel contentPane) { this.setTitle(Inter.getLocText("FR-Designer-BBSLogin_Login-Title")); tipLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); - userLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Account")+":"); - passLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Password")+":"); + userLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Account") + ":"); + passLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Password") + ":"); nameField = new UITextField(); passField = new UIPassWordField(); loginButton = new UIButton(Inter.getLocText("FR-Designer-BBSLogin_Login")); - passwordReset = getURLActionLabel(PASSWORD_RESET_URL); - registerLabel = getURLActionLabel(REGISTER_URL); + passwordReset = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("bbs.reset")); + registerLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("bbs.register")); loginButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent arg0) { - login(); - } - }); - + @Override + public void actionPerformed(ActionEvent arg0) { + login(); + } + }); + nameField.addKeyListener(keyListener); passField.addKeyListener(keyListener); loginButton.addKeyListener(keyListener); - + userLabel.setFont(DEFAULT_FONT); passLabel.setFont(DEFAULT_FONT); this.tipLabel.setVisible(false); - + contentPane.setLayout(new BorderLayout()); - + JPanel mainPane = new JPanel(); - mainPane.setLayout(new BorderLayout(0,V_GAP)); - + mainPane.setLayout(new BorderLayout(0, V_GAP)); + initNorthPane(mainPane); - + initCenterPane(mainPane); - + initSouthPane(mainPane); - contentPane.add(mainPane,BorderLayout.NORTH); - + contentPane.add(mainPane, BorderLayout.NORTH); + this.setResizable(false); } - - - private void login(){ - if(nameField.getText().isEmpty()){ - tipForUsernameEmpty(); - nameField.requestFocus(); - return; - } - if(String.valueOf(passField.getPassword()).isEmpty()){ - tipForPasswordEmpty(); - passField.requestFocus(); - return; - } - if(!testConnection()){ - connectionFailue(); - return; - } - if(login(nameField.getText(),String.valueOf(passField.getPassword()))){ - loginSuccess(); - }else{ - loginFailure(); - } - + + + private void login() { + if (nameField.getText().isEmpty()) { + tipForUsernameEmpty(); + nameField.requestFocus(); + return; + } + if (String.valueOf(passField.getPassword()).isEmpty()) { + tipForPasswordEmpty(); + passField.requestFocus(); + return; + } + if (!testConnection()) { + connectionFailue(); + return; + } + if (login(nameField.getText(), String.valueOf(passField.getPassword()))) { + loginSuccess(); + } else { + loginFailure(); + } + } - - private boolean testConnection(){ - HttpClient client = new HttpClient(TEST_CONNECTION_URL); - return client.isServerAlive(); + + private boolean testConnection() { + HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("bbs.test")); + return client.isServerAlive(); } - - private void initNorthPane(JPanel mainPane){ + + private void initNorthPane(JPanel mainPane) { JPanel northPane = new JPanel(); - northPane.setPreferredSize(new Dimension(DIALOG_WIDTH,NORTH_PANE_HEIGHT)); + northPane.setPreferredSize(new Dimension(DIALOG_WIDTH, NORTH_PANE_HEIGHT)); northPane.add(tipLabel); - mainPane.add(northPane,BorderLayout.NORTH); + mainPane.add(northPane, BorderLayout.NORTH); } - - private void initCenterPane(JPanel mainPane){ + + private void initCenterPane(JPanel mainPane) { JPanel loginPane = new JPanel(); - loginPane.setLayout(new GridLayout(2,1,0,V_GAP)); + loginPane.setLayout(new GridLayout(2, 1, 0, V_GAP)); JPanel namePane = new JPanel(); - namePane.setLayout(new FlowLayout(FlowLayout.RIGHT,FLOWLAYOUT_H_GAP,0)); + namePane.setLayout(new FlowLayout(FlowLayout.RIGHT, FLOWLAYOUT_H_GAP, 0)); namePane.add(userLabel); - nameField.setPreferredSize(new Dimension(FIELD_WIDTH,FIELD_HEIGHT)); + nameField.setPreferredSize(new Dimension(FIELD_WIDTH, FIELD_HEIGHT)); namePane.add(nameField); namePane.add(passwordReset); loginPane.add(namePane); - + JPanel passPane = new JPanel(); - passPane.setLayout(new FlowLayout(FlowLayout.RIGHT,FLOWLAYOUT_H_GAP,0)); + passPane.setLayout(new FlowLayout(FlowLayout.RIGHT, FLOWLAYOUT_H_GAP, 0)); passPane.add(passLabel); passPane.add(passField); - passField.setPreferredSize(new Dimension(FIELD_WIDTH,FIELD_HEIGHT)); + passField.setPreferredSize(new Dimension(FIELD_WIDTH, FIELD_HEIGHT)); passPane.add(registerLabel); loginPane.add(passPane); - - mainPane.add(loginPane,BorderLayout.CENTER); + + mainPane.add(loginPane, BorderLayout.CENTER); } - - private void initSouthPane(JPanel mainPane){ + + private void initSouthPane(JPanel mainPane) { JPanel southPane = new JPanel(); - southPane.setLayout(new FlowLayout(FlowLayout.RIGHT,BUTTON_H_GAP,0)); - loginButton.setPreferredSize(new Dimension(BUTTON_WIDTH,FIELD_HEIGHT)); + southPane.setLayout(new FlowLayout(FlowLayout.RIGHT, BUTTON_H_GAP, 0)); + loginButton.setPreferredSize(new Dimension(BUTTON_WIDTH, FIELD_HEIGHT)); loginButton.setFont(DEFAULT_FONT); southPane.add(loginButton); - mainPane.add(southPane,BorderLayout.SOUTH); + mainPane.add(southPane, BorderLayout.SOUTH); } - + // 登录成功 - private void loginSuccess(){ - DesignerEnvManager.getEnvManager().setBBSPassword(String.valueOf(passField.getPassword())); - userInfoLabel.setUserName(nameField.getText()); - userInfoLabel.getUserInfoPane().markSignIn(nameField.getText()); - userInfoLabel.getUserInfoPane().getSwitchAccountLabel().setVisible(true); - BBSLoginDialog.this.setVisible(false); + private void loginSuccess() { + DesignerEnvManager.getEnvManager().setBBSPassword(String.valueOf(passField.getPassword())); + userInfoLabel.setUserName(nameField.getText()); + userInfoLabel.getUserInfoPane().markSignIn(nameField.getText()); + userInfoLabel.getUserInfoPane().getSwitchAccountLabel().setVisible(true); + BBSLoginDialog.this.setVisible(false); } - + // 登录失败 - private void loginFailure(){ - setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); + private void loginFailure() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); } - - private void tipForUsernameEmpty(){ - setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); + + private void tipForUsernameEmpty() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); } public void showTipForDownloadPluginWithoutLogin() { setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); } - - private void tipForPasswordEmpty(){ - setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip")); + + private void tipForPasswordEmpty() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip")); } - - private void setLoginFailureTxt(String errorTxt){ - tipLabel.setText(errorTxt); - tipLabel.setForeground(Color.RED); - tipLabel.repaint(); - tipLabel.setVisible(true); + + private void setLoginFailureTxt(String errorTxt) { + tipLabel.setText(errorTxt); + tipLabel.setForeground(Color.RED); + tipLabel.repaint(); + tipLabel.setVisible(true); } - + // 连接失败 - private void connectionFailue(){ - setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Connection-Failure")); + private void connectionFailue() { + setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Connection-Failure")); } - + /** * 清楚登录信息 */ - public void clearLoginInformation(){ - tipLabel.setText(StringUtils.EMPTY); - nameField.setText(StringUtils.EMPTY); - passField.setText(StringUtils.EMPTY); + public void clearLoginInformation() { + tipLabel.setText(StringUtils.EMPTY); + nameField.setText(StringUtils.EMPTY); + passField.setText(StringUtils.EMPTY); } - /** + /** * 显示登录窗口 */ - public void showWindow(){ + public void showWindow() { GUICoreUtils.centerWindow(this); setVisible(true); } @@ -273,39 +270,45 @@ public class BBSLoginDialog extends UIDialog { public void checkValid() throws Exception { } - + /** * 是否登陆成功 + * * @param username 用户名 * @param password 密码 * @return 同上 */ - public static boolean login(String username,String password){ - String url = URL + "&username=" + username + "&password=" + password; - HttpClient client = new HttpClient(url); - client.setTimeout(TIME_OUT); - if(client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK){ - try { - String res = client.getResponseText("GBK"); - if(res.contains(LOGIN_SUCCESS_FLAG)){ - return true; - } - } catch (Exception e) { - FRLogger.getLogger().error(e.getMessage()); - } - } - return false; + public static boolean login(String username, String password) { + try { + username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK); + } catch (UnsupportedEncodingException e) { + FRLogger.getLogger().error(e.getMessage()); + } + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password; + HttpClient client = new HttpClient(url); + client.setTimeout(TIME_OUT); + if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) { + try { + String res = client.getResponseText(EncodeConstants.ENCODING_GBK); + if (res.contains(LOGIN_SUCCESS_FLAG)) { + return true; + } + } catch (Exception e) { + FRLogger.getLogger().error(e.getMessage()); + } + } + return false; } - - private BoxCenterAligmentPane getURLActionLabel(final String url){ - ActionLabel actionLabel = new ActionLabel(url); - if(ComparatorUtils.equals(url, PASSWORD_RESET_URL)){ - actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Forgot-Password")); - }else{ - actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Register-Account")); - } - - actionLabel.addActionListener(new ActionListener() { + + private BoxCenterAligmentPane getURLActionLabel(final String url) { + ActionLabel actionLabel = new ActionLabel(url); + if (ComparatorUtils.equals(url, SiteCenter.getInstance().acquireUrlByKind("bbs.reset"))) { + actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Forgot-Password")); + } else { + actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Register-Account")); + } + + actionLabel.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { try { @@ -315,14 +318,14 @@ public class BBSLoginDialog extends UIDialog { } } }); - + return new BoxCenterAligmentPane(actionLabel); } - + class BoxCenterAligmentPane extends JPanel { private UILabel textLabel; - + public BoxCenterAligmentPane(String text) { this(new UILabel(text)); } diff --git a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java index 78e0c00b0..3da7406c6 100644 --- a/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java +++ b/designer/src/com/fr/design/mainframe/cell/CellElementEditPane.java @@ -180,7 +180,7 @@ public class CellElementEditPane extends BasicPane { paneList.add(new CellPresentPane()); paneList.add(new CellOtherSetPane()); - cellAttributeProvider = ExtraDesignClassManager.getInstance().getCelllAttributeProvider(); + cellAttributeProvider = ExtraDesignClassManager.getInstance().getSingle(CellAttributeProvider.MARK_STRING); if (cellAttributeProvider != null){ paneList.add((AbstractCellAttrPane) cellAttributeProvider.createCellAttributePane()); } diff --git a/designer/src/com/fr/design/module/DesignerModule.java b/designer/src/com/fr/design/module/DesignerModule.java index 276172536..8ed444c19 100644 --- a/designer/src/com/fr/design/module/DesignerModule.java +++ b/designer/src/com/fr/design/module/DesignerModule.java @@ -54,7 +54,9 @@ import com.fr.stable.ArrayUtils; import com.fr.stable.ParameterProvider; import com.fr.stable.StringUtils; import com.fr.stable.bridge.StableFactory; +import com.fr.stable.fun.LogProvider; import com.fr.stable.module.Module; +import com.fr.stable.plugin.PluginSimplify; import com.fr.stable.script.CalculatorProviderContext; import com.fr.stable.script.ValueConverter; import com.fr.stable.xml.ObjectTokenizer; @@ -69,6 +71,7 @@ import java.awt.event.ActionListener; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Iterator; +import java.util.Set; public class DesignerModule extends DesignModule { @@ -94,7 +97,7 @@ public class DesignerModule extends DesignModule { InformationCollector.getInstance().collectStartTime(); ExtraDesignClassManager.getInstance().getFeedback().didFeedback(); - ExtraClassManager.getInstance().addLogProvider(DesignerLogImpl.getInstance()); + ExtraClassManager.getInstance().addMutable(LogProvider.MARK_STRING, DesignerLogImpl.getInstance(), PluginSimplify.NULL); } private void registerOtherPane() { @@ -118,7 +121,7 @@ public class DesignerModule extends DesignModule { ActionFactory.registerChartCellEditorInEditor(ChartQuickEditor.getInstance()); - ElementUIProvider[] providers = ExtraDesignClassManager.getInstance().getElementUIProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING); for (ElementUIProvider provider : providers) { ActionFactory.registerCellEditor(provider.targetObjectClass(), provider.quickEditor()); } @@ -222,6 +225,16 @@ public class DesignerModule extends DesignModule { public JTemplate openTemplate(FILE tplFile) { return new JWorkBook(asIOFile(tplFile), tplFile); } + + @Override + public String mark4Provider() { + return getClass().getName(); + } + + @Override + public void process() { + + } } @Override diff --git a/designer/src/com/fr/design/present/PresentPane.java b/designer/src/com/fr/design/present/PresentPane.java index 0360a813a..043b069b0 100644 --- a/designer/src/com/fr/design/present/PresentPane.java +++ b/designer/src/com/fr/design/present/PresentPane.java @@ -16,6 +16,7 @@ import com.fr.report.cell.cellattr.CurrencyLinePresent; import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * @author zhou @@ -86,7 +87,7 @@ public class PresentPane extends UIComboBoxPane { keys.add(CurrencyLinePresent.class.getName()); displays.add(currency.title4PopupWindow()); - PresentKindProvider[] providers = ExtraDesignClassManager.getInstance().getPresentKindProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(PresentKindProvider.MARK_STRING); for (PresentKindProvider provider : providers) { FurtherBasicBeanPane extra = provider.appearanceForPresent(); paneList.add(extra); diff --git a/designer/src/com/fr/design/report/ReportExportAttrPane.java b/designer/src/com/fr/design/report/ReportExportAttrPane.java index f3df79528..33eb07519 100644 --- a/designer/src/com/fr/design/report/ReportExportAttrPane.java +++ b/designer/src/com/fr/design/report/ReportExportAttrPane.java @@ -11,6 +11,7 @@ import com.fr.io.attr.ReportExportAttr; import java.util.ArrayList; import java.util.List; +import java.util.Set; public class ReportExportAttrPane extends BasicPane { @@ -29,8 +30,8 @@ public class ReportExportAttrPane extends BasicPane { uiTabbedPane.addTab("PDF", pdfExportPane); wordExportPane = new WordExportPane(); uiTabbedPane.addTab("Word", wordExportPane); - ExportAttrTabProvider[] providers = ExtraDesignClassManager.getInstance().getExportAttrTabProviders(); - paneList = new ArrayList(); + Set providers = ExtraDesignClassManager.getInstance().getArray(ExportAttrTabProvider.XML_TAG); + paneList = new ArrayList<>(); for (ExportAttrTabProvider provider : providers) { uiTabbedPane.addTab(provider.title(), provider.toSwingComponent()); paneList.add(provider.toExportPane()); diff --git a/designer/src/com/fr/design/report/VerifierListPane.java b/designer/src/com/fr/design/report/VerifierListPane.java index 914261244..9bdedbd8a 100644 --- a/designer/src/com/fr/design/report/VerifierListPane.java +++ b/designer/src/com/fr/design/report/VerifierListPane.java @@ -1 +1 @@ -package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; for (VerifyDefineProvider provider : ExtraDesignClassManager.getInstance().getVerifyDefineProviders()) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( Inter.getLocText(new String[]{"Custom", "Verify"}), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file +package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.Inter; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ new NameObjectCreator(Inter.getLocText(new String[]{"BuildIn", "Verify"}), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( Inter.getLocText(new String[]{"Custom", "Verify"}), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file diff --git a/designer/src/com/fr/design/webattr/EditToolBar.java b/designer/src/com/fr/design/webattr/EditToolBar.java index 7b64ca271..c147b1b0f 100644 --- a/designer/src/com/fr/design/webattr/EditToolBar.java +++ b/designer/src/com/fr/design/webattr/EditToolBar.java @@ -47,6 +47,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; +import java.util.Set; public class EditToolBar extends BasicPane { @@ -354,7 +355,8 @@ public class EditToolBar extends BasicPane { * 初始化元素 */ public void initComponents() { - exportToolBarProviders = ExtraDesignClassManager.getInstance().getExportToolBarProviders(); + Set set = ExtraDesignClassManager.getInstance().getArray(ExportToolBarProvider.XML_TAG); + exportToolBarProviders = set.toArray(new ExportToolBarProvider[set.size()]); this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel north = FRGUIPaneFactory.createBorderLayout_S_Pane(); icon = new UICheckBox(Inter.getLocText("FR-Designer_Show_Icon")); diff --git a/designer/src/com/fr/design/webattr/WebSettingPane.java b/designer/src/com/fr/design/webattr/WebSettingPane.java index 24d991407..d4bb3485c 100644 --- a/designer/src/com/fr/design/webattr/WebSettingPane.java +++ b/designer/src/com/fr/design/webattr/WebSettingPane.java @@ -4,6 +4,7 @@ import com.fr.base.ConfigManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -81,9 +82,9 @@ public abstract class WebSettingPane extends BasicBeanPane } this.setLayout(new BorderLayout()); - JPanel allPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - allPanel.add(panel,BorderLayout.CENTER); - this.add(allPanel,BorderLayout.CENTER); + + UIScrollPane scrollPane = new UIScrollPane(panel); + this.add(scrollPane, BorderLayout.CENTER); } ItemListener itemListener = new ItemListener() { diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 83cde6556..4b5ca4433 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -1,19 +1,20 @@ package com.fr.design.widget; import com.fr.design.ExtraDesignClassManager; +import com.fr.design.dialog.BasicPane; +import com.fr.design.fun.WidgetDesignHandler; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.ElementCasePane; -import com.fr.design.dialog.BasicPane; +import com.fr.design.widget.btn.ButtonConstants; import com.fr.form.ui.Button; import com.fr.form.ui.*; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; -import com.fr.design.widget.btn.ButtonConstants; import javax.swing.*; import java.awt.*; @@ -61,16 +62,22 @@ public class WidgetPane extends BasicPane implements ItemListener { /** * 状态改变 + * * @param e 事件对象 */ public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { + Widget oldWidget = update(); + Widget selectedItem = editorTypeComboBox.getCellWidget(); + WidgetDesignHandler handler = ExtraDesignClassManager.getInstance().getSingle(WidgetDesignHandler.XML_TAG); + if (handler != null) { + handler.transferWidgetProperties(oldWidget, selectedItem); + } if (e.getItem() instanceof Item && ((Item) e.getItem()).getValue() instanceof WidgetConfig) { - populate(editorTypeComboBox.getCellWidget()); + populate(selectedItem); return; } if (shouldFireSelectedEvent) { - Widget selectedItem = editorTypeComboBox.getCellWidget(); populateWidgetConfig(selectedItem); } } @@ -109,9 +116,9 @@ public class WidgetPane extends BasicPane implements ItemListener { public Widget update() { return cellEditorCardPane.update(); } - + protected void populateWidgetConfig(Widget widget) { - cellEditorCardPane.populate(widget); + cellEditorCardPane.populate(widget); } @@ -190,12 +197,13 @@ public class WidgetPane extends BasicPane implements ItemListener { } private WidgetOption[] getWidgetOptions() { - return (WidgetOption[])ArrayUtils.addAll(WidgetOption.getReportWidgetInstance(), ExtraDesignClassManager.getInstance().getCellWidgetOptions()); + return (WidgetOption[]) ArrayUtils.addAll(WidgetOption.getReportWidgetInstance(), ExtraDesignClassManager.getInstance().getCellWidgetOptions()); } } /** * 校验 + * * @throws Exception 抛出异常 */ public void checkValid() throws Exception { @@ -222,6 +230,7 @@ public class WidgetPane extends BasicPane implements ItemListener { /** * 转化成字符串形式 + * * @return 返回字符串 */ public String toString() { diff --git a/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java b/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java index 033a01e5e..156af0f96 100644 --- a/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java +++ b/designer/src/com/fr/design/write/submit/SubmitVisitorListPane.java @@ -21,7 +21,6 @@ import com.fr.report.write.BuiltInSQLSubmiter; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.SubmitVisitor; import com.fr.report.write.WClassSubmiter; -import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.write.BuiltInSQLSubmiterProvider; import com.fr.write.DBManipulation; @@ -31,10 +30,8 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; import java.util.List; -import java.util.Map; public class SubmitVisitorListPane extends ObjectJControlPane { @@ -172,17 +169,17 @@ public class SubmitVisitorListPane extends ObjectJControlPane { public CustomPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); customCardPane = FRGUIPaneFactory.createCardLayout_S_Pane(); - customSubmitPanes = new HashMap(); - comboItemsMap = new HashMap(); + customSubmitPanes = new HashMap<>(); + comboItemsMap = new HashMap<>(); - SubmitProvider[] providers = ExtraDesignClassManager.getInstance().getSubmitProviders(); - providers = (SubmitProvider[]) ArrayUtils.add(providers, new DefaultSubmit()); + Set providers = ExtraDesignClassManager.getInstance().getArray(SubmitProvider.MARK_STRING); + providers.add(new DefaultSubmit()); for (SubmitProvider provider : providers) { customSubmitPanes.put(provider.keyForSubmit(), provider.appearanceForSubmit()); comboItemsMap.put(provider.keyForSubmit(), provider.dataForSubmit()); } - configTypes = new ArrayList(); + configTypes = new ArrayList<>(); for (Map.Entry entry : customSubmitPanes.entrySet()) { String key = entry.getKey(); configTypes.add(comboItemsMap.get(key)); diff --git a/designer_base/.classpath b/designer_base/.classpath index b7ba91ed1..cc6f823ac 100644 --- a/designer_base/.classpath +++ b/designer_base/.classpath @@ -1,33 +1,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/designer_base/src/com/fr/design/ExtraDesignClassManager.java b/designer_base/src/com/fr/design/ExtraDesignClassManager.java index b0a6bb2a7..72c902821 100644 --- a/designer_base/src/com/fr/design/ExtraDesignClassManager.java +++ b/designer_base/src/com/fr/design/ExtraDesignClassManager.java @@ -5,54 +5,33 @@ package com.fr.design; import com.fr.base.BaseUtils; -import com.fr.base.FRContext; import com.fr.design.data.datapane.TableDataNameObjectCreator; -import com.fr.design.data.tabledata.wrapper.TableDataFactory; import com.fr.design.fun.*; -import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.core.WidgetOptionFactory; -import com.fr.design.mainframe.App; -import com.fr.design.mainframe.DesignerFrame; -import com.fr.design.menu.ShortCut; import com.fr.design.widget.Appearance; -import com.fr.file.XMLFileManager; import com.fr.form.ui.Widget; -import com.fr.general.ComparatorUtils; import com.fr.general.FRLogger; import com.fr.general.GeneralContext; import com.fr.general.GeneralUtils; -import com.fr.plugin.PluginCollector; -import com.fr.plugin.PluginInvalidLevelException; -import com.fr.plugin.PluginLicenseManager; -import com.fr.plugin.PluginMessage; +import com.fr.general.IOUtils; +import com.fr.plugin.ExtraXMLFileManager; import com.fr.stable.EnvChangedListener; -import com.fr.stable.StringUtils; -import com.fr.stable.fun.Authorize; -import com.fr.stable.fun.Level; import com.fr.stable.plugin.ExtraDesignClassManagerProvider; import com.fr.stable.plugin.PluginSimplify; import com.fr.stable.xml.XMLPrintWriter; import com.fr.stable.xml.XMLableReader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @author : richie * @since : 8.0 * 用于设计器扩展的管理类 */ -public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesignClassManagerProvider { +public class ExtraDesignClassManager extends ExtraXMLFileManager implements ExtraDesignClassManagerProvider { private static final String XML_TAG = "ExtraDesignClassManager"; - private static final String TEMPLATE_TREE_TAG = "TemplateTreeShortCut"; - - private static ClassLoader loader = Thread.currentThread().getContextClassLoader(); private static ExtraDesignClassManager classManager; @@ -78,222 +57,11 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi classManager = null; } - private List reportTDCreators; - private List serverTDCreators; - - private List parameterWidgetOptions; - private Map, Class> parameterWidgetOptionsMap; - private List webWidgetOptions; - - private List formWidgetOptions; - private List formWidgetContainerOptions; - private Map, Class> formWidgetOptionsMap; - - private List cellWidgetOptions; - private Map, Appearance> cellWidgetOptionMap; - private List connectionCreators; - private Set previewProviders; - - private Set highlightProviders; - - private TableDataCreatorProvider tableDataCreatorProvider; - - private List menuHandlers; - - private UIFormulaProcessor uiFormulaProcessor; - - private List presentKindProviders; - - private List exportToolBarProviders; - - private Set templateTreeShortCutProviders; - - private List submitProviders; - - private List globalListenerProviders; - - private List javaScriptActionProviders; - - private TitlePlaceProcessor titlePlaceProcessor; - - private FormElementCaseEditorProcessor formElementCaseEditorProcessor; - - private IndentationUnitProcessor indentationUnitProcessor; - - private CellAttributeProvider cellAttributeProvider; - - private Set hyperlinkGroupProviders; - - private DesignerEnvProcessor envProcessor; - - private TableDataPaneProcessor tableDataPaneProcessor; - - private Set elementUIProviders; - - private Set widgetAttrProviders; - - private Set exportAttrTabProviders; - - private Set backgroundQuickUIProviders; - - private Set backgroundUIProviders; - - private Set verifyDefineProviders; - - public TableDataPaneProcessor getTableDataPaneProcessor() { - return tableDataPaneProcessor; - } - - public void setTableDataPaneProcessor(Level level, PluginSimplify simplify) { - validAPILevel(level, TableDataPaneProcessor.CURRENT_LEVEL, simplify.getPluginName()); - tableDataPaneProcessor = (TableDataPaneProcessor) level; - } - - public DesignerEnvProcessor getEnvProcessor() { - return envProcessor; - } - - public void setEnvProcessor(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, DesignerEnvProcessor.CURRENT_LEVEL, simplify.getPluginName()); - envProcessor = (DesignerEnvProcessor) level; - } - - public void addSupportDesignApps(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, App.CURRENT_LEVEL, simplify.getPluginName()); - App provider = (App) level; - DesignerFrame.registApp(provider); - } - - private void validAPILevel(Level level, int targetLevel, String pluginName) { - if (PluginCollector.getCollector().isError(level, targetLevel, pluginName)) { - throw new PluginInvalidLevelException(pluginName, level.currentAPILevel()); - } - } - - public HyperlinkProvider[] getHyperlinkProvider() { - if (hyperlinkGroupProviders == null) { - return new HyperlinkProvider[0]; - } - return hyperlinkGroupProviders.toArray(new HyperlinkProvider[hyperlinkGroupProviders.size()]); - } - - public void addHyperlinkProvider(Level level, PluginSimplify simplify) throws Exception { - if (hyperlinkGroupProviders == null) { - hyperlinkGroupProviders = new HashSet(); - } - validAPILevel(level, HyperlinkProvider.CURRENT_LEVEL, simplify.getPluginName()); - HyperlinkProvider provider = (HyperlinkProvider) level; - hyperlinkGroupProviders.add(provider); - } - - public GlobalListenerProvider[] getGlobalListenerProvider() { - if (globalListenerProviders == null) { - return new GlobalListenerProvider[0]; - } - return globalListenerProviders.toArray(new GlobalListenerProvider[globalListenerProviders.size()]); - } - /** - * 获取javaScriptPane - * - * @return javaScriptPane集合 - */ - public List getJavaScriptActionProvider() { - return javaScriptActionProviders; - } - /** - * 添加一个javaScriptPane - */ - public void addJavaScriptActionProvider(Level level, PluginSimplify simplify) throws Exception { - if (javaScriptActionProviders == null) { - javaScriptActionProviders = new ArrayList(); - } - validAPILevel(level, JavaScriptActionProvider.CURRENT_LEVEL, simplify.getPluginName()); - JavaScriptActionProvider provider = (JavaScriptActionProvider) level; - if (!javaScriptActionProviders.contains(provider)) { - javaScriptActionProviders.add(provider); - } - } - - /** - * 添加全局监听 - */ - public void addGlobalListenerProvider(Level level, PluginSimplify simplify) throws Exception { - if (globalListenerProviders == null) { - globalListenerProviders = new ArrayList(); - } - validAPILevel(level, GlobalListenerProvider.CURRENT_LEVEL, simplify.getPluginName()); - GlobalListenerProvider provider = (GlobalListenerProvider) level; - if (!globalListenerProviders.contains(provider)) { - globalListenerProviders.add(provider); - } - } - - public TableDataCreatorProvider getTableDataCreatorProvider() { - return tableDataCreatorProvider; - } - - public void setTableDataCreatorProvider(String className) { - if (StringUtils.isNotBlank(className)) { - try { - Class clazz = Class.forName(className); - tableDataCreatorProvider = (TableDataCreatorProvider) clazz.newInstance(); - } catch (Exception e) { - FRLogger.getLogger().error(e.getMessage(), e); - } - } - } - - public SubmitProvider[] getSubmitProviders() { - if (submitProviders == null) { - return new SubmitProvider[0]; - } - return submitProviders.toArray(new SubmitProvider[submitProviders.size()]); - } - - /** - * 添加提交接口 - */ - public void addSubmitProvider(Level level, PluginSimplify simplify) throws Exception { - if (submitProviders == null) { - submitProviders = new ArrayList(); - } - validAPILevel(level, SubmitProvider.CURRENT_LEVEL, simplify.getPluginName()); - SubmitProvider provider = (SubmitProvider) level; - if (!submitProviders.contains(provider)) { - submitProviders.add(provider); - } - } public TableDataNameObjectCreator[] getReportTableDataCreators() { - if (reportTDCreators == null) { - return new TableDataNameObjectCreator[0]; - } else { - return reportTDCreators.toArray(new TableDataNameObjectCreator[reportTDCreators.size()]); - } - } - - - /** - * 添加reportTDCreators - * - * @param className 类名 - */ - public void addTableDataNameObjectCreator(String className, PluginSimplify simplify) { - if (StringUtils.isNotBlank(className)) { - try { - if (reportTDCreators == null) { - reportTDCreators = new ArrayList(); - } - TableDataNameObjectCreator creator = createTableDataNameObjectCreator(className, simplify); - if (!reportTDCreators.contains(creator)) { - reportTDCreators.add(creator); - } - } catch (Exception e) { - PluginMessage.remindUpdate(className + e.getMessage()); - } - } + return getKindsOfTableDataCreators(TableDataDefineProvider.XML_TAG); } @@ -303,309 +71,141 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi * @return 类名 */ public TableDataNameObjectCreator[] getServerTableDataCreators() { - if (serverTDCreators == null) { - return new TableDataNameObjectCreator[0]; - } else { - return serverTDCreators.toArray(new TableDataNameObjectCreator[serverTDCreators.size()]); - } + return getKindsOfTableDataCreators(ServerTableDataDefineProvider.XML_TAG); } - /** - * 添加serverTDCreators - * - * @param className 类名 - */ - public void addServerTableDataNameObjectCreator(String className, PluginSimplify simplify) { - if (StringUtils.isNotBlank(className)) { - try { - if (serverTDCreators == null) { - serverTDCreators = new ArrayList(); - } - TableDataNameObjectCreator creator = createTableDataNameObjectCreator(className, simplify); - if (!serverTDCreators.contains(creator)) { - serverTDCreators.add(creator); - } - } catch (Exception e) { - PluginMessage.remindUpdate(className + e.getMessage()); - } + private TableDataNameObjectCreator[] getKindsOfTableDataCreators(String tag) { + Set set = getArray(tag); + if (set.isEmpty()) { + return new TableDataNameObjectCreator[0]; } + List creators = new ArrayList<>(); + for (TableDataDefineProvider provider : set) { + TableDataNameObjectCreator creator = new TableDataNameObjectCreator( + provider.nameForTableData(), + provider.prefixForTableData(), + provider.iconPathForTableData(), + provider.classForTableData(), + provider.classForInitTableData(), + provider.appearanceForTableData() + ); + creators.add(creator); + } + return creators.toArray(new TableDataNameObjectCreator[creators.size()]); } - private TableDataNameObjectCreator createTableDataNameObjectCreator(String className, PluginSimplify simplify) throws Exception { - Class clazz = loader.loadClass(className); - TableDataDefineProvider provider = (TableDataDefineProvider) clazz.newInstance(); - validAPILevel(provider, TableDataDefineProvider.CURRENT_LEVEL, simplify.getPluginName()); - TableDataNameObjectCreator creator = new TableDataNameObjectCreator( - provider.nameForTableData(), - provider.prefixForTableData(), - provider.iconPathForTableData(), - provider.classForTableData(), - provider.classForInitTableData(), - provider.appearanceForTableData() - ); - TableDataFactory.register(provider.classForTableData(), creator); - return creator; - } public Map, Class> getParameterWidgetOptionsMap() { - if (parameterWidgetOptionsMap == null) { - return new HashMap, Class>(); - } else { - return parameterWidgetOptionsMap; + Map, Class> map = new HashMap<>(); + Set set = getArray(ParameterWidgetOptionProvider.XML_TAG); + for (ParameterWidgetOptionProvider provider : set) { + map.put(provider.classForWidget(), provider.appearanceForWidget()); } + return map; } public WidgetOption[] getParameterWidgetOptions() { - if (parameterWidgetOptions == null) { + Set set = getArray(ParameterWidgetOptionProvider.XML_TAG); + if (set.isEmpty()) { return new WidgetOption[0]; - } else { - return parameterWidgetOptions.toArray(new WidgetOption[parameterWidgetOptions.size()]); - } - } - - /** - * 添加parameterWidgetOptionsMap - */ - public void addParameterWidgetOption(Level level, PluginSimplify simplify) throws Exception { - if (parameterWidgetOptions == null) { - parameterWidgetOptions = new ArrayList(); } - if (parameterWidgetOptionsMap == null) { - parameterWidgetOptionsMap = new HashMap, Class>(); + Set result = new HashSet<>(); + for (ParameterWidgetOptionProvider provider : set) { + WidgetOption option = WidgetOptionFactory.createByWidgetClass( + provider.nameForWidget(), + IOUtils.readIcon(provider.iconPathForWidget()), + provider.classForWidget() + ); + result.add(option); } - validAPILevel(level, ParameterWidgetOptionProvider.CURRENT_LEVEL, simplify.getPluginName()); - - ParameterWidgetOptionProvider provider = (ParameterWidgetOptionProvider) level; - WidgetOption option = WidgetOptionFactory.createByWidgetClass( - provider.nameForWidget(), - BaseUtils.readIcon(provider.iconPathForWidget()), - provider.classForWidget() - ); - parameterWidgetOptionsMap.put(provider.classForWidget(), provider.appearanceForWidget()); - parameterWidgetOptions.add(option); + return result.toArray(new WidgetOption[result.size()]); } - /** - * 添加 webWidgetOptions - * - * @return 返回 webWidgetOptions - */ - public void addWebWidgetOption(Level level, PluginSimplify simplify) throws Exception { - if (webWidgetOptions == null) { - webWidgetOptions = new ArrayList(); + + public WidgetOption[] getWebWidgetOptions() { + Set set = getArray(ToolbarItemProvider.XML_TAG); + if (set.isEmpty()) { + return new WidgetOption[0]; } - validAPILevel(level, ToolbarItemProvider.CURRENT_LEVEL, simplify.getPluginName()); - - ToolbarItemProvider provider = (ToolbarItemProvider) level; - WidgetOption option = WidgetOptionFactory.createByWidgetClass( - provider.nameForWidget(), - BaseUtils.readIcon(provider.iconPathForWidget()), - provider.classForWidget() - ); - if (!webWidgetOptions.contains(option)) { - webWidgetOptions.add(option); + List list = new ArrayList<>(); + for (ToolbarItemProvider provider : set) { + WidgetOption option = WidgetOptionFactory.createByWidgetClass( + provider.nameForWidget(), + IOUtils.readIcon(provider.iconPathForWidget()), + provider.classForWidget() + ); + list.add(option); } + return list.toArray(new WidgetOption[list.size()]); } + + public Map, Class> getFormWidgetOptionsMap() { - if (formWidgetOptionsMap == null) { - return new HashMap, Class>(); - } else { - return formWidgetOptionsMap; + Set set = getArray(FormWidgetOptionProvider.XML_TAG); + Map, Class> map = new HashMap<>(); + for (FormWidgetOptionProvider provider : set) { + map.put(provider.classForWidget(), provider.appearanceForWidget()); } + return map; } public WidgetOption[] getFormWidgetOptions() { - if (formWidgetOptions == null) { - return new WidgetOption[0]; - } else { - return formWidgetOptions.toArray(new WidgetOption[formWidgetOptions.size()]); - } - } - - public WidgetOption[] getWebWidgetOptions() { - if (webWidgetOptions == null) { - return new WidgetOption[0]; - } else { - return webWidgetOptions.toArray(new WidgetOption[webWidgetOptions.size()]); - } + return getFormUnits(false); } public WidgetOption[] getFormWidgetContainerOptions() { - if (formWidgetContainerOptions == null) { - return new WidgetOption[0]; - } else { - return formWidgetContainerOptions.toArray(new WidgetOption[formWidgetContainerOptions.size()]); - } - } - - /** - * 添加 formWidgetContainerOptions - */ - public void addFormWidgetOption(Level level, PluginSimplify simplify) throws Exception { - if (formWidgetOptions == null) { - formWidgetOptions = new ArrayList(); - } - if (formWidgetContainerOptions == null) { - formWidgetContainerOptions = new ArrayList(); - } - if (formWidgetOptionsMap == null) { - formWidgetOptionsMap = new HashMap, Class>(); - } - validAPILevel(level, FormWidgetOptionProvider.CURRENT_LEVEL, simplify.getPluginName()); - - FormWidgetOptionProvider provider = (FormWidgetOptionProvider) level; - WidgetOption option = WidgetOptionFactory.createByWidgetClass( - provider.nameForWidget(), - BaseUtils.readIcon(provider.iconPathForWidget()), - provider.classForWidget() - ); - formWidgetOptionsMap.put(provider.classForWidget(), provider.appearanceForWidget()); - if (provider.isContainer()) { - formWidgetContainerOptions.add(option); - } else { - formWidgetOptions.add(option); - } + return getFormUnits(true); } - public Map, Appearance> getCellWidgetOptionsMap() { - if (cellWidgetOptionMap == null) { - return new HashMap, Appearance>(); - } else { - return cellWidgetOptionMap; - } - } - - public WidgetOption[] getCellWidgetOptions() { - if (cellWidgetOptions == null) { + private WidgetOption[] getFormUnits(boolean isContainer) { + Set set = getArray(FormWidgetOptionProvider.XML_TAG); + if (set.isEmpty()) { return new WidgetOption[0]; - } else { - return cellWidgetOptions.toArray(new WidgetOption[cellWidgetOptions.size()]); - } - } - - /** - * 添加cellWidgetOptionMap - */ - public void addCellWidgetOption(Level level, PluginSimplify simplify) throws Exception { - if (cellWidgetOptions == null) { - cellWidgetOptions = new ArrayList(); } - if (cellWidgetOptionMap == null) { - cellWidgetOptionMap = new HashMap, Appearance>(); - } - validAPILevel(level, CellWidgetOptionProvider.CURRENT_LEVEL, simplify.getPluginName()); - - CellWidgetOptionProvider provider = (CellWidgetOptionProvider) level; - WidgetOption option = WidgetOptionFactory.createByWidgetClass( - provider.nameForWidget(), - BaseUtils.readIcon(provider.iconPathForWidget()), - provider.classForWidget() - ); - if (cellWidgetOptions.contains(option)) { - return; - } - cellWidgetOptionMap.put(provider.classForWidget(), new Appearance(provider.appearanceForWidget(), Appearance.P_MARK + cellWidgetOptionMap.size())); - cellWidgetOptions.add(option); - } - - - /** - * 添加 connectionCreators - * - * @param className 类名 - */ - public void addConnection(String className, PluginSimplify simplify) { - if (StringUtils.isNotBlank(className)) { - try { - Class clazz = Class.forName(className); - if (connectionCreators == null) { - connectionCreators = new ArrayList(); - } - ConnectionProvider provider = (ConnectionProvider) clazz.newInstance(); - validAPILevel(provider, ConnectionProvider.CURRENT_LEVEL, simplify.getPluginName()); - NameObjectCreator creator = new NameObjectCreator( - provider.nameForConnection(), - provider.iconPathForConnection(), - provider.classForConnection(), - provider.appearanceForConnection() + Set result = new HashSet<>(); + for (FormWidgetOptionProvider provider : set) { + if (provider.isContainer() == isContainer) { + WidgetOption option = WidgetOptionFactory.createByWidgetClass( + provider.nameForWidget(), + BaseUtils.readIcon(provider.iconPathForWidget()), + provider.classForWidget() ); - if (!connectionCreators.contains(creator)) { - connectionCreators.add(creator); - } - } catch (Exception e) { - PluginMessage.remindUpdate(className + e.getMessage()); + result.add(option); } } + return result.toArray(new WidgetOption[result.size()]); } - public NameObjectCreator[] getConnections() { - if (connectionCreators == null) { - return new NameObjectCreator[0]; - } else { - return connectionCreators.toArray(new NameObjectCreator[connectionCreators.size()]); - } - } - public PreviewProvider[] getPreviewProviders() { - if (previewProviders == null) { - return new PreviewProvider[0]; - } - return previewProviders.toArray(new PreviewProvider[previewProviders.size()]); - } - /** - * 添加previewProviders - */ - public void addPreviewProvider(Level level, PluginSimplify simplify) throws Exception { - if (previewProviders == null) { - previewProviders = new HashSet(); + public WidgetOption[] getCellWidgetOptions() { + Set set = getArray(CellWidgetOptionProvider.XML_TAG); + if (set.isEmpty()) { + return new WidgetOption[0]; } - validAPILevel(level, PreviewProvider.CURRENT_LEVEL, simplify.getPluginName()); - - PreviewProvider provider = (PreviewProvider) level; - if (!previewProviders.contains(provider)) { - previewProviders.add(provider); + Set result = new HashSet<>(); + for (CellWidgetOptionProvider provider : set) { + WidgetOption option = WidgetOptionFactory.createByWidgetClass( + provider.nameForWidget(), + IOUtils.readIcon(provider.iconPathForWidget()), + provider.classForWidget() + ); + result.add(option); } - } + return result.toArray(new WidgetOption[result.size()]); - public HighlightProvider[] getHighlightProviders() { - if (highlightProviders == null) { - return new HighlightProvider[0]; - } - return highlightProviders.toArray(new HighlightProvider[highlightProviders.size()]); } - /** - * 添加 highlightProviders - */ - public void addTemplateTreeShortCutProvider(Level level, PluginSimplify simplify) throws Exception { - if (templateTreeShortCutProviders == null) { - templateTreeShortCutProviders = new HashSet(); + public Map, Appearance> getCellWidgetOptionsMap() { + Set set = getArray(CellWidgetOptionProvider.XML_TAG); + Map, Appearance> map = new HashMap<>(); + for (CellWidgetOptionProvider provider : set) { + map.put(provider.classForWidget(), new Appearance(provider.appearanceForWidget(), Appearance.P_MARK + map.size())); } - validAPILevel(level, ShortCut.CURRENT_LEVEL, simplify.getPluginName()); - ShortCut provider = (ShortCut) level; - templateTreeShortCutProviders.add(provider); + return map; } - public ShortCut[] getTemplateTreeShortCutProviders() { - if (templateTreeShortCutProviders == null) { - return new ShortCut[0]; - } - return templateTreeShortCutProviders.toArray(new ShortCut[templateTreeShortCutProviders.size()]); - } - - /** - * 添加 highlightProviders - */ - public void addConditionProvider(Level level, PluginSimplify simplify) throws Exception { - if (highlightProviders == null) { - highlightProviders = new HashSet(); - } - validAPILevel(level, HighlightProvider.CURRENT_LEVEL, simplify.getPluginName()); - HighlightProvider provider = (HighlightProvider) level; - highlightProviders.add(provider); - } public Feedback getFeedback() { try { @@ -619,208 +219,6 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi return Feedback.EMPTY; } - public MenuHandler[] getMenuHandlers(String category) { - if (menuHandlers == null) { - return new MenuHandler[0]; - } - List handlers = new ArrayList(); - for (MenuHandler handler : menuHandlers) { - if (ComparatorUtils.equals(category, handler.category())) { - handlers.add(handler); - } - } - return handlers.toArray(new MenuHandler[handlers.size()]); - } - - /** - * 添加menuHandlers - */ - public void addMenuHandler(Level level, PluginSimplify simplify) throws Exception { - if (menuHandlers == null) { - menuHandlers = new ArrayList(); - } - validAPILevel(level, MenuHandler.CURRENT_LEVEL, simplify.getPluginName()); - MenuHandler handler = (MenuHandler) level; - if (!menuHandlers.contains(handler)) { - menuHandlers.add(handler); - } - } - - public UIFormulaProcessor getUIFormulaProcessor() { - return uiFormulaProcessor; - } - - public void setUIFormulaProcessor(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, UIFormulaProcessor.CURRENT_LEVEL, simplify.getPluginName()); - uiFormulaProcessor = (UIFormulaProcessor) level; - } - - public PresentKindProvider[] getPresentKindProviders() { - if (presentKindProviders == null) { - return new PresentKindProvider[0]; - } - return presentKindProviders.toArray(new PresentKindProvider[presentKindProviders.size()]); - } - - /** - * 添加presentKindProviders - */ - public void addPresentKindProvider(Level level, PluginSimplify simplify) throws Exception { - if (presentKindProviders == null) { - presentKindProviders = new ArrayList(); - } - validAPILevel(level, PresentKindProvider.CURRENT_LEVEL, simplify.getPluginName()); - PresentKindProvider provider = (PresentKindProvider) level; - presentKindProviders.add(provider); - } - - public ExportToolBarProvider[] getExportToolBarProviders() { - if (exportToolBarProviders == null) { - return new ExportToolBarProvider[0]; - } - return exportToolBarProviders.toArray(new ExportToolBarProvider[exportToolBarProviders.size()]); - } - - /** - * 添加exportToolBarProviders - */ - public void addExportToolBarProvider(Level level, PluginSimplify simplify) throws Exception { - if (exportToolBarProviders == null) { - exportToolBarProviders = new ArrayList(); - } - validAPILevel(level, ExportToolBarProvider.CURRENT_LEVEL, simplify.getPluginName()); - ExportToolBarProvider provider = (ExportToolBarProvider) level; - if (!exportToolBarProviders.contains(provider)) { - exportToolBarProviders.add(provider); - } - } - - public TitlePlaceProcessor getTitlePlaceProcessor() { - return titlePlaceProcessor; - } - - public void setTitlePlaceProcessor(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, TitlePlaceProcessor.CURRENT_LEVEL, simplify.getPluginName()); - titlePlaceProcessor = (TitlePlaceProcessor) level; - } - - public FormElementCaseEditorProcessor getPropertyTableEditor() { - return formElementCaseEditorProcessor; - } - - public void setPropertyTableEditor(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, FormElementCaseEditorProcessor.CURRENT_LEVEL, simplify.getPluginName()); - formElementCaseEditorProcessor = (FormElementCaseEditorProcessor) level; - } - - public IndentationUnitProcessor getIndentationUnitEditor() { - return indentationUnitProcessor; - } - - public void setIndentationUnitEditor(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, IndentationUnitProcessor.CURRENT_LEVEL, simplify.getPluginName()); - indentationUnitProcessor = (IndentationUnitProcessor) level; - } - - public CellAttributeProvider getCelllAttributeProvider() { - return cellAttributeProvider; - } - - public void setCellAttributeProvider(Level level, PluginSimplify simplify) throws Exception { - validAPILevel(level, CellAttributeProvider.CURRENT_LEVEL, simplify.getPluginName()); - cellAttributeProvider = (CellAttributeProvider) level; - } - - public ElementUIProvider[] getElementUIProviders() { - if (elementUIProviders == null) { - return new ElementUIProvider[0]; - } - return elementUIProviders.toArray(new ElementUIProvider[elementUIProviders.size()]); - } - - public void addElementUIProvider(Level level, PluginSimplify simplify) throws Exception { - if (elementUIProviders == null) { - elementUIProviders = new HashSet(); - } - validAPILevel(level, ElementUIProvider.CURRENT_LEVEL, simplify.getPluginName()); - elementUIProviders.add((ElementUIProvider) level); - } - - public WidgetPropertyUIProvider[] getWidgetAttrProviders() { - if (widgetAttrProviders == null) { - return new WidgetPropertyUIProvider[0]; - } - return widgetAttrProviders.toArray(new WidgetPropertyUIProvider[widgetAttrProviders.size()]); - } - - public void addWidgetAttrProvider(Level level, PluginSimplify simplify) throws Exception { - if (widgetAttrProviders == null) { - widgetAttrProviders = new HashSet(); - } - validAPILevel(level, WidgetPropertyUIProvider.CURRENT_LEVEL, simplify.getPluginName()); - widgetAttrProviders.add((WidgetPropertyUIProvider) level); - } - - public ExportAttrTabProvider[] getExportAttrTabProviders() { - if (exportAttrTabProviders == null) { - return new ExportAttrTabProvider[0]; - } - return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]); - } - - public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception { - if (exportAttrTabProviders == null) { - exportAttrTabProviders = new HashSet(); - } - validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName()); - exportAttrTabProviders.add((ExportAttrTabProvider) level); - } - - public BackgroundQuickUIProvider[] getBackgroundQuickUIProviders() { - if (backgroundQuickUIProviders == null) { - return new BackgroundQuickUIProvider[0]; - } - return backgroundQuickUIProviders.toArray(new BackgroundQuickUIProvider[backgroundQuickUIProviders.size()]); - } - - public void addBackgroundQuickUIProvider(Level level, PluginSimplify simplify) throws Exception { - if (backgroundQuickUIProviders == null) { - backgroundQuickUIProviders = new HashSet<>(); - } - validAPILevel(level, BackgroundQuickUIProvider.CURRENT_LEVEL, simplify.getPluginName()); - backgroundQuickUIProviders.add((BackgroundQuickUIProvider) level); - } - - public BackgroundUIProvider[] getBackgroundUIProviders() { - if (backgroundUIProviders == null) { - return new BackgroundUIProvider[0]; - } - return backgroundUIProviders.toArray(new BackgroundUIProvider[backgroundUIProviders.size()]); - } - - public void addBackgroundUIProvider(Level level, PluginSimplify simplify) throws Exception { - if (backgroundUIProviders == null) { - backgroundUIProviders = new HashSet<>(); - } - validAPILevel(level, BackgroundUIProvider.CURRENT_LEVEL, simplify.getPluginName()); - backgroundUIProviders.add((BackgroundUIProvider) level); - } - - public VerifyDefineProvider[] getVerifyDefineProviders() { - if (verifyDefineProviders == null) { - return new VerifyDefineProvider[0]; - } - return verifyDefineProviders.toArray(new VerifyDefineProvider[verifyDefineProviders.size()]); - } - - private void addVerifyDefineProvider(Level level, PluginSimplify simplify) throws Exception { - if (verifyDefineProviders == null) { - verifyDefineProviders = new HashSet<>(); - } - validAPILevel(level, VerifyDefineProvider.CURRENT_LEVEL, simplify.getPluginName()); - verifyDefineProviders.add((VerifyDefineProvider) level); - } - /** * 文件名 * @@ -840,126 +238,6 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi readXML(reader, null, PluginSimplify.NULL); } - /** - * 读xml - * - * @param reader xml对象 - * @param extraDesignInterfaceList 接口列表 - */ - @Override - public void readXML(XMLableReader reader, List extraDesignInterfaceList, PluginSimplify simplify) { - if (reader.isChildNode()) { - String tagName = reader.getTagName(); - if (extraDesignInterfaceList != null) { - extraDesignInterfaceList.add(tagName); - } - String className = reader.getAttrAsString("class", ""); - if (StringUtils.isEmpty(className)) { - return; - } - readLevelTag(tagName, className, simplify); - } - } - - private void readLevelTag(String tagName, String className, PluginSimplify simplify) { - try { - //实现了Level接口的, 可以直接newInstance子类的 - Class clazz = loader.loadClass(className); - Authorize authorize = clazz.getAnnotation(Authorize.class); - if (authorize != null) { - PluginLicenseManager.getInstance().registerPaid(authorize, simplify); - } - - Level impl = (Level) clazz.newInstance(); - //控件 - readWidgetRelated(tagName, impl, simplify); - //数据集, 数据连接 - readTableDataRelated(tagName, className, simplify); - // 样式相关的 - readStyleRelated(tagName, impl, simplify); - if (tagName.equals(ParameterWidgetOptionProvider.XML_TAG)) { - addParameterWidgetOption(impl, simplify); - } else if (tagName.equals(PreviewProvider.MARK_STRING)) { - addPreviewProvider(impl, simplify); - } else if (tagName.equals(HighlightProvider.MARK_STRING)) { - addConditionProvider(impl, simplify); - } else if (tagName.equals(MenuHandler.MARK_STRING)) { - addMenuHandler(impl, simplify); - } else if (tagName.equals(UIFormulaProcessor.MARK_STRING)) { - setUIFormulaProcessor(impl, simplify); - } else if (tagName.equals(PresentKindProvider.MARK_STRING)) { - addPresentKindProvider(impl, simplify); - } else if (tagName.equals(TEMPLATE_TREE_TAG)) { - addTemplateTreeShortCutProvider(impl, simplify); - } else if (tagName.equals(SubmitProvider.MARK_STRING)) { - addSubmitProvider(impl, simplify); - } else if (tagName.equals(GlobalListenerProvider.XML_TAG)) { - addGlobalListenerProvider(impl, simplify); - } else if (tagName.equals(JavaScriptActionProvider.XML_TAG)) { - addJavaScriptActionProvider(impl, simplify); - } else if (tagName.equals(TitlePlaceProcessor.MARK_STRING)) { - setTitlePlaceProcessor(impl, simplify); - } else if (tagName.equals(FormElementCaseEditorProcessor.MARK_STRING)) { - setPropertyTableEditor(impl, simplify); - } else if (tagName.equals(IndentationUnitProcessor.MARK_STRING)) { - setIndentationUnitEditor(impl, simplify); - } else if (tagName.equals(CellAttributeProvider.MARK_STRING)) { - setCellAttributeProvider(impl, simplify); - } else if (tagName.equals(HyperlinkProvider.XML_TAG)) { - addHyperlinkProvider(impl, simplify); - } else if (tagName.equals(App.MARK_STRING)) { - addSupportDesignApps(impl, simplify); - } else if (tagName.equals(DesignerEnvProcessor.XML_TAG)) { - setEnvProcessor(impl, simplify); - } else if (tagName.equals(TableDataPaneProcessor.XML_TAG)) { - setTableDataPaneProcessor(impl, simplify); - } else if (tagName.equals(ElementUIProvider.MARK_STRING)) { - addElementUIProvider(impl, simplify); - } else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) { - addWidgetAttrProvider(impl, simplify); - } else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) { - addExportAttrTabProvider(impl, simplify); - } else if (tagName.equals(VerifyDefineProvider.MARK_STRING)) { - addVerifyDefineProvider(impl, simplify); - } - } catch (PluginInvalidLevelException e) { - PluginMessage.remindUpdate(e.getMessage()); - } catch (Exception e) { - FRContext.getLogger().error(e.getMessage()); - } - } - - private void readTableDataRelated(String tagName, String className, PluginSimplify simplify) { - if (tagName.equals(TableDataCreatorProvider.XML_TAG)) { - setTableDataCreatorProvider(className); - } else if (tagName.equals(TableDataDefineProvider.XML_TAG)) { - addTableDataNameObjectCreator(className, simplify); - } else if (tagName.equals(ServerTableDataDefineProvider.XML_TAG)) { - addServerTableDataNameObjectCreator(className, simplify); - } else if (tagName.equals(ConnectionProvider.XML_TAG)) { - addConnection(className, simplify); - } - } - - private void readWidgetRelated(String tagName, Level impl, PluginSimplify simplify) throws Exception { - if (tagName.equals(FormWidgetOptionProvider.XML_TAG)) { - addFormWidgetOption(impl, simplify); - } else if (tagName.equals(ToolbarItemProvider.XML_TAG)) { - addWebWidgetOption(impl, simplify); - } else if (tagName.equals(ExportToolBarProvider.XML_TAG)) { - addExportToolBarProvider(impl, simplify); - } else if (tagName.equals(CellWidgetOptionProvider.XML_TAG)) { - addCellWidgetOption(impl, simplify); - } - } - - private void readStyleRelated(String tagName, Level impl, PluginSimplify simplify) throws Exception { - if (tagName.equals(BackgroundQuickUIProvider.MARK_STRING)) { - addBackgroundQuickUIProvider(impl, simplify); - } else if (tagName.equals(BackgroundUIProvider.MARK_STRING)) { - addBackgroundUIProvider(impl, simplify); - } - } /** * 写xml diff --git a/designer_base/src/com/fr/design/actions/community/BBSAction.java b/designer_base/src/com/fr/design/actions/community/BBSAction.java new file mode 100644 index 000000000..09add551d --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/BBSAction.java @@ -0,0 +1,74 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class BBSAction extends UpdateAction +{ + + + public BBSAction() + { + this.setMenuKeySet(BBS); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bbs.png")); + + } + + /** + * 动作 + * @param e 事件 + */ + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = SiteCenter.getInstance().acquireUrlByKind("bbs"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + } + public static final MenuKeySet BBS = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'B'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_BBS"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/BugAction.java b/designer_base/src/com/fr/design/actions/community/BugAction.java new file mode 100644 index 000000000..497a12caa --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/BugAction.java @@ -0,0 +1,72 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class BugAction extends UpdateAction +{ + + public BugAction() + { this.setMenuKeySet(BUG); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/bug.png")); + +} + +@Override +public void actionPerformed(ActionEvent arg0) +{ + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.bugs"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + +} + public static final MenuKeySet BUG = new MenuKeySet() { + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_BUG"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + + @Override + public char getMnemonic() + { + + return 'U'; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/NeedAction.java b/designer_base/src/com/fr/design/actions/community/NeedAction.java new file mode 100644 index 000000000..bf9b3a509 --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/NeedAction.java @@ -0,0 +1,70 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class NeedAction extends UpdateAction +{ + + public NeedAction() + { + this.setMenuKeySet(NEED); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/need.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.needs"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + + } + public static final MenuKeySet NEED = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'N'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_NEED"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/QuestionAction.java b/designer_base/src/com/fr/design/actions/community/QuestionAction.java new file mode 100644 index 000000000..7e8ced10b --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/QuestionAction.java @@ -0,0 +1,69 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class QuestionAction extends UpdateAction +{ + + public QuestionAction() + { this.setMenuKeySet(QUESTIONS); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/questions.png")); + +} + +@Override +public void actionPerformed(ActionEvent arg0) +{ + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.questions"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + +} + public static final MenuKeySet QUESTIONS = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'Q'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_QUESTIONS"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/SignAction.java b/designer_base/src/com/fr/design/actions/community/SignAction.java new file mode 100644 index 000000000..30170bc86 --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/SignAction.java @@ -0,0 +1,70 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class SignAction extends UpdateAction +{ + + public SignAction() + { + this.setMenuKeySet(SIGN); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/signature.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.aut"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + + } + public static final MenuKeySet SIGN = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'S'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_SIGN"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/UpAction.java b/designer_base/src/com/fr/design/actions/community/UpAction.java new file mode 100644 index 000000000..999b7e9e8 --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/UpAction.java @@ -0,0 +1,70 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class UpAction extends UpdateAction +{ + + public UpAction() + { + this.setMenuKeySet(UPDATE); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/update.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.update"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + + } + public static final MenuKeySet UPDATE = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'U'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_UPDATE"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/community/VideoAction.java b/designer_base/src/com/fr/design/actions/community/VideoAction.java new file mode 100644 index 000000000..86b411ace --- /dev/null +++ b/designer_base/src/com/fr/design/actions/community/VideoAction.java @@ -0,0 +1,70 @@ +package com.fr.design.actions.community; + +import java.awt.Desktop; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; + +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.actions.UpdateAction; +import com.fr.design.menu.MenuKeySet; +import com.fr.general.Inter; +import com.fr.general.SiteCenter; +import com.fr.stable.StringUtils; + +public class VideoAction extends UpdateAction +{ + + public VideoAction() + { + this.setMenuKeySet(VIDEO); + this.setName(getMenuKeySet().getMenuName()); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/video.png")); + + } + + @Override + public void actionPerformed(ActionEvent arg0) + { + String url = SiteCenter.getInstance().acquireUrlByKind("bbs.video"); + if (StringUtils.isEmpty(url)) { + FRContext.getLogger().info("The URL is empty!"); + return; + } + try { + Desktop.getDesktop().browse(new URI(url)); + } catch (IOException exp) { + JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser")); + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (URISyntaxException exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + } catch (Exception exp) { + FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp); + FRContext.getLogger().error("Can not open the browser for URL: " + url); + } + + } + public static final MenuKeySet VIDEO = new MenuKeySet() { + @Override + public char getMnemonic() { + return 'V'; + } + + @Override + public String getMenuName() { + return Inter.getLocText("FR-Designer_COMMUNITY_VIDEO"); + } + + @Override + public KeyStroke getKeyStroke() { + return null; + } + }; + +} diff --git a/designer_base/src/com/fr/design/actions/help/TutorialAction.java b/designer_base/src/com/fr/design/actions/help/TutorialAction.java index b2f83e494..b23835945 100644 --- a/designer_base/src/com/fr/design/actions/help/TutorialAction.java +++ b/designer_base/src/com/fr/design/actions/help/TutorialAction.java @@ -17,6 +17,7 @@ import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; +import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -28,7 +29,7 @@ public class TutorialAction extends UpdateAction { this.setMenuKeySet(HELP_TUTORIAL); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_help/help.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/help.png")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } @@ -60,10 +61,10 @@ public class TutorialAction extends UpdateAction { public void actionPerformed(ActionEvent evt) { Locale locale = FRContext.getLocale(); if (ComparatorUtils.equals(locale, Locale.CHINA) || ComparatorUtils.equals(locale, Locale.TAIWAN)){ - HttpClient client = new HttpClient(ProductConstants.HELP_URL); + HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("help")); if(client.getResponseCode() != -1) { try { - Desktop.getDesktop().browse(new URI(ProductConstants.HELP_URL)); + Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("help"))); return; } catch (Exception e) { //出了异常的话, 依然打开本地教程 @@ -86,7 +87,7 @@ public class TutorialAction extends UpdateAction { @Override public String getMenuName() { - return Inter.getLocText("M_Help-Tutorial"); + return Inter.getLocText("FR-Designer_COMMUNITY_HELP"); } @Override diff --git a/designer_base/src/com/fr/design/condition/LiteConditionPane.java b/designer_base/src/com/fr/design/condition/LiteConditionPane.java index 5c5eea0ff..a32a11239 100644 --- a/designer_base/src/com/fr/design/condition/LiteConditionPane.java +++ b/designer_base/src/com/fr/design/condition/LiteConditionPane.java @@ -517,6 +517,8 @@ public abstract class LiteConditionPane extends BasicBeanPa // formulaPane JPanel formulaPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + // 95106 公式区域限定宽高, 显示两行即可, 在新窗口编辑. + formulaPane.setPreferredSize(new Dimension(450, 40)); formulaConditionPane.add(formulaPane, BorderLayout.CENTER); formulaPane.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 2)); formulaPane.add(GUICoreUtils.createBorderPane(new UILabel(Inter.getLocText("FR-Designer_LiteCondition_Formula") + "="), BorderLayout.NORTH), BorderLayout.WEST); diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer_base/src/com/fr/design/data/datapane/TableDataCreatorProducer.java index 5f60be6b9..5c98a0c9d 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -100,10 +100,6 @@ public class TableDataCreatorProducer { TableDataNameObjectCreator[] creators = new TableDataNameObjectCreator[]{dataBase, ds_Class, table, fileTable, storeProcedure, multiTable, treeTable}; - TableDataCreatorProvider creatorProvider = ExtraDesignClassManager.getInstance().getTableDataCreatorProvider(); - if (creatorProvider != null) { - return creatorProvider.produceServerTableDataCreator(creators); - } return merge(creators, ExtraDesignClassManager.getInstance().getServerTableDataCreators()); } diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java index fcaa7c6e7..162957ebf 100644 --- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java @@ -47,7 +47,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { public synchronized static BasicTableDataTreePane getInstance(DesignModelAdapter tc) { - TableDataPaneProcessor treePaneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor(); + TableDataPaneProcessor treePaneProcessor = ExtraDesignClassManager.getInstance().getSingle(TableDataPaneProcessor.XML_TAG); if (treePaneProcessor != null) { return treePaneProcessor.createTableDataTreePane(tc); } diff --git a/designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java index 725a65ad3..8d0f2aa39 100644 --- a/designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer_base/src/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -4,6 +4,7 @@ import com.fr.data.impl.Connection; import com.fr.data.impl.JDBCDatabaseConnection; import com.fr.data.impl.JNDIDatabaseConnection; import com.fr.design.ExtraDesignClassManager; +import com.fr.design.fun.ConnectionProvider; import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; @@ -107,9 +108,18 @@ public class ConnectionListPane extends JListControlPane { JNDIDatabaseConnection.class, DatabaseConnectionPane.JNDI.class )}; - NameObjectCreator[] pluginCreators = ExtraDesignClassManager.getInstance().getConnections(); + Set pluginCreators = ExtraDesignClassManager.getInstance().getArray(ConnectionProvider.XML_TAG); + for (ConnectionProvider provider : pluginCreators) { + NameObjectCreator creator = new NameObjectCreator( + provider.nameForConnection(), + provider.iconPathForConnection(), + provider.classForConnection(), + provider.appearanceForConnection() + ); + creators = ArrayUtils.add(creators, creator); + } - return (NameableCreator[]) ArrayUtils.addAll(creators, pluginCreators); + return creators; } @Override diff --git a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java index daf2ed1f5..3251f738a 100644 --- a/designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java +++ b/designer_base/src/com/fr/design/data/tabledata/tabledatapane/TableDataManagerPane.java @@ -40,7 +40,7 @@ public class TableDataManagerPane extends LoadingBasicPane { this.tableDataTextField = new UITextField(); tableDataPathPane.add(tableDataTextField, BorderLayout.CENTER); this.tableDataTextField.setEditable(false); - TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor(); + TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getSingle(TableDataPaneProcessor.XML_TAG); TableDataPaneController pane = null; if (paneProcessor != null) { pane = paneProcessor.createServerTableDataPane(DesignModelAdapter.getCurrentModelAdapter() diff --git a/designer_base/src/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer_base/src/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index f3d2991c5..bc414d1a9 100644 --- a/designer_base/src/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/designer_base/src/com/fr/design/data/tabledata/wrapper/TableDataFactory.java @@ -59,10 +59,6 @@ public abstract class TableDataFactory { } private static TableDataNameObjectCreator getTableDataNameObjectCreator(TableData tabledata) { - TableDataCreatorProvider creatorProvider = ExtraDesignClassManager.getInstance().getTableDataCreatorProvider(); - if (creatorProvider != null) { - map.putAll(creatorProvider.registerMap()); - } TableDataNameObjectCreator tableDataNameObjectCreator = map.get(tabledata.getClass().getName()); if (tableDataNameObjectCreator == null) { tableDataNameObjectCreator = map.get(tabledata.getClass().getSuperclass().getName()); diff --git a/designer_base/src/com/fr/design/dialog/BasicScrollPane.java b/designer_base/src/com/fr/design/dialog/BasicScrollPane.java index d4fabca8b..bdb5a012f 100644 --- a/designer_base/src/com/fr/design/dialog/BasicScrollPane.java +++ b/designer_base/src/com/fr/design/dialog/BasicScrollPane.java @@ -154,8 +154,8 @@ public abstract class BasicScrollPane extends BasicBeanPane{ scrollBar.setVisible(false); } else { boolean show = isShowScrollBar(); - scrollBar.setEnabled(show); - scrollBar.setVisible(show); + scrollBar.setEnabled(show); + scrollBar.setVisible(show); } maxheight = getHeight() - DET_HEIGHT; if ((MAXVALUE - scrollBar.getVisibleAmount()) == 0) { @@ -180,7 +180,8 @@ public abstract class BasicScrollPane extends BasicBeanPane{ } leftcontentPane.validate(); } - } + + } protected boolean isShowScrollBar() { return true; diff --git a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java index 62f829aaf..0f1c50a5f 100644 --- a/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer_base/src/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -13,7 +13,6 @@ import com.fr.stable.StringUtils; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import java.util.*; import java.util.List; import java.util.regex.Pattern; diff --git a/designer_base/src/com/fr/design/extra/PluginWebBridge.java b/designer_base/src/com/fr/design/extra/PluginWebBridge.java index 07d37b86a..156627b6b 100644 --- a/designer_base/src/com/fr/design/extra/PluginWebBridge.java +++ b/designer_base/src/com/fr/design/extra/PluginWebBridge.java @@ -36,8 +36,6 @@ public class PluginWebBridge { private UIDialog uiDialog; - public static final String PLUGIN_SHOP = SiteCenter.getInstance().acquireUrlByKind("plugin.plist"); - public static PluginWebBridge getHelper() { if (helper != null) { return helper; diff --git a/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java index 030b22f21..35fde2e13 100644 --- a/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java +++ b/designer_base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java @@ -1,8 +1,8 @@ package com.fr.design.extra.exe; -import com.fr.design.extra.PluginWebBridge; import com.fr.design.extra.Process; import com.fr.general.FRLogger; +import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; import com.fr.stable.StringUtils; @@ -38,7 +38,7 @@ public class GetPluginFromStoreExecutor implements Executor { @Override public void run(Process process) { - StringBuilder url = new StringBuilder(PluginWebBridge.PLUGIN_SHOP); + StringBuilder url = new StringBuilder(SiteCenter.getInstance().acquireUrlByKind("plugin.plist")); if (StringUtils.isNotBlank(category)) { url.append("&cid=").append(category.split("-")[1]); } diff --git a/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java index 8120049e1..c510a67cc 100644 --- a/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java +++ b/designer_base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java @@ -3,8 +3,11 @@ package com.fr.design.extra.exe; import com.fr.design.extra.PluginsReaderFromStore; import com.fr.design.extra.Process; import com.fr.general.FRLogger; + import com.fr.plugin.Plugin; import com.fr.stable.StringUtils; +import org.json.JSONArray; +import org.json.JSONObject; /** * Created by vito on 16/4/19. @@ -31,15 +34,13 @@ public class ReadUpdateOnlineExecutor implements Executor { public void run(Process process) { try { plugins = PluginsReaderFromStore.readPluginsForUpdate(); - StringBuilder sb = new StringBuilder(); - if (plugins != null) { - sb.append("["); - for (Plugin plugin : plugins) { - sb.append("{pluginid:'").append(plugin.getId()).append("'}"); - } - sb.append("]"); + JSONArray jsonArray = new JSONArray(); + for (Plugin plugin : plugins) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("pluginid", plugin.getId()); + jsonArray.put(jsonObject); } - result = sb.toString(); + result = jsonArray.toString(); } catch (Exception e) { FRLogger.getLogger().error(e.getMessage()); } diff --git a/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java b/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java index a94fcc5f2..089173c98 100644 --- a/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java +++ b/designer_base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java @@ -1,8 +1,8 @@ package com.fr.design.extra.exe; -import com.fr.design.extra.PluginWebBridge; import com.fr.design.extra.Process; import com.fr.general.FRLogger; +import com.fr.general.SiteCenter; import com.fr.general.http.HttpClient; import com.fr.stable.StringUtils; @@ -34,7 +34,7 @@ public class SearchOnlineExecutor implements Executor { @Override public void run(Process process) { try { - HttpClient httpClient = new HttpClient(PluginWebBridge.PLUGIN_SHOP + "&keyword=" + keyword); + HttpClient httpClient = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("plugin.plist") + "&keyword=" + keyword); result = httpClient.getResponseText(); } catch (Exception e) { diff --git a/designer_base/src/com/fr/design/formula/FormulaFactory.java b/designer_base/src/com/fr/design/formula/FormulaFactory.java index e0c19555a..4e1026584 100644 --- a/designer_base/src/com/fr/design/formula/FormulaFactory.java +++ b/designer_base/src/com/fr/design/formula/FormulaFactory.java @@ -20,7 +20,7 @@ public class FormulaFactory { } private static UIFormulaProcessor get() { - UIFormulaProcessor processor = ExtraDesignClassManager.getInstance().getUIFormulaProcessor(); + UIFormulaProcessor processor = ExtraDesignClassManager.getInstance().getSingle(UIFormulaProcessor.MARK_STRING); if (processor == null) { processor = new DefaultUIFormulaProcessor(); } diff --git a/designer_base/src/com/fr/design/formula/FormulaPane.java b/designer_base/src/com/fr/design/formula/FormulaPane.java index 34a523697..d7e3f21be 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPane.java +++ b/designer_base/src/com/fr/design/formula/FormulaPane.java @@ -166,6 +166,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{ checkValidButton.addActionListener(checkValidActionListener); JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + checkBoxPane.setPreferredSize(new Dimension(450, 30)); checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST); checkBoxandbuttonPane.add(checkValidButton, BorderLayout.EAST); diff --git a/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java b/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java index cd55c06bd..05530d630 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java +++ b/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java @@ -25,7 +25,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { @Override protected void extendCheckBoxPane(JPanel checkBoxPane) { // peter:添加公式是否兼容Excel的属性 - reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FormulaD-Reserve_when_export-edit_result")); + reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FR-Designer_Export-Save-Formula")); reserveCheckBox4Result.setSelected(false); reserveCheckBox4Result.addChangeListener(new ChangeListener() { @@ -38,7 +38,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { } } }); - reserveCheckBox4Write = new UICheckBox(Inter.getLocText("FormulaD-Reserve_when_bs-write_or_analy")); + reserveCheckBox4Write = new UICheckBox(Inter.getLocText("FR-Designer_Write-Save-Formula")); reserveCheckBox4Write.setSelected(false); checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/fun/BackgroundQuickUIProvider.java b/designer_base/src/com/fr/design/fun/BackgroundQuickUIProvider.java index 257d257a3..9a88175d8 100644 --- a/designer_base/src/com/fr/design/fun/BackgroundQuickUIProvider.java +++ b/designer_base/src/com/fr/design/fun/BackgroundQuickUIProvider.java @@ -3,12 +3,13 @@ package com.fr.design.fun; import com.fr.design.mainframe.backgroundpane.BackgroundQuickPane; import com.fr.stable.fun.Level; import com.fr.stable.fun.Provider; +import com.fr.stable.fun.mark.Mutable; /** * Created by richie on 16/5/18. * 背景设置界面接口,用于扩展设置更多类型的背景 */ -public interface BackgroundQuickUIProvider extends Level, Provider { +public interface BackgroundQuickUIProvider extends Mutable { String MARK_STRING = "BackgroundQuickUIProvider"; diff --git a/designer_base/src/com/fr/design/fun/BackgroundUIProvider.java b/designer_base/src/com/fr/design/fun/BackgroundUIProvider.java index 0ae87b9d7..96808fdab 100644 --- a/designer_base/src/com/fr/design/fun/BackgroundUIProvider.java +++ b/designer_base/src/com/fr/design/fun/BackgroundUIProvider.java @@ -2,13 +2,12 @@ package com.fr.design.fun; import com.fr.design.style.background.BackgroundDetailPane; import com.fr.general.Background; -import com.fr.stable.fun.Level; -import com.fr.stable.fun.Provider; +import com.fr.stable.fun.mark.Mutable; /** * Created by richie on 16/5/18. */ -public interface BackgroundUIProvider extends Level, Provider { +public interface BackgroundUIProvider extends Mutable { String MARK_STRING = "BackgroundUIProvider"; diff --git a/designer_base/src/com/fr/design/fun/CellAttributeProvider.java b/designer_base/src/com/fr/design/fun/CellAttributeProvider.java index d3822da43..52093ea49 100644 --- a/designer_base/src/com/fr/design/fun/CellAttributeProvider.java +++ b/designer_base/src/com/fr/design/fun/CellAttributeProvider.java @@ -1,12 +1,12 @@ package com.fr.design.fun; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; /** * Created by zhouping on 2015/11/11. */ -public interface CellAttributeProvider extends Level{ +public interface CellAttributeProvider extends Immutable{ String MARK_STRING = "CellAttributeProvider"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/CellWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/CellWidgetOptionProvider.java index 6fd51f71f..1cb7869d7 100644 --- a/designer_base/src/com/fr/design/fun/CellWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/CellWidgetOptionProvider.java @@ -10,7 +10,7 @@ import com.fr.stable.fun.Level; * @since 8.0 * 格子中的自定义控件接口 */ -public interface CellWidgetOptionProvider extends ParameterWidgetOptionProvider, Level { +public interface CellWidgetOptionProvider extends ParameterWidgetOptionProvider { String XML_TAG = "CellWidgetOptionProvider"; diff --git a/designer_base/src/com/fr/design/fun/ConnectionProvider.java b/designer_base/src/com/fr/design/fun/ConnectionProvider.java index 24c0f31c1..c6bd2fca2 100644 --- a/designer_base/src/com/fr/design/fun/ConnectionProvider.java +++ b/designer_base/src/com/fr/design/fun/ConnectionProvider.java @@ -2,13 +2,13 @@ package com.fr.design.fun; import com.fr.data.impl.Connection; import com.fr.design.beans.BasicBeanPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * @author : richie * @since : 8.0 */ -public interface ConnectionProvider extends Level { +public interface ConnectionProvider extends Mutable { public static final String XML_TAG = "ConnectionProvider"; diff --git a/designer_base/src/com/fr/design/fun/DesignerEnvProcessor.java b/designer_base/src/com/fr/design/fun/DesignerEnvProcessor.java index a74c73f96..80e979fc1 100644 --- a/designer_base/src/com/fr/design/fun/DesignerEnvProcessor.java +++ b/designer_base/src/com/fr/design/fun/DesignerEnvProcessor.java @@ -1,6 +1,6 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; /** * 在env加载之前, 修改env参数的接口 @@ -9,7 +9,7 @@ import com.fr.stable.fun.Level; * * Created by Administrator on 2016/3/31/0031. */ -public interface DesignerEnvProcessor extends Level{ +public interface DesignerEnvProcessor extends Immutable{ String XML_TAG = "DesignerEnvProcessor"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/ElementUIProvider.java b/designer_base/src/com/fr/design/fun/ElementUIProvider.java index cb960564f..9f93c21ed 100644 --- a/designer_base/src/com/fr/design/fun/ElementUIProvider.java +++ b/designer_base/src/com/fr/design/fun/ElementUIProvider.java @@ -2,14 +2,14 @@ package com.fr.design.fun; import com.fr.design.actions.UpdateAction; import com.fr.design.selection.QuickEditor; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * Created by richie on 16/4/25. * 单元格元素和悬浮元素扩展,通过实现这个接口,可以在单元格中添加更多类型的元素. */ -public interface ElementUIProvider extends Level { +public interface ElementUIProvider extends Mutable { String MARK_STRING = "ElementUIProvider"; diff --git a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java index 7a7161531..811d5e960 100644 --- a/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java +++ b/designer_base/src/com/fr/design/fun/ExportAttrTabProvider.java @@ -1,23 +1,48 @@ package com.fr.design.fun; import com.fr.design.report.AbstractExportPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; import javax.swing.*; /** * Created by vito on 16/5/5. */ -public interface ExportAttrTabProvider extends Level{ + +/** + * 导出属性Tab页的接口 + */ +public interface ExportAttrTabProvider extends Mutable { String XML_TAG = "ExportAttrTabProvider"; int CURRENT_LEVEL = 1; + /** + * 转换成SwingComponent + * + * @return JComponent + */ JComponent toSwingComponent(); + /** + * 转换成AbstractExportPane + * + * @return AbstractExportPane + */ AbstractExportPane toExportPane(); + /** + * tab的标题 + * + * @return + */ String title(); + /** + * tag标签 + * + * @return tag名称 + * @deprecated 将来不使用tag作为区分 + */ String tag(); } diff --git a/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java b/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java index c2c560260..7b2fd2088 100644 --- a/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java +++ b/designer_base/src/com/fr/design/fun/ExportToolBarProvider.java @@ -1,13 +1,13 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; import javax.swing.*; /** * 导出菜单设计器端拓展，用于控制该菜单是否在web端显示 */ -public interface ExportToolBarProvider extends Level{ +public interface ExportToolBarProvider extends Mutable{ String XML_TAG = "ExportToolBarProvider"; diff --git a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java index 346fdb2b0..e887d389b 100644 --- a/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/FormElementCaseEditorProcessor.java @@ -1,13 +1,14 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.ReportFitAttrProvider; +import com.fr.stable.fun.mark.Immutable; import java.beans.PropertyDescriptor; /** * Created by zhouping on 2015/9/10. */ -public interface FormElementCaseEditorProcessor extends Level{ +public interface FormElementCaseEditorProcessor extends Immutable { String MARK_STRING = "PropertyEditor"; @@ -17,8 +18,17 @@ public interface FormElementCaseEditorProcessor extends Level{ /** * 生成属性表 * @param temp 传入当前操作的class + * @param reportFitAttr 传入的自适应属性 * @return 返回属性表 */ - PropertyDescriptor[] createPropertyDescriptor(Class temp); + PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider reportFitAttr); + + /** + * 返回pc自适应属性值 + * @param fitAttrProvider 传入的自适应属性 + * @return 返回pc自适应属性值 + */ + int getFitStateInPC(ReportFitAttrProvider fitAttrProvider); + } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/FormWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/FormWidgetOptionProvider.java index 24a32da00..bfc32f4e9 100644 --- a/designer_base/src/com/fr/design/fun/FormWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/FormWidgetOptionProvider.java @@ -1,14 +1,12 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; - /** * @author richie * @date 2015-03-23 * @since 8.0 * 表单控件 */ -public interface FormWidgetOptionProvider extends ParameterWidgetOptionProvider, Level { +public interface FormWidgetOptionProvider extends ParameterWidgetOptionProvider { String XML_TAG = "FormWidgetOptionProvider"; diff --git a/designer_base/src/com/fr/design/fun/GlobalListenerProvider.java b/designer_base/src/com/fr/design/fun/GlobalListenerProvider.java index 7fbd9b371..ae2984853 100644 --- a/designer_base/src/com/fr/design/fun/GlobalListenerProvider.java +++ b/designer_base/src/com/fr/design/fun/GlobalListenerProvider.java @@ -1,7 +1,7 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; import java.awt.event.AWTEventListener; @@ -9,7 +9,7 @@ import java.awt.event.AWTEventListener; * Created by zack on 2015/8/17. * 全局事件监听 */ -public interface GlobalListenerProvider extends Level{ +public interface GlobalListenerProvider extends Mutable{ String XML_TAG = "GlobalListenerProvider"; diff --git a/designer_base/src/com/fr/design/fun/HighlightProvider.java b/designer_base/src/com/fr/design/fun/HighlightProvider.java index ebee36932..af232f4da 100644 --- a/designer_base/src/com/fr/design/fun/HighlightProvider.java +++ b/designer_base/src/com/fr/design/fun/HighlightProvider.java @@ -3,11 +3,12 @@ package com.fr.design.fun; import com.fr.design.condition.ConditionAttrSingleConditionPane; import com.fr.design.condition.ConditionAttributesPane; import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * 条件属性界面设计接口 */ -public interface HighlightProvider extends Level{ +public interface HighlightProvider extends Mutable{ String MARK_STRING = "HighlightProvider"; diff --git a/designer_base/src/com/fr/design/fun/HyperlinkProvider.java b/designer_base/src/com/fr/design/fun/HyperlinkProvider.java index 58d7a490a..e6eccc882 100644 --- a/designer_base/src/com/fr/design/fun/HyperlinkProvider.java +++ b/designer_base/src/com/fr/design/fun/HyperlinkProvider.java @@ -2,11 +2,12 @@ package com.fr.design.fun; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * Created by zack on 2016/1/20. */ -public interface HyperlinkProvider extends Level{ +public interface HyperlinkProvider extends Mutable { String XML_TAG = "HyperlinkProvider"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/IndentationUnitProcessor.java b/designer_base/src/com/fr/design/fun/IndentationUnitProcessor.java index 9c4a5c854..e87037dbe 100644 --- a/designer_base/src/com/fr/design/fun/IndentationUnitProcessor.java +++ b/designer_base/src/com/fr/design/fun/IndentationUnitProcessor.java @@ -1,11 +1,11 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; /** * Created by zhouping on 2015/9/20. */ -public interface IndentationUnitProcessor extends Level{ +public interface IndentationUnitProcessor extends Immutable { String MARK_STRING = "IndentationProcessor"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java index e1c570d54..dfb4cdca0 100644 --- a/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java +++ b/designer_base/src/com/fr/design/fun/JavaScriptActionProvider.java @@ -2,12 +2,12 @@ package com.fr.design.fun; import com.fr.design.beans.FurtherBasicBeanPane; import com.fr.js.JavaScript; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * Created by zack on 2015/8/14. */ -public interface JavaScriptActionProvider extends Level{ +public interface JavaScriptActionProvider extends Mutable{ String XML_TAG = "JavaScriptActionProvider"; diff --git a/designer_base/src/com/fr/design/fun/MenuHandler.java b/designer_base/src/com/fr/design/fun/MenuHandler.java index 5b9dd179d..740a7f6e8 100644 --- a/designer_base/src/com/fr/design/fun/MenuHandler.java +++ b/designer_base/src/com/fr/design/fun/MenuHandler.java @@ -2,7 +2,7 @@ package com.fr.design.fun; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; import com.fr.design.menu.ShortCut; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * @author richie @@ -10,7 +10,7 @@ import com.fr.stable.fun.Level; * @since 8.0 * 设计器菜单栏插件接口 */ -public interface MenuHandler extends Level { +public interface MenuHandler extends Mutable { String MARK_STRING = "MenuHandler"; diff --git a/designer_base/src/com/fr/design/fun/ParameterWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/ParameterWidgetOptionProvider.java index dfa0dda62..685c81a92 100644 --- a/designer_base/src/com/fr/design/fun/ParameterWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/ParameterWidgetOptionProvider.java @@ -1,14 +1,14 @@ package com.fr.design.fun; import com.fr.form.ui.Widget; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * @author : richie * @since : 8.0 * 自定义参数界面控件 */ -public interface ParameterWidgetOptionProvider extends Level{ +public interface ParameterWidgetOptionProvider extends Mutable { String XML_TAG = "ParameterWidgetOptionProvider"; diff --git a/designer_base/src/com/fr/design/fun/PresentKindProvider.java b/designer_base/src/com/fr/design/fun/PresentKindProvider.java index 8e224e49c..1e669e994 100644 --- a/designer_base/src/com/fr/design/fun/PresentKindProvider.java +++ b/designer_base/src/com/fr/design/fun/PresentKindProvider.java @@ -2,7 +2,7 @@ package com.fr.design.fun; import com.fr.base.present.Present; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * @author richie @@ -10,7 +10,7 @@ import com.fr.stable.fun.Level; * @since 8.0 * 形态类型接口 */ -public interface PresentKindProvider extends Level{ +public interface PresentKindProvider extends Mutable{ int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/PreviewProvider.java b/designer_base/src/com/fr/design/fun/PreviewProvider.java index 3536970b8..876c7d202 100644 --- a/designer_base/src/com/fr/design/fun/PreviewProvider.java +++ b/designer_base/src/com/fr/design/fun/PreviewProvider.java @@ -1,7 +1,7 @@ package com.fr.design.fun; import com.fr.design.mainframe.JTemplate; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; import java.util.Map; @@ -11,7 +11,7 @@ import java.util.Map; * @since 8.0 * 自定义预览方式接口 */ -public interface PreviewProvider extends Level{ +public interface PreviewProvider extends Mutable{ String MARK_STRING = "PreviewProvider"; diff --git a/designer_base/src/com/fr/design/fun/SubmitProvider.java b/designer_base/src/com/fr/design/fun/SubmitProvider.java index e499689e0..729a0abe1 100644 --- a/designer_base/src/com/fr/design/fun/SubmitProvider.java +++ b/designer_base/src/com/fr/design/fun/SubmitProvider.java @@ -1,12 +1,12 @@ package com.fr.design.fun; import com.fr.design.beans.BasicBeanPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * 自定义提交接口 */ -public interface SubmitProvider extends Level{ +public interface SubmitProvider extends Mutable{ String MARK_STRING = "SubmitProvider"; diff --git a/designer_base/src/com/fr/design/fun/TableDataDefineProvider.java b/designer_base/src/com/fr/design/fun/TableDataDefineProvider.java index 4ddfa9a95..4ca4f1bc0 100644 --- a/designer_base/src/com/fr/design/fun/TableDataDefineProvider.java +++ b/designer_base/src/com/fr/design/fun/TableDataDefineProvider.java @@ -2,14 +2,15 @@ package com.fr.design.fun; import com.fr.base.TableData; import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; +import com.fr.stable.fun.mark.Aftermath; /** * @author : richie * @since : 7.1.1 * 自定义报表数据集界面接口，单独存在的一个个数据集 */ -public interface TableDataDefineProvider extends Level { +public interface TableDataDefineProvider extends Mutable, Aftermath { String XML_TAG = "TableDataDefineProvider"; diff --git a/designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java b/designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java index 06db5c974..7704d6275 100644 --- a/designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java +++ b/designer_base/src/com/fr/design/fun/TableDataPaneProcessor.java @@ -4,7 +4,7 @@ import com.fr.design.DesignModelAdapter; import com.fr.design.data.BasicTableDataTreePane; import com.fr.design.data.datapane.TableDataPaneController; import com.fr.design.menu.ShortCut; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; /** * 自定义的模板（服务器）数据集的树样式接口 el:分组样式 @@ -12,7 +12,7 @@ import com.fr.stable.fun.Level; * Date: 2016/4/18 * Time: 9:04 */ -public interface TableDataPaneProcessor extends Level { +public interface TableDataPaneProcessor extends Immutable { String XML_TAG = "TableDataPaneProcessor"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/TitlePlaceProcessor.java b/designer_base/src/com/fr/design/fun/TitlePlaceProcessor.java index ebe0eb4e9..f54b142b3 100644 --- a/designer_base/src/com/fr/design/fun/TitlePlaceProcessor.java +++ b/designer_base/src/com/fr/design/fun/TitlePlaceProcessor.java @@ -1,10 +1,10 @@ package com.fr.design.fun; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; import java.awt.*; -public interface TitlePlaceProcessor extends Level{ +public interface TitlePlaceProcessor extends Immutable { String MARK_STRING = "TitlePlaceProcessor"; diff --git a/designer_base/src/com/fr/design/fun/ToolbarItemProvider.java b/designer_base/src/com/fr/design/fun/ToolbarItemProvider.java index f5d80e8c2..f4add0333 100644 --- a/designer_base/src/com/fr/design/fun/ToolbarItemProvider.java +++ b/designer_base/src/com/fr/design/fun/ToolbarItemProvider.java @@ -1,14 +1,14 @@ package com.fr.design.fun; import com.fr.form.ui.Widget; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * @author : focus * @since : 8.0 * 自定义web工具栏菜单 */ -public interface ToolbarItemProvider extends Level{ +public interface ToolbarItemProvider extends Mutable { String XML_TAG = "ToolbarItemProvider"; diff --git a/designer_base/src/com/fr/design/fun/UIFormulaProcessor.java b/designer_base/src/com/fr/design/fun/UIFormulaProcessor.java index 32e6390ab..4a5d8830b 100644 --- a/designer_base/src/com/fr/design/fun/UIFormulaProcessor.java +++ b/designer_base/src/com/fr/design/fun/UIFormulaProcessor.java @@ -1,7 +1,7 @@ package com.fr.design.fun; import com.fr.design.formula.UIFormula; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Immutable; /** * @author richie @@ -9,7 +9,7 @@ import com.fr.stable.fun.Level; * @since 8.0 * 公式编辑器界面处理接口 */ -public interface UIFormulaProcessor extends Level{ +public interface UIFormulaProcessor extends Immutable{ String MARK_STRING = "UIFormulaProcessor"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/VerifyDefineProvider.java b/designer_base/src/com/fr/design/fun/VerifyDefineProvider.java index 35384bf0a..d81ff9dac 100644 --- a/designer_base/src/com/fr/design/fun/VerifyDefineProvider.java +++ b/designer_base/src/com/fr/design/fun/VerifyDefineProvider.java @@ -2,13 +2,12 @@ package com.fr.design.fun; import com.fr.data.Verifier; import com.fr.design.beans.BasicBeanPane; -import com.fr.stable.fun.Level; -import com.fr.stable.fun.Provider; +import com.fr.stable.fun.mark.Mutable; /** * Created by richie on 16/6/8. */ -public interface VerifyDefineProvider extends Level, Provider { +public interface VerifyDefineProvider extends Mutable { String MARK_STRING = "VerifyDefineProvider"; diff --git a/designer_base/src/com/fr/design/fun/WidgetDesignHandler.java b/designer_base/src/com/fr/design/fun/WidgetDesignHandler.java new file mode 100644 index 000000000..6350e4e04 --- /dev/null +++ b/designer_base/src/com/fr/design/fun/WidgetDesignHandler.java @@ -0,0 +1,22 @@ +package com.fr.design.fun; + +import com.fr.form.ui.Widget; +import com.fr.stable.fun.mark.Immutable; + +/** + * Coder: zack + * Date: 2016/5/12 + * Time: 10:37 + */ +public interface WidgetDesignHandler extends Immutable { + String XML_TAG = "WidgetDesignHandler"; + int CURRENT_LEVEL = 1; + + /** + * 传递控件共有属性 + * + * @param oldWidget 老控件 + * @param newWidget 新控件 + */ + void transferWidgetProperties(Widget oldWidget, Widget newWidget); +} diff --git a/designer_base/src/com/fr/design/fun/WidgetPropertyUIProvider.java b/designer_base/src/com/fr/design/fun/WidgetPropertyUIProvider.java index c8a051315..e82329326 100644 --- a/designer_base/src/com/fr/design/fun/WidgetPropertyUIProvider.java +++ b/designer_base/src/com/fr/design/fun/WidgetPropertyUIProvider.java @@ -1,13 +1,13 @@ package com.fr.design.fun; import com.fr.design.gui.itable.AbstractPropertyTable; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; /** * Created by vito on 16/4/27. */ -public interface WidgetPropertyUIProvider extends Level { +public interface WidgetPropertyUIProvider extends Mutable { String XML_TAG = "WidgetPropertyUIProvider"; int CURRENT_LEVEL = 1; diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundQuickUIProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundQuickUIProvider.java index 82da697c1..373fa2750 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundQuickUIProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundQuickUIProvider.java @@ -2,10 +2,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.BackgroundQuickUIProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by richie on 16/5/18. */ +@API(level = BackgroundQuickUIProvider.CURRENT_LEVEL) public abstract class AbstractBackgroundQuickUIProvider extends AbstractProvider implements BackgroundQuickUIProvider { @Override diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundUIProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundUIProvider.java index ad95e3684..85ab8ec1f 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundUIProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractBackgroundUIProvider.java @@ -2,10 +2,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.BackgroundUIProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by richie on 16/5/18. */ +@API(level = BackgroundUIProvider.CURRENT_LEVEL) public abstract class AbstractBackgroundUIProvider extends AbstractProvider implements BackgroundUIProvider { @Override diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractCellAttributeProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractCellAttributeProvider.java index e57fb6529..86c89d5b4 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractCellAttributeProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractCellAttributeProvider.java @@ -1,10 +1,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.CellAttributeProvider; +import com.fr.stable.fun.mark.API; /** * Created by zhouping on 2015/11/11. */ +@API(level = CellAttributeProvider.CURRENT_LEVEL) public abstract class AbstractCellAttributeProvider implements CellAttributeProvider { public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractCellWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractCellWidgetOptionProvider.java index eb1b5d795..8e040bcd9 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractCellWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractCellWidgetOptionProvider.java @@ -1,17 +1,23 @@ package com.fr.design.fun.impl; import com.fr.design.fun.CellWidgetOptionProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractCellWidgetOptionProvider implements CellWidgetOptionProvider { +@API(level = CellWidgetOptionProvider.CURRENT_LEVEL) +public abstract class AbstractCellWidgetOptionProvider extends AbstractProvider implements CellWidgetOptionProvider { public int currentAPILevel() { return CURRENT_LEVEL; } - + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractConnectionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractConnectionProvider.java index 3f8044ae6..f20b644fa 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractConnectionProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractConnectionProvider.java @@ -1,16 +1,24 @@ package com.fr.design.fun.impl; import com.fr.design.fun.ConnectionProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractConnectionProvider implements ConnectionProvider { +@API(level = ConnectionProvider.CURRENT_LEVEL) +public abstract class AbstractConnectionProvider extends AbstractProvider implements ConnectionProvider { @Override public int currentAPILevel() { return CURRENT_LEVEL; } + + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractDesignerEnvProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractDesignerEnvProcessor.java index 03a0b7f36..75dd0e2f9 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractDesignerEnvProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractDesignerEnvProcessor.java @@ -1,10 +1,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.DesignerEnvProcessor; +import com.fr.stable.fun.mark.API; /** * Created by Administrator on 2016/3/31/0031. */ +@API(level = DesignerEnvProcessor.CURRENT_LEVEL) public abstract class AbstractDesignerEnvProcessor implements DesignerEnvProcessor { public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractElementUIProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractElementUIProvider.java index b76459928..c26fce835 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractElementUIProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractElementUIProvider.java @@ -2,10 +2,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.ElementUIProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by richie on 16/4/25. */ +@API(level = ElementUIProvider.CURRENT_LEVEL) public abstract class AbstractElementUIProvider extends AbstractProvider implements ElementUIProvider { @Override diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractExportAttrTabProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractExportAttrTabProvider.java index f1654ff6b..2e526e697 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractExportAttrTabProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractExportAttrTabProvider.java @@ -2,10 +2,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.ExportAttrTabProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by vito on 16/5/5. */ +@API(level = ExportAttrTabProvider.CURRENT_LEVEL) public abstract class AbstractExportAttrTabProvider extends AbstractProvider implements ExportAttrTabProvider { @Override public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java index d528627d6..ad65b2dba 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormElementCaseEditorProcessor.java @@ -1,12 +1,15 @@ package com.fr.design.fun.impl; import com.fr.design.fun.FormElementCaseEditorProcessor; +import com.fr.stable.fun.ReportFitAttrProvider; +import com.fr.stable.fun.mark.API; import java.beans.PropertyDescriptor; /** * Created by zhouping on 2015/9/10. */ +@API(level = FormElementCaseEditorProcessor.CURRENT_LEVEL) public abstract class AbstractFormElementCaseEditorProcessor implements FormElementCaseEditorProcessor { public int currentAPILevel() { @@ -17,9 +20,21 @@ public abstract class AbstractFormElementCaseEditorProcessor implements FormElem /** * 生成属性表 * @param temp 传入当前操作的class + * @param reportFitAttr 传入的自适应属性 * @return 返回属性表 */ - public PropertyDescriptor[] createPropertyDescriptor(Class temp){ + @Override + public PropertyDescriptor[] createPropertyDescriptor(Class temp, ReportFitAttrProvider reportFitAttr) { return new PropertyDescriptor[0]; } + + /** + * 返回pc自适应属性值 + * @param fitAttrProvider 传入的自适应属性 + * @return 返回pc自适应属性值 + */ + @Override + public int getFitStateInPC(ReportFitAttrProvider fitAttrProvider) { + return 0; + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java index 563d544db..43cab9514 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractFormWidgetOptionProvider.java @@ -1,18 +1,25 @@ package com.fr.design.fun.impl; import com.fr.design.fun.FormWidgetOptionProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractFormWidgetOptionProvider implements FormWidgetOptionProvider { +@API(level = FormWidgetOptionProvider.CURRENT_LEVEL) +public abstract class AbstractFormWidgetOptionProvider extends AbstractProvider implements FormWidgetOptionProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } @Override public boolean isContainer() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractGlobalListenerProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractGlobalListenerProvider.java index 2cf0232eb..231e80937 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractGlobalListenerProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractGlobalListenerProvider.java @@ -1,15 +1,21 @@ package com.fr.design.fun.impl; import com.fr.design.fun.GlobalListenerProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by zack on 2015/8/17. */ -public abstract class AbstractGlobalListenerProvider implements GlobalListenerProvider { +@API(level = GlobalListenerProvider.CURRENT_LEVEL) +public abstract class AbstractGlobalListenerProvider extends AbstractProvider implements GlobalListenerProvider { public int currentAPILevel() { return CURRENT_LEVEL; } - + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractHighlightProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractHighlightProvider.java index db0323959..e8fc8bce1 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractHighlightProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractHighlightProvider.java @@ -1,16 +1,23 @@ package com.fr.design.fun.impl; import com.fr.design.fun.HighlightProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractHighlightProvider implements HighlightProvider { +@API(level = HighlightProvider.CURRENT_LEVEL) +public abstract class AbstractHighlightProvider extends AbstractProvider implements HighlightProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractHyperlinkProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractHyperlinkProvider.java index ebb193e5f..24ce3ab97 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractHyperlinkProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractHyperlinkProvider.java @@ -1,14 +1,21 @@ package com.fr.design.fun.impl; import com.fr.design.fun.HyperlinkProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by zack on 2016/1/18. */ -public abstract class AbstractHyperlinkProvider implements HyperlinkProvider { +@API(level = HyperlinkProvider.CURRENT_LEVEL) +public abstract class AbstractHyperlinkProvider extends AbstractProvider implements HyperlinkProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractIndentationUnitProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractIndentationUnitProcessor.java index 7dbe61f76..4ebf914da 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractIndentationUnitProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractIndentationUnitProcessor.java @@ -1,10 +1,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.IndentationUnitProcessor; +import com.fr.stable.fun.mark.API; /** * Created by zhouping on 2015/9/20. */ +@API(level = IndentationUnitProcessor.CURRENT_LEVEL) public class AbstractIndentationUnitProcessor implements IndentationUnitProcessor { private int indentationUnit = 1; diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java index 8074cdcc9..504a8b73e 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractJavaScriptActionProvider.java @@ -1,14 +1,21 @@ package com.fr.design.fun.impl; import com.fr.design.fun.JavaScriptActionProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by zack on 2015/8/20. */ -public abstract class AbstractJavaScriptActionProvider implements JavaScriptActionProvider { +@API(level = JavaScriptActionProvider.CURRENT_LEVEL) +public abstract class AbstractJavaScriptActionProvider extends AbstractProvider implements JavaScriptActionProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java b/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java index d62769a2d..b679f3ab9 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractMenuHandler.java @@ -4,12 +4,14 @@ import com.fr.design.fun.MenuHandler; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; import com.fr.design.menu.ShortCut; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ +@API(level = MenuHandler.CURRENT_LEVEL) public abstract class AbstractMenuHandler extends AbstractProvider implements MenuHandler { public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractParameterWidgetOptionProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractParameterWidgetOptionProvider.java index da2ce5d28..0c66aae11 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractParameterWidgetOptionProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractParameterWidgetOptionProvider.java @@ -1,16 +1,23 @@ package com.fr.design.fun.impl; import com.fr.design.fun.ParameterWidgetOptionProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractParameterWidgetOptionProvider implements ParameterWidgetOptionProvider { +@API(level = ParameterWidgetOptionProvider.CURRENT_LEVEL) +public abstract class AbstractParameterWidgetOptionProvider extends AbstractProvider implements ParameterWidgetOptionProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractPresentKindProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractPresentKindProvider.java index ebe28c709..4f3a5c03c 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractPresentKindProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractPresentKindProvider.java @@ -1,17 +1,23 @@ package com.fr.design.fun.impl; import com.fr.design.fun.PresentKindProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-22 * @since 8.0 */ -public abstract class AbstractPresentKindProvider implements PresentKindProvider { +@API(level = PresentKindProvider.CURRENT_LEVEL) +public abstract class AbstractPresentKindProvider extends AbstractProvider implements PresentKindProvider { public int currentAPILevel() { return CURRENT_LEVEL; } - + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractPreviewProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractPreviewProvider.java index d5a67a451..3f824d4bb 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractPreviewProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractPreviewProvider.java @@ -3,6 +3,8 @@ package com.fr.design.fun.impl; import com.fr.design.fun.PreviewProvider; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; import java.util.Collections; import java.util.Map; @@ -12,12 +14,17 @@ import java.util.Map; * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractPreviewProvider implements PreviewProvider { +@API(level = PreviewProvider.CURRENT_LEVEL) +public abstract class AbstractPreviewProvider extends AbstractProvider implements PreviewProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } @Override public void onClick(JTemplate jt) { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractServerTableDataDefineProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractServerTableDataDefineProvider.java index 57d1dffef..de7be2750 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractServerTableDataDefineProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractServerTableDataDefineProvider.java @@ -1,12 +1,39 @@ package com.fr.design.fun.impl; +import com.fr.design.data.datapane.TableDataNameObjectCreator; +import com.fr.design.data.tabledata.wrapper.TableDataFactory; import com.fr.design.fun.ServerTableDataDefineProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractServerTableDataDefineProvider implements ServerTableDataDefineProvider { +@API(level = ServerTableDataDefineProvider.CURRENT_LEVEL) +public abstract class AbstractServerTableDataDefineProvider extends AbstractProvider implements ServerTableDataDefineProvider { + @Override + public int currentAPILevel() { + return CURRENT_LEVEL; + } + + @Override + public String mark4Provider() { + return getClass().getName(); + } + + @Override + public void process() { + TableDataNameObjectCreator creator = new TableDataNameObjectCreator( + nameForTableData(), + prefixForTableData(), + iconPathForTableData(), + classForTableData(), + classForInitTableData(), + appearanceForTableData() + ); + TableDataFactory.register(classForTableData(), creator); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractSubmitProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractSubmitProvider.java index 451526cfa..0b2698722 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractSubmitProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractSubmitProvider.java @@ -1,12 +1,18 @@ package com.fr.design.fun.impl; import com.fr.design.fun.SubmitProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; -public abstract class AbstractSubmitProvider implements SubmitProvider { +@API(level = SubmitProvider.CURRENT_LEVEL) +public abstract class AbstractSubmitProvider extends AbstractProvider implements SubmitProvider { public int currentAPILevel() { return CURRENT_LEVEL; } - + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java index e5f591a65..53da881a8 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractTDPaneProcessor.java @@ -1,12 +1,14 @@ package com.fr.design.fun.impl; import com.fr.design.fun.TableDataPaneProcessor; +import com.fr.stable.fun.mark.API; /** * Coder: zack * Date: 2016/4/18 * Time: 10:30 */ +@API(level = TableDataPaneProcessor.CURRENT_LEVEL) public abstract class AbstractTDPaneProcessor implements TableDataPaneProcessor { @Override public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTableDataDefineProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractTableDataDefineProvider.java index 62f77abd6..42433a68b 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractTableDataDefineProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractTableDataDefineProvider.java @@ -1,16 +1,39 @@ package com.fr.design.fun.impl; +import com.fr.design.data.datapane.TableDataNameObjectCreator; +import com.fr.design.data.tabledata.wrapper.TableDataFactory; import com.fr.design.fun.TableDataDefineProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ -public abstract class AbstractTableDataDefineProvider implements TableDataDefineProvider { +@API(level = TableDataDefineProvider.CURRENT_LEVEL) +public abstract class AbstractTableDataDefineProvider extends AbstractProvider implements TableDataDefineProvider { @Override public int currentAPILevel() { return CURRENT_LEVEL; } + + @Override + public String mark4Provider() { + return getClass().getName(); + } + + @Override + public void process() { + TableDataNameObjectCreator creator = new TableDataNameObjectCreator( + nameForTableData(), + prefixForTableData(), + iconPathForTableData(), + classForTableData(), + classForInitTableData(), + appearanceForTableData() + ); + TableDataFactory.register(classForTableData(), creator); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractTitleProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractTitleProcessor.java index 455c7dc78..5eaa7ba87 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractTitleProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractTitleProcessor.java @@ -1,7 +1,9 @@ package com.fr.design.fun.impl; import com.fr.design.fun.TitlePlaceProcessor; +import com.fr.stable.fun.mark.API; +@API(level = TitlePlaceProcessor.CURRENT_LEVEL) public abstract class AbstractTitleProcessor implements TitlePlaceProcessor { public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractToolbarItem.java b/designer_base/src/com/fr/design/fun/impl/AbstractToolbarItem.java index e60d35d3b..ec3c47bc1 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractToolbarItem.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractToolbarItem.java @@ -1,14 +1,21 @@ package com.fr.design.fun.impl; import com.fr.design.fun.ToolbarItemProvider; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by richie on 15/12/1. */ -public abstract class AbstractToolbarItem implements ToolbarItemProvider { +@API(level = ToolbarItemProvider.CURRENT_LEVEL) +public abstract class AbstractToolbarItem extends AbstractProvider implements ToolbarItemProvider { public int currentAPILevel() { return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractUIFormulaProcessor.java b/designer_base/src/com/fr/design/fun/impl/AbstractUIFormulaProcessor.java index ce58a1a7f..2b4144488 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractUIFormulaProcessor.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractUIFormulaProcessor.java @@ -1,12 +1,14 @@ package com.fr.design.fun.impl; import com.fr.design.fun.UIFormulaProcessor; +import com.fr.stable.fun.mark.API; /** * @author richie * @date 2015-05-13 * @since 8.0 */ +@API(level = UIFormulaProcessor.CURRENT_LEVEL) public abstract class AbstractUIFormulaProcessor implements UIFormulaProcessor { public int currentAPILevel() { diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractVerifyDefineProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractVerifyDefineProvider.java index 04c627610..f1ebfd296 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractVerifyDefineProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractVerifyDefineProvider.java @@ -2,10 +2,12 @@ package com.fr.design.fun.impl; import com.fr.design.fun.VerifyDefineProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by richie on 16/6/8. */ +@API(level = VerifyDefineProvider.CURRENT_LEVEL) public abstract class AbstractVerifyDefineProvider extends AbstractProvider implements VerifyDefineProvider { @Override diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractWidgetDesignHandler.java b/designer_base/src/com/fr/design/fun/impl/AbstractWidgetDesignHandler.java new file mode 100644 index 000000000..17f6d8b4d --- /dev/null +++ b/designer_base/src/com/fr/design/fun/impl/AbstractWidgetDesignHandler.java @@ -0,0 +1,18 @@ +package com.fr.design.fun.impl; + +import com.fr.design.fun.WidgetDesignHandler; +import com.fr.stable.fun.mark.API; + +/** + * Coder: zack + * Date: 2016/5/12 + * Time: 10:41 + */ +@API(level = WidgetDesignHandler.CURRENT_LEVEL) +public abstract class AbstractWidgetDesignHandler implements WidgetDesignHandler { + + @Override + public int currentAPILevel() { + return CURRENT_LEVEL; + } +} diff --git a/designer_base/src/com/fr/design/fun/impl/AbstractWidgetPropertyUIProvider.java b/designer_base/src/com/fr/design/fun/impl/AbstractWidgetPropertyUIProvider.java index 0c6b89808..80eddae49 100644 --- a/designer_base/src/com/fr/design/fun/impl/AbstractWidgetPropertyUIProvider.java +++ b/designer_base/src/com/fr/design/fun/impl/AbstractWidgetPropertyUIProvider.java @@ -2,11 +2,13 @@ package com.fr.design.fun.impl; import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by vito on 16/4/27. */ +@API(level = WidgetPropertyUIProvider.CURRENT_LEVEL) public abstract class AbstractWidgetPropertyUIProvider extends AbstractProvider implements WidgetPropertyUIProvider { @Override diff --git a/designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java b/designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java index b7992e60e..4d1028e78 100644 --- a/designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java +++ b/designer_base/src/com/fr/design/gui/frpane/HyperlinkGroupPane.java @@ -18,6 +18,7 @@ import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * 超级链接 界面. @@ -43,13 +44,13 @@ public class HyperlinkGroupPane extends JListControlPane { for (int i = 0; i < templateArrayLisy.size(); i++) { pluginCreators[i] = ((HyperlinkPluginAction) templateArrayLisy.get(i)).getHyperlinkCreator(); } - HyperlinkProvider[] providers = ExtraDesignClassManager.getInstance().getHyperlinkProvider(); + Set providers = ExtraDesignClassManager.getInstance().getArray(HyperlinkProvider.XML_TAG); List creatorList = new ArrayList(); for (HyperlinkProvider provider : providers) { NameableCreator nc = provider.createHyperlinkCreator(); creatorList.add(nc); } - return (NameableCreator[]) ArrayUtils.addAll(creatorList.toArray(new NameableCreator[creatorList.size()]), ArrayUtils.addAll(creators, pluginCreators)); + return ArrayUtils.addAll(creatorList.toArray(new NameableCreator[creatorList.size()]), ArrayUtils.addAll(creators, pluginCreators)); } /** diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java index b436c4de5..22d1bb521 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -175,6 +175,10 @@ public class UIResizableContainer extends JPanel { @Override public void layoutContainer(Container parent) { + if (verticalToolPane == null || downPane == null) { + return; + } + if (direction == Constants.RIGHT) { if(isDownPaneVisible){ upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY); diff --git a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java index 9409cc573..413ad70a4 100644 --- a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java +++ b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java @@ -81,7 +81,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("StyleAlignment-Tooltips_Right"), + hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Distributed"),Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_DEFAULT")}); hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); @@ -95,7 +95,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO initOtherComponent(); initAllNames(); - indentationUnitProcessor = ExtraDesignClassManager.getInstance().getIndentationUnitEditor(); + indentationUnitProcessor = ExtraDesignClassManager.getInstance().getSingle(IndentationUnitProcessor.MARK_STRING); if (null == indentationUnitProcessor){ indentationUnitProcessor = new DefaultIndentationUnitProcessor(); } @@ -134,7 +134,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO private void initTextRotationCombox(){ ArrayList selectOption = new ArrayList(); selectOption.add(Inter.getLocText("FR-Designer_Custom-Angle")); - VerticalTextProcessor processor = ExtraClassManager.getInstance().getVerticalTextProcessor(); + VerticalTextProcessor processor = ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG); if (processor != null){ selectOption.addAll(Arrays.asList(processor.getComboxOption())); } @@ -241,7 +241,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO } else { this.textComboBox.setSelectedIndex(0); } - if (style.getVerticalText() == Style.VERTICALTEXT && ExtraClassManager.getInstance().getVerticalTextProcessor() != null) { + if (style.getVerticalText() == Style.VERTICALTEXT && ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) != null) { textRotationComboBox.setSelectedIndex(style.getTextDirection() == Style.LEFT_TO_RIGHT ? 1 : 2); } else { textRotationComboBox.setSelectedIndex(0); diff --git a/designer_base/src/com/fr/design/gui/style/BackgroundPane.java b/designer_base/src/com/fr/design/gui/style/BackgroundPane.java index 1bf6d7e4b..440d8fcef 100644 --- a/designer_base/src/com/fr/design/gui/style/BackgroundPane.java +++ b/designer_base/src/com/fr/design/gui/style/BackgroundPane.java @@ -15,6 +15,7 @@ import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.ArrayList; +import java.util.Set; /** * @author zhou @@ -68,7 +69,7 @@ public class BackgroundPane extends AbstractBasicStylePane { kinds.add(new PatternBackgroundQuickPane()); kinds.add(new ImageBackgroundQuickPane()); kinds.add(new GradientBackgroundQuickPane()); - BackgroundQuickUIProvider[] providers = ExtraDesignClassManager.getInstance().getBackgroundQuickUIProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(BackgroundQuickUIProvider.MARK_STRING); for (BackgroundQuickUIProvider provider : providers) { kinds.add(provider.appearanceForBackground()); diff --git a/designer_base/src/com/fr/design/images/bbs.png b/designer_base/src/com/fr/design/images/bbs.png new file mode 100644 index 000000000..7321bc72e Binary files /dev/null and b/designer_base/src/com/fr/design/images/bbs.png differ diff --git a/designer_base/src/com/fr/design/images/bug.png b/designer_base/src/com/fr/design/images/bug.png new file mode 100644 index 000000000..81f0b81f3 Binary files /dev/null and b/designer_base/src/com/fr/design/images/bug.png differ diff --git a/designer_base/src/com/fr/design/images/help.png b/designer_base/src/com/fr/design/images/help.png new file mode 100644 index 000000000..b339cfe7c Binary files /dev/null and b/designer_base/src/com/fr/design/images/help.png differ diff --git a/designer_base/src/com/fr/design/images/need.png b/designer_base/src/com/fr/design/images/need.png new file mode 100644 index 000000000..6758b4c66 Binary files /dev/null and b/designer_base/src/com/fr/design/images/need.png differ diff --git a/designer_base/src/com/fr/design/images/questions.png b/designer_base/src/com/fr/design/images/questions.png new file mode 100644 index 000000000..9a11d6541 Binary files /dev/null and b/designer_base/src/com/fr/design/images/questions.png differ diff --git a/designer_base/src/com/fr/design/images/signature.png b/designer_base/src/com/fr/design/images/signature.png new file mode 100644 index 000000000..38ef2b89d Binary files /dev/null and b/designer_base/src/com/fr/design/images/signature.png differ diff --git a/designer_base/src/com/fr/design/images/update.png b/designer_base/src/com/fr/design/images/update.png new file mode 100644 index 000000000..700ee451b Binary files /dev/null and b/designer_base/src/com/fr/design/images/update.png differ diff --git a/designer_base/src/com/fr/design/images/video.png b/designer_base/src/com/fr/design/images/video.png new file mode 100644 index 000000000..ed8b67c98 Binary files /dev/null and b/designer_base/src/com/fr/design/images/video.png differ diff --git a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java index 66de7bf71..d29393944 100644 --- a/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java +++ b/designer_base/src/com/fr/design/javascript/JavaScriptActionPane.java @@ -21,6 +21,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; +import java.util.Set; public abstract class JavaScriptActionPane extends UIComboBoxPane { @@ -52,7 +53,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane { } ); paneList.add(initEmaiPane()); - List javaScriptActionProviders = ExtraDesignClassManager.getInstance().getJavaScriptActionProvider(); + Set javaScriptActionProviders = ExtraDesignClassManager.getInstance().getArray(JavaScriptActionProvider.XML_TAG); if (javaScriptActionProviders != null) { for (JavaScriptActionProvider jsp : javaScriptActionProviders) { paneList.add(jsp.getJavaScriptActionPane()); diff --git a/designer_base/src/com/fr/design/mainframe/AbstractAppProvider.java b/designer_base/src/com/fr/design/mainframe/AbstractAppProvider.java index f45d228a6..f4f6bea97 100644 --- a/designer_base/src/com/fr/design/mainframe/AbstractAppProvider.java +++ b/designer_base/src/com/fr/design/mainframe/AbstractAppProvider.java @@ -1,13 +1,26 @@ package com.fr.design.mainframe; import com.fr.base.io.IOFile; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; /** * Created by Administrator on 2016/3/17/0017. */ -public abstract class AbstractAppProvider implements App{ +@API(level = App.CURRENT_LEVEL) +public abstract class AbstractAppProvider extends AbstractProvider implements App{ public int currentAPILevel() { return CURRENT_LEVEL; } + + @Override + public String mark4Provider() { + return getClass().getName(); + } + + @Override + public void process() { + DesignerFrame.registApp(this); + } } diff --git a/designer_base/src/com/fr/design/mainframe/App.java b/designer_base/src/com/fr/design/mainframe/App.java index d6c376fa9..c657abdcd 100644 --- a/designer_base/src/com/fr/design/mainframe/App.java +++ b/designer_base/src/com/fr/design/mainframe/App.java @@ -2,12 +2,13 @@ package com.fr.design.mainframe; import com.fr.base.io.IOFile; import com.fr.file.FILE; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.mark.Mutable; +import com.fr.stable.fun.mark.Aftermath; /** * Created by Administrator on 2016/3/17/0017. */ -public interface App extends Level{ +public interface App extends Mutable, Aftermath { String MARK_STRING = "DesignerApp"; diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 876bf3922..a1f5f16a4 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -263,7 +263,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta GeneralContext.addPluginReadListener(new PluginReadListener() { @Override public void success() { - TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getTitlePlaceProcessor(); + TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); if (processor == null) { processor = new DefaultTitlePlace(); } diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 867340115..eb20ee9e7 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -43,6 +43,7 @@ import java.awt.event.KeyEvent; import java.io.File; import java.util.HashMap; import java.util.Map; +import java.util.Set; public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarStateChangeListener, ResponseDataSourceChange { private static final String FILE = "file"; @@ -127,7 +128,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt toolbarDef.addShortCut(openFolderAction, renameAction); } toolbarDef.addShortCut(delFileAction); - ShortCut[] extraShortCuts = ExtraDesignClassManager.getInstance().getTemplateTreeShortCutProviders(); + Set extraShortCuts = ExtraDesignClassManager.getInstance().getArray(ShortCut.TEMPLATE_TREE); for (ShortCut shortCut : extraShortCuts){ toolbarDef.addShortCut(shortCut); } diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index ea8dd28e3..b372156d7 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -8,6 +8,13 @@ import com.fr.base.FRContext; import com.fr.design.DesignState; import com.fr.design.ExtraDesignClassManager; import com.fr.design.actions.UpdateAction; +import com.fr.design.actions.community.BBSAction; +import com.fr.design.actions.community.BugAction; +import com.fr.design.actions.community.NeedAction; +import com.fr.design.actions.community.QuestionAction; +import com.fr.design.actions.community.SignAction; +import com.fr.design.actions.community.UpAction; +import com.fr.design.actions.community.VideoAction; import com.fr.design.actions.file.CloseCurrentTemplateAction; import com.fr.design.actions.file.ExitDesignerAction; import com.fr.design.actions.file.OpenRecentReportMenuDef; @@ -48,9 +55,7 @@ import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Locale; +import java.util.*; /** * @author richer @@ -149,6 +154,8 @@ public abstract class ToolBarMenuDock { // 添加帮助菜单 menuList.add(createHelpMenuDef()); + // 添加社区菜单 + menuList.add(createCommunityMenuDef()); return menuList.toArray(new MenuDef[menuList.size()]); } @@ -290,7 +297,7 @@ public abstract class ToolBarMenuDock { } private ShortCut createGlobalTDAction() { - TableDataPaneProcessor processor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor(); + TableDataPaneProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TableDataPaneProcessor.XML_TAG); return processor == null ? new GlobalTableDataAction() : processor.createServerTDAction(); } @@ -306,14 +313,14 @@ public abstract class ToolBarMenuDock { java.util.List shortCuts = new ArrayList(); shortCuts.add(new WebDemoAction()); shortCuts.add(SeparatorDef.DEFAULT); - shortCuts.add(new TutorialAction()); + //shortCuts.add(new TutorialAction()); shortCuts.add(SeparatorDef.DEFAULT); if (ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)) { shortCuts.add(new FeedBackAction()); shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(new SupportQQAction()); shortCuts.add(SeparatorDef.DEFAULT); - shortCuts.add(new ForumAction()); + // shortCuts.add(new ForumAction()); } shortCuts.add(SeparatorDef.DEFAULT); shortCuts.add(new AboutAction()); @@ -321,7 +328,22 @@ public abstract class ToolBarMenuDock { return shortCuts.toArray(new ShortCut[shortCuts.size()]); } - + /** + * 创建社区子菜单 + * @return 社区菜单的子菜单 + */ + public ShortCut[] createCommunityShortCuts() { + java.util.List shortCuts = new ArrayList(); + shortCuts.add(new BBSAction()); + shortCuts.add(new VideoAction()); + shortCuts.add(new TutorialAction()); + shortCuts.add(new QuestionAction()); + shortCuts.add(new UpAction()); + shortCuts.add(new NeedAction()); + shortCuts.add(new BugAction()); + shortCuts.add(new SignAction()); + return shortCuts.toArray(new ShortCut[shortCuts.size()]); + } private MenuDef createHelpMenuDef() { MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_Help"), 'H'); ShortCut[] otherHelpShortCuts = createHelpShortCuts(); @@ -331,7 +353,15 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.HELP); return menuDef; } - + private MenuDef createCommunityMenuDef() { + MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_COMMUNITY"), 'C'); + ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); + for (ShortCut shortCut : otherCommunityShortCuts) { + menuDef.addShortCut(shortCut); + } + insertMenu(menuDef, MenuHandler.HELP); + return menuDef; + } /** * 生成工具栏 * @@ -496,8 +526,15 @@ public abstract class ToolBarMenuDock { protected void insertMenu(MenuDef menuDef, String anchor, ShortCutMethodAction action) { // 下面是插件接口接入点 - MenuHandler[] menuHandlers = ExtraDesignClassManager.getInstance().getMenuHandlers(anchor); - for (MenuHandler handler : menuHandlers) { + Set set = ExtraDesignClassManager.getInstance().getArray(MenuHandler.MARK_STRING); + java.util.List target = new ArrayList<>(); + for (MenuHandler handler : set) { + if (ComparatorUtils.equals(handler.category(), anchor)) { + target.add(handler); + } + } + + for (MenuHandler handler : target) { int insertPosition = handler.insertPosition(menuDef.getShortCutCount()); ShortCut shortCut = action.methodAction(handler); if (shortCut == null){ diff --git a/designer_base/src/com/fr/design/mainframe/widget/editors/FormattedEditor.java b/designer_base/src/com/fr/design/mainframe/widget/editors/FormattedEditor.java index 942fc902c..2db12f23b 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/editors/FormattedEditor.java +++ b/designer_base/src/com/fr/design/mainframe/widget/editors/FormattedEditor.java @@ -4,6 +4,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; import java.text.Format; import java.text.ParseException; @@ -32,17 +33,21 @@ public class FormattedEditor extends AbstractPropertyEditor { textField = new JFormattedTextField(format); panel.add(textField, BorderLayout.CENTER); textField.setBorder(null); - textField.addKeyListener(new KeyAdapter() { + textField.addKeyListener(createKeyListener()); + } + + protected KeyListener createKeyListener() { + return new KeyAdapter() { - public void keyReleased(KeyEvent e) { - try { - textField.commitEdit(); - } catch (ParseException e1) { - return; - } - firePropertyChanged(); - } - }); + public void keyReleased(KeyEvent e) { + try { + textField.commitEdit(); + } catch (ParseException e1) { + return; + } + firePropertyChanged(); + } + }; } @Override diff --git a/designer_base/src/com/fr/design/menu/ShortCut.java b/designer_base/src/com/fr/design/menu/ShortCut.java index 796724614..7f71d9a2c 100644 --- a/designer_base/src/com/fr/design/menu/ShortCut.java +++ b/designer_base/src/com/fr/design/menu/ShortCut.java @@ -1,16 +1,20 @@ package com.fr.design.menu; -import com.fr.stable.fun.Level; +import com.fr.stable.fun.impl.AbstractProvider; +import com.fr.stable.fun.mark.API; +import com.fr.stable.fun.mark.Mutable; -import javax.swing.JPopupMenu; -import javax.swing.JToolBar; +import javax.swing.*; /** * 用来往MenuDef或是ToolBarDef里面加东西时用的接口 * august:ShortCut没有必要序列化和XMLabled * 原来那么多Menudef都提供持久化操作，太浪费资源 */ -public abstract class ShortCut implements Level{ +@API(level = ShortCut.CURRENT_LEVEL) +public abstract class ShortCut extends AbstractProvider implements Mutable { + + public static final String TEMPLATE_TREE = "TemplateTreeShortCut"; public static final int CURRENT_LEVEL = 1; @@ -18,6 +22,10 @@ public abstract class ShortCut implements Level{ return CURRENT_LEVEL; } + @Override + public String mark4Provider() { + return getClass().getName(); + } private MenuKeySet menuKeySet = null; diff --git a/designer_base/src/com/fr/design/mingche.java b/designer_base/src/com/fr/design/mingche.java new file mode 100644 index 000000000..da6ffa948 --- /dev/null +++ b/designer_base/src/com/fr/design/mingche.java @@ -0,0 +1,6 @@ +package com.fr.design; + +public class mingche +{ + +} diff --git a/designer_base/src/com/fr/design/module/DesignModule.java b/designer_base/src/com/fr/design/module/DesignModule.java index 74e8944a2..7dca3803f 100644 --- a/designer_base/src/com/fr/design/module/DesignModule.java +++ b/designer_base/src/com/fr/design/module/DesignModule.java @@ -22,6 +22,7 @@ import com.fr.stable.plugin.ExtraDesignClassManagerProvider; import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * Created by IntelliJ IDEA. @@ -66,7 +67,7 @@ public abstract class DesignModule extends TopModule { public Class[] actionsForInsertCellElement() { List> classes = new ArrayList<>(); - ElementUIProvider[] providers = ExtraDesignClassManager.getInstance().getElementUIProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING); for (ElementUIProvider provider : providers) { classes.add(provider.actionForInsertCellElement()); } @@ -75,7 +76,7 @@ public abstract class DesignModule extends TopModule { public Class[] actionsForInsertFloatElement() { List> classes = new ArrayList<>(); - ElementUIProvider[] providers = ExtraDesignClassManager.getInstance().getElementUIProviders(); + Set providers = ExtraDesignClassManager.getInstance().getArray(ElementUIProvider.MARK_STRING); for (ElementUIProvider provider : providers) { classes.add(provider.actionForInsertFloatElement()); } diff --git a/designer_base/src/com/fr/design/style/AlignmentPane.java b/designer_base/src/com/fr/design/style/AlignmentPane.java index 346465d05..d95d4bcea 100644 --- a/designer_base/src/com/fr/design/style/AlignmentPane.java +++ b/designer_base/src/com/fr/design/style/AlignmentPane.java @@ -17,6 +17,7 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.plugin.ExtraClassManager; +import com.fr.report.fun.VerticalTextProcessor; import com.fr.stable.CoreConstants; import javax.swing.*; @@ -125,7 +126,7 @@ public class AlignmentPane extends BasicPane { directionBG.add(rightToLeftRB); rightToLeftRB.setSelected(true); - if (ExtraClassManager.getInstance().getVerticalTextProcessor() == null){ + if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){ return; } isVerticalTextPanel.add(isVerticalTextCheckBox); @@ -301,7 +302,7 @@ public class AlignmentPane extends BasicPane { } private void populateVertical(Style style){ - if (ExtraClassManager.getInstance().getVerticalTextProcessor() == null){ + if (ExtraClassManager.getInstance().getSingle(VerticalTextProcessor.XML_TAG) == null){ return; } this.isVerticalTextCheckBox.setSelected(true); diff --git a/designer_base/src/com/fr/design/style/background/BackgroundFactory.java b/designer_base/src/com/fr/design/style/background/BackgroundFactory.java index 6dd04773a..25bf0b5b5 100644 --- a/designer_base/src/com/fr/design/style/background/BackgroundFactory.java +++ b/designer_base/src/com/fr/design/style/background/BackgroundFactory.java @@ -3,6 +3,7 @@ package com.fr.design.style.background; import com.fr.base.background.*; import com.fr.design.ExtraDesignClassManager; +import com.fr.design.fun.BackgroundQuickUIProvider; import com.fr.design.fun.BackgroundUIProvider; import com.fr.design.style.background.gradient.GradientBackgroundPane; import com.fr.design.style.background.impl.*; @@ -54,7 +55,8 @@ public class BackgroundFactory { } private static void registerExtra(Map, BackgroundUIWrapper> map) { - for (BackgroundUIProvider provider : ExtraDesignClassManager.getInstance().getBackgroundUIProviders()) { + Set set = ExtraDesignClassManager.getInstance().getArray(BackgroundUIProvider.MARK_STRING); + for (BackgroundUIProvider provider : set) { map.put(provider.targetClass(), BackgroundUIWrapper.create() .setType(provider.targetUIClass()).setTitle(provider.targetTitle())); } diff --git a/designer_base/src/com/fr/design/utils/DesignUtils.java b/designer_base/src/com/fr/design/utils/DesignUtils.java index 94db76af5..8ed8aa617 100644 --- a/designer_base/src/com/fr/design/utils/DesignUtils.java +++ b/designer_base/src/com/fr/design/utils/DesignUtils.java @@ -324,7 +324,7 @@ public class DesignUtils { private static String getWebBrowserPath() { String urlPath = FRContext.getCurrentEnv().getPath(); - DesignerEnvProcessor processor = ExtraDesignClassManager.getInstance().getEnvProcessor(); + DesignerEnvProcessor processor = ExtraDesignClassManager.getInstance().getSingle(DesignerEnvProcessor.XML_TAG); if (processor != null) { //cas访问的时候, url要处理下. urlPath = processor.getWebBrowserURL(urlPath); diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index 6f7d1e3b7..7cff11c37 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -388,7 +388,7 @@ public class RemoteEnv implements Env { private void extraChangeEnvPara() { //在env连接之前, 加载一下不依赖env的插件. 看看需不需要改变参数. PluginLoader.init(); - DesignerEnvProcessor envProcessor = ExtraDesignClassManager.getInstance().getEnvProcessor(); + DesignerEnvProcessor envProcessor = ExtraDesignClassManager.getInstance().getSingle(DesignerEnvProcessor.XML_TAG); if (envProcessor != null) { this.path = envProcessor.changeEnvPathBeforeConnect(user, password, path); } @@ -2046,25 +2046,7 @@ public class RemoteEnv implements Env { } - private void readPlugins() throws Exception { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - HashMap para = new HashMap(); - para.put("op", "fr_remote_design"); - para.put("cmd", "design_plugins"); - - InputStream inputStream = postBytes2ServerB(out.toByteArray(), para); - String pluginsStr = IOUtils.inputStream2String(inputStream, EncodeConstants.ENCODING_UTF_8); - if (StringUtils.isNotBlank(pluginsStr) && pluginsStr.startsWith("[")) { - JSONArray jsonArray = new JSONArray(pluginsStr); - for (int i = 0; i < jsonArray.length(); i++) { - Plugin plugin = new Plugin(); - plugin.parseJSON(jsonArray.getJSONObject(i)); - PluginLoader.getLoader().addRemotePlugin(plugin); - } - } - } - - private void readPluginLicenses() throws Exception { + public void readPluginLicenses() throws Exception { ByteArrayOutputStream out = new ByteArrayOutputStream(); HashMap para = new HashMap(); para.put("op", "fr_remote_design"); @@ -2083,8 +2065,6 @@ public class RemoteEnv implements Env { } @Override - public void readPluginConfig() throws Exception { - readPlugins(); - readPluginLicenses(); + public void checkAndRegisterLic(FileNode node, Plugin plugin) throws Exception { } } \ No newline at end of file diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 6d92b1067..470affb44 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -39,6 +39,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.lang.reflect.Method; +import java.util.Set; /** * The main class of Report Designer. @@ -113,11 +114,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } private void bindGlobalListener() { - GlobalListenerProvider[] providers = ExtraDesignClassManager.getInstance().getGlobalListenerProvider(); - if (ArrayUtils.isNotEmpty(providers)) { - for (GlobalListenerProvider provider : providers) { - Toolkit.getDefaultToolkit().addAWTEventListener(provider.listener(), AWTEvent.KEY_EVENT_MASK); - } + Set providers = ExtraDesignClassManager.getInstance().getArray(GlobalListenerProvider.XML_TAG); + for (GlobalListenerProvider provider : providers) { + Toolkit.getDefaultToolkit().addAWTEventListener(provider.listener(), AWTEvent.KEY_EVENT_MASK); } } diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java index 686c130c1..2203f4963 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/ChartTypePane.java @@ -7,6 +7,7 @@ import com.fr.chart.chartattr.Plot; import com.fr.chart.charttypes.ChartTypeManager; import com.fr.design.ChartTypeInterfaceManager; import com.fr.design.beans.FurtherBasicBeanPane; +import com.fr.design.dialog.BasicScrollPane; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; @@ -37,8 +38,28 @@ public class ChartTypePane extends AbstractChartAttrPane{ content.add(buttonPane, BorderLayout.NORTH); chartTypePane = new ComboBoxPane(); - chartTypePane.setBorder(BorderFactory.createEmptyBorder(0,0, 0, 10)); - content.add(chartTypePane, BorderLayout.CENTER); + BasicScrollPane scrollPane = new BasicScrollPane() { + @Override + protected JPanel createContentPane() { + return chartTypePane; + } + + @Override + protected void layoutContentPane() { + leftcontentPane = createContentPane(); + this.add(leftcontentPane); + } + + @Override + public void populateBean(Object ob) { + } + + @Override + protected String title4PopupWindow() { + return null; + } + }; + content.add(scrollPane, BorderLayout.CENTER); buttonPane.setEditingChartPane(chartTypePane); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java index fbe51e794..5de599d9a 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java @@ -199,6 +199,7 @@ public class ChartFillStylePane extends BasicBeanPane{ condition.setColorStyle(ChartConstants.COLOR_DEFAULT); } } else { + condition.setCustomFillStyle(true); if(gradientButton.isSelected()) { condition.setColorStyle(ChartConstants.COLOR_GRADIENT); Color start = colorGradient.getSelectColorPointBtnP1().getColorInner(); diff --git a/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyFitLayoutAdapter.java b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyFitLayoutAdapter.java new file mode 100644 index 000000000..0dc00045b --- /dev/null +++ b/designer_form/src/com/fr/design/designer/beans/adapters/layout/FRBodyFitLayoutAdapter.java @@ -0,0 +1,21 @@ +package com.fr.design.designer.beans.adapters.layout; + +import com.fr.design.beans.GroupModel; +import com.fr.design.designer.creator.XLayoutContainer; +import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.properties.BodyMobileLayoutPropertiesGroupModel; + +public class FRBodyFitLayoutAdapter extends FRFitLayoutAdapter { + + public FRBodyFitLayoutAdapter(XLayoutContainer container) { + super(container); + } + /** + * 返回布局自身属性，方便一些特有设置在layout刷新时处理 + */ + @Override + public GroupModel getLayoutProperties() { + XWFitLayout xfl = (XWFitLayout) container; + return new BodyMobileLayoutPropertiesGroupModel(xfl); + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/creator/XElementCase.java b/designer_form/src/com/fr/design/designer/creator/XElementCase.java index 29310ca0c..3824016e5 100644 --- a/designer_form/src/com/fr/design/designer/creator/XElementCase.java +++ b/designer_form/src/com/fr/design/designer/creator/XElementCase.java @@ -9,7 +9,10 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.mainframe.CoverReportPane; import com.fr.design.mainframe.EditingMouseListener; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.widget.editors.*; +import com.fr.design.mainframe.WidgetPropertyPane; +import com.fr.design.mainframe.widget.editors.BooleanEditor; +import com.fr.design.mainframe.widget.editors.PaddingMarginEditor; +import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor; import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer; import com.fr.design.mainframe.widget.renderer.PaddingMarginCellRenderer; import com.fr.form.FormElementCaseContainerProvider; @@ -18,6 +21,8 @@ import com.fr.form.ui.ElementCaseEditor; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; import com.fr.stable.core.PropertyChangeAdapter; +import com.fr.stable.fun.FitProvider; +import com.fr.stable.fun.ReportFitAttrProvider; import javax.swing.*; import java.awt.*; @@ -29,17 +34,21 @@ import java.beans.PropertyDescriptor; public class XElementCase extends XBorderStyleWidgetCreator implements FormElementCaseContainerProvider{ private UILabel imageLable; private JPanel coverPanel; + private FormDesigner designer; public XElementCase(ElementCaseEditor widget, Dimension initSize) { super(widget, initSize); + + } - + protected void initXCreatorProperties() { super.initXCreatorProperties(); + // 报表块初始化时要加载对应的borderStyle initBorderStyle(); } - + /** * 是否支持设置标题 * @return 是返回true @@ -77,15 +86,23 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme }; - FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getPropertyTableEditor(); - if (processor == null){ + FormElementCaseEditorProcessor processor = ExtraDesignClassManager.getInstance().getSingle(FormElementCaseEditorProcessor.MARK_STRING); + if (processor == null) { return propertyTableEditor; } - PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass()); + this.designer = WidgetPropertyPane.getInstance().getEditingFormDesigner(); + FitProvider wbTpl = (FitProvider) designer.getTarget(); + ReportFitAttrProvider fitAttr = wbTpl.getFitAttr(); + ElementCaseEditor editor = this.toData(); + ReportFitAttrProvider reportFitAttr = editor.getReportFitAttr() == null ? fitAttr : editor.getReportFitAttr(); + PropertyDescriptor[] extraEditor = processor.createPropertyDescriptor(this.data.getClass(), reportFitAttr); + + if (editor.getReportFitAttr() == null) { + editor.setReportFitInPc(processor.getFitStateInPC(fitAttr)); + } return (CRPropertyDescriptor[]) ArrayUtils.addAll(propertyTableEditor, extraEditor); } - @Override protected String getIconName() { return "text_field_16.png"; @@ -118,7 +135,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme } return editor; } - + /** * 从data中获取到图片背景, 并设置到Label上 */ @@ -126,10 +143,10 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme UILabel imageLable = new UILabel(); BufferedImage image = toData().getECImage(); setLabelBackground(image, imageLable); - + return imageLable; } - + /** * 设置指定Label的背景 */ @@ -179,7 +196,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public boolean canEnterIntoParaPane(){ return false; } - + /** * 返回报表块对应的widget * @return 返回ElementCaseEditor @@ -187,11 +204,11 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public ElementCaseEditor toData() { return ((ElementCaseEditor) data); } - + public FormElementCaseProvider getElementCase() { return toData().getElementCase(); } - + public String getElementCaseContainerName() { return toData().getWidgetName(); } @@ -199,20 +216,20 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme public void setElementCase(FormElementCaseProvider el) { toData().setElementCase(el); } - + public void setBackground(BufferedImage image){ toData().setECImage(image); setEditorIcon(image); } - + private void setEditorIcon(BufferedImage image){ setLabelBackground(image, imageLable); } - + public Dimension getSize(){ return new Dimension(this.getWidth(), this.getHeight()); } - + /** * 响应点击事件 * @param editingMouseListener 事件处理器 @@ -222,8 +239,8 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme super.respondClick(editingMouseListener, e); switchTab(e,editingMouseListener); } - - + + private void switchTab(MouseEvent e,EditingMouseListener editingMouseListener){ FormDesigner designer = editingMouseListener.getDesigner(); if (e.getClickCount() == 2 || designer.getCursor().getType() == Cursor.HAND_CURSOR){ diff --git a/designer_form/src/com/fr/design/designer/creator/XWBodyFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWBodyFitLayout.java new file mode 100644 index 000000000..d9a404cb5 --- /dev/null +++ b/designer_form/src/com/fr/design/designer/creator/XWBodyFitLayout.java @@ -0,0 +1,20 @@ +package com.fr.design.designer.creator; + +import com.fr.design.designer.beans.LayoutAdapter; +import com.fr.design.designer.beans.adapters.layout.FRBodyFitLayoutAdapter; +import com.fr.form.ui.container.WFitLayout; +import java.awt.Dimension; + +public class XWBodyFitLayout extends XWFitLayout { + public XWBodyFitLayout() { + this(new WFitLayout(), new Dimension()); + } + + public XWBodyFitLayout(WFitLayout widget, Dimension initSize) { + super(widget, initSize); + } + @Override + public LayoutAdapter getLayoutAdapter() { + return new FRBodyFitLayoutAdapter(this); + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java index bd2b34290..38652b3d4 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWFitLayout.java @@ -13,7 +13,9 @@ import com.fr.design.designer.beans.LayoutAdapter; import com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter; import com.fr.design.designer.beans.location.Direction; import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; +import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI; import com.fr.design.form.layout.FRFitLayout; +import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.mainframe.FormArea; import com.fr.design.utils.gui.LayoutUtils; import com.fr.form.ui.PaddingMargin; @@ -1155,5 +1157,10 @@ public class XWFitLayout extends XLayoutContainer { public XLayoutContainer findNearestFit() { return this; } + + @Override + public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() { + return new WidgetPropertyUIProvider[]{ new BodyMobilePropertyUI(new XWBodyFitLayout())}; + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java index 1e59959be..9f92b9786 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWParameterLayout.java @@ -56,9 +56,6 @@ public class XWParameterLayout extends XWAbsoluteLayout { .getLocText("FR-Designer_Form-Widget_Name")), new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class) .setRendererClass(BackgroundRenderer.class).setI18NName(Inter.getLocText("Background")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("display", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(Inter.getLocText("ParameterD-Show_Parameter_Window")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) .setI18NName(Inter.getLocText("FR-Designer_DisplayNothingBeforeQuery")) diff --git a/designer_form/src/com/fr/design/designer/creator/XWTitleLayout.java b/designer_form/src/com/fr/design/designer/creator/XWTitleLayout.java index 0d8e3ec22..c0f45c888 100644 --- a/designer_form/src/com/fr/design/designer/creator/XWTitleLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/XWTitleLayout.java @@ -1,5 +1,5 @@ /** - * + * */ package com.fr.design.designer.creator; @@ -25,17 +25,17 @@ import java.awt.event.ContainerEvent; public class XWTitleLayout extends DedicateLayoutContainer { /** - * + * */ private static final long serialVersionUID = 5274572473978467325L; - + public XWTitleLayout() { super(new WTitleLayout("titlePane"), new Dimension()); } /** * 容器构造函数 - * + * * @param widget 控件widget * @param initSize 尺寸大小 */ @@ -58,17 +58,17 @@ public class XWTitleLayout extends DedicateLayoutContainer { public LayoutAdapter getLayoutAdapter() { return new FRTitleLayoutAdapter(this); } - + /** * 返回容器对应的wlayout - * + * * @return 同上 */ @Override public WTitleLayout toData() { return (WTitleLayout) data; } - + /** * 重置组件的名称 * @param name 名称 @@ -77,20 +77,20 @@ public class XWTitleLayout extends DedicateLayoutContainer { super.resetCreatorName(name); // 有标题的话，标题的名字也要重置下 if (getXCreatorCount() > 1) { - getTitleCreator().toData().setWidgetName(WidgetTitle.TITLE_NAME_INDEX + name); - } + getTitleCreator().toData().setWidgetName(WidgetTitle.TITLE_NAME_INDEX + name); + } } - + /** * 返回默认组件name - * + * * @return 容器名 */ @Override public String createDefaultName() { return "titlePanel"; } - + /** * 返回标题组件 * @return 标题组件 @@ -104,7 +104,7 @@ public class XWTitleLayout extends DedicateLayoutContainer { } return null; } - + /** * 将WLayout转换为XLayoutContainer */ @@ -128,7 +128,7 @@ public class XWTitleLayout extends DedicateLayoutContainer { /** * 组件增加 - * + * * @param e 容器事件 */ @Override @@ -139,17 +139,17 @@ public class XWTitleLayout extends DedicateLayoutContainer { WTitleLayout layout = this.toData(); XWidgetCreator creator = (XWidgetCreator) e.getChild(); FRTitleLayout lay = (FRTitleLayout) getLayout(); - Object constraints = lay.getConstraints(creator); - if (ComparatorUtils.equals(WTitleLayout.TITLE,constraints)) { - layout.addTitle(creator.toData(), creator.getBounds()); - } else if (ComparatorUtils.equals(WTitleLayout.BODY,constraints)) { - layout.addBody(creator.toData(), creator.getBounds()); - } + Object constraints = lay.getConstraints(creator); + if (ComparatorUtils.equals(WTitleLayout.TITLE,constraints)) { + layout.addTitle(creator.toData(), creator.getBounds()); + } else if (ComparatorUtils.equals(WTitleLayout.BODY,constraints)) { + layout.addBody(creator.toData(), creator.getBounds()); + } } /** * 组件删除 - * + * * @param e * 容器事件 */ diff --git a/designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java b/designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java new file mode 100644 index 000000000..e675a81f0 --- /dev/null +++ b/designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java @@ -0,0 +1,83 @@ +package com.fr.design.designer.properties; + +import java.awt.event.MouseEvent; +import java.util.ArrayList; + +import javax.swing.JTable; +import javax.swing.table.TableColumn; +import javax.swing.table.TableModel; + +import com.fr.design.beans.GroupModel; +import com.fr.design.designer.creator.*; +import com.fr.design.gui.itable.AbstractPropertyTable; +import com.fr.design.gui.itable.PropertyGroup; +import com.fr.design.designer.beans.LayoutAdapter; + + +public class BodyAppRelayoutTable extends AbstractPropertyTable { + + private XWBodyFitLayout xwBodyFitLayout; + + public BodyAppRelayoutTable(XWBodyFitLayout xwBodyFitLayout) { + super(); + setDesigner(xwBodyFitLayout); + } + + public static ArrayList getCreatorPropertyGroup(XCreator source) { + ArrayList groups = new ArrayList(); + if (source instanceof XLayoutContainer) { + LayoutAdapter layoutAdapter = ((XLayoutContainer)source).getLayoutAdapter(); + if(layoutAdapter != null){ + GroupModel m = layoutAdapter.getLayoutProperties(); + if (m != null) { + groups.add(new PropertyGroup(m)); + } + } + } + return groups; + } + + /** + * 初始化属性表组 + * @param source 控件 + */ + public void initPropertyGroups(Object source) { + + groups = getCreatorPropertyGroup(xwBodyFitLayout); + + TableModel model = new BeanTableModel(); + setModel(model); + this.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); + TableColumn tc = this.getColumn(this.getColumnName(0)); + tc.setPreferredWidth(30); + this.repaint(); + } + + private void setDesigner(XWBodyFitLayout xwBodyFitLayout) { + this.xwBodyFitLayout = xwBodyFitLayout; + } + + + /** + * 单元格tooltip + * 属性名悬浮提示 + * + * @param 鼠标点击事件 + * @return 单元格tooltip + */ + public String getToolTipText(MouseEvent event) { + int row = BodyAppRelayoutTable.super.rowAtPoint(event.getPoint()); + int column = BodyAppRelayoutTable.super.columnAtPoint(event.getPoint()); + if(row != -1 && column == 0){ + return String.valueOf(this.getValueAt(row, column)); + } + return null; + } + + /** + * 待说明 + */ + public void firePropertyEdit() { + + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/properties/BodyMobileLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/BodyMobileLayoutPropertiesGroupModel.java new file mode 100644 index 000000000..7ec437662 --- /dev/null +++ b/designer_form/src/com/fr/design/designer/properties/BodyMobileLayoutPropertiesGroupModel.java @@ -0,0 +1,111 @@ +package com.fr.design.designer.properties; + +import com.fr.design.beans.GroupModel; +import com.fr.form.ui.container.WFitLayout; +import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.gui.icheckbox.UICheckBox; +import com.fr.design.mainframe.widget.editors.BooleanEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; +import com.fr.general.Inter; + +import javax.swing.*; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.*; + +public class BodyMobileLayoutPropertiesGroupModel implements GroupModel { + private PropertyCellEditor reLayoutEditor; + private CheckBoxCellRenderer reLayoutrenderer; + private WFitLayout layout; + private XWFitLayout xfl; + + public BodyMobileLayoutPropertiesGroupModel(XWFitLayout xfl) { + this.xfl = xfl; + this.layout = xfl.toData(); + reLayoutrenderer = new CheckBoxCellRenderer(); + reLayoutEditor = new PropertyCellEditor(new BooleanEditor()); + } + + @Override + public String getGroupName() { + return Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"); + } + + @Override + public int getRowCount() { + return 1; + } + + @Override + public TableCellRenderer getRenderer(int row) { + return reLayoutrenderer; + } + + @Override + public TableCellEditor getEditor(int row) { + return reLayoutEditor; + } + + @Override + public Object getValue(int row, int column) { + if (column == 0) { + return Inter.getLocText("FR-Designer-App_ReLayout"); + }else { + return layout.getAppRelayout(); + } + } + + @Override + public boolean setValue(Object value, int row, int column) { + int state = 0; + boolean appRelayoutState = true; + if(value instanceof Integer) { + state = (Integer)value; + }else if (value instanceof Boolean) { + appRelayoutState = (boolean)value; + } + if (column == 0 || state < 0) { + return false; + } else { + layout.setAppRelayout(appRelayoutState); + return true; + } + } + + /** + * 是否可编辑 + * @param row 行 + * @return 否 + */ + @Override + public boolean isEditable(int row) { + return true; + } + + private class CheckBoxCellRenderer extends UICheckBox implements TableCellRenderer { + + + public CheckBoxCellRenderer() { + super(); + setOpaque(true); + + } + + public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + if (value instanceof Boolean) { + setSelected(((Boolean) value).booleanValue()); + setEnabled(table.isCellEditable(row, column)); + if (isSelected) { + setBackground(table.getSelectionBackground()); + setForeground(table.getSelectionForeground()); + } else { + setForeground(table.getForeground()); + setBackground(table.getBackground()); + } + } else { + return null; + } + return this; + } + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java index bbabddcc8..8a2f50793 100644 --- a/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java +++ b/designer_form/src/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java @@ -5,19 +5,15 @@ package com.fr.design.designer.properties; import com.fr.design.beans.GroupModel; import com.fr.design.designer.creator.XWFitLayout; -import com.fr.design.gui.icheckbox.UICheckBox; -import com.fr.design.mainframe.widget.editors.BooleanEditor; import com.fr.design.mainframe.widget.editors.FitLayoutDirectionEditor; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WFitLayout; import com.fr.general.Inter; -import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; -import java.awt.*; /** * 自适应布局自身的属性表 @@ -32,8 +28,6 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { private DefaultTableCellRenderer renderer; private FitLayoutDirectionEditor stateEditor; private FitStateRenderer stateRenderer; - private PropertyCellEditor reLayoutEditor; - private CheckBoxCellRenderer reLayoutrenderer; private WFitLayout layout; private XWFitLayout xfl; @@ -44,8 +38,6 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { editor = new PropertyCellEditor(new IntegerPropertyEditor()); stateEditor = new FitLayoutDirectionEditor(); stateRenderer = new FitStateRenderer(); - reLayoutrenderer = new CheckBoxCellRenderer(); - reLayoutEditor = new PropertyCellEditor(new BooleanEditor()); } /** @@ -58,7 +50,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { @Override public int getRowCount() { - return 3; + return 2; } @Override @@ -66,11 +58,8 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { switch (row) { case 0: return renderer; - case 1: - return stateRenderer; default: - return reLayoutrenderer; - + return stateRenderer; } } @@ -79,10 +68,8 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { switch (row) { case 0: return editor; - case 1: - return stateEditor; default: - return reLayoutEditor; + return stateEditor; } } @@ -92,19 +79,15 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { switch (row) { case 0: return Inter.getLocText("FR-Designer_Component_Interval"); - case 1 : - return Inter.getLocText("FR-Designer_Component_Scale"); default: - return Inter.getLocText("FR-Designer-App_ReLayout"); + return Inter.getLocText("FR-Designer_Component_Scale"); } } else { switch (row) { case 0: return layout.getCompInterval(); - case 1 : - return layout.getCompState(); default: - return layout.getAppRelayout(); + return layout.getCompState(); } } } @@ -112,11 +95,8 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { @Override public boolean setValue(Object value, int row, int column) { int state = 0; - boolean appRelayoutState = true; if(value instanceof Integer) { state = (Integer)value; - } else if (value instanceof Boolean) { - appRelayoutState = (boolean) value; } if (column == 0 || state < 0) { return false; @@ -128,10 +108,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { }else if (row == 1) { layout.setCompState(state); return true; - } else if (row == 2) { - layout.setAppRelayout(appRelayoutState); - return true; - } + } return false; } } @@ -155,33 +132,4 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } - - - private class CheckBoxCellRenderer extends UICheckBox implements TableCellRenderer { - - - public CheckBoxCellRenderer() { - super(); - setOpaque(true); - - } - - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - if (value instanceof Boolean) { - setSelected(((Boolean) value).booleanValue()); - setEnabled(table.isCellEditable(row, column)); - if (isSelected) { - setBackground(table.getSelectionBackground()); - setForeground(table.getSelectionForeground()); - } else { - setForeground(table.getForeground()); - setBackground(table.getBackground()); - } - } else { - return null; - } - return this; - } - } - } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java b/designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java new file mode 100644 index 000000000..3816b9841 --- /dev/null +++ b/designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java @@ -0,0 +1,30 @@ +package com.fr.design.designer.properties.mobile; + +import com.fr.design.designer.creator.XCreator; +import com.fr.design.designer.creator.XWBodyFitLayout; +import com.fr.design.designer.properties.BodyAppRelayoutTable; +import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider; +import com.fr.design.gui.itable.AbstractPropertyTable; +import com.fr.general.Inter; + +/** + * Created by Administrator on 2016/5/16/0016. + */ +public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider { + + private XCreator xCreator; + + public BodyMobilePropertyUI(XWBodyFitLayout xWBodyFitLayout) { + this.xCreator = xWBodyFitLayout; + } + + @Override + public AbstractPropertyTable createWidgetAttrTable() { + return new BodyAppRelayoutTable((XWBodyFitLayout) xCreator); + } + + @Override + public String tableTitle() { + return Inter.getLocText("FR-Designer_Mobile-Attr"); + } +} diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/BooleanRender.java b/designer_form/src/com/fr/design/designer/properties/mobile/BooleanRender.java new file mode 100644 index 000000000..04536f29c --- /dev/null +++ b/designer_form/src/com/fr/design/designer/properties/mobile/BooleanRender.java @@ -0,0 +1,39 @@ +package com.fr.design.designer.properties.mobile; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.plaf.UIResource; +import javax.swing.table.TableCellRenderer; +import java.awt.*; + +public class BooleanRender extends JCheckBox implements TableCellRenderer, UIResource { + private static final Border noFocusBorder = new EmptyBorder(1, 0, 0, 0); + + public BooleanRender() { + super(); + setHorizontalAlignment(JLabel.LEFT); + setBorderPainted(true); + } + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + if (isSelected) { + setForeground(table.getSelectionForeground()); + super.setBackground(table.getSelectionBackground()); + } + else { + setForeground(table.getForeground()); + setBackground(table.getBackground()); + } + setSelected((value != null && ((Boolean)value).booleanValue())); + + if (hasFocus) { + setBorder(UIManager.getBorder("Table.focusCellHighlightBorder")); + } else { + setBorder(noFocusBorder); + } + + return this; + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java index 9d4a14d5b..c846d48f5 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java @@ -1,17 +1,18 @@ package com.fr.design.designer.properties.mobile; import com.fr.base.FRContext; +import com.fr.base.mobile.MobileFitAttrState; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.CRPropertyDescriptor; import com.fr.design.designer.creator.XCreator; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.gui.itable.PropertyGroup; -import com.fr.design.gui.xtable.PropertyGroupModel; +import com.fr.design.gui.xtable.ReportAppPropertyGroupModel; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.WidgetPropertyPane; -import com.fr.design.mainframe.widget.editors.DoubleEditor; +import com.fr.design.mainframe.WidgetPropertyPane;; import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor; +import com.fr.design.mainframe.widget.editors.RefinedDoubleEditor; import com.fr.form.ui.ElementCaseEditor; import com.fr.general.Inter; @@ -27,17 +28,20 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ private XCreator xCreator; private FormDesigner designer; + private boolean cascade = false; public ElementCasePropertyTable(XCreator xCreator) { this.xCreator = xCreator; } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { - if (((ElementCaseEditor ) xCreator.toData()).getVerticalAttr().getState() == 2 && !((ElementCaseEditor ) xCreator.toData()).isHeightRestrict()) { + if (((ElementCaseEditor ) xCreator.toData()).getVerticalAttr() == MobileFitAttrState.VERTICAL && !((ElementCaseEditor ) xCreator.toData()).isHeightRestrict()) { ((ElementCaseEditor ) xCreator.toData()).setHeightRestrict(true); + cascade = true; return revealHeightLimit(); } CRPropertyDescriptor[] crp = ((ElementCaseEditor) xCreator.toData()).isHeightRestrict() ? revealHeightLimit() : getDefault(); + cascade = ((ElementCaseEditor ) xCreator.toData()).getVerticalAttr() == MobileFitAttrState.VERTICAL; return crp; } @@ -53,6 +57,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit-App")), new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) .setI18NName(Inter.getLocText("Form-EC_heightrestrict")) + .setRendererClass(BooleanRender.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, Inter.getLocText("FR-Designer_Fit-App")) }; List defaultList = new ArrayList<>(); @@ -65,7 +70,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException { CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass()) - .setEditorClass(DoubleEditor.class) + .setEditorClass(RefinedDoubleEditor.class) .setI18NName(Inter.getLocText("Form-EC_heightpercent")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); ArrayList defaultList = (ArrayList) createNonListenerProperties(); @@ -91,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ } - groups.add(new PropertyGroup(new PropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Fit-App"), xCreator, propertyTableEditor, designer))); TableModel model = new BeanTableModel(); setModel(model); @@ -103,6 +108,14 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); } + @Override + public boolean isCellEditable(int row, int column) { + if (cascade && row ==3 ) { + return false; + } + return super.isCellEditable(row, column); + } + public void populate(FormDesigner designer) { this.designer = designer; initPropertyGroups(this.designer.getTarget()); diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java index 5e7721a2e..ac0ba0094 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java @@ -9,7 +9,7 @@ import com.fr.general.Inter; /** * Created by Administrator on 2016/5/16/0016. */ -public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider{ +public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { private XCreator xCreator; diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitAlignmentItems.java b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitAlignmentItems.java index 094249bf5..552589b71 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitAlignmentItems.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitAlignmentItems.java @@ -4,7 +4,7 @@ import com.fr.base.mobile.MobileFitAttrState; import com.fr.design.designer.properties.items.Item; import com.fr.design.designer.properties.items.ItemProvider; -public class MobileFitAlignmentItems implements ItemProvider{ +public class MobileFitAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS; diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitEditor.java b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitEditor.java index 0930a8e69..9b3948b17 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitEditor.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitEditor.java @@ -6,7 +6,7 @@ import com.fr.design.mainframe.widget.editors.ComboEditor; import java.util.Vector; -public class MobileFitEditor extends ComboEditor{ +public class MobileFitEditor extends ComboEditor { public MobileFitEditor() { this(new MobileFitAlignmentItems()); } diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitRender.java b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitRender.java index 6f560e4e3..e8932459b 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitRender.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitRender.java @@ -2,7 +2,7 @@ package com.fr.design.designer.properties.mobile; import com.fr.design.mainframe.widget.renderer.EncoderCellRenderer; -public class MobileFitRender extends EncoderCellRenderer{ +public class MobileFitRender extends EncoderCellRenderer { public MobileFitRender(){ super(new MobileFitWrapper()); diff --git a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitWrapper.java b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitWrapper.java index 164bcc5c0..2e4c219b9 100644 --- a/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitWrapper.java +++ b/designer_form/src/com/fr/design/designer/properties/mobile/MobileFitWrapper.java @@ -2,7 +2,7 @@ package com.fr.design.designer.properties.mobile; import com.fr.design.designer.properties.ItemWrapper; -public class MobileFitWrapper extends ItemWrapper{ +public class MobileFitWrapper extends ItemWrapper { public MobileFitWrapper(){ super(new MobileFitAlignmentItems()); } diff --git a/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java b/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java index 143176553..8e8cadad1 100644 --- a/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java +++ b/designer_form/src/com/fr/design/gui/xtable/PropertyGroupModel.java @@ -17,16 +17,16 @@ import java.lang.reflect.Method; import java.util.ArrayList; public class PropertyGroupModel extends AbstractPropertyGroupModel { - - private FormDesigner designer; + + private FormDesigner designer; public PropertyGroupModel(String name, XCreator creator, CRPropertyDescriptor[] propArray, - FormDesigner designer) { - super(name, creator, propArray); - this.designer = designer; - } + FormDesigner designer) { + super(name, creator, propArray); + this.designer = designer; + } - @Override + @Override public Object getValue(int row, int column) { if (column == 0) { return properties[row].getDisplayName(); @@ -49,9 +49,9 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel { try { Method m = properties[row].getWriteMethod(); m.invoke(dealCreatorData(), value); - //属性名称为控件名时，单独处理下 + //属性名称为控件名时，单独处理下 if(ComparatorUtils.equals(FormConstants.NAME, properties[row].getName())){ - creator.resetCreatorName(value.toString()); + creator.resetCreatorName(value.toString()); } properties[row].firePropertyChanged(); return true; @@ -103,49 +103,49 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel { PROPERTIES.add("Properties"); PROPERTIES.add("Others"); } - + /** * 控件属性赋值和取值时，针对scale和title做下处理 * @return */ private Object dealCreatorData() { - return creator.getPropertyDescriptorCreator().toData(); + return creator.getPropertyDescriptorCreator().toData(); } - - @Override - protected void initEditor(final int row) throws Exception { - ExtendedPropertyEditor editor = (ExtendedPropertyEditor) properties[row].createPropertyEditor(dealCreatorData()); - if (editor == null) { - Class propType = properties[row].getPropertyType(); - editor = TableUtils.getPropertyEditorClass(propType).newInstance(); - } - if (editor != null) { - final ExtendedPropertyEditor extendEditor = editor; - editors[row] = new PropertyCellEditor(editor); - extendEditor.addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if(ComparatorUtils.equals(extendEditor.getValue(),getValue(row,1))) { - return; - } - if (extendEditor.refreshInTime()) { - editors[row].stopCellEditing(); - } else { - setValue(extendEditor.getValue(), row, 1); + + @Override + protected void initEditor(final int row) throws Exception { + ExtendedPropertyEditor editor = (ExtendedPropertyEditor) properties[row].createPropertyEditor(dealCreatorData()); + if (editor == null) { + Class propType = properties[row].getPropertyType(); + editor = TableUtils.getPropertyEditorClass(propType).newInstance(); + } + if (editor != null) { + final ExtendedPropertyEditor extendEditor = editor; + editors[row] = new PropertyCellEditor(editor); + extendEditor.addPropertyChangeListener(new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if(ComparatorUtils.equals(extendEditor.getValue(),getValue(row,1))) { + return; + } + if (extendEditor.refreshInTime()) { + editors[row].stopCellEditing(); + } else { + setValue(extendEditor.getValue(), row, 1); if (designer == null) { return; } - if ("widgetName".equals(properties[row].getName())) { - designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_RENAMED); - } else { - designer.fireTargetModified(); - } - designer.refreshDesignerUI(); - } - } - }); - } - } + if ("widgetName".equals(properties[row].getName())) { + designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_RENAMED); + } else { + designer.fireTargetModified(); + } + designer.refreshDesignerUI(); + } + } + }); + } + } } \ No newline at end of file diff --git a/designer_form/src/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java b/designer_form/src/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java new file mode 100644 index 000000000..3b45260e4 --- /dev/null +++ b/designer_form/src/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java @@ -0,0 +1,59 @@ +package com.fr.design.gui.xtable; + +import com.fr.base.FRContext; +import com.fr.design.designer.creator.CRPropertyDescriptor; +import com.fr.design.designer.creator.XCreator; +import com.fr.design.mainframe.FormDesigner; +import com.fr.general.Inter; +import java.lang.reflect.Method; +import com.fr.general.ComparatorUtils; +import com.fr.report.stable.FormConstants; + +import javax.swing.*; + +public class ReportAppPropertyGroupModel extends PropertyGroupModel { + + private static final double MAX_HEIGHT = 0.8; + + public ReportAppPropertyGroupModel(String name, XCreator creator, CRPropertyDescriptor[] propArray, + FormDesigner designer) { + super(name, creator, propArray, designer); + } + + @Override + public boolean setValue(Object value, int row, int column) { + double state = 0; + if (column == 0) { + return false; + } + if (value instanceof Double) { + state = (Double) value; + } + + try { + Method m = properties[row].getWriteMethod(); + if (state > MAX_HEIGHT) { + //弹窗提示 + JOptionPane.showMessageDialog(null, + Inter.getLocText("FR-Designer_Mobile-Warning"), + Inter.getLocText("FR-Designer_Tooltips"), + JOptionPane.PLAIN_MESSAGE); + return false; + } + m.invoke(dealCreatorData(), value); + //属性名称为控件名时，单独处理下 + if(ComparatorUtils.equals(FormConstants.NAME, properties[row].getName())){ + creator.resetCreatorName(value.toString()); + } + properties[row].firePropertyChanged(); + return true; + } catch (Exception e) { + FRContext.getLogger().error(e.getMessage(), e); + return false; + } + } + + private Object dealCreatorData() { + return creator.getPropertyDescriptorCreator().toData(); + } +} \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/FormDesigner.java b/designer_form/src/com/fr/design/mainframe/FormDesigner.java index 6312c5248..19bf64c70 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesigner.java +++ b/designer_form/src/com/fr/design/mainframe/FormDesigner.java @@ -340,6 +340,8 @@ public class FormDesigner extends TargetComponent
implements TreeSelection parameterArray = null; refreshParameter(); + //parameter多的时候，不刷新会出现控件边界交叉 + refreshRoot(); //不知道为什么添加完参数后控件树只有一个label，这儿刷新一下控件树好了 EastRegionContainerPane.getInstance().refreshDownPane(); } @@ -738,9 +740,6 @@ public class FormDesigner extends TargetComponent implements TreeSelection public void refreshRoot() { // 撤销恢复操作都会refreshRoot，这时候的target.getContainer里的widget会和之前不一样，所以不用root判断来取 XLayoutContainer formLayoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(this.getTarget().getContainer()); - if(ExtraClassManager.getInstance().getDebugLogProviders().length != 0){ - formDesignerDebug(); - } // 布局默认都是1，底层的border改为0，不然没意义 this.getTarget().getContainer().setMargin(new PaddingMargin(0,0,0,0)); formLayoutContainer.setBorder(null); @@ -797,9 +796,6 @@ public class FormDesigner extends TargetComponent implements TreeSelection // 再次打开时，layout下root，有内边距的话组件加上 LayoutUtils.layoutContainer(centerContainer); formLayoutContainer.add(rootComponent, WBorderLayout.CENTER); - if(ExtraClassManager.getInstance().getDebugLogProviders().length != 0){ - formDesignerDebug(); - } } @@ -1067,30 +1063,9 @@ public class FormDesigner extends TargetComponent implements TreeSelection */ public void refreshDesignerUI() { LayoutUtils.layoutRootContainer(getRootComponent()); - if(ExtraClassManager.getInstance().getDebugLogProviders().length != 0){ - formDesignerDebug(); - } repaint(); } - private void formDesignerDebug() { - if(this.getTarget().getContainer() instanceof WBorderLayout){ - Widget widget= ((WBorderLayout) this.getTarget().getContainer()).getLayoutWidget(WBorderLayout.CENTER); - if(widget != null){ - ExtraClassManager.getInstance().sendDebugLog(widget.getClass().getName()+"@"+Integer.toHexString(widget.hashCode())); - } - else { - ExtraClassManager.getInstance().sendDebugLog("Target.center is null"); - } - } - if(this.getRootComponent() != null && this.getRootComponent().toData() != null){ - ExtraClassManager.getInstance().sendDebugLog(this.getRootComponent().toData().getClass().getName()+"@"+Integer.toHexString(this.getRootComponent().toData().getClass().hashCode())); - } - else { - ExtraClassManager.getInstance().sendDebugLog("RootComponent or rootComponent.data is null"); - } - } - /** * 返回复制粘贴删除等动作 * @return 同上 diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index e7342fc87..0ab170429 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -20,14 +20,12 @@ import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.gui.xpane.FormHyperlinkGroupPane; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction; +import com.fr.design.mainframe.actions.TemplateParameterAction; import com.fr.design.mainframe.form.FormECCompositeProvider; import com.fr.design.mainframe.form.FormECDesignerProvider; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus; -import com.fr.design.menu.KeySetUtils; -import com.fr.design.menu.MenuDef; -import com.fr.design.menu.ShortCut; -import com.fr.design.menu.ToolBarDef; +import com.fr.design.menu.*; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; import com.fr.design.utils.gui.LayoutUtils; import com.fr.file.FILE; @@ -378,8 +376,13 @@ public class JForm extends JTemplate implements BaseJForm { * @return 返回菜单 */ public ShortCut[] shortcut4TemplateMenu() { - return this.index == FORM_TAB ? new ShortCut[0] : - this.elementCaseDesign.shortcut4TemplateMenu(); + if (this.index == FORM_TAB) { + return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{ + new TemplateParameterAction(this) + }, new ShortCut[0]); + } else { + return this.elementCaseDesign.shortcut4TemplateMenu(); + } } /** diff --git a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java index 57087597e..a385aed28 100644 --- a/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer_form/src/com/fr/design/mainframe/WidgetPropertyPane.java @@ -18,6 +18,7 @@ import javax.swing.*; import java.awt.*; import java.util.ArrayList; import java.util.List; +import java.util.Set; /** * 控件属性表Docking @@ -120,8 +121,8 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper if (selection != null && selection.getSelectedCreator() != null) { embeddedPropertyUIProviders = selection.getSelectedCreator().getWidgetPropertyUIProviders(); } - WidgetPropertyUIProvider[] widgetAttrProviders = ExtraDesignClassManager.getInstance().getWidgetAttrProviders(); - widgetAttrProviders = (WidgetPropertyUIProvider[]) ArrayUtils.addAll(embeddedPropertyUIProviders, widgetAttrProviders); + Set set = ExtraDesignClassManager.getInstance().getArray(WidgetPropertyUIProvider.XML_TAG); + WidgetPropertyUIProvider[] widgetAttrProviders = ArrayUtils.addAll(embeddedPropertyUIProviders, set.toArray(new WidgetPropertyUIProvider[set.size()])); return widgetAttrProviders; } diff --git a/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java new file mode 100644 index 000000000..59e08ae03 --- /dev/null +++ b/designer_form/src/com/fr/design/mainframe/actions/TemplateParameterAction.java @@ -0,0 +1,60 @@ +package com.fr.design.mainframe.actions; + +import com.fr.base.BaseUtils; +import com.fr.base.Parameter; +import com.fr.design.actions.JTemplateAction; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.mainframe.JForm; +import com.fr.design.menu.KeySetUtils; +import com.fr.design.parameter.ParameterArrayPane; +import com.fr.form.main.Form; + +import javax.swing.*; +import java.awt.event.ActionEvent; + +/** + * Created by 夏翔 on 2016/6/18. + */ +public class TemplateParameterAction extends JTemplateAction { + public TemplateParameterAction(JForm jwb) { + super(jwb); + this.setMenuKeySet(KeySetUtils.REPORT_PARAMETER_ATTR); + this.setName(getMenuKeySet().getMenuKeySetName() + "..."); + this.setMnemonic(getMenuKeySet().getMnemonic()); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.png")); + } + + @Override + public void actionPerformed(ActionEvent e) { + final JForm jwb = getEditingComponent(); + if (jwb == null) { + return; + } + final Form wbTpl = jwb.getTarget(); + + final ParameterArrayPane parameterArrayPane = new ParameterArrayPane(); + BasicDialog parameterArrayDialog = parameterArrayPane.showWindow(SwingUtilities.getWindowAncestor(jwb)); + parameterArrayDialog.setModal(true); + + final Parameter[] copyTemplateParameters = wbTpl.getTemplateParameters(); + parameterArrayPane.populate(copyTemplateParameters); + parameterArrayDialog.addDialogActionListener(new DialogActionAdapter() { + + @Override + public void doOk() { + wbTpl.clearParameters(); + Parameter[] parameters = parameterArrayPane.updateParameters(); + for (int i = 0; i < parameters.length; i++) { + wbTpl.addParameter(parameters[i]); + } + jwb.fireTargetModified(); + jwb.getFormDesign().setParameterArray(parameters); + jwb.getFormDesign().refreshParameter(); + } + }); + parameterArrayDialog.setVisible(true); + + } + +} diff --git a/designer_form/src/com/fr/design/mainframe/widget/editors/RefinedDoubleEditor.java b/designer_form/src/com/fr/design/mainframe/widget/editors/RefinedDoubleEditor.java new file mode 100644 index 000000000..0caad975d --- /dev/null +++ b/designer_form/src/com/fr/design/mainframe/widget/editors/RefinedDoubleEditor.java @@ -0,0 +1,31 @@ +package com.fr.design.mainframe.widget.editors; + +import javax.swing.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.text.ParseException; + +public class RefinedDoubleEditor extends DoubleEditor { + + private JFormattedTextField textField; + + public RefinedDoubleEditor() { + super(); + textField = (JFormattedTextField) super.getCustomEditor(); + } + + @Override + public KeyListener createKeyListener() { + return new KeyAdapter() { + + public void keyReleased(KeyEvent e) { + try { + textField.commitEdit(); + return; + } catch (ParseException e1) { + } + } + }; + } +} \ No newline at end of file