Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-dev

4 files changed, 3 insertions, 169 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmEscapePropertyValueMethod.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmEscapePropertyValueMethod.java
deleted file mode 100644
index c6dc704..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmEscapePropertyValueMethod.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.ide.eclipse.adt.internal.wizards.templates;
-
-import com.android.utils.SdkUtils;
-import freemarker.template.SimpleScalar;
-import freemarker.template.TemplateMethodModel;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.List;
-import java.util.Properties;
-
-/** Escapes a property value (such that its syntax is valid in a Java properties file */
-public class FmEscapePropertyValueMethod implements TemplateMethodModel {
-  @Override
-  public TemplateModel exec(List args) throws TemplateModelException {
-    if (args.size() != 1) {
-      throw new TemplateModelException("Wrong arguments");
-    }
-
-    // Slow, stupid implementation, but is 100% compatible with Java's property file implementation
-    Properties properties = new Properties();
-    String value = args.get(0).toString();
-    properties.setProperty("k", value); // key doesn't matter
-    StringWriter writer = new StringWriter();
-    String escaped;
-    try {
-      properties.store(writer, null);
-      String s = writer.toString();
-      int end = s.length();
-
-      // Writer inserts trailing newline
-      String lineSeparator = SdkUtils.getLineSeparator();
-      if (s.endsWith(lineSeparator)) {
-        end -= lineSeparator.length();
-      }
-
-      int start = s.indexOf('=');
-      assert start != -1 : s;
-      escaped = s.substring(start + 1, end);
-    }
-    catch (IOException e) {
-      escaped = value; // shouldn't happen; we're not going to disk
-    }
-
-    return new SimpleScalar(escaped);
-  }
-}
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmExtractLettersMethod.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmExtractLettersMethod.java
index 1f50161..09fa81c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmExtractLettersMethod.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmExtractLettersMethod.java
@@ -15,13 +15,13 @@
  */
 package com.android.ide.eclipse.adt.internal.wizards.templates;
 
-import java.util.List;
-
 import freemarker.template.SimpleScalar;
 import freemarker.template.TemplateMethodModel;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
 
+import java.util.List;
+
 /**
  * Method invoked by FreeMarker to extract letters from a string; this will remove
  * any whitespace, punctuation and digits.
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmHasDependencyMethod.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmHasDependencyMethod.java
deleted file mode 100644
index 1618969..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/FmHasDependencyMethod.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.ide.eclipse.adt.internal.wizards.templates;
-
-import java.util.List;
-import java.util.Map;
-
-import freemarker.template.TemplateBooleanModel;
-import freemarker.template.TemplateMethodModelEx;
-import freemarker.template.TemplateModel;
-import freemarker.template.TemplateModelException;
-
-/**
- * Method invoked by FreeMarker to check whether a given dependency is available
- * in this module
- */
-public class FmHasDependencyMethod implements TemplateMethodModelEx {
-    private final Map<String, Object> myParamMap;
-
-    public FmHasDependencyMethod(Map<String, Object> paramMap) {
-        myParamMap = paramMap;
-    }
-
-    @Override
-    public TemplateModel exec(List args) throws TemplateModelException {
-        if (args.size() != 1) {
-            throw new TemplateModelException("Wrong arguments");
-        }
-
-        // TODO: Try to figure out if the project has appcompat etc
-        // com.android.support:appcompat-v7
-
-        // Not yet implemented
-        return TemplateBooleanModel.FALSE;
-    }
-}
\ No newline at end of file
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java
index 569e017..8e11841 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/templates/TemplateHandler.java
@@ -43,15 +43,9 @@ import com.android.ide.eclipse.adt.internal.editors.layout.gle2.DomUtilities;
 import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper;
 import com.android.ide.eclipse.adt.internal.sdk.AdtManifestMergeCallback;
 import com.android.manifmerger.ManifestMerger;
-import com.android.manifmerger.ManifestMerger2;
-import com.android.manifmerger.ManifestMerger2.Invoker.Feature;
-import com.android.manifmerger.ManifestMerger2.MergeType;
 import com.android.manifmerger.MergerLog;
-import com.android.manifmerger.MergingReport;
-import com.android.manifmerger.XmlDocument;
 import com.android.resources.ResourceFolderType;
 import com.android.utils.SdkUtils;
-import com.android.utils.StdLogger;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
@@ -357,9 +351,7 @@ class TemplateHandler {
         paramMap.put("escapeXmlAttribute", new FmEscapeXmlStringMethod());          //$NON-NLS-1$
         paramMap.put("escapeXmlText", new FmEscapeXmlStringMethod());               //$NON-NLS-1$
         paramMap.put("escapeXmlString", new FmEscapeXmlStringMethod());             //$NON-NLS-1$
-        paramMap.put("escapePropertyValue", new FmEscapePropertyValueMethod());     //$NON-NLS-1$
         paramMap.put("extractLetters", new FmExtractLettersMethod());               //$NON-NLS-1$
-        paramMap.put("hasDependency", new FmHasDependencyMethod(paramMap));         //$NON-NLS-1$
 
         // This should be handled better: perhaps declared "required packages" as part of the
         // inputs? (It would be better if we could conditionally disable template based
@@ -765,17 +757,7 @@ class TemplateHandler {
         boolean ok;
         String fileName = to.getName();
         if (fileName.equals(SdkConstants.FN_ANDROID_MANIFEST_XML)) {
-            if (Boolean.getBoolean("adt.use_old_manifest_merger")) {
-                modified = ok = mergeManifest(currentDocument, fragment);
-            } else {
-                XmlDocument doc = mergeManifest(currentXml, xml);
-                if (doc != null) {
-                    currentDocument = doc.getXml();
-                    ok = modified = true;
-                } else {
-                    ok = modified = false;
-                }
-            }
+            modified = ok = mergeManifest(currentDocument, fragment);
         } else {
             // Merge plain XML files
             String parentFolderName = to.getParent().getName();
@@ -942,41 +924,6 @@ class TemplateHandler {
                 merger.process(currentManifest, fragment);
     }
 
-    /** Merges the given manifest fragment into the given manifest file */
-    @Nullable
-    private static XmlDocument mergeManifest(@NonNull String currentText, @NonNull String mergeText) {
-        File mergeFile = null;
-        File currentFile = null;
-        try {
-            mergeFile = File.createTempFile("manifmerge", DOT_XML);
-            currentFile = File.createTempFile("main", DOT_XML);
-            Files.write(currentText, currentFile, Charsets.UTF_8);
-            Files.write(mergeText, mergeFile, Charsets.UTF_8);
-            StdLogger logger = new StdLogger(StdLogger.Level.INFO);
-            ManifestMerger2.Invoker merger = ManifestMerger2
-                    .newMerger(currentFile, logger, MergeType.APPLICATION)
-                    .withFeatures(Feature.EXTRACT_FQCNS)
-                    .addLibraryManifest(mergeFile);
-            MergingReport mergeReport = merger.merge();
-            if (mergeReport.getMergedDocument().isPresent()) {
-                return mergeReport.getMergedDocument().get();
-            }
-            return null;
-        } catch (IOException e) {
-            AdtPlugin.log(e, null);
-        } catch (ManifestMerger2.MergeFailureException e) {
-            AdtPlugin.log(e, null);
-        } finally {
-            if (mergeFile != null) {
-                mergeFile.delete();
-            }
-            if (currentFile != null) {
-                currentFile.delete();
-            }
-        }
-        return null;
-    }
-
     /**
      * Makes a backup of the given file, if it exists, by renaming it to name~
      * (and removing an old name~ file if it exists)