[Esbox-commits] r2501 - in trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui: actions/debian wizards/debian

[ilpyykko at garage.maemo.org]

Author: ilpyykko
Date: 2010-01-07 13:15:16 +0200 (Thu, 07 Jan 2010)
New Revision: 2501

Added:
   trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxPythonDebianStructureWizard.java
Modified:
   trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java
   trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java
Log:
Merge rev 2500 from work_mmad

Modified: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java	2010-01-05 09:34:52 UTC (rev 2500)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java	2010-01-07 11:15:16 UTC (rev 2501)
@@ -13,10 +13,9 @@
 
 import org.eclipse.core.resources.IProject;
 import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageBuildWizard;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxPythonDebianStructureWizard;
 import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction;
 import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractDebianPackageWizard;
-import org.maemo.mica.python.project.ui.wizards.PythonDebianStructureWizard;
-
 /**
  * Build Debian package action for Python projects. 
  */
@@ -37,6 +36,6 @@
 	 */
 	@Override
 	protected AbstractDebianPackageWizard createStructureWizard(IProject project) {
-		return new PythonDebianStructureWizard(project);
+		return new ESboxPythonDebianStructureWizard(project);
 	}
 }

Modified: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java	2010-01-05 09:34:52 UTC (rev 2500)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java	2010-01-07 11:15:16 UTC (rev 2501)
@@ -13,7 +13,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.wizard.IWizard;
-import org.maemo.mica.python.project.ui.wizards.PythonDebianStructureWizard;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxPythonDebianStructureWizard;
 
 /**
  * Action to launch Python Debian structure generator wizard.
@@ -25,6 +25,6 @@
 	 */
 	@Override
 	protected IWizard createWizard(IProject project) {
-		return new PythonDebianStructureWizard(project);
+		return new ESboxPythonDebianStructureWizard(project);
 	}
 }

Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxPythonDebianStructureWizard.java (from rev 2500, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxPythonDebianStructureWizard.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxPythonDebianStructureWizard.java	                        (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxPythonDebianStructureWizard.java	2010-01-07 11:15:16 UTC (rev 2501)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ *    Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.maemo.mica.python.project.ui.wizards.AbstractPythonDebianStructureWizard;
+
+/**
+ * Wizard for creating Debian package from Python project.
+ *   
+ * @see AbstractPythonDebianStructureWizard
+ */
+public class ESboxPythonDebianStructureWizard extends AbstractPythonDebianStructureWizard {
+
+	/**
+	 * Constructor
+	 * 
+	 * @param project the project
+	 */
+	public ESboxPythonDebianStructureWizard(IProject project) {
+		super(project);
+	}
+	
+}