Merge pull request #1344 in BA/design from ~DANIEL/finereport_design:release/9.0 to release/9.0

* commit '97fd46b185d2da3b3a62c96f67995c3448928422':
  PFC-1053

designer/designer.iml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="designer_form" />
-    <orderEntry type="module" module-name="designer_chart" />
-    <orderEntry type="module" module-name="designer_chart" />
-    <orderEntry type="module" module-name="designer_base" />
-    <orderEntry type="module" module-name="designer_form" />
-    <orderEntry type="module" module-name="base" />
-    <orderEntry type="module" module-name="base-basic" />
-    <orderEntry type="module" module-name="base-calculate" />
-    <orderEntry type="module" module-name="base-data" />
-    <orderEntry type="module" module-name="base-file" />
-    <orderEntry type="module" module-name="base-performance" />
-    <orderEntry type="module" module-name="base-plugin-engine" />
-    <orderEntry type="module" module-name="base-stable" />
-    <orderEntry type="module" module-name="chart-base" />
-    <orderEntry type="module" module-name="chart-chartattr" />
-    <orderEntry type="module" module-name="chart-chartdata" />
-    <orderEntry type="module" module-name="chart-chartglyph" />
-    <orderEntry type="module" module-name="chart-web" />
-    <orderEntry type="module" module-name="engine" />
-    <orderEntry type="module" module-name="engine-cross" />
-    <orderEntry type="module" module-name="engine-enhancement" />
-    <orderEntry type="module" module-name="engine-page" />
-    <orderEntry type="module" module-name="engine-remote" />
-    <orderEntry type="module" module-name="engine-view" />
-    <orderEntry type="module" module-name="engine-write" />
-    <orderEntry type="module" module-name="fmobile" />
-    <orderEntry type="module" module-name="form" />
-    <orderEntry type="module" module-name="fsbakrestore" />
-    <orderEntry type="module" module-name="fschedule" />
-    <orderEntry type="module" module-name="fservice" />
-    <orderEntry type="module" module-name="fsmonitor" />
-    <orderEntry type="library" name="lib" level="project" />
-  </component>
-</module>

designer_base/src/com/fr/env/RemoteEnv.java

@@ -29,11 +29,7 @@ import com.fr.file.CacheManager;
 import com.fr.file.DatasourceManager;
 import com.fr.file.DatasourceManagerProvider;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.ComparatorUtils;
+import com.fr.general.*;
-import com.fr.general.FRLogger;
-import com.fr.general.IOUtils;
-import com.fr.general.Inter;
-import com.fr.general.LogRecordTime;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONException;
@@ -1839,7 +1835,7 @@ public class RemoteEnv extends AbstractEnv {
         if (input == null) {
             return;
         }
-        LogRecordTime[] records = DavXMLUtils.readXMLLogRecords(input);
+        LogRecordTime[] records = LogUtils.readXMLLogRecords(input);
         for (LogRecordTime logRecordTime : records) {
             //TODO
         }