OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

development


Commit MetaInfo

Revisione71a4a39a457e5fc8feb504279c0ea78a7f0122b (tree)
Time2009-03-27 05:53:00
AuthorRaphael Moll <>
CommiterThe Android Open Source Project

Log Message

Automated import from //branches/cupcake/...@142978,142978

Change Summary

Incremental Difference

--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchConfiguration.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchConfiguration.java
@@ -32,8 +32,14 @@ public class AndroidLaunchConfiguration {
3232 */
3333 public int mLaunchAction = LaunchConfigDelegate.DEFAULT_LAUNCH_ACTION;
3434
35+ /**
36+ * Target selection mode for the configuration: either {@link #AUTO} or {@link #MANUAL}.
37+ */
3538 public enum TargetMode {
36- AUTO(true), MANUAL(false);
39+ /** Automatic target selection mode. */
40+ AUTO(true),
41+ /** Manual target selection mode. */
42+ MANUAL(false);
3743
3844 private boolean mValue;
3945
@@ -58,10 +64,7 @@ public class AndroidLaunchConfiguration {
5864
5965 /**
6066 * Target selection mode.
61- * <ul>
62- * <li><code>true</code>: automatic mode, see {@link #AUTO_TARGET_MODE}</li>
63- * <li><code>false</code>: manual mode</li>
64- * </ul>
67+ * @see TargetMode
6568 */
6669 public TargetMode mTargetMode = LaunchConfigDelegate.DEFAULT_TARGET_MODE;
6770
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/AndroidLaunchController.java
@@ -17,9 +17,6 @@
1717 package com.android.ide.eclipse.adt.launch;
1818
1919 import com.android.ddmlib.AndroidDebugBridge;
20-import com.android.ddmlib.AndroidDebugBridge.IClientChangeListener;
21-import com.android.ddmlib.AndroidDebugBridge.IDebugBridgeChangeListener;
22-import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
2320 import com.android.ddmlib.Client;
2421 import com.android.ddmlib.ClientData;
2522 import com.android.ddmlib.Device;
@@ -27,6 +24,9 @@ import com.android.ddmlib.IDevice;
2724 import com.android.ddmlib.Log;
2825 import com.android.ddmlib.MultiLineReceiver;
2926 import com.android.ddmlib.SyncService;
27+import com.android.ddmlib.AndroidDebugBridge.IClientChangeListener;
28+import com.android.ddmlib.AndroidDebugBridge.IDebugBridgeChangeListener;
29+import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
3030 import com.android.ddmlib.SyncService.SyncResult;
3131 import com.android.ide.eclipse.adt.AdtPlugin;
3232 import com.android.ide.eclipse.adt.launch.AndroidLaunchConfiguration.TargetMode;
@@ -34,10 +34,9 @@ import com.android.ide.eclipse.adt.launch.DelayedLaunchInfo.InstallRetryMode;
3434 import com.android.ide.eclipse.adt.launch.DeviceChooserDialog.DeviceChooserResponse;
3535 import com.android.ide.eclipse.adt.project.ProjectHelper;
3636 import com.android.ide.eclipse.adt.sdk.Sdk;
37-import com.android.ide.eclipse.common.AndroidConstants;
3837 import com.android.ide.eclipse.common.project.AndroidManifestParser;
39-import com.android.prefs.AndroidLocation.AndroidLocationException;
4038 import com.android.ide.eclipse.common.project.BaseProjectHelper;
39+import com.android.prefs.AndroidLocation.AndroidLocationException;
4140 import com.android.sdklib.IAndroidTarget;
4241 import com.android.sdklib.SdkManager;
4342 import com.android.sdklib.avd.AvdManager;
@@ -56,7 +55,6 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
5655 import org.eclipse.debug.core.ILaunchManager;
5756 import org.eclipse.debug.core.model.IDebugTarget;
5857 import org.eclipse.debug.ui.DebugUITools;
59-import org.eclipse.jdt.core.IJavaModel;
6058 import org.eclipse.jdt.core.IJavaProject;
6159 import org.eclipse.jdt.core.JavaModelException;
6260 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
@@ -102,8 +100,9 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
102100
103101 /**
104102 * List of {@link DelayedLaunchInfo} waiting for an emulator to connect.
105- * <p>Once an emulator has connected, {@link DelayedLaunchInfo#mDevice} is set and the
106- * DelayedLaunchInfo object is moved to {@link AndroidLaunchController#mWaitingForReadyEmulatorList}.
103+ * <p>Once an emulator has connected, {@link DelayedLaunchInfo#getDevice()} is set and the
104+ * DelayedLaunchInfo object is moved to
105+ * {@link AndroidLaunchController#mWaitingForReadyEmulatorList}.
107106 * <b>ALL ACCESS MUST BE INSIDE A <code>synchronized (sListLock)</code> block!</b>
108107 */
109108 private final ArrayList<DelayedLaunchInfo> mWaitingForEmulatorLaunches =
@@ -487,7 +486,7 @@ public final class AndroidLaunchController implements IDebugBridgeChangeListener
487486 // FIXME: ask the user if he wants to create a AVD.
488487 // we found no compatible AVD.
489488 AdtPlugin.printErrorToConsole(project, String.format(
490- "Failed to find a AVD compatible with target '%1$s'. Launch aborted.",
489+ "Failed to find an AVD compatible with target '%1$s'. Launch aborted.",
491490 projectTarget.getName()));
492491 stopLaunch(launchInfo);
493492 return;
--- a/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
+++ b/tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/launch/junit/AndroidJUnitLaunchAction.java
@@ -57,7 +57,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
5757 * Launch a instrumentation test run on given Android device.
5858 * Reuses JDT JUnit launch delegate so results can be communicated back to JDT JUnit UI.
5959 *
60- * @see com.android.ide.eclipse.adt.launch.IAndroidLaunchAction#doLaunchAction(com.android.ide.eclipse.adt.launch.AndroidLaunchController.DelayedLaunchInfo, com.android.ddmlib.Device)
60+ * @see IAndroidLaunchAction#doLaunchAction(DelayedLaunchInfo, IDevice)
6161 */
6262 public boolean doLaunchAction(DelayedLaunchInfo info, IDevice device) {
6363 String msg = String.format("Launching instrumentation %s on device %s", mRunner,
@@ -108,7 +108,9 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
108108 super.launch(configuration, mode, launch, monitor);
109109 }
110110
111- /* (non-Javadoc)
111+ /**
112+ * {@inheritDoc}
113+ * @throws CoreException
112114 * @see org.eclipse.jdt.junit.launcher.JUnitLaunchConfigurationDelegate#verifyMainTypeName(org.eclipse.debug.core.ILaunchConfiguration)
113115 */
114116 @Override
@@ -119,6 +121,7 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
119121 /**
120122 * Overrides parent to return a VM Runner implementation which launches a thread, rather
121123 * than a separate VM process
124+ * @throws CoreException
122125 */
123126 @Override
124127 public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode)
@@ -127,7 +130,9 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
127130 mTestPackage, mRunner, mLaunchInfo.isDebugMode(), mDevice));
128131 }
129132
130- /* (non-Javadoc)
133+ /**
134+ * {@inheritDoc}
135+ * @throws CoreException
131136 * @see org.eclipse.debug.core.model.LaunchConfigurationDelegate#getLaunch(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String)
132137 */
133138 @Override
@@ -148,6 +153,10 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
148153 mJUnitInfo = info;
149154 }
150155
156+ /**
157+ * {@inheritDoc}
158+ * @throws CoreException
159+ */
151160 public void run(final VMRunnerConfiguration config, ILaunch launch,
152161 IProgressMonitor monitor) throws CoreException {
153162
@@ -183,7 +192,9 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
183192 return null;
184193 }
185194
186- /* (non-Javadoc)
195+ /**
196+ * {@inheritDoc}
197+ * @throws DebugException
187198 * @see org.eclipse.debug.core.model.IProcess#getExitValue()
188199 */
189200 public int getExitValue() throws DebugException {
@@ -241,7 +252,9 @@ class AndroidJUnitLaunchAction implements IAndroidLaunchAction {
241252 return mIsTerminated;
242253 }
243254
244- /* (non-Javadoc)
255+ /**
256+ * {@inheritDoc}
257+ * @throws DebugException
245258 * @see org.eclipse.debug.core.model.ITerminate#terminate()
246259 */
247260 public void terminate() throws DebugException {