Browse Source

Pull request #15489: REPORT-140121 FBP代码优化第三期-Activator的所有子类删除

Merge in DESIGN/design from ~YUAN.WANG/design:fbp/release to fbp/release

* commit 'bd155c3c0b9ed16be818b19597768ca0cee7c95a':
  REPORT-140121 FBP代码优化第三期-Activator的所有子类删除
fbp/release
Yuan.Wang-王垣 3 days ago
parent
commit
dbe4db47ee
  1. 2
      designer-base/src/main/java/com/fr/design/EnvSwitcherSubmitTask.java
  2. 2
      designer-realize/src/main/java/com/fr/start/Designer.java
  3. 2
      designer-realize/src/main/java/com/fr/start/Designer4Debug.java
  4. 21
      designer-realize/src/main/java/com/fr/start/MainDesigner.java
  5. 7
      designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java

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

@ -162,7 +162,7 @@ public class EnvSwitcherSubmitTask extends AbstractDesignerMetric {
/**
* 循环处理 JSON, 并降序排序
*
* @param moduleUsed 模块用时 {@link com.fr.module.engine.FineModule}
* @param moduleUsed 模块用时
* @param entries 降序排序的树集合
*/
private void sortBySelfUsed(JSONObject moduleUsed, TreeSet<Entry> entries) {

2
designer-realize/src/main/java/com/fr/start/Designer.java

@ -49,6 +49,6 @@ public class Designer {
* @param args 参数
*/
private static void runNonGuardianDesigner(String[] args) {
MainDesigner.main(args);
//MainDesigner.main(args);
}
}

2
designer-realize/src/main/java/com/fr/start/Designer4Debug.java

@ -6,6 +6,6 @@ package com.fr.start;
public class Designer4Debug {
public static void main(String... args) {
org.swingexplorer.Launcher.main(new String[]{"com.fr.start.MainDesigner"});
//org.swingexplorer.Launcher.main(new String[]{"com.fr.start.MainDesigner"});
}
}

21
designer-realize/src/main/java/com/fr/start/MainDesigner.java

@ -2,6 +2,7 @@ package com.fr.start;
import com.fanruan.gui.UiInspector;
import com.fanruan.product.ProductConstants;
import com.fine.theme.icon.LazyIcon;
import com.fr.base.function.UITerminator;
import com.fr.base.vcs.DesignerMode;
@ -13,10 +14,7 @@ import com.fr.design.actions.server.ServerConfigManagerAction;
import com.fr.design.actions.server.TemplateThemeManagerAction;
import com.fr.design.actions.server.WidgetManagerAction;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.carton.latency.DesignerLatencyMetric;
import com.fr.design.carton.SwitchForSwingChecker;
import com.fr.design.constants.DesignerLaunchStatus;
import com.fr.design.deeplink.DeepLinkManager;
import com.fr.design.file.HistoryTemplateListCache;
import com.fr.design.file.HistoryTemplateListPane;
import com.fr.design.file.MultiTemplateTabPane;
@ -48,7 +46,6 @@ import com.fr.design.menu.ShortCut;
import com.fr.design.module.ChartEmptyDataStyleAction;
import com.fr.design.module.ChartPreStyleAction;
import com.fr.design.module.DesignModuleFactory;
import com.fr.design.monitor.DesignerLifecycleMonitorContext;
import com.fr.design.notification.ui.NotificationCenterPane;
import com.fr.design.share.SharableManager;
import com.fr.design.ui.util.UIUtil;
@ -56,26 +53,14 @@ import com.fr.design.utils.DesignUtils;
import com.fr.design.utils.DesignerPort;
import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
import com.fr.env.utils.DesignerInteractionHistory;
import com.fr.event.Event;
import com.fr.event.EventDispatcher;
import com.fr.event.Listener;
import com.fr.general.ComparatorUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.log.SystemOutLoggerProvider;
import com.fr.module.Module;
import com.fr.module.ModuleContext;
import com.fr.module.engine.event.LifecycleErrorEvent;
import com.fr.runtime.FineRuntime;
import com.fanruan.product.ProductConstants;
import com.fr.stable.StableUtils;
import com.fr.stable.StringUtils;
import com.fr.stable.lifecycle.FineLifecycleFatalError;
import com.fr.stable.xml.XMLTools;
import com.fr.start.common.DesignerStartupContext;
import com.fr.start.common.SplashCommon;
import com.fr.start.module.StartupArgs;
import com.fr.start.preload.PreLoadService;
import com.fr.start.server.ServerTray;
import com.fr.van.chart.map.server.ChartMapEditorAction;
import com.fr.workspace.WorkContext;
@ -115,7 +100,7 @@ public class MainDesigner extends BaseDesigner {
*
* @param args 参数
*/
public static void main(String[] args) {
/* public static void main(String[] args) {
DesignerStartupContext.getRecorder().start();
// 设置一下默认的logger,启动后再Reset
FineLoggerFactory.setLogger(SystemOutLoggerProvider.getInstance());
@ -162,7 +147,7 @@ public class MainDesigner extends BaseDesigner {
DesignerLatencyMetric.getInstance().start();
installUIDevModeTools();
}
}*/
/**
* 进入UI开发者模式

7
designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java

@ -1,5 +1,6 @@
package com.fr.strongest;
import com.fanruan.ComponentUtils;
import com.finebi.cbb.utils.StringUtils;
import com.fr.base.io.BaseBook;
import com.fr.design.constants.DesignerLaunchStatus;
@ -11,7 +12,6 @@ import com.fr.event.Event;
import com.fr.event.EventDispatcher;
import com.fr.event.Listener;
import com.fr.event.Null;
import com.fr.module.ModuleContext;
import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr;
/**
@ -22,7 +22,8 @@ import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr;
* Created on 2023/11/13
*/
public class WidgetThemeListenerStarter {
private WidgetThemeListenerStarter(){}
private WidgetThemeListenerStarter() {
}
/**
* 启动对模版控件主题显示的监听开关
@ -43,7 +44,7 @@ public class WidgetThemeListenerStarter {
dealWithJTemplate4Attr(temp);
}
};
if (ModuleContext.isDesignerStartup()) {
if (ComponentUtils.isDesignerStart()) {
EventDispatcher.listen(JTemplateEvent.BEFORE_TEMPLATE_INIT, attrListener);
}
}

Loading…
Cancel
Save