[log] Merge vcs-log-data and -ui modules into a single vcs-log-impl

Now we have only vcs-log-api for API, vcs-log-graph which is able to
independently store a graph nearly from anything,
and vcs-log-impl providing the currently working implementation.

.idea/modules.xml

@@ -149,10 +149,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-api/vcs-api.iml" filepath="$PROJECT_DIR$/platform/vcs-api/vcs-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-impl/vcs-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/api/vcs-log-api.iml" filepath="$PROJECT_DIR$/platform/vcs-log/api/vcs-log-api.iml" group="platform/vcs-log" />
-      <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/data/vcs-log-data.iml" filepath="$PROJECT_DIR$/platform/vcs-log/data/vcs-log-data.iml" group="platform/vcs-log" />
+      <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/vcs-log-impl.iml" group="platform/vcs-log" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/graph/vcs-log-graph.iml" filepath="$PROJECT_DIR$/platform/vcs-log/graph/vcs-log-graph.iml" group="platform/vcs-log" />
-      <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/print-model/vcs-log-print-model.iml" filepath="$PROJECT_DIR$/platform/vcs-log/print-model/vcs-log-print-model.iml" group="platform/vcs-log" />
-      <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/ui/vcs-log-ui.iml" filepath="$PROJECT_DIR$/platform/vcs-log/ui/vcs-log-ui.iml" group="platform/vcs-log" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />

platform/dvcs/dvcs.iml

@@ -14,9 +14,8 @@
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="core-impl" />
     <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-log-ui" />
     <orderEntry type="module" module-name="vcs-log-api" />
-    <orderEntry type="module" module-name="vcs-log-data" />
+    <orderEntry type="module" module-name="vcs-log-impl" />
   </component>
 </module>
 

platform/vcs-log/impl/vcs-log-impl.iml

@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/icons" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -14,6 +15,8 @@
     <orderEntry type="module" module-name="vcs-log-graph" />
     <orderEntry type="module" module-name="platform-impl" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="library" name="Guava" level="project" />
   </component>
 </module>
 

platform/vcs-log/ui/vcs-log-ui.iml

@@ -1,32 +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" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../plugins/git4idea/GitAlk/swing_ui/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/icons" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/annotations.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="swingx" level="project" />
-    <orderEntry type="module" module-name="util" />
-    <orderEntry type="library" name="Guava" level="project" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="vcs-log-graph" />
-    <orderEntry type="module" module-name="vcs-log-api" />
-    <orderEntry type="module" module-name="vcs-api" />
-    <orderEntry type="module" module-name="vcs-impl" />
-    <orderEntry type="module" module-name="vcs-log-data" />
-  </component>
-</module>
-

plugins/git4idea/git4idea.iml

@@ -69,7 +69,7 @@
     <orderEntry type="module" module-name="spellchecker" />
     <orderEntry type="module" module-name="cucumber-test-runner" scope="RUNTIME" />
     <orderEntry type="module" module-name="vcs-log-api" />
-    <orderEntry type="module" module-name="vcs-log-data" />
+    <orderEntry type="module" module-name="vcs-log-impl" />
     <orderEntry type="module" module-name="vcs-log-graph" />
   </component>
 </module>