Browse Source

Merge pull request #3354 in DESIGN/design from feature/10.0 to research/10.0

* commit '2cdd15fc69073a998f0eb1aaa72d7c24859d0bdf':
  REPORT-46953 GeneralXMLTools 兼容处理
research/10.0
superman 4 years ago
parent
commit
85f01a47c6
  1. 5
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

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

@ -99,7 +99,6 @@ import com.fr.report.cell.cellattr.core.group.DSColumn;
import com.fr.report.cell.painter.BiasTextPainter; import com.fr.report.cell.painter.BiasTextPainter;
import com.fr.report.cell.painter.CellImagePainter; import com.fr.report.cell.painter.CellImagePainter;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.EssentialUtils;
import com.fr.stable.ParameterProvider; import com.fr.stable.ParameterProvider;
import com.fr.stable.bridge.StableFactory; import com.fr.stable.bridge.StableFactory;
import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSBasedAction;
@ -192,8 +191,8 @@ public class DesignerActivator extends Activator {
justStartModules4Designer(); justStartModules4Designer();
CalculatorProviderContext.setValueConverter(valueConverter()); CalculatorProviderContext.setValueConverter(valueConverter());
EssentialUtils.Object_Tokenizer = startXMLReadObjectTokenizer(); GeneralXMLTools.Object_Tokenizer = startXMLReadObjectTokenizer();
EssentialUtils.Object_XML_Writer_Finder = startObjectXMLWriterFinder(); GeneralXMLTools.Object_XML_Writer_Finder = startObjectXMLWriterFinder();
addAdapterForPlate(); addAdapterForPlate();
designerRegister(); designerRegister();

Loading…
Cancel
Save