Refactoring of LayoutAction, implementation of getting most recent ve…

…rsion of file from editor.
tmorcinek · Sep 27, 2014 · 2cd6cae · 2cd6cae
1 parent 305ea89
commit 2cd6cae
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/src/com/morcinek/android/codegenerator/plugin/actions/ActivityAction.java b/src/com/morcinek/android/codegenerator/plugin/actions/ActivityAction.java
@@ -1,8 +1,7 @@
 package com.morcinek.android.codegenerator.plugin.actions;
 
-import com.morcinek.android.codegenerator.CodeGenerator;
+import com.morcinek.android.codegenerator.codegeneration.providers.ResourceProvidersFactory;
 import com.morcinek.android.codegenerator.codegeneration.providers.factories.ActivityResourceProvidersFactory;
-import com.morcinek.android.codegenerator.plugin.codegenerator.CodeGeneratorFactory;
 
 /**
  * Copyright 2014 Tomasz Morcinek. All rights reserved.
@@ -15,7 +14,12 @@ protected String getResourceName() {
     }
 
     @Override
-    protected CodeGenerator getCodeGenerator() {
-        return CodeGeneratorFactory.createCodeGenerator("Activity_template", new ActivityResourceProvidersFactory());
+    protected String getTemplateName() {
+        return "Activity_template";
+    }
+
+    @Override
+    protected ResourceProvidersFactory getResourceProvidersFactory() {
+        return new ActivityResourceProvidersFactory();
     }
 }
diff --git a/src/com/morcinek/android/codegenerator/plugin/actions/AdapterAction.java b/src/com/morcinek/android/codegenerator/plugin/actions/AdapterAction.java
@@ -1,8 +1,7 @@
 package com.morcinek.android.codegenerator.plugin.actions;
 
-import com.morcinek.android.codegenerator.CodeGenerator;
+import com.morcinek.android.codegenerator.codegeneration.providers.ResourceProvidersFactory;
 import com.morcinek.android.codegenerator.codegeneration.providers.factories.AdapterResourceProvidersFactory;
-import com.morcinek.android.codegenerator.plugin.codegenerator.CodeGeneratorFactory;
 
 /**
  * Copyright 2014 Tomasz Morcinek. All rights reserved.
@@ -15,7 +14,12 @@ protected String getResourceName() {
     }
 
     @Override
-    protected CodeGenerator getCodeGenerator() {
-        return CodeGeneratorFactory.createCodeGenerator("Adapter_template", new AdapterResourceProvidersFactory());
+    protected String getTemplateName() {
+        return "Adapter_template";
+    }
+
+    @Override
+    protected ResourceProvidersFactory getResourceProvidersFactory() {
+        return new AdapterResourceProvidersFactory();
     }
 }
diff --git a/src/com/morcinek/android/codegenerator/plugin/actions/FragmentAction.java b/src/com/morcinek/android/codegenerator/plugin/actions/FragmentAction.java
@@ -1,8 +1,7 @@
 package com.morcinek.android.codegenerator.plugin.actions;
 
-import com.morcinek.android.codegenerator.CodeGenerator;
+import com.morcinek.android.codegenerator.codegeneration.providers.ResourceProvidersFactory;
 import com.morcinek.android.codegenerator.codegeneration.providers.factories.FragmentResourceProvidersFactory;
-import com.morcinek.android.codegenerator.plugin.codegenerator.CodeGeneratorFactory;
 
 /**
  * Copyright 2014 Tomasz Morcinek. All rights reserved.
@@ -15,7 +14,12 @@ protected String getResourceName() {
     }
 
     @Override
-    protected CodeGenerator getCodeGenerator() {
-        return CodeGeneratorFactory.createCodeGenerator("Fragment_template", new FragmentResourceProvidersFactory());
+    protected String getTemplateName() {
+        return "Fragment_template";
+    }
+
+    @Override
+    protected ResourceProvidersFactory getResourceProvidersFactory() {
+        return new FragmentResourceProvidersFactory();
     }
 }
diff --git a/src/com/morcinek/android/codegenerator/plugin/actions/LayoutAction.java b/src/com/morcinek/android/codegenerator/plugin/actions/LayoutAction.java
@@ -7,8 +7,9 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.morcinek.android.codegenerator.CodeGenerator;
+import com.morcinek.android.codegenerator.codegeneration.providers.ResourceProvidersFactory;
 import com.morcinek.android.codegenerator.plugin.actions.visibility.ActionVisibilityHelper;
+import com.morcinek.android.codegenerator.plugin.codegenerator.CodeGeneratorController;
 import com.morcinek.android.codegenerator.plugin.error.ErrorHandler;
 import com.morcinek.android.codegenerator.plugin.persistence.Settings;
 import com.morcinek.android.codegenerator.plugin.ui.CodeDialogBuilder;
@@ -17,10 +18,7 @@
 import com.morcinek.android.codegenerator.plugin.utils.PackageHelper;
 import com.morcinek.android.codegenerator.plugin.utils.PathHelper;
 import com.morcinek.android.codegenerator.plugin.utils.ProjectHelper;
-import org.xml.sax.SAXException;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
 import java.io.IOException;
 
 /**
@@ -45,7 +43,8 @@ public void actionPerformed(AnActionEvent event) {
         final Project project = event.getData(PlatformDataKeys.PROJECT);
         final VirtualFile selectedFile = event.getData(PlatformDataKeys.VIRTUAL_FILE);
         try {
-            String generatedCode = getGeneratedCode(selectedFile);
+            CodeGeneratorController codeGeneratorController = new CodeGeneratorController(getTemplateName(), getResourceProvidersFactory());
+            String generatedCode = codeGeneratorController.generateCode(project, selectedFile, event.getData(PlatformDataKeys.EDITOR));
             final CodeDialogBuilder codeDialogBuilder = new CodeDialogBuilder(project,
                     String.format(StringResources.TITLE_FORMAT_TEXT, selectedFile.getName()), generatedCode);
             codeDialogBuilder.addTextSection(StringResources.SOURCE_PATH_LABEL, settings.getSourcePath());
@@ -79,7 +78,9 @@ public void run() {
 
     protected abstract String getResourceName();
 
-    protected abstract CodeGenerator getCodeGenerator();
+    protected abstract String getTemplateName();
+
+    protected abstract ResourceProvidersFactory getResourceProvidersFactory();
 
     private String getFolderPath(CodeDialogBuilder codeDialogBuilder) {
         String sourcePath = codeDialogBuilder.getValueForLabel(StringResources.SOURCE_PATH_LABEL);
@@ -93,10 +94,6 @@ private String getFinalCode(CodeDialogBuilder codeDialogBuilder) {
         return pathHelper.getMergedCodeWithPackage(packageName, modifiedCode);
     }
 
-    private String getGeneratedCode(VirtualFile file) throws ParserConfigurationException, SAXException, XPathExpressionException, IOException {
-        return getCodeGenerator().produceCode(file.getInputStream(), file.getName());
-    }
-
     @Override
     public void update(AnActionEvent event) {
         event.getPresentation().setVisible(actionVisibilityHelper.isVisible(event.getDataContext()));