[518053]Changes in config.xml related to platform are propagated to project

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=518053
Signed-off-by: Rastislav Wagner <[email protected]>

Author: rawagner

plugins/org.eclipse.thym.android.core/plugin.xml

@@ -13,11 +13,9 @@
    <extension
          point="org.eclipse.thym.core.platformSupport">
       <platform
-            projectGenerator="org.eclipse.thym.android.core.adt.AndroidProjectGenerator"
             id="org.eclipse.thym.android.core.platformSupport"
             platform="Android"
             platformID="android"
-            pluginInstallActionFactory="org.eclipse.thym.android.core.adt.AndroidPluginInstallationActionsFactory"
             libraryResolver="org.eclipse.thym.android.core.adt.AndroidLibraryResolver">       
       </platform>
    </extension>

plugins/org.eclipse.thym.android.core/src/org/eclipse/thym/android/core/adt/AndroidLibraryResolver.java

@@ -10,135 +10,31 @@
  *******************************************************************************/
 package org.eclipse.thym.android.core.adt;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.net.URL;
 import java.util.HashMap;
-import java.util.Iterator;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.thym.android.core.AndroidCore;
-import org.eclipse.thym.core.HybridCore;
 import org.eclipse.thym.core.engine.HybridMobileLibraryResolver;
-import org.eclipse.thym.core.internal.util.FileUtils;
+import org.eclipse.thym.core.platform.PlatformConstants;
 
-import com.github.zafarkhaja.semver.Version;
-
-public class AndroidLibraryResolver extends
-		HybridMobileLibraryResolver {
-	private static final Version VERSION_4_0_0 = Version.valueOf("4.0.0");
-
-	public static final String DIR_LIBS = "libs";
-	public static final String DIR_RES = "res";
-	public static final String DIR_SRC = "src";
+public class AndroidLibraryResolver extends HybridMobileLibraryResolver {
 
-	public static final String FILE_JAR_CORDOVA = "cordova.jar";
-	private static final IPath KEY_PATH_CORDOVA_JAR = new Path(DIR_LIBS +"/" + FILE_JAR_CORDOVA);
-	public static final String FILE_XML_ANDROIDMANIFEST = "AndroidManifest.xml";
+	public static final String PROPERTIES="project.propeties";
 
-	HashMap<IPath, URL> files = new HashMap<IPath, URL>();
+	HashMap<String, String> files = new HashMap<String, String>();
 
 	private void initFiles() {
-		Assert.isNotNull(libraryRoot, "Library resolver is not initialized. Call init before accessing any other functions.");
-		if(version == null ){
-			return;
-		}
-		Version ver = Version.valueOf(version);
-		
-		IPath templatePrjRoot = libraryRoot.append("bin/templates/project");
-		IPath cordovaJar = libraryRoot.append("framework").append(NLS.bind("cordova-{0}.jar",version));
-		files.put(KEY_PATH_CORDOVA_JAR, getEngineFile(cordovaJar));	
-		files.put(new Path(DIR_RES),getEngineFile(templatePrjRoot.append(DIR_RES)));
-		files.put(new Path(FILE_XML_ANDROIDMANIFEST), getEngineFile(templatePrjRoot.append(FILE_XML_ANDROIDMANIFEST)));
-		files.put(new Path(DIR_SRC).append(VAR_PACKAGE_NAME.replace('.', '/')).append(VAR_APP_NAME+".java"), 
-				getEngineFile(templatePrjRoot.append("Activity.java")));
-		if(ver.lessThan(VERSION_4_0_0)){
-			files.put(PATH_CORDOVA_JS, getEngineFile(libraryRoot.append("framework/assets/www/cordova.js")));
-		}else{
-			// version 4.0.0 places cordova.js to a new location
-			files.put(PATH_CORDOVA_JS, getEngineFile(templatePrjRoot.append("assets/www/cordova.js")));
-		}
-		files.put(new Path("framework/project.properties"), getEngineFile(libraryRoot.append("framework/project.properties")));
-	}
-
-
-	@Override
-	public URL getTemplateFile(IPath destination) {
-		if(files.isEmpty()) initFiles();
-		Assert.isNotNull(destination);
-		Assert.isTrue(!destination.isAbsolute());
-		return files.get(destination);
-	}
-
-	@Override
-	public IStatus isLibraryConsistent() {
-		if(version == null ){
-			return new Status(IStatus.ERROR, HybridCore.PLUGIN_ID, "Library for Android platform is not compatible with this tool. File for path {0} is missing.");
-		}
-		if(files.isEmpty()) initFiles();
-		Iterator<IPath> paths = files.keySet().iterator();
-		while (paths.hasNext()) {
-			IPath key = paths.next();
-			URL url = files.get(key);
-			if(url != null  ){
-				File file = new File(url.getFile());
-				if( file.exists() || key.equals(KEY_PATH_CORDOVA_JAR)){
-					// we skip cordova.jar because it is generated by precompilation 
-					continue;
-				}
-			}
-			return new Status(IStatus.ERROR, HybridCore.PLUGIN_ID, NLS.bind("Library for Android platform is not compatible with this tool. File for path {0} is missing.",key.toString()));
-		}
-		return Status.OK_STATUS;
-	}
-	
-	public void preCompile(IProgressMonitor monitor) throws CoreException{
-	}
-	
-	public boolean needsPreCompilation(){
-		IPath cordovaJar = libraryRoot.append("framework").append(NLS.bind("cordova-{0}.jar",version));
-		return !cordovaJar.toFile().exists();
-	}
-	
-	private URL getEngineFile(IPath path){
-		File file = path.toFile();
-		if(!file.exists()){
-			AndroidCore.log(IStatus.WARNING, NLS.bind( "Missing Android engine file {0}", file.toString()), null );
-		}
-		return FileUtils.toURL(file);
+		files.put(PROPERTIES, "android/project.properties");
+		files.put(PlatformConstants.FILE_JS_CORDOVA, "android/assets/www/cordova.js");
 	}
 
 
 	@Override
-	public String detectVersion() {
-		File versionFile = this.libraryRoot.append("VERSION").toFile();
-		if(versionFile.exists()){
-			BufferedReader reader = null;
-			try{
-				try {
-					reader = new BufferedReader(new FileReader(versionFile));
-					String version = reader.readLine();
-					return version;
-				} 
-				finally{
-					if(reader != null ) reader.close();
-				}
-			}catch (IOException e) {
-				AndroidCore.log(IStatus.WARNING, "Can not detect version on library", e);
-			}
-		}else{
-			AndroidCore.log(IStatus.WARNING, NLS.bind("Can not detect version. VERSION file {0} is missing",versionFile.toString()), null);
+	public String getTemplateFile(String key) {
+		if(files.isEmpty()){ 
+			initFiles();
 		}
-		return null;
+		Assert.isNotNull(key);
+		return files.get(key);
 	}
 
-}
+}