Browse Source

Pull request #4347: feature/10.0 -> feature/x 冲突解决

Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x

* commit 'd092816eb30e67a4c480446a7edaa6b36692a789':
  feature/10.0 -> feature/x 冲突解决
research/11.0
Henry.Wang 4 years ago
parent
commit
bf7127f916
  1. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

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

@ -42,7 +42,6 @@ import com.fr.design.javascript.JavaScriptImplPane;
import com.fr.design.javascript.ParameterJavaScriptPane; import com.fr.design.javascript.ParameterJavaScriptPane;
import com.fr.design.javascript.ProcessTransitionAdapter; import com.fr.design.javascript.ProcessTransitionAdapter;
import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.BaseJForm;
import com.fr.design.mainframe.ElementCaseThumbnail;
import com.fr.design.mainframe.FormHierarchyTreePane; import com.fr.design.mainframe.FormHierarchyTreePane;
import com.fr.design.mainframe.InformationCollector; import com.fr.design.mainframe.InformationCollector;
import com.fr.design.mainframe.JTemplateEvent; import com.fr.design.mainframe.JTemplateEvent;
@ -407,7 +406,6 @@ public class DesignerActivator extends Activator {
DesignModuleFactory.registerParameterReader(new FormParameterReader()); DesignModuleFactory.registerParameterReader(new FormParameterReader());
StableFactory.registerMarkedClass(BaseJForm.XML_TAG, NewJForm.class); StableFactory.registerMarkedClass(BaseJForm.XML_TAG, NewJForm.class);
StableFactory.registerMarkedObject(ElementCaseThumbnailProcessor.MARK_STRING, new ElementCaseThumbnail());
registerJTemplateEvent(); registerJTemplateEvent();
} }

Loading…
Cancel
Save