diff: cleanup: move some classes into diff-impl

platform/diff-api/diff-api.iml

@@ -7,9 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="core-api" exported="" />
-    <orderEntry type="module" module-name="editor-ui-api" />
     <orderEntry type="module" module-name="platform-api" exported="" />
-    <orderEntry type="module" module-name="core-impl" />
   </component>
 </module>

platform/diff-impl/src/com/intellij/diff/DiffContentFactoryImpl.java

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.diff.impl;
+package com.intellij.diff;
 
-import com.intellij.diff.DiffContentFactory;
 import com.intellij.diff.contents.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;

platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java

@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.diff.impl;
+package com.intellij.diff;
 
-import com.intellij.diff.DiffContentFactory;
-import com.intellij.diff.DiffRequestFactory;
 import com.intellij.diff.contents.DiffContent;
 import com.intellij.diff.requests.ContentDiffRequest;
 import com.intellij.diff.requests.SimpleDiffRequest;

platform/platform-resources/src/META-INF/PlatformExtensions.xml

@@ -84,9 +84,9 @@
     <applicationService serviceInterface="com.intellij.diff.DiffManager"
                         serviceImplementation="com.intellij.diff.DiffManagerImpl"/>
     <applicationService serviceInterface="com.intellij.diff.DiffContentFactory"
-                        serviceImplementation="com.intellij.diff.impl.DiffContentFactoryImpl"/>
+                        serviceImplementation="com.intellij.diff.DiffContentFactoryImpl"/>
     <applicationService serviceInterface="com.intellij.diff.DiffRequestFactory"
-                        serviceImplementation="com.intellij.diff.impl.DiffRequestFactoryImpl"/>
+                        serviceImplementation="com.intellij.diff.DiffRequestFactoryImpl"/>
     <applicationService serviceInterface="com.intellij.diff.comparison.ComparisonManager"
                         serviceImplementation="com.intellij.diff.comparison.ComparisonManagerImpl"/>
     <applicationService serviceInterface="com.intellij.diff.tools.util.base.TextDiffSettingsHolder"