diff options
6 files changed, 24 insertions, 56 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java index afe4d35..9fe2170 100644 --- a/anttasks/src/com/android/ant/AaptExecLoopTask.java +++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java @@ -16,7 +16,6 @@ package com.android.ant; -import com.android.sdklib.internal.project.ApkConfigurationHelper; import com.android.sdklib.internal.project.ApkSettings; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.internal.project.ProjectProperties.PropertyType; @@ -267,7 +266,7 @@ public final class AaptExecLoopTask extends Task { PropertyType.DEFAULT); - ApkSettings apkSettings = ApkConfigurationHelper.getSettings(properties); + ApkSettings apkSettings = new ApkSettings(properties); if (apkSettings != null) { Map<String, String> apkFilters = apkSettings.getResourceFilters(); if (apkFilters.size() > 0) { diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java index c326fa9..3fdf4d5 100644 --- a/anttasks/src/com/android/ant/ApkBuilderTask.java +++ b/anttasks/src/com/android/ant/ApkBuilderTask.java @@ -19,7 +19,6 @@ package com.android.ant; import com.android.apkbuilder.ApkBuilder.ApkCreationException; import com.android.apkbuilder.internal.ApkBuilderImpl; import com.android.apkbuilder.internal.ApkBuilderImpl.ApkFile; -import com.android.sdklib.internal.project.ApkConfigurationHelper; import com.android.sdklib.internal.project.ApkSettings; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.internal.project.ProjectProperties.PropertyType; @@ -245,7 +244,7 @@ public class ApkBuilderTask extends Task { ProjectProperties properties = ProjectProperties.load(baseDir.getAbsolutePath(), PropertyType.DEFAULT); - ApkSettings apkSettings = ApkConfigurationHelper.getSettings(properties); + ApkSettings apkSettings = new ApkSettings(properties); if (apkSettings != null) { Map<String, String> apkFilters = apkSettings.getResourceFilters(); if (apkFilters.size() > 0) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java index b5ad1f0..50ddc9c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/ProjectState.java @@ -19,7 +19,6 @@ package com.android.ide.eclipse.adt.internal.project; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.internal.project.ApkConfigurationHelper; import com.android.sdklib.internal.project.ApkSettings; import com.android.sdklib.internal.project.ProjectProperties; @@ -155,7 +154,7 @@ public final class ProjectState { mProperties = properties; // load the ApkSettings - mApkSettings = ApkConfigurationHelper.getSettings(properties); + mApkSettings = new ApkSettings(properties); // load the libraries synchronized (mLibraries) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java index bc4f14b..2dc5981 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java @@ -34,7 +34,6 @@ import com.android.sdklib.ISdkLog; import com.android.sdklib.SdkConstants; import com.android.sdklib.SdkManager; import com.android.sdklib.internal.avd.AvdManager; -import com.android.sdklib.internal.project.ApkConfigurationHelper; import com.android.sdklib.internal.project.ApkSettings; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.internal.project.ProjectProperties.PropertyType; @@ -366,7 +365,7 @@ public final class Sdk { state.setApkSettings(settings); // save the project settings into the project persistent property - ApkConfigurationHelper.setProperties(properties, settings); + settings.write(properties); } // we are done with the modification. Save the property file. diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkConfigurationHelper.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkConfigurationHelper.java deleted file mode 100644 index 4ba6fa6..0000000 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkConfigurationHelper.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009 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.sdklib.internal.project; - - -/** - * Helper class to read and write Apk Configuration into a {@link ProjectProperties} file. - */ -public class ApkConfigurationHelper { - /** - * Reads the project settings from a {@link ProjectProperties} file and returns them as a - * {@link ApkSettings} object. - */ - public static ApkSettings getSettings(ProjectProperties properties) { - ApkSettings apkSettings = new ApkSettings(); - - boolean splitByDensity = Boolean.parseBoolean(properties.getProperty( - ProjectProperties.PROPERTY_SPLIT_BY_DENSITY)); - apkSettings.setSplitByDensity(splitByDensity); - - - return apkSettings; - } - - /** - * Sets the content of a {@link ApkSettings} into a {@link ProjectProperties}. - * @param properties the {@link ProjectProperties} in which to store the settings. - * @param settings the project settings to store. - */ - public static void setProperties(ProjectProperties properties, ApkSettings settings) { - properties.setProperty(ProjectProperties.PROPERTY_SPLIT_BY_DENSITY, - Boolean.toString(settings.isSplitByDpi())); - } -} diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkSettings.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkSettings.java index ff9028a..1c57b33 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkSettings.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ApkSettings.java @@ -29,6 +29,16 @@ public class ApkSettings { } /** + * Creates an ApkSettings and fills it from the project settings read from a + * {@link ProjectProperties} file. + */ + public ApkSettings(ProjectProperties properties) { + boolean splitByDensity = Boolean.parseBoolean(properties.getProperty( + ProjectProperties.PROPERTY_SPLIT_BY_DENSITY)); + setSplitByDensity(splitByDensity); + } + + /** * Returns a map of configuration filters to be used by the -c option of aapt. * <p/>The map stores (key, value) pairs where the keys is a filename modifier and the value * is the parameter to pass to aapt through the -c option. @@ -56,6 +66,16 @@ public class ApkSettings { mSplitByDpi = split; } + /** + * Writes the receiver into a {@link ProjectProperties}. + * @param properties the {@link ProjectProperties} in which to store the settings. + */ + public void write(ProjectProperties properties) { + // TODO: this is not supported at the moment, so we dont write the property into the file. +// propertiessetProperty(ProjectProperties.PROPERTY_SPLIT_BY_DENSITY, +// Boolean.toString(isSplitByDpi())); + } + @Override public boolean equals(Object obj) { if (obj instanceof ApkSettings) { |