[Esbox-commits] r1185 - in branches/work_Ed/org.maemo.esbox.project.python/src: . org org/maemo org/maemo/esbox org/maemo/esbox/internal org/maemo/esbox/internal/project org/maemo/esbox/internal/project/python org/maemo/esbox/internal/project/python/core org/maemo/esbox/internal/project/python/ui org/maemo/esbox/internal/project/python/ui/properties org/maemo/esbox/internal/project/python/wizards
eswartz at garage.maemo.org
eswartz at garage.maemo.org
Sun Feb 1 18:28:40 EET 2009
Author: eswartz
Date: 2009-02-01 18:28:38 +0200 (Sun, 01 Feb 2009)
New Revision: 1185
Added:
branches/work_Ed/org.maemo.esbox.project.python/src/org/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
Removed:
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/
branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
Log:
Stop deleting Python project sources
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python)
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.project.python;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
- public static final String PREFIX = UIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
-
- /**
- * Global preference => ESbox => Build Machines.
- */
- public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
-
- /**
- * Global preference => ESbox => X Server.
- */
- public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/IHelpID.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.project.python;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+ public static final String PREFIX = UIActivator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+ /**
+ * Global preference => ESbox => Build Machines.
+ */
+ public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
+
+ /**
+ * Global preference => ESbox => X Server.
+ */
+ public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
+}
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.project.python;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class UIActivator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.maemo.esbox.maemosdk.ui";
-
- // The shared instance
- private static UIActivator plugin;
-
- /**
- * The constructor
- */
- public UIActivator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static UIActivator getDefault() {
- return plugin;
- }
-
- /**
- * @param object
- * @param e
- * @return
- */
- public static IStatus createErrorStatus(String msg, Throwable t) {
- return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
- }
-
- /**
- * @param warning
- * @param format
- * @param e
- * @return
- */
- public static IStatus createStatus(int severity, String msg,
- Throwable t) {
- return new Status(severity, PLUGIN_ID, msg, t);
- }
-
- /**
- * @param warning
- * @param string
- * @return
- */
- public static IStatus createStatus(int severity, String string) {
- return new Status(severity, PLUGIN_ID, string);
- }
-
- /**
- * Return the error logger instance of this plug-in.
- *
- * @return the error logger instance of this plug-in.
- */
- public static ErrorLogger getErrorLogger() {
- class CoreErrorLogger extends ErrorLogger {
-
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
- @Override
- public Plugin getPlugin() {
- return UIActivator.getDefault();
- }
-
- }
-
- return new CoreErrorLogger();
- }
-
- /**
- * Find a file relative to the plugin, either in a running
- * workspace or a standalone unit test (assumed to run relative
- * to a plugin)
- * @param path
- */
- public static InputStream getPluginRelativeInputStream(String path) throws IOException {
- if (getDefault() != null) {
- return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
- } else {
- return new FileInputStream("../" + path);
- }
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path.
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-
-
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/UIActivator.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.project.python;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class UIActivator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.maemo.esbox.maemosdk.ui";
+
+ // The shared instance
+ private static UIActivator plugin;
+
+ /**
+ * The constructor
+ */
+ public UIActivator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static UIActivator getDefault() {
+ return plugin;
+ }
+
+ /**
+ * @param object
+ * @param e
+ * @return
+ */
+ public static IStatus createErrorStatus(String msg, Throwable t) {
+ return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+ }
+
+ /**
+ * @param warning
+ * @param format
+ * @param e
+ * @return
+ */
+ public static IStatus createStatus(int severity, String msg,
+ Throwable t) {
+ return new Status(severity, PLUGIN_ID, msg, t);
+ }
+
+ /**
+ * @param warning
+ * @param string
+ * @return
+ */
+ public static IStatus createStatus(int severity, String string) {
+ return new Status(severity, PLUGIN_ID, string);
+ }
+
+ /**
+ * Return the error logger instance of this plug-in.
+ *
+ * @return the error logger instance of this plug-in.
+ */
+ public static ErrorLogger getErrorLogger() {
+ class CoreErrorLogger extends ErrorLogger {
+
+ @Override
+ public String getPluginID() {
+ return PLUGIN_ID;
+ }
+ @Override
+ public Plugin getPlugin() {
+ return UIActivator.getDefault();
+ }
+
+ }
+
+ return new CoreErrorLogger();
+ }
+
+ /**
+ * Find a file relative to the plugin, either in a running
+ * workspace or a standalone unit test (assumed to run relative
+ * to a plugin)
+ * @param path
+ */
+ public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+ if (getDefault() != null) {
+ return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+ } else {
+ return new FileInputStream("../" + path);
+ }
+ }
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path.
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+
+
+}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core)
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
-import org.maemo.mica.python.project.core.MicaPythonProjectNature;
-
-/**
- * Provide the maemo-specific Python development packages for a project.
- * @author eswartz
- *
- */
-public class MaemoPythonProjectPackageGatherer implements
- IProjectPackageGatherer {
-
- /**
- *
- */
- public MaemoPythonProjectPackageGatherer() {
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
- */
- public ProjectPackageInfo scanPackages(IProject project,
- IProgressMonitor monitor) throws CoreException {
- if (MicaPythonProjectNature.isNatureInProject(project)) {
- ProjectPackageInfo info = new ProjectPackageInfo();
- info.getSystemPackages().add("maemo-python-env");
- return info;
- }
- return null;
- }
-
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/MaemoPythonProjectPackageGatherer.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
+import org.maemo.mica.python.project.core.MicaPythonProjectNature;
+
+/**
+ * Provide the maemo-specific Python development packages for a project.
+ * @author eswartz
+ *
+ */
+public class MaemoPythonProjectPackageGatherer implements
+ IProjectPackageGatherer {
+
+ /**
+ *
+ */
+ public MaemoPythonProjectPackageGatherer() {
+ // TODO Auto-generated constructor stub
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
+ */
+ public ProjectPackageInfo scanPackages(IProject project,
+ IProgressMonitor monitor) throws CoreException {
+ if (MicaPythonProjectNature.isNatureInProject(project)) {
+ ProjectPackageInfo info = new ProjectPackageInfo();
+ info.getSystemPackages().add("maemo-python-env");
+ return info;
+ }
+ return null;
+ }
+
+}
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.common.ui.common.GridLayoutWrappedTextUtils;
-import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
-
-/**
- * This composite contains the configurable aspects of a project for a Debian
- * source package.
- * @author eswartz
- *
- */
-public class PythonDebianProjectImportConfigurationComposite extends PythonProjectImportConfigurationComposite {
-
- /*private*/ String[] rules;
-
- public PythonDebianProjectImportConfigurationComposite(
- Composite parent,
- IValidatingDialogPage dialogPage,
- final IProject project,
- final IPath projectLocation,
- ProjectConfigHandler configHandler,
- String[] rules) {
- super(parent, SWT.NONE, dialogPage, project, projectLocation, configHandler);
- this.rules = rules;
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite#createProjectUI(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected void createProjectUI(Composite composite) {
- super.createProjectUI(composite);
-
- Label label = new Label(composite, SWT.NONE);
- GridData labelData = GridDataFactory.swtDefaults().create();
- label.setText("Python projects cannot (currently) be built with the 'debian/rules' script since this requires a Make-based builder.");
-
- GridLayoutWrappedTextUtils.setupLabel(getShell(), label, labelData);
-
- }
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectImportConfigurationComposite.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.common.ui.common.GridLayoutWrappedTextUtils;
+import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
+
+/**
+ * This composite contains the configurable aspects of a project for a Debian
+ * source package.
+ * @author eswartz
+ *
+ */
+public class PythonDebianProjectImportConfigurationComposite extends PythonProjectImportConfigurationComposite {
+
+ /*private*/ String[] rules;
+
+ public PythonDebianProjectImportConfigurationComposite(
+ Composite parent,
+ IValidatingDialogPage dialogPage,
+ final IProject project,
+ final IPath projectLocation,
+ ProjectConfigHandler configHandler,
+ String[] rules) {
+ super(parent, SWT.NONE, dialogPage, project, projectLocation, configHandler);
+ this.rules = rules;
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite#createProjectUI(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected void createProjectUI(Composite composite) {
+ super.createProjectUI(composite);
+
+ Label label = new Label(composite, SWT.NONE);
+ GridData labelData = GridDataFactory.swtDefaults().create();
+ label.setText("Python projects cannot (currently) be built with the 'debian/rules' script since this requires a Make-based builder.");
+
+ GridLayoutWrappedTextUtils.setupLabel(getShell(), label, labelData);
+
+ }
+}
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.widgets.Composite;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
-
-/**
- * @author eswartz
- *
- */
-public class PythonDebianProjectSupport implements IDebianProjectConvertImportSupport {
-
- /**
- * @param micaPythonProjectType
- * @param adaptableObject
- */
- public PythonDebianProjectSupport(MicaPythonProjectType micaPythonProjectType) {
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
- */
- public Composite createDebianProjectImportConfigurationComposite(Composite parent,
- int style, IValidatingDialogPage dialogPage, IProject project,
- IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
-
- PythonDebianProjectImportConfigurationComposite configComposite =
- new PythonDebianProjectImportConfigurationComposite(
- parent,
- dialogPage,
- project,
- projectLocation,
- configHandler,
- debianRules
- );
-
- configComposite.init();
-
- return configComposite;
- }
-
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonDebianProjectSupport.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swt.widgets.Composite;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
+
+/**
+ * @author eswartz
+ *
+ */
+public class PythonDebianProjectSupport implements IDebianProjectConvertImportSupport {
+
+ /**
+ * @param micaPythonProjectType
+ * @param adaptableObject
+ */
+ public PythonDebianProjectSupport(MicaPythonProjectType micaPythonProjectType) {
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
+ */
+ public Composite createDebianProjectImportConfigurationComposite(Composite parent,
+ int style, IValidatingDialogPage dialogPage, IProject project,
+ IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
+
+ PythonDebianProjectImportConfigurationComposite configComposite =
+ new PythonDebianProjectImportConfigurationComposite(
+ parent,
+ dialogPage,
+ project,
+ projectLocation,
+ configHandler,
+ debianRules
+ );
+
+ configComposite.init();
+
+ return configComposite;
+ }
+
+}
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.core;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-
-/**
- * This factory proclaims Debian support for a project type.
- * @author eswartz
- *
- */
-public class PythonProjectDebianSupportAdapterFactory implements IAdapterFactory {
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof MicaPythonProjectType) {
- if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
- return new PythonDebianProjectSupport((MicaPythonProjectType) adaptableObject);
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[] { IDebianProjectConvertImportSupport.class };
- }
-
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/core/PythonProjectDebianSupportAdapterFactory.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.core;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+
+/**
+ * This factory proclaims Debian support for a project type.
+ * @author eswartz
+ *
+ */
+public class PythonProjectDebianSupportAdapterFactory implements IAdapterFactory {
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+ */
+ public Object getAdapter(Object adaptableObject, Class adapterType) {
+ if (adaptableObject instanceof MicaPythonProjectType) {
+ if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
+ return new PythonDebianProjectSupport((MicaPythonProjectType) adaptableObject);
+ }
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+ */
+ public Class[] getAdapterList() {
+ return new Class[] { IDebianProjectConvertImportSupport.class };
+ }
+
+}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui)
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties)
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.ui.properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.maemo.esbox.internal.project.python.UIActivator;
-import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.project.core.*;
-import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
-import org.maemo.mica.python.project.core.*;
-
-import java.util.List;
-
-/**
- * The Python variant of the ESbox > Build Configurations property page
- * will convert the project format when the user saves the settings.
- * @author eswartz
- *
- */
-public class ESboxOldPythonBuildTargetPropertyPage extends
- MicaBuildConfigurationsPage {
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#getCurrentConfigurations()
- */
- @Override
- protected List<IBuildConfiguration> getCurrentConfigurations() {
- // the handle will become non-null when we convert
- if (projectHandle == null) {
- // since this is an old project, there are no configurations
- // or project handle, so create it now
- try {
- IProjectProperties projectProperties = ProjectManager.getInstance().getOldStyleProjectProperties(project);
- projectHandle = ProjectManager.getInstance().getProjectType(MicaPythonProjectType.ID).createProjectHandle(project);
- BuildConfigurationParameters params =
- new BuildConfigurationParameters(projectProperties.getSDKTarget().getName(),
- projectProperties.getSDKTarget());
- projectHandle.createBuildConfiguration(params);
- } catch (CoreException e) {
- UIActivator.getErrorLogger().logAndShowError("Failed to read old project settings", e);
- } catch (MicaException e) {
- // not sure why this panel is appearing!
- }
- }
- return super.getCurrentConfigurations();
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#addCustomUI(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected void addCustomTrailingUI(Composite control) {
- if (ProjectManager.getInstance().getProjectHandle(project) == null) {
- Label label = new Label(control, SWT.WRAP);
- label.setText("This project is in an old format. It will be converted to the new format and become incompatible with older versions of ESbox if you save changes.");
- GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- gridData.horizontalSpan = 2;
- label.setLayoutData(gridData);
- }
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#performOk()
- */
- @Override
- public boolean performOk() {
- // convert the project by swapping the project nature
- try {
- OldESboxPythonProjectNature.removeESboxPythonNature(project, null);
- MicaPythonProjectNature.addESboxPythonNature(project, null);
- } catch (CoreException e) {
- UIActivator.getErrorLogger().logAndShowError("Failed to convert project to new-style Python project", e);
- }
-
- return super.performOk();
- }
-
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.ui.properties;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.maemo.esbox.internal.project.python.UIActivator;
+import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.project.core.*;
+import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
+import org.maemo.mica.python.project.core.*;
+
+import java.util.List;
+
+/**
+ * The Python variant of the ESbox > Build Configurations property page
+ * will convert the project format when the user saves the settings.
+ * @author eswartz
+ *
+ */
+public class ESboxOldPythonBuildTargetPropertyPage extends
+ MicaBuildConfigurationsPage {
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#getCurrentConfigurations()
+ */
+ @Override
+ protected List<IBuildConfiguration> getCurrentConfigurations() {
+ // the handle will become non-null when we convert
+ if (projectHandle == null) {
+ // since this is an old project, there are no configurations
+ // or project handle, so create it now
+ try {
+ IProjectProperties projectProperties = ProjectManager.getInstance().getOldStyleProjectProperties(project);
+ projectHandle = ProjectManager.getInstance().getProjectType(MicaPythonProjectType.ID).createProjectHandle(project);
+ BuildConfigurationParameters params =
+ new BuildConfigurationParameters(projectProperties.getSDKTarget().getName(),
+ projectProperties.getSDKTarget());
+ projectHandle.createBuildConfiguration(params);
+ } catch (CoreException e) {
+ UIActivator.getErrorLogger().logAndShowError("Failed to read old project settings", e);
+ } catch (MicaException e) {
+ // not sure why this panel is appearing!
+ }
+ }
+ return super.getCurrentConfigurations();
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#addCustomUI(org.eclipse.swt.widgets.Composite)
+ */
+ @Override
+ protected void addCustomTrailingUI(Composite control) {
+ if (ProjectManager.getInstance().getProjectHandle(project) == null) {
+ Label label = new Label(control, SWT.WRAP);
+ label.setText("This project is in an old format. It will be converted to the new format and become incompatible with older versions of ESbox if you save changes.");
+ GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+ gridData.horizontalSpan = 2;
+ label.setLayoutData(gridData);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#performOk()
+ */
+ @Override
+ public boolean performOk() {
+ // convert the project by swapping the project nature
+ try {
+ OldESboxPythonProjectNature.removeESboxPythonNature(project, null);
+ MicaPythonProjectNature.addESboxPythonNature(project, null);
+ } catch (CoreException e) {
+ UIActivator.getErrorLogger().logAndShowError("Failed to convert project to new-style Python project", e);
+ }
+
+ return super.performOk();
+ }
+
+}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards)
Deleted: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-01 02:02:28 UTC (rev 1183)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.project.python.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.INewWizard;
-import org.maemo.esbox.internal.project.python.UIActivator;
-import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-import org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard;
-
-/**
- * This wizard creates Python projects for ESbox.
- * @author eswartz
- *
- */
-public class ESboxPythonProjectWizard extends BasePythonProjectWizard
- implements INewWizard {
- public static final String PYTHON_PROJECT_WIZARD_ID = UIActivator.PLUGIN_ID + ".ESboxPythonProjectWizard";
-
- /**
- * Constructor.
- * Creates a wizard to new ESbox Python projects.
- */
- public ESboxPythonProjectWizard() {
- super("New Maemo Python Project", "Create a Maemo project inside Scratchbox");
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#getProjectTypeIdPattern()
- */
- protected String getProjectTypeIdPattern() {
- return MicaPythonProjectType.ID;
- }
-
- protected String getWizardId() {
- return PYTHON_PROJECT_WIZARD_ID;
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard#createBuildTargetFilter()
- */
- @Override
- protected IBuildTargetFilter createBuildTargetFilter() {
- return new ESboxBuildTargetFilter();
- }
-
- /* (non-Javadoc)
- * @see org.maemo.mica.common.project.ui.wizards.ESboxTemplateProjectWizard#getWizardPageImageDescriptor()
- */
- protected ImageDescriptor getWizardPageImageDescriptor() {
- return UIActivator.getImageDescriptor("./icons/full/wizban/maemo_wizban.gif");
- }
-}
Copied: branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java (from rev 1183, branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java)
===================================================================
--- branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java (rev 0)
+++ branches/work_Ed/org.maemo.esbox.project.python/src/org/maemo/esbox/internal/project/python/wizards/ESboxPythonProjectWizard.java 2009-02-01 16:28:38 UTC (rev 1185)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.project.python.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.INewWizard;
+import org.maemo.esbox.internal.project.python.UIActivator;
+import org.maemo.esbox.maemosdk.core.ESboxBuildTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+import org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard;
+
+/**
+ * This wizard creates Python projects for ESbox.
+ * @author eswartz
+ *
+ */
+public class ESboxPythonProjectWizard extends BasePythonProjectWizard
+ implements INewWizard {
+ public static final String PYTHON_PROJECT_WIZARD_ID = UIActivator.PLUGIN_ID + ".ESboxPythonProjectWizard";
+
+ /**
+ * Constructor.
+ * Creates a wizard to new ESbox Python projects.
+ */
+ public ESboxPythonProjectWizard() {
+ super("New Maemo Python Project", "Create a Maemo project inside Scratchbox");
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#getProjectTypeIdPattern()
+ */
+ protected String getProjectTypeIdPattern() {
+ return MicaPythonProjectType.ID;
+ }
+
+ protected String getWizardId() {
+ return PYTHON_PROJECT_WIZARD_ID;
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard#createBuildTargetFilter()
+ */
+ @Override
+ protected IBuildTargetFilter createBuildTargetFilter() {
+ return new ESboxBuildTargetFilter();
+ }
+
+ /* (non-Javadoc)
+ * @see org.maemo.mica.common.project.ui.wizards.ESboxTemplateProjectWizard#getWizardPageImageDescriptor()
+ */
+ protected ImageDescriptor getWizardPageImageDescriptor() {
+ return UIActivator.getImageDescriptor("./icons/full/wizban/maemo_wizban.gif");
+ }
+}
More information about the Esbox-commits
mailing list