Import and package change working.

Guiandrade · Sep 6, 2016 · f7a9cd3 · f7a9cd3
1 parent e6d1041
commit f7a9cd3
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 676 deletions.
diff --git a/webApp/messenger/openIabTranslator/.idea/workspace.xml b/webApp/messenger/openIabTranslator/.idea/workspace.xml
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$1$1.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$1$1.class
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$1.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$1.class
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$2.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$2.class
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$3.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$3.class
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$4.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes$4.class
diff --git a/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes.class b/webApp/messenger/openIabTranslator/out/production/openIabTranslator/TextBoxes.class
diff --git a/webApp/messenger/openIabTranslator/src/TextBoxes.java b/webApp/messenger/openIabTranslator/src/TextBoxes.java
@@ -1,20 +1,16 @@
-/**
- * Created by Guilherme Andrade on 10-08-2016.
- */
 
 import com.intellij.codeInsight.completion.AllClassesGetter;
 import com.intellij.codeInsight.completion.PlainPrefixMatcher;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.Processor;
 
 
-
-
 public class TextBoxes extends AnAction {
     // If you register the action from Java code, this constructor is used to set the menu item name
     // (optionally, you can specify the menu description and an icon to display next to the menu item).
@@ -26,9 +22,7 @@ public TextBoxes() {
         // super("Text _Boxes","Item description",IconLoader.getIcon("/Mypackage/icon.png"));
     }
 
-
-
-
+    IOpenInAppBillingService mService;
 
     public void actionPerformed(AnActionEvent event) {
         Project project = event.getData(PlatformDataKeys.PROJECT);
@@ -53,14 +47,16 @@ public boolean process(PsiClass psiClass) {
                     @Override
                     public void visitElement(PsiElement element) {
                         if (isMethod(element)) {
-                            //System.out.println("MÉTODO \n"+element.getText());
-                        }
-                        else if (isField(element)){
-                            System.out.println("FIELD \n"+element.getText());
+                            //Change intents
                         }
-
                         else {
-                            super.visitElement(element);
+                            if (isField(element)) {
+                                PsiField field = (PsiField) element;
+                                changeField(javaFile,project,field);
+
+                            } else {
+                                super.visitElement(element);
+                            }
                         }
                     }
                 });
@@ -76,33 +72,22 @@ else if (isField(element)){
                 processor
         );
 
-/*
-        String txt= Messages.showInputDialog(project, "What is your name?", "Input your name", Messages.getQuestionIcon());
-        showMessageDialog(project, "Hello, " + txt + "!\n I am glad to see you.", "Information", Messages.getInformationIcon());
-*/
-
-
     }
 
     public void changePackage(PsiJavaFile javaFile, Project project){
         PsiPackageStatement packStatement = javaFile.getPackageStatement();
-        PsiPackageStatement newStatement;
         String oldPackage = "package com.android.vending.billing;";
-        String newPackage = "org.onepf.oms";
-
         if(packStatement == null){
-
-            newStatement = JavaPsiFacade.getElementFactory(project).createPackageStatement(newPackage);
-            javaFile.add(newStatement);
+            // do nothing
             return;
-
         }
 
         String packageName = packStatement.getText();
 
         if (packageName.equals(oldPackage)){
-            newStatement = JavaPsiFacade.getElementFactory(project).createPackageStatement(newPackage);
-            packStatement.replace(newStatement);
+            //Fix suggested to an error that appeared when not using Runnable
+            Runnable modificationRunnable= createPackageRunnable(javaFile,project);
+            WriteCommandAction.runWriteCommandAction(project, modificationRunnable);
         }
 
     }
@@ -111,18 +96,82 @@ public void changeImport(PsiJavaFile javaFile, Project project){
         PsiImportList list = javaFile.getImportList();
         PsiImportStatementBase[] imports = list.getAllImportStatements();
         String oldBillingImport  = "import com.android.vending.billing.IInAppBillingService;";
-        String newBillingImport= "import org.onepf.oms.IOpenInAppBillingService;";
-        for (PsiImportStatementBase importStatement: imports){
 
+        for (PsiImportStatementBase importStatement: imports){
             String textImport = importStatement.getText();
             if (textImport.equals(oldBillingImport)){
-                PsiImportStatement newStatement;
-                newStatement = JavaPsiFacade.getElementFactory(project).createImportStatementOnDemand(newBillingImport);
-                importStatement.replace(newStatement);
+                Runnable modificationRunnable= createImportRunnable(javaFile,project,importStatement);
+                WriteCommandAction.runWriteCommandAction(project, modificationRunnable);
+
             }
         }
     }
 
+    public void changeField(PsiJavaFile javaFile, Project project,PsiField field){
+        String fieldName="mService";
+        if (field.getName().equals(fieldName)){
+            Runnable modificationRunnable= createFieldRunnable(javaFile,project,field);
+            WriteCommandAction.runWriteCommandAction(project, modificationRunnable);
+
+        }
+    }
+
+    public void addField(PsiJavaFile javaFile, Project project,PsiField field){
+        String newFieldValue="IOpenInAppBillingService mService;";
+        PsiField newField;
+        newField = JavaPsiFacade.getElementFactory(project).createFieldFromText(newFieldValue,javaFile);
+        field.replace(newField);
+            }
+
+
+    public void addPackage(PsiJavaFile javaFile,Project project){
+        //Adds package name
+        String newPackage = "org.onepf.oms";
+        javaFile.setPackageName(newPackage);
+    }
+
+    public void addImport(PsiJavaFile javaFile, Project project,PsiImportStatementBase importStatement) {
+        String newBillingImport= "org.onepf.oms.IOpenInAppBillingService";
+        PsiImportStatement newStatement;
+        newStatement = JavaPsiFacade.getElementFactory(project).createImportStatementOnDemand(newBillingImport);
+        importStatement.replace(newStatement);
+    }
+
+    private Runnable createPackageRunnable(PsiJavaFile javaFile,Project project){
+
+        Runnable aRunnable = new Runnable() {
+            @Override
+            public void run() {
+                addPackage(javaFile,project);
+            }
+        };
+        return aRunnable;
+    }
+
+    private Runnable createImportRunnable(PsiJavaFile javaFile,Project project,PsiImportStatementBase importStatement){
+
+        Runnable aRunnable = new Runnable() {
+            @Override
+            public void run() {
+                addImport(javaFile,project,importStatement);
+            }
+        };
+        return aRunnable;
+    }
+
+    private Runnable createFieldRunnable(PsiJavaFile javaFile,Project project,PsiField field){
+
+        Runnable aRunnable = new Runnable() {
+            @Override
+            public void run() {
+                addField(javaFile,project,field);
+            }
+        };
+        return aRunnable;
+    }
+
+
+
     public boolean isMethod(PsiElement element){
         if (element instanceof PsiMethod){
             return true;
@@ -149,5 +198,3 @@ public void testarAlterar(){
     }
 
 }
-
-