Browse Source

Merge pull request #1262 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0

* commit '94d186b494cef06ddbc53c84986daf5105c8b7df':
  无jira任务, 合代码冲突漏删
research/11.0
neil 5 years ago
parent
commit
e4e4eef72c
  1. 4
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

4
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

@ -11,7 +11,6 @@ import com.fr.config.MarketConfig;
import com.fr.decision.update.backup.RecoverManager; import com.fr.decision.update.backup.RecoverManager;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.ExtraDesignClassManager; import com.fr.design.ExtraDesignClassManager;
import com.fr.design.RestartHelper;
import com.fr.design.actions.NewFormAction; import com.fr.design.actions.NewFormAction;
import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.core.ActionFactory;
import com.fr.design.actions.insert.cell.BiasCellAction; import com.fr.design.actions.insert.cell.BiasCellAction;
@ -56,7 +55,6 @@ import com.fr.design.mainframe.form.FormReportComponentComposite;
import com.fr.design.mainframe.loghandler.DesignerLogAppender; import com.fr.design.mainframe.loghandler.DesignerLogAppender;
import com.fr.design.mainframe.socketio.DesignerSocketIO; import com.fr.design.mainframe.socketio.DesignerSocketIO;
import com.fr.design.module.DesignModuleFactory; import com.fr.design.module.DesignModuleFactory;
import com.fr.design.os.impl.RestartAction;
import com.fr.design.os.impl.SupportOSImpl; import com.fr.design.os.impl.SupportOSImpl;
import com.fr.design.parameter.FormParameterReader; import com.fr.design.parameter.FormParameterReader;
import com.fr.design.parameter.ParameterPropertyPane; import com.fr.design.parameter.ParameterPropertyPane;
@ -138,11 +136,9 @@ public class DesignerActivator extends Activator {
UserInfoPane.getInstance().updateBBSUserInfo(); UserInfoPane.getInstance().updateBBSUserInfo();
} }
}, SupportOSImpl.USERINFOPANE); }, SupportOSImpl.USERINFOPANE);
storePassport(); storePassport();
AlphaFineHelper.switchConfig4Locale(); AlphaFineHelper.switchConfig4Locale();
RecoverManager.register(new RecoverForDesigner()); RecoverManager.register(new RecoverForDesigner());
RestartHelper.initRestartAction();
} }
@Override @Override

Loading…
Cancel
Save