diff options
Diffstat (limited to 'eclipse/plugins')
13 files changed, 62 insertions, 34 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java index a7bc53b..6549361 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/resources/platform/AttrsXmlParser.java @@ -20,9 +20,9 @@ import static com.android.ide.common.layout.LayoutConstants.DOT_LAYOUT_PARAMS; import static com.android.ide.eclipse.adt.AdtConstants.DOC_HIDE; import com.android.ide.common.api.IAttributeInfo.Format; -import com.android.ide.common.log.ILogger; import com.android.ide.common.resources.platform.ViewClassInfo.LayoutParamsInfo; import com.android.ide.eclipse.adt.AdtUtils; +import com.android.utils.ILogger; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -497,7 +497,7 @@ public final class AttrsXmlParser { for (String f : attrFormat.getNodeValue().split("\\|")) { //$NON-NLS-1$ Format format = mFormatNames.get(f); if (format == null) { - mLog.printf( + mLog.info( "Unknown format name '%s' in <attr name=\"%s\">, file '%s'.", //$NON-NLS-1$ f, name, getOsAttrsXmlPath()); } else if (format != AttributeInfo.Format.ENUM && diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index d62e8f3..dddffef 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -25,7 +25,6 @@ import com.android.AndroidConstants; import com.android.SdkConstants; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.ide.common.log.ILogger; import com.android.ide.common.resources.ResourceFile; import com.android.ide.common.sdk.LoadStatus; import com.android.ide.eclipse.adt.AdtPlugin.CheckSdkErrorHandler.Solution; @@ -51,7 +50,7 @@ import com.android.ide.eclipse.ddms.DdmsPlugin; import com.android.io.StreamException; import com.android.resources.ResourceFolderType; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.ISdkLog; +import com.android.utils.ILogger; import com.google.common.io.Closeables; import org.eclipse.core.commands.Command; @@ -128,7 +127,7 @@ import java.util.List; /** * The activator class controls the plug-in life cycle */ -public class AdtPlugin extends AbstractUIPlugin implements ILogger, ISdkLog { +public class AdtPlugin extends AbstractUIPlugin implements ILogger { /** * Temporary logging code to help track down * http://code.google.com/p/android/issues/detail?id=15003 @@ -1891,7 +1890,12 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger, ISdkLog { } @Override - public void printf(String format, Object... args) { + public void info(String format, Object... args) { + log(IStatus.INFO, format, args); + } + + @Override + public void verbose(String format, Object... args) { log(IStatus.INFO, format, args); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java index 5e485b7..28ab22b 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/AddSupportJarAction.java @@ -24,13 +24,13 @@ import com.android.ide.eclipse.adt.AdtUtils; import com.android.ide.eclipse.adt.internal.sdk.AdtConsoleSdkLog; import com.android.ide.eclipse.adt.internal.sdk.ProjectState; import com.android.ide.eclipse.adt.internal.sdk.Sdk; -import com.android.sdklib.NullSdkLog; import com.android.sdklib.SdkManager; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.internal.project.ProjectProperties.PropertyType; import com.android.sdklib.internal.project.ProjectPropertiesWorkingCopy; import com.android.sdklib.io.FileOp; import com.android.sdkuilib.internal.repository.sdkman2.AdtUpdateDialog; +import com.android.utils.NullLogger; import com.android.utils.Pair; import org.eclipse.core.filesystem.EFS; @@ -224,7 +224,7 @@ public class AddSupportJarAction implements IObjectActionDelegate { final Sdk sdk = Sdk.getCurrent(); if (sdk != null) { String sdkLocation = sdk.getSdkLocation(); - SdkManager manager = SdkManager.createManager(sdkLocation, new NullSdkLog()); + SdkManager manager = SdkManager.createManager(sdkLocation, NullLogger.getLogger()); Map<String, Integer> versions = manager.getExtrasVersions(); Integer version = versions.get(VENDOR_ID + '/' + SUPPORT_ID); if (version == null) { @@ -297,7 +297,7 @@ public class AddSupportJarAction implements IObjectActionDelegate { final Sdk sdk = Sdk.getCurrent(); if (sdk != null) { String sdkLocation = sdk.getSdkLocation(); - SdkManager manager = SdkManager.createManager(sdkLocation, new NullSdkLog()); + SdkManager manager = SdkManager.createManager(sdkLocation, NullLogger.getLogger()); Map<String, Integer> versions = manager.getExtrasVersions(); Integer version = versions.get(VENDOR_ID + '/' + SUPPORT_ID); if (version != null) { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java index 13245d5..91bc411 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/SdkManagerAction.java @@ -203,7 +203,7 @@ public class SdkManagerAction implements IWorkbenchWindowActionDelegate, IObject @Override public void err(@Nullable String line) { if (line != null) { - logger.printf("[SDK Manager] %s", line); + logger.info("[SDK Manager] %s", line); } } }); @@ -264,7 +264,11 @@ public class SdkManagerAction implements IWorkbenchWindowActionDelegate, IObject AdtPlugin.getDisplay().getActiveShell(), new AdtConsoleSdkLog() { @Override - public void printf(String msgFormat, Object... args) { + public void info(String msgFormat, Object... args) { + // Do not show non-error/warning log in Eclipse. + }; + @Override + public void verbose(String msgFormat, Object... args) { // Do not show non-error/warning log in Eclipse. }; }, diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java index 7c7bf9a..4da8004 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PreCompilerBuilder.java @@ -45,10 +45,10 @@ import com.android.manifmerger.ManifestMerger; import com.android.manifmerger.MergerLog; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.ISdkLog; import com.android.sdklib.internal.build.BuildConfigGenerator; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.io.FileOp; +import com.android.utils.ILogger; import com.android.xml.AndroidManifest; import org.eclipse.core.resources.IFile; @@ -827,7 +827,7 @@ public class PreCompilerBuilder extends BaseBuilder { // TODO change MergerLog.wrapSdkLog by a custom IMergerLog that will create // and maintain error markers. - ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(new ISdkLog() { + ManifestMerger merger = new ManifestMerger(MergerLog.wrapSdkLog(new ILogger() { @Override public void warning(String warningFormat, Object... args) { @@ -835,11 +835,16 @@ public class PreCompilerBuilder extends BaseBuilder { } @Override - public void printf(String msgFormat, Object... args) { + public void info(String msgFormat, Object... args) { AdtPlugin.printToConsole(getProject(), String.format(msgFormat, args)); } @Override + public void verbose(String msgFormat, Object... args) { + info(msgFormat, args); + } + + @Override public void error(Throwable t, String errorFormat, Object... args) { errors.add(String.format(errorFormat, args)); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java index a7188aa..804d299 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/AndroidLaunchController.java @@ -46,9 +46,9 @@ import com.android.ide.eclipse.ddms.DdmsPlugin; import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.NullSdkLog; import com.android.sdklib.internal.avd.AvdInfo; import com.android.sdklib.internal.avd.AvdManager; +import com.android.utils.NullLogger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -317,7 +317,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener // reload the AVDs to make sure we are up to date try { - avdManager.reloadAvds(NullSdkLog.getLogger()); + avdManager.reloadAvds(NullLogger.getLogger()); } catch (AndroidLocationException e1) { // this happens if the AVD Manager failed to find the folder in which the AVDs are // stored. This is unlikely to happen, but if it does, we should force to go manual diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java index 3f4ec93..22e5efa 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/launch/EmulatorConfigTab.java @@ -25,11 +25,11 @@ import com.android.ide.eclipse.adt.internal.sdk.AdtConsoleSdkLog; import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.NullSdkLog; import com.android.sdklib.internal.avd.AvdInfo; import com.android.sdklib.internal.avd.AvdManager; import com.android.sdkuilib.internal.widgets.AvdSelector; import com.android.sdkuilib.internal.widgets.AvdSelector.DisplayMode; +import com.android.utils.NullLogger; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -147,7 +147,7 @@ public class EmulatorConfigTab extends AbstractLaunchConfigurationTab { // reload the AVDs to make sure we are up to date try { - Sdk.getCurrent().getAvdManager().reloadAvds(NullSdkLog.getLogger()); + Sdk.getCurrent().getAvdManager().reloadAvds(NullLogger.getLogger()); } catch (AndroidLocationException e1) { // this happens if the AVD Manager failed to find the folder in which the AVDs are // stored. There isn't much we can do at this point. diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java index e5798d2..268fc53 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/AdtConsoleSdkLog.java @@ -17,12 +17,12 @@ package com.android.ide.eclipse.adt.internal.sdk; import com.android.ide.eclipse.adt.AdtPlugin; -import com.android.sdklib.ISdkLog; +import com.android.utils.ILogger; /** - * An {@link ISdkLog} logger that outputs to the ADT console. + * An {@link ILogger} logger that outputs to the ADT console. */ -public class AdtConsoleSdkLog implements ISdkLog { +public class AdtConsoleSdkLog implements ILogger { private static final String TAG = "SDK Manager"; //$NON-NLS-1$ @@ -36,7 +36,7 @@ public class AdtConsoleSdkLog implements ISdkLog { } @Override - public void printf(String msgFormat, Object... args) { + public void info(String msgFormat, Object... args) { String msg = String.format(msgFormat, args); for (String s : msg.split("\n")) { if (s.trim().length() > 0) { @@ -46,6 +46,11 @@ public class AdtConsoleSdkLog implements ISdkLog { } @Override + public void verbose(String msgFormat, Object... args) { + info(msgFormat, args); + } + + @Override public void warning(String warningFormat, Object... args) { AdtPlugin.printToConsole(TAG, String.format("Warning: " + warningFormat, args)); } 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 35d59f0..8c2ad4d 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 @@ -44,7 +44,6 @@ import com.android.io.StreamException; import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.ISdkLog; import com.android.sdklib.SdkManager; import com.android.sdklib.devices.Device; import com.android.sdklib.devices.DeviceManager; @@ -52,6 +51,7 @@ import com.android.sdklib.internal.avd.AvdManager; import com.android.sdklib.internal.project.ProjectProperties; import com.android.sdklib.internal.project.ProjectProperties.PropertyType; import com.android.sdklib.internal.project.ProjectPropertiesWorkingCopy; +import com.android.utils.ILogger; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; @@ -232,7 +232,7 @@ public final class Sdk { } final ArrayList<String> logMessages = new ArrayList<String>(); - ISdkLog log = new ISdkLog() { + ILogger log = new ILogger() { @Override public void error(Throwable throwable, String errorFormat, Object... arg) { if (errorFormat != null) { @@ -250,9 +250,14 @@ public final class Sdk { } @Override - public void printf(String msgFormat, Object... arg) { + public void info(String msgFormat, Object... arg) { logMessages.add(String.format(msgFormat, arg)); } + + @Override + public void verbose(String msgFormat, Object... arg) { + info(msgFormat, arg); + } }; // get an SdkManager object for the location @@ -321,7 +326,7 @@ public final class Sdk { * @param log The logger for the {@link SdkManager}. * @return A new {@link SdkManager} parsing the same location. */ - public @NonNull SdkManager getNewSdkManager(@NonNull ISdkLog log) { + public @NonNull SdkManager getNewSdkManager(@NonNull ILogger log) { return SdkManager.createManager(getSdkLocation(), log); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/SdkSelectionPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/SdkSelectionPage.java index c6e8e71..9ce5060 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/SdkSelectionPage.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/SdkSelectionPage.java @@ -27,9 +27,9 @@ import com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectWizardS import com.android.io.FileWrapper; import com.android.sdklib.AndroidVersion; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.NullSdkLog; import com.android.sdklib.SdkManager; import com.android.sdkuilib.internal.widgets.SdkTargetSelector; +import com.android.utils.NullLogger; import com.android.utils.Pair; import org.eclipse.core.resources.IProject; @@ -216,7 +216,7 @@ class SdkSelectionPage extends WizardPage implements ITargetChangeListener { // Parse the extras to see if we can find samples that are // compatible with the selected target API. // First we need an SdkManager that suppresses all output. - SdkManager sdkman = sdk.getNewSdkManager(new NullSdkLog()); + SdkManager sdkman = sdk.getNewSdkManager(NullLogger.getLogger()); Map<File, String> extras = sdkman.getExtraSamples(); for (Entry<File, String> entry : extras.entrySet()) { diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 5c799d0..9472625 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -25,7 +25,6 @@ Bundle-ClassPath: ., Export-Package: com.android, com.android.annotations, com.android.dvlib, - com.android.ide.common.log, com.android.ide.common.rendering, com.android.ide.common.rendering.api, com.android.ide.common.rendering.legacy, diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorApplication.java b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorApplication.java index 5f87813..aee6c87 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorApplication.java +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/MonitorApplication.java @@ -18,11 +18,11 @@ package com.android.ide.eclipse.monitor; import com.android.ide.eclipse.monitor.SdkToolsLocator.SdkInstallStatus; import com.android.prefs.AndroidLocation; -import com.android.sdklib.ISdkLog; -import com.android.sdklib.NullSdkLog; import com.android.sdklib.SdkManager; import com.android.sdkstats.SdkStatsService; import com.android.sdkuilib.internal.repository.sdkman2.AdtUpdateDialog; +import com.android.utils.ILogger; +import com.android.utils.NullLogger; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; @@ -60,7 +60,7 @@ public class MonitorApplication implements IApplication { MonitorPlugin.getDefault().setSdkPath(sdkPath); // install platform tools if necessary - ISdkLog sdkLog = new NullSdkLog(); + ILogger sdkLog = NullLogger.getLogger(); SdkManager manager = SdkManager.createManager(sdkPath, sdkLog); if (manager.getPlatformToolsVersion() == null) { AdtUpdateDialog window = new AdtUpdateDialog(new Shell(display), sdkLog, sdkPath); diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/mock/TestLogger.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/mock/TestLogger.java index 5516168..f8bf4b3 100644 --- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/mock/TestLogger.java +++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/eclipse/mock/TestLogger.java @@ -16,7 +16,8 @@ package com.android.ide.eclipse.mock; -import com.android.ide.common.log.ILogger; + +import com.android.utils.ILogger; import junit.framework.Assert; @@ -36,11 +37,16 @@ public class TestLogger implements ILogger { } @Override - public void printf(String msgFormat, Object... args) { + public void info(String msgFormat, Object... args) { System.out.println(String.format(msgFormat, args)); } @Override + public void verbose(String msgFormat, Object... args) { + info(msgFormat, args); + } + + @Override public void warning(String warningFormat, Object... args) { System.err.println(String.format(warningFormat, args)); } |