Browse Source

修改命名

research/11.0
kerry 5 years ago
parent
commit
6b626aaa3c
  1. 2
      designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java
  2. 2
      designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java
  3. 6
      designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java
  4. 6
      designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java
  5. 10
      designer-realize/src/main/java/com/fr/design/style/StylePane.java

2
designer-base/src/main/java/com/fr/design/fun/MultiStyleUIConfigProvider.java

@ -19,5 +19,5 @@ public interface MultiStyleUIConfigProvider extends Mutable {
* *
* @return 配置项list * @return 配置项list
*/ */
List<CustomStyleUIConfigProvider> getConfigList(); List<StyleUIConfigProvider> getConfigList();
} }

2
designer-base/src/main/java/com/fr/design/fun/CustomStyleUIConfigProvider.java → designer-base/src/main/java/com/fr/design/fun/StyleUIConfigProvider.java

@ -11,7 +11,7 @@ import javax.swing.event.ChangeListener;
* Created by kerry on 2019-11-11 * Created by kerry on 2019-11-11
*/ */
@Open @Open
public interface CustomStyleUIConfigProvider extends Mutable { public interface StyleUIConfigProvider extends Mutable {
String XML_TAG = "CustomStyleUIConfigProvider"; String XML_TAG = "CustomStyleUIConfigProvider";
int CURRENT_LEVEL = 1; int CURRENT_LEVEL = 1;

6
designer-base/src/main/java/com/fr/design/fun/impl/AbstractMultiStyleUIConfigProvider.java

@ -1,6 +1,6 @@
package com.fr.design.fun.impl; package com.fr.design.fun.impl;
import com.fr.design.fun.CustomStyleUIConfigProvider; import com.fr.design.fun.StyleUIConfigProvider;
import com.fr.design.fun.MultiStyleUIConfigProvider; import com.fr.design.fun.MultiStyleUIConfigProvider;
import com.fr.stable.fun.mark.API; import com.fr.stable.fun.mark.API;
@ -13,8 +13,8 @@ import java.util.List;
@API(level = MultiStyleUIConfigProvider.CURRENT_LEVEL) @API(level = MultiStyleUIConfigProvider.CURRENT_LEVEL)
public abstract class AbstractMultiStyleUIConfigProvider implements MultiStyleUIConfigProvider { public abstract class AbstractMultiStyleUIConfigProvider implements MultiStyleUIConfigProvider {
@Override @Override
public List<CustomStyleUIConfigProvider> getConfigList() { public List<StyleUIConfigProvider> getConfigList() {
return new ArrayList<CustomStyleUIConfigProvider>(); return new ArrayList<StyleUIConfigProvider>();
} }
@Override @Override

6
designer-base/src/main/java/com/fr/design/fun/impl/AbstractCustomStyleUIConfigProvider.java → designer-base/src/main/java/com/fr/design/fun/impl/AbstractStyleUIConfigProvider.java

@ -1,7 +1,7 @@
package com.fr.design.fun.impl; package com.fr.design.fun.impl;
import com.fr.base.Style; import com.fr.base.Style;
import com.fr.design.fun.CustomStyleUIConfigProvider; import com.fr.design.fun.StyleUIConfigProvider;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.fun.mark.API; import com.fr.stable.fun.mark.API;
@ -11,8 +11,8 @@ import javax.swing.event.ChangeListener;
/** /**
* Created by kerry on 2019-11-11 * Created by kerry on 2019-11-11
*/ */
@API(level = CustomStyleUIConfigProvider.CURRENT_LEVEL) @API(level = StyleUIConfigProvider.CURRENT_LEVEL)
public class AbstractCustomStyleUIConfigProvider implements CustomStyleUIConfigProvider { public class AbstractStyleUIConfigProvider implements StyleUIConfigProvider {
@Override @Override
public int currentAPILevel() { public int currentAPILevel() {
return CURRENT_LEVEL; return CURRENT_LEVEL;

10
designer-realize/src/main/java/com/fr/design/style/StylePane.java

@ -10,7 +10,7 @@ import com.fr.base.Style;
import com.fr.base.core.StyleUtils; import com.fr.base.core.StyleUtils;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.fun.CustomStyleUIConfigProvider; import com.fr.design.fun.StyleUIConfigProvider;
import com.fr.design.fun.MultiStyleUIConfigProvider; import com.fr.design.fun.MultiStyleUIConfigProvider;
import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.frpane.UITabbedPane;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
@ -63,7 +63,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
private FRFontPane frFontPane = null; private FRFontPane frFontPane = null;
private BorderPane borderPane = null; private BorderPane borderPane = null;
private BackgroundPane backgroundPane = null; private BackgroundPane backgroundPane = null;
private static List<CustomStyleUIConfigProvider> configList = PluginSandboxCollections.newSandboxList(); private static List<StyleUIConfigProvider> configList = PluginSandboxCollections.newSandboxList();
private PreivewArea previewArea; private PreivewArea previewArea;
private JPanel previewPane; private JPanel previewPane;
@ -99,7 +99,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); mainTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
for (CustomStyleUIConfigProvider config : configList) { for (StyleUIConfigProvider config : configList) {
mainTabbedPane.addTab(config.configName(), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane()); mainTabbedPane.addTab(config.configName(), FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane());
} }
mainTabbedPane.addChangeListener(tabChangeActionListener); mainTabbedPane.addChangeListener(tabChangeActionListener);
@ -362,7 +362,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
if (this.backgroundPane != null) { if (this.backgroundPane != null) {
this.backgroundPane.populate(editing.getBackground()); this.backgroundPane.populate(editing.getBackground());
} }
for(CustomStyleUIConfigProvider tabConfig : configList){ for(StyleUIConfigProvider tabConfig : configList){
tabConfig.populateConfig(this.editing); tabConfig.populateConfig(this.editing);
} }
updatePreviewArea(); updatePreviewArea();
@ -399,7 +399,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
if (this.backgroundPane != null) { if (this.backgroundPane != null) {
style = style.deriveBackground(this.backgroundPane.update()); style = style.deriveBackground(this.backgroundPane.update());
} }
for(CustomStyleUIConfigProvider tabConfig : configList){ for(StyleUIConfigProvider tabConfig : configList){
style = tabConfig.updateConfig(); style = tabConfig.updateConfig();
} }

Loading…
Cancel
Save