From e9ea34f6bd501970dfa6324a9cde98893adc636e Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Tue, 1 Sep 2009 17:33:23 +0400 Subject: [PATCH] converting packaging related parts of javaee facets to artifacts --- .../com/intellij/conversion/ConversionContext.java | 13 +++++++++++++ .../com/intellij/conversion/ConverterProvider.java | 2 +- .../conversion/impl/ConversionContextImpl.java | 7 ++----- .../intellij/conversion/impl/ConversionRunner.java | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 platform/lang-impl/src/com/intellij/conversion/ConversionContext.java diff --git a/platform/lang-impl/src/com/intellij/conversion/ConversionContext.java b/platform/lang-impl/src/com/intellij/conversion/ConversionContext.java new file mode 100644 index 000000000000..5a7b56bb4168 --- /dev/null +++ b/platform/lang-impl/src/com/intellij/conversion/ConversionContext.java @@ -0,0 +1,13 @@ +package com.intellij.conversion; + +import org.jetbrains.annotations.NotNull; + +import java.io.File; + +/** + * @author nik + */ +public interface ConversionContext { + @NotNull + File getProjectBaseDir(); +} diff --git a/platform/lang-impl/src/com/intellij/conversion/ConverterProvider.java b/platform/lang-impl/src/com/intellij/conversion/ConverterProvider.java index 7e50d2e030e7..1e00fac41e5a 100644 --- a/platform/lang-impl/src/com/intellij/conversion/ConverterProvider.java +++ b/platform/lang-impl/src/com/intellij/conversion/ConverterProvider.java @@ -28,5 +28,5 @@ public abstract class ConverterProvider { public abstract String getConversionDescription(); @NotNull - public abstract ProjectConverter createConverter(); + public abstract ProjectConverter createConverter(@NotNull ConversionContext context); } diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java index 58099f509ec1..a2477383d04c 100644 --- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionContextImpl.java @@ -1,10 +1,7 @@ package com.intellij.conversion.impl; import com.intellij.application.options.PathMacrosImpl; -import com.intellij.conversion.CannotConvertException; -import com.intellij.conversion.ModuleSettings; -import com.intellij.conversion.ProjectSettings; -import com.intellij.conversion.WorkspaceSettings; +import com.intellij.conversion.*; import com.intellij.ide.highlighter.ProjectFileType; import com.intellij.ide.highlighter.WorkspaceFileType; import com.intellij.ide.impl.convert.JDomConvertingUtil; @@ -25,7 +22,7 @@ import java.util.Map; /** * @author nik */ -public class ConversionContextImpl { +public class ConversionContextImpl implements ConversionContext { private StorageScheme myStorageScheme; private File myProjectBaseDir; private File myProjectFile; diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java index 79e0d6b7b4ab..e747fbf339ae 100644 --- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java +++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionRunner.java @@ -24,7 +24,7 @@ public class ConversionRunner { public ConversionRunner(ConverterProvider provider, ConversionContextImpl context) { myProvider = provider; myContext = context; - ProjectConverter converter = provider.createConverter(); + ProjectConverter converter = provider.createConverter(context); myModuleFileConverter = converter.createModuleFileConverter(); myProjectFileConverter = converter.createProjectFileConverter(); myWorkspaceConverter = converter.createWorkspaceFileConverter();