aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2011-05-16 13:47:42 -0700
committerRaphael Moll <ralf@android.com>2011-05-16 13:48:49 -0700
commit7f8f80cfe2a29b7ebaf139fb4228ad31192fb8a9 (patch)
tree5219e409cb475aef48797240e150a8b17c479055
parentce413f1280be32c1a87fa4d964be37410a6cfd7c (diff)
downloadsdk-7f8f80cfe2a29b7ebaf139fb4228ad31192fb8a9.zip
sdk-7f8f80cfe2a29b7ebaf139fb4228ad31192fb8a9.tar.gz
sdk-7f8f80cfe2a29b7ebaf139fb4228ad31192fb8a9.tar.bz2
Remove "Android Tools > Convert to Android Project"
The feature to convert a Java Project into an Android Project is broken. It's also quite irrelevant now since project are better created using the NPW. SDK Bug: 3259855 Change-Id: I80e697651adba5a44beb3b53b31887d4e65b0868
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml35
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/ConvertToAndroidAction.java154
2 files changed, 0 insertions, 189 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
index a16a766..031bda1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/plugin.xml
@@ -209,41 +209,6 @@
<extension
point="org.eclipse.ui.popupMenus">
<objectContribution
- id="com.android.ide.eclipse.adt.contribution1"
- nameFilter="*"
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true">
- <menu
- id="com.android.ide.eclipse.adt.AndroidTools"
- label="Android Tools"
- path="additions">
- <separator name="group1"/>
- </menu>
- <visibility>
- <and>
- <not>
- <objectState
- name="projectNature"
- value="com.android.ide.eclipse.adt.AndroidNature"/>
- </not>
- <not>
- <objectState
- name="projectNature"
- value="com.android.ide.eclipse.adt.AndroidExportNature"/>
- </not>
- <objectState
- name="open"
- value="true"/>
- </and>
- </visibility>
- <action
- class="com.android.ide.eclipse.adt.internal.actions.ConvertToAndroidAction"
- enablesFor="1"
- id="com.android.ide.eclipse.adt.ConvertToAndroidAction"
- label="Convert To Android Project"
- menubarPath="com.android.ide.eclipse.adt.AndroidTools/group1"/>
- </objectContribution>
- <objectContribution
id="com.android.ide.eclipse.adt.contribution2"
nameFilter="*"
objectClass="org.eclipse.core.resources.IProject"
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/ConvertToAndroidAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/ConvertToAndroidAction.java
deleted file mode 100644
index cf46192..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/ConvertToAndroidAction.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Eclipse Public License, Version 1.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.eclipse.org/org/documents/epl-v10.php
- *
- * 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.actions;
-
-import com.android.ide.eclipse.adt.AdtPlugin;
-import com.android.ide.eclipse.adt.AdtConstants;
-import com.android.ide.eclipse.adt.internal.project.ProjectHelper;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-import java.util.Iterator;
-
-/**
- * Converts a project created with the activity creator into an
- * Android project.
- */
-public class ConvertToAndroidAction implements IObjectActionDelegate {
-
- private ISelection mSelection;
-
- /*
- * (non-Javadoc)
- *
- * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
- */
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- // pass
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IActionDelegate#run(IAction)
- */
- public void run(IAction action) {
- if (mSelection instanceof IStructuredSelection) {
- for (Iterator<?> it = ((IStructuredSelection)mSelection).iterator(); it.hasNext();) {
- Object element = it.next();
- IProject project = null;
- if (element instanceof IProject) {
- project = (IProject)element;
- } else if (element instanceof IAdaptable) {
- project = (IProject)((IAdaptable)element).getAdapter(IProject.class);
- }
- if (project != null) {
- convertProject(project);
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IActionDelegate#selectionChanged(IAction, ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- mSelection = selection;
- }
-
- /**
- * Toggles sample nature on a project
- *
- * @param project to have sample nature added or removed
- */
- private void convertProject(final IProject project) {
- new Job("Convert Project") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- if (monitor != null) {
- monitor.beginTask(String.format(
- "Convert %1$s to Android", project.getName()), 5);
- }
-
- IProjectDescription description = project.getDescription();
- String[] natures = description.getNatureIds();
-
- // check if the project already has the android nature.
- for (int i = 0; i < natures.length; ++i) {
- if (AdtConstants.NATURE_DEFAULT.equals(natures[i])) {
- // we shouldn't be here as the visibility of the item
- // is dependent on the project.
- return new Status(Status.WARNING, AdtPlugin.PLUGIN_ID,
- "Project is already an Android project");
- }
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
-
- String[] newNatures = new String[natures.length + 1];
- System.arraycopy(natures, 0, newNatures, 1, natures.length);
- newNatures[0] = AdtConstants.NATURE_DEFAULT;
-
- // set the new nature list in the project
- description.setNatureIds(newNatures);
- project.setDescription(description, null);
- if (monitor != null) {
- monitor.worked(1);
- }
-
- // Fix the classpath entries.
- // get a java project
- IJavaProject javaProject = JavaCore.create(project);
- ProjectHelper.fixProjectClasspathEntries(javaProject);
- if (monitor != null) {
- monitor.worked(1);
- }
-
- return Status.OK_STATUS;
- } catch (JavaModelException e) {
- return e.getJavaModelStatus();
- } catch (CoreException e) {
- return e.getStatus();
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
- }.schedule();
- }
-}