[Esbox-commits] r2498 - in trunk: org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project org.maemo.esbox.scratchbox.core org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters org.maemo.esbox.scratchbox.ui org.maemo.esbox.scratchbox.ui/META-INF org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian org.maemo.esbox.tests/src/org/maemo/esbox/tests/linux
ilpyykko at garage.maemo.org
ilpyykko at garage.maemo.org
Mon Jan 4 13:36:38 EET 2010
Author: ilpyykko
Date: 2010-01-04 13:36:36 +0200 (Mon, 04 Jan 2010)
New Revision: 2498
Added:
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java
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/ESboxDebianPackageDeployAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java
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/ESboxDebianPackageUninstallAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java
Removed:
trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/
trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java
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/ESboxDebianPackageDeployAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java
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/ESboxDebianPackageUninstallAction.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java
trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java
Modified:
trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java
trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java
trunk/org.maemo.esbox.scratchbox.core/plugin.xml
trunk/org.maemo.esbox.scratchbox.ui/META-INF/MANIFEST.MF
trunk/org.maemo.esbox.scratchbox.ui/plugin.xml
trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/linux/TestDebianStructureGenerator4CppProject.java
Log:
Merge revs 2323:2497 from work_mmad
Modified: trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -35,7 +35,7 @@
*/
@Override
protected boolean isTemplateForWizard(ITemplate templ) {
- return templ.getProjectTypeId().equals(MicaCppProjectConstants.CC_PROJECT_TYPE_ID);
+ return MicaCppProjectConstants.CC_PROJECT_TYPE_ID.equals(templ.getProjectTypeId());
}
Modified: trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -31,7 +31,7 @@
*/
@Override
protected boolean isTemplateForWizard(ITemplate templ) {
- return templ.getProjectTypeId().equals(MicaCppProjectConstants.C_PROJECT_TYPE_ID);
+ return MicaCppProjectConstants.C_PROJECT_TYPE_ID.equals(templ.getProjectTypeId());
}
@Override
Modified: trunk/org.maemo.esbox.scratchbox.core/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/plugin.xml 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.core/plugin.xml 2010-01-04 11:36:36 UTC (rev 2498)
@@ -63,14 +63,6 @@
type="org.maemo.mica.common.core.adapters.IExecutionEnvironmentProviderAdapter">
</adapter>
</factory>
- <factory
- adaptableType="org.maemo.esbox.internal.api.scratchbox.core.sdk.AbstractScratchboxSDKTarget"
- class="org.maemo.esbox.internal.scratchbox.adapters.ESboxDebianDeploySupportAdapterFactory">
- <adapter
- type="org.maemo.mica.internal.api.linux.packages.core.adapters.IDebianDeploySupportAdapter">
- </adapter>
- </factory>
-
</extension>
<extension
Deleted: trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java
===================================================================
--- trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/adapters/ESboxDebianDeploySupportAdapterFactory.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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.scratchbox.adapters;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.adapters.IDebianDeploySupportAdapter;
-
-/**
- * Scratchbox targets support Debian package installation.
- * @author eswartz
- *
- */
-public class ESboxDebianDeploySupportAdapterFactory 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 (adapterType.equals(IDebianDeploySupportAdapter.class)
- && adaptableObject instanceof IScratchboxSDKTarget) {
- return new ESboxDebianDeploySupportAdapter((ISDKTarget) adaptableObject);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[] { IDebianDeploySupportAdapter.class };
- }
-
-}
Modified: trunk/org.maemo.esbox.scratchbox.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/META-INF/MANIFEST.MF 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/META-INF/MANIFEST.MF 2010-01-04 11:36:36 UTC (rev 2498)
@@ -7,13 +7,16 @@
Bundle-Vendor: INdT / NOKIA
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
+ org.eclipse.ui.ide;bundle-version="3.4.0",
org.maemo.esbox.scratchbox.core;bundle-version="2.0.0",
org.maemo.mica.common.core;bundle-version="2.0.0",
org.maemo.mica.common.project.core;bundle-version="2.0.0",
org.maemo.mica.common.ui;bundle-version="2.0.0",
org.maemo.mica.maemosdk.core;bundle-version="2.0.0",
org.maemo.mica.maemosdk.ui;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.0"
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
+ org.maemo.mica.python.project.ui;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.maemo.esbox.internal.api.scratchbox.ui.adapters,
Modified: trunk/org.maemo.esbox.scratchbox.ui/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/plugin.xml 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/plugin.xml 2010-01-04 11:36:36 UTC (rev 2498)
@@ -15,4 +15,127 @@
</contextMenuProvider>
</extension>
+
+ <!-- Start: Debian package -->
+
+ <!-- Debian package menu -->
+ <!-- Debian package actions for Python and C/C++ -->
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ adaptable="true"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian"
+ objectClass="org.eclipse.core.resources.IProject">
+ <menu
+ id="org.maemo.esbox.scratchbox.ui.debpopup"
+ label="Debian Package"
+ path="buildGroup" />
+
+ <visibility>
+ <or>
+ <objectState
+ name="nature"
+ value="org.maemo.esbox.cpp.project.cppNature" />
+ <objectState
+ name="nature"
+ value="org.maemo.esbox.python.project.pythonNature" />
+ </or>
+ </visibility>
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESboxDebianPackageDeployAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.deploy"
+ label="Install Debian Package on Target"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESboxDebianPackageUninstallAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.uninstall"
+ label="Uninstall Debian Package"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+ <!-- Show content dialog -->
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESboxDebianPackageShowContentAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.show"
+ label="Show Debian Package Contents"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+ </objectContribution>
+ </extension>
+
+ <!-- Debian package actions for C/C++ -->
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ adaptable="true"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.cpp"
+ objectClass="org.eclipse.core.resources.IProject">
+
+ <visibility>
+ <objectState
+ name="nature"
+ value="org.maemo.esbox.cpp.project.cppNature" />
+ </visibility>
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESboxDebianPackageStructureCppAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.create.cpp"
+ label="Create Debian Structure"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESBoxDebianPackageBuildCppAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.build.cpp"
+ label="Build Debian Package"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+ </objectContribution>
+ </extension>
+
+ <!-- Debian package actions for Python -->
+ <extension
+ point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ adaptable="true"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.python"
+ objectClass="org.eclipse.core.resources.IProject">
+
+ <visibility>
+ <objectState
+ name="nature"
+ value="org.maemo.esbox.python.project.pythonNature" />
+ </visibility>
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESboxDebianPackageStructurePythonAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.create.python"
+ label="Create Debian Structure"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+
+ <action
+ class="org.maemo.esbox.internal.api.scratchbox.ui.actions.debian.ESBoxDebianPackageBuildPythonAction"
+ enablesFor="1"
+ id="org.maemo.esbox.scratchbox.ui.actions.debian.build.python"
+ label="Build Debian Package"
+ menubarPath="org.maemo.esbox.scratchbox.ui.debpopup/content">
+ </action>
+ </objectContribution>
+ </extension>
+
+ <!-- End: Debian package -->
+
</plugin>
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions)
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian)
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.maemo.mica.internal.api.common.ui.actions.AbstractSelectedResourceAction;
-
-import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
-
-/**
- * Abstract action for running dialog.
- */
-public abstract class AbstractESboxDebianPackageAction extends AbstractSelectedResourceAction {
-
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- new WizardDialog(WorkbenchUtils.getSafeShell(), createWizard(extractSelection().getProject())).open();
- }
-
- /**
- * Create wizard
- *
- * @param project the project
- * @return the created wizard
- */
- protected abstract IWizard createWizard(IProject project);
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/AbstractESboxDebianPackageAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.maemo.mica.internal.api.common.ui.actions.AbstractSelectedResourceAction;
+
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+/**
+ * Abstract action for running dialog.
+ */
+public abstract class AbstractESboxDebianPackageAction extends AbstractSelectedResourceAction {
+
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+ */
+ public void run(IAction action) {
+ new WizardDialog(WorkbenchUtils.getSafeShell(), createWizard(extractSelection().getProject())).open();
+ }
+
+ /**
+ * Create wizard
+ *
+ * @param project the project
+ * @return the created wizard
+ */
+ protected abstract IWizard createWizard(IProject project);
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,42 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-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.ESboxDebianPackageStructureCppWizard;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractDebianPackageWizard;
-
-/**
- * Build debian package action for C/C++ projects.
- */
-public class ESBoxDebianPackageBuildCppAction extends AbstractBuildDebianPackageAction {
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createBuildWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected AbstractDebianPackageWizard createBuildWizard(IProject project) {
- return new ESboxDebianPackageBuildWizard(project);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createStructureWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected AbstractDebianPackageWizard createStructureWizard(IProject project) {
- return new ESboxDebianPackageStructureCppWizard(project);
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildCppAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+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.ESboxDebianPackageStructureCppWizard;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractDebianPackageWizard;
+
+/**
+ * Build debian package action for C/C++ projects.
+ */
+public class ESBoxDebianPackageBuildCppAction extends AbstractBuildDebianPackageAction {
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createBuildWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected AbstractDebianPackageWizard createBuildWizard(IProject project) {
+ return new ESboxDebianPackageBuildWizard(project);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createStructureWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected AbstractDebianPackageWizard createStructureWizard(IProject project) {
+ return new ESboxDebianPackageStructureCppWizard(project);
+ }
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,42 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageBuildWizard;
-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.
- */
-public class ESBoxDebianPackageBuildPythonAction extends AbstractBuildDebianPackageAction {
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createBuildWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected AbstractDebianPackageWizard createBuildWizard(IProject project) {
- return new ESboxDebianPackageBuildWizard(project);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createStructureWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected AbstractDebianPackageWizard createStructureWizard(IProject project) {
- return new PythonDebianStructureWizard(project);
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java (from rev 2497, branches/work_mmad/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 (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESBoxDebianPackageBuildPythonAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageBuildWizard;
+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.
+ */
+public class ESBoxDebianPackageBuildPythonAction extends AbstractBuildDebianPackageAction {
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createBuildWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected AbstractDebianPackageWizard createBuildWizard(IProject project) {
+ return new ESboxDebianPackageBuildWizard(project);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractBuildDebianPackageAction#createStructureWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected AbstractDebianPackageWizard createStructureWizard(IProject project) {
+ return new PythonDebianStructureWizard(project);
+ }
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,32 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizard;
-import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageDeployWizard;
-
-/**
- * Deploy Debian package action
- */
-public class ESboxDebianPackageDeployAction extends AbstractESboxDebianPackageAction {
-
- /*
- * (non-Javadoc)
- * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected IWizard createWizard(IProject project) {
- return new ESboxDebianPackageDeployWizard(project);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageDeployAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.wizard.IWizard;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageDeployWizard;
+
+/**
+ * Deploy Debian package action
+ */
+public class ESboxDebianPackageDeployAction extends AbstractESboxDebianPackageAction {
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IWizard createWizard(IProject project) {
+ return new ESboxDebianPackageDeployWizard(project);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,33 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.jface.action.IAction;
-import org.maemo.mica.internal.api.common.ui.actions.AbstractSelectedResourceAction;
-import org.maemo.mica.internal.api.linux.packages.ui.debian.DebianPackageContentViewerDialog;
-
-import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
-
-/**
- * Show content dialog action.
- */
-public class ESboxDebianPackageShowContentAction extends
- AbstractSelectedResourceAction {
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- new DebianPackageContentViewerDialog(WorkbenchUtils.getSafeShell())
- .open();
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageShowContentAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.jface.action.IAction;
+import org.maemo.mica.internal.api.common.ui.actions.AbstractSelectedResourceAction;
+import org.maemo.mica.internal.api.linux.packages.ui.debian.DebianPackageContentViewerDialog;
+
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
+/**
+ * Show content dialog action.
+ */
+public class ESboxDebianPackageShowContentAction extends
+ AbstractSelectedResourceAction {
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
+ */
+ public void run(IAction action) {
+ new DebianPackageContentViewerDialog(WorkbenchUtils.getSafeShell())
+ .open();
+ }
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,33 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizard;
-import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageStructureCppWizard;
-
-/**
- * Action to launch Debian package Structure wizard.
- */
-public class ESboxDebianPackageStructureCppAction extends
- AbstractESboxDebianPackageAction {
-
- /*
- * (non-Javadoc)
- * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected IWizard createWizard(IProject project) {
- return new ESboxDebianPackageStructureCppWizard(project);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructureCppAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.wizard.IWizard;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageStructureCppWizard;
+
+/**
+ * Action to launch Debian package Structure wizard.
+ */
+public class ESboxDebianPackageStructureCppAction extends
+ AbstractESboxDebianPackageAction {
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IWizard createWizard(IProject project) {
+ return new ESboxDebianPackageStructureCppWizard(project);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,30 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizard;
-import org.maemo.mica.python.project.ui.wizards.PythonDebianStructureWizard;
-
-/**
- * Action to launch Python Debian structure generator wizard.
- */
-public class ESboxDebianPackageStructurePythonAction extends AbstractESboxDebianPackageAction {
- /*
- * (non-Javadoc)
- * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected IWizard createWizard(IProject project) {
- return new PythonDebianStructureWizard(project);
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java (from rev 2497, branches/work_mmad/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 (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageStructurePythonAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.wizard.IWizard;
+import org.maemo.mica.python.project.ui.wizards.PythonDebianStructureWizard;
+
+/**
+ * Action to launch Python Debian structure generator wizard.
+ */
+public class ESboxDebianPackageStructurePythonAction extends AbstractESboxDebianPackageAction {
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IWizard createWizard(IProject project) {
+ return new PythonDebianStructureWizard(project);
+ }
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,31 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizard;
-import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageUndeployWizard;
-/**
- * Action to launch undeploy (uninstall) wizard.
- */
-public class ESboxDebianPackageUninstallAction extends
- AbstractESboxDebianPackageAction {
- /*
- * (non-Javadoc)
- * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected IWizard createWizard(IProject project) {
- return new ESboxDebianPackageUndeployWizard(project);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/actions/debian/ESboxDebianPackageUninstallAction.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.actions.debian;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.wizard.IWizard;
+import org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian.ESboxDebianPackageUndeployWizard;
+/**
+ * Action to launch undeploy (uninstall) wizard.
+ */
+public class ESboxDebianPackageUninstallAction extends
+ AbstractESboxDebianPackageAction {
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.esbox.internal.maemosdk.ui.actions.debian.AbstractESboxDebianPackageAction#createWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected IWizard createWizard(IProject project) {
+ return new ESboxDebianPackageUndeployWizard(project);
+ }
+
+}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian)
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,41 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
-
-import org.maemo.mica.common.core.sdk.DeviceTargetFilter;
-import org.maemo.mica.common.core.sdk.ISDK;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-
-/**
- * Target filter. Accepts devices and Scratchbox targets.
- */
-public class DeviceScratchboxTargetFilter extends DeviceTargetFilter {
- private ScratchboxTargetFilter filter = new ScratchboxTargetFilter();
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.common.core.sdk.DeviceTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDK)
- */
- @Override
- public boolean accept(ISDK sdk) {
- return filter.accept(sdk) || super.accept(sdk);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.common.core.sdk.DeviceTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDKTarget)
- */
- @Override
- public boolean accept(ISDKTarget sdkTarget) {
- return filter.accept(sdkTarget) || super.accept(sdkTarget);
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/DeviceScratchboxTargetFilter.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
+
+import org.maemo.mica.common.core.sdk.DeviceTargetFilter;
+import org.maemo.mica.common.core.sdk.ISDK;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+
+/**
+ * Target filter. Accepts devices and Scratchbox targets.
+ */
+public class DeviceScratchboxTargetFilter extends DeviceTargetFilter {
+ private ScratchboxTargetFilter filter = new ScratchboxTargetFilter();
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.common.core.sdk.DeviceTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDK)
+ */
+ @Override
+ public boolean accept(ISDK sdk) {
+ return filter.accept(sdk) || super.accept(sdk);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.common.core.sdk.DeviceTargetFilter#accept(org.maemo.mica.common.core.sdk.ISDKTarget)
+ */
+ @Override
+ public boolean accept(ISDKTarget sdkTarget) {
+ return filter.accept(sdkTarget) || super.accept(sdkTarget);
+ }
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,54 +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:
- * 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.common.core.MicaException;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractDebianPackageWizard;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard;
-
-/**
- * ESbox Debian package builder wizard
- */
-public class ESboxDebianPackageBuildWizard extends AbstractDebianPackageBuildWizard {
-
- /**
- * New wizard instance.
- *
- * @param project the project
- */
- public ESboxDebianPackageBuildWizard(IProject project) {
- super(project, new ScratchboxTargetFilter());
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard#createBuilder(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
- */
- @Override
- protected IDebianPackageExecutable createBuilder(IProject project,
- ISDKTarget target, String destination) throws MicaException {
- return new ESboxDebianPackageBuilder(project, target, destination, this);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard#createDeployWizard(org.eclipse.core.resources.IProject)
- */
- @Override
- protected AbstractDebianPackageWizard createDeployWizard(IProject project) {
- return new ESboxDebianPackageDeployWizard(project);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuildWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * 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:
+ * 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.common.core.MicaException;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.AbstractDebianPackageWizard;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard;
+
+/**
+ * ESbox Debian package builder wizard
+ */
+public class ESboxDebianPackageBuildWizard extends AbstractDebianPackageBuildWizard {
+
+ /**
+ * New wizard instance.
+ *
+ * @param project the project
+ */
+ public ESboxDebianPackageBuildWizard(IProject project) {
+ super(project, new ScratchboxTargetFilter());
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard#createBuilder(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
+ */
+ @Override
+ protected IDebianPackageExecutable createBuilder(IProject project,
+ ISDKTarget target, String destination) throws MicaException {
+ return new ESboxDebianPackageBuilder(project, target, destination, this);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.build.AbstractDebianPackageBuildWizard#createDeployWizard(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ protected AbstractDebianPackageWizard createDeployWizard(IProject project) {
+ return new ESboxDebianPackageDeployWizard(project);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,53 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
-
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.core.process.ProcessLauncherParameters;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageBuilder;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageBuild;
-
-/**
- * Debian package builder for ESbox projects
- */
-public class ESboxDebianPackageBuilder extends AbstractDebianPackageBuilder{
-
- /**
- * Constructor.
- *
- * @param project the project
- * @param target the target SDK
- * @param destination the destination directory
- * @param callback the callback object (if <code>null</code> then not used)
- * @throws MicaException
- */
- public ESboxDebianPackageBuilder(IProject project, ISDKTarget target,
- String destination, IDebianPackageBuild callback) throws MicaException {
- super(project, target, destination, callback, false);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageBuilder#createBuildParameters(org.eclipse.core.runtime.IPath)
- */
- @Override
- protected ProcessLauncherParameters createBuildParameters(IPath project) {
- return ProcessLauncherParameters.create(project,
- Arrays.asList( "dpkg-buildpackage", "-rfakeroot", "-d"));
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageBuilder.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
+
+import java.util.Arrays;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.process.ProcessLauncherParameters;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageBuilder;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageBuild;
+
+/**
+ * Debian package builder for ESbox projects
+ */
+public class ESboxDebianPackageBuilder extends AbstractDebianPackageBuilder{
+
+ /**
+ * Constructor.
+ *
+ * @param project the project
+ * @param target the target SDK
+ * @param destination the destination directory
+ * @param callback the callback object (if <code>null</code> then not used)
+ * @throws MicaException
+ */
+ public ESboxDebianPackageBuilder(IProject project, ISDKTarget target,
+ String destination, IDebianPackageBuild callback) throws MicaException {
+ super(project, target, destination, callback, false);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageBuilder#createBuildParameters(org.eclipse.core.runtime.IPath)
+ */
+ @Override
+ protected ProcessLauncherParameters createBuildParameters(IPath project) {
+ return ProcessLauncherParameters.create(project,
+ Arrays.asList( "dpkg-buildpackage", "-rfakeroot", "-d"));
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,46 +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:
- * 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.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageDeployWizard;
-
-/**
- * ESbox debian package installer wizard
- */
-public class ESboxDebianPackageDeployWizard extends
- AbstractDebianPackageDeployWizard {
-
- /**
- * Constructor.
- *
- * @param project the project
- */
- public ESboxDebianPackageDeployWizard(IProject project) {
- super(project, new DeviceScratchboxTargetFilter());
-
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageDeployWizard#createDebianPackageInstaller(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String, int)
- */
- @Override
- protected IDebianPackageExecutable createDebianPackageInstaller(
- IProject project, ISDKTarget target, String location, int debugMask) {
- return new ESboxDebianPackageInstaller(project, target, location, debugMask);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageDeployWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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:
+ * 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.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageDeployWizard;
+
+/**
+ * ESbox debian package installer wizard
+ */
+public class ESboxDebianPackageDeployWizard extends
+ AbstractDebianPackageDeployWizard {
+
+ /**
+ * Constructor.
+ *
+ * @param project the project
+ */
+ public ESboxDebianPackageDeployWizard(IProject project) {
+ super(project, new DeviceScratchboxTargetFilter());
+
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageDeployWizard#createDebianPackageInstaller(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String, int)
+ */
+ @Override
+ protected IDebianPackageExecutable createDebianPackageInstaller(
+ IProject project, ISDKTarget target, String location, int debugMask) {
+ return new ESboxDebianPackageInstaller(project, target, location, debugMask);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
- * 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.common.core.MicaException;
-import org.maemo.mica.common.core.process.ProcessLauncherParameters;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
-
-/**
- * Debian package installer for ESbox.
- */
-public class ESboxDebianPackageInstaller extends AbstractDebianPackageInstaller {
- /**
- * Constructor
- *
- * @param project the project
- * @param target the target where to install
- * @param location the location of the packet
- * @param debugMask the debug mask
- */
- public ESboxDebianPackageInstaller(IProject project, ISDKTarget target,
- String location, int debugMask) {
- super(false, null, true, project, location, target, debugMask);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller#createDebianPackageBuilder(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
- */
- @Override
- protected IDebianPackageExecutable createDebianPackageBuilder(
- IProject project, ISDKTarget target, String location)
- throws MicaException {
- return null; // Should not come here
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller#createInstallParameters(org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String, int)
- */
- @Override
- protected ProcessLauncherParameters createInstallParameters(
- ISDKTarget machineTarget, String targetPackageLocation,
- int informationMask) {
- return ProcessLauncherParameters.create("dpkg", "-i", "-D"
- + informationMask, targetPackageLocation);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageInstaller.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
+ * 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.common.core.MicaException;
+import org.maemo.mica.common.core.process.ProcessLauncherParameters;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
+
+/**
+ * Debian package installer for ESbox.
+ */
+public class ESboxDebianPackageInstaller extends AbstractDebianPackageInstaller {
+ /**
+ * Constructor
+ *
+ * @param project the project
+ * @param target the target where to install
+ * @param location the location of the packet
+ * @param debugMask the debug mask
+ */
+ public ESboxDebianPackageInstaller(IProject project, ISDKTarget target,
+ String location, int debugMask) {
+ super(false, null, true, project, location, target, debugMask);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller#createDebianPackageBuilder(org.eclipse.core.resources.IProject, org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
+ */
+ @Override
+ protected IDebianPackageExecutable createDebianPackageBuilder(
+ IProject project, ISDKTarget target, String location)
+ throws MicaException {
+ return null; // Should not come here
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageInstaller#createInstallParameters(org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String, int)
+ */
+ @Override
+ protected ProcessLauncherParameters createInstallParameters(
+ ISDKTarget machineTarget, String targetPackageLocation,
+ int informationMask) {
+ return ProcessLauncherParameters.create("dpkg", "-i", "-D"
+ + informationMask, targetPackageLocation);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,46 +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:
- * 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.common.core.MicaException;
-import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureGenerator;
-import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureValues;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.structure.AbstractDebianPackageStructureWizard;
-
-/**
- * Debian package structure generator wizard.
- */
-public class ESboxDebianPackageStructureCppWizard extends
- AbstractDebianPackageStructureWizard {
-
- /**
- * Constructor
- * @param project the project
- */
- public ESboxDebianPackageStructureCppWizard(IProject project) {
- super(project);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.structure.AbstractDebianPackageStructureWizard#createStructureGenerator(org.eclipse.core.resources.IProject, org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureValues)
- */
- @Override
- protected IDebianPackageExecutable createStructureGenerator(
- IProject project, DebianPackageStructureValues values)
- throws MicaException {
- return new DebianPackageStructureGenerator(project, values);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageStructureCppWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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:
+ * 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.common.core.MicaException;
+import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureGenerator;
+import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureValues;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.structure.AbstractDebianPackageStructureWizard;
+
+/**
+ * Debian package structure generator wizard.
+ */
+public class ESboxDebianPackageStructureCppWizard extends
+ AbstractDebianPackageStructureWizard {
+
+ /**
+ * Constructor
+ * @param project the project
+ */
+ public ESboxDebianPackageStructureCppWizard(IProject project) {
+ super(project);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.structure.AbstractDebianPackageStructureWizard#createStructureGenerator(org.eclipse.core.resources.IProject, org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureValues)
+ */
+ @Override
+ protected IDebianPackageExecutable createStructureGenerator(
+ IProject project, DebianPackageStructureValues values)
+ throws MicaException {
+ return new DebianPackageStructureGenerator(project, values);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,43 +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:
- * 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.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
-import org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageUndeployWizard;
-
-/**
- * Debian package uninstall wizard.
- */
-public class ESboxDebianPackageUndeployWizard extends
- AbstractDebianPackageUndeployWizard {
-
- /**
- * Constructor. Filters devices.
- * @param project the project
- */
- public ESboxDebianPackageUndeployWizard(IProject project) {
- super(project, new DeviceScratchboxTargetFilter());
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageUndeployWizard#createUninstaller(java.lang.String, org.maemo.mica.common.core.sdk.ISDKTarget)
- */
- @Override
- protected IDebianPackageExecutable createUninstaller(String packageName,
- ISDKTarget target) {
- return new ESboxDebianPackageUninstaller(packageName, target);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUndeployWizard.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * 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:
+ * 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.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.IDebianPackageExecutable;
+import org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageUndeployWizard;
+
+/**
+ * Debian package uninstall wizard.
+ */
+public class ESboxDebianPackageUndeployWizard extends
+ AbstractDebianPackageUndeployWizard {
+
+ /**
+ * Constructor. Filters devices.
+ * @param project the project
+ */
+ public ESboxDebianPackageUndeployWizard(IProject project) {
+ super(project, new DeviceScratchboxTargetFilter());
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.ui.wizard.deploy.AbstractDebianPackageUndeployWizard#createUninstaller(java.lang.String, org.maemo.mica.common.core.sdk.ISDKTarget)
+ */
+ @Override
+ protected IDebianPackageExecutable createUninstaller(String packageName,
+ ISDKTarget target) {
+ return new ESboxDebianPackageUninstaller(packageName, target);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
-
-import org.maemo.mica.common.core.process.ProcessLauncherParameters;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageUninstaller;
-
-/**
- * Debian package uninstaller.
- */
-public class ESboxDebianPackageUninstaller extends
- AbstractDebianPackageUninstaller {
-
- /**
- * Constructor.
- *
- * @param packageName the package to uninstall
- * @param target the target where to uninstall from
- */
- public ESboxDebianPackageUninstaller(String packageName, ISDKTarget target) {
- super(packageName, target);
- }
-
- /*
- * (non-Javadoc)
- * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageUninstaller#createUninstallParameters(org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
- */
- @Override
- protected ProcessLauncherParameters createUninstallParameters(
- ISDKTarget target, String packageName) {
- return ProcessLauncherParameters.create("dpkg", "--remove", packageName);
- }
-
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ESboxDebianPackageUninstaller.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
+
+import org.maemo.mica.common.core.process.ProcessLauncherParameters;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageUninstaller;
+
+/**
+ * Debian package uninstaller.
+ */
+public class ESboxDebianPackageUninstaller extends
+ AbstractDebianPackageUninstaller {
+
+ /**
+ * Constructor.
+ *
+ * @param packageName the package to uninstall
+ * @param target the target where to uninstall from
+ */
+ public ESboxDebianPackageUninstaller(String packageName, ISDKTarget target) {
+ super(packageName, target);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.maemo.mica.internal.api.linux.packages.core.debian.AbstractDebianPackageUninstaller#createUninstallParameters(org.maemo.mica.common.core.sdk.ISDKTarget, java.lang.String)
+ */
+ @Override
+ protected ProcessLauncherParameters createUninstallParameters(
+ ISDKTarget target, String packageName) {
+ return ProcessLauncherParameters.create("dpkg", "--remove", packageName);
+ }
+
+}
Deleted: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java
===================================================================
--- branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -1,32 +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:
- * Ilja Pyykkönen (Digia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
-
-import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
-import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
-import org.maemo.mica.common.core.sdk.IBuildTargetFilter;
-import org.maemo.mica.common.core.sdk.ISDK;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-
-/**
- * Target filter. Accepts Scratchbox targets.
- */
-public class ScratchboxTargetFilter implements IBuildTargetFilter {
-
- public boolean accept(ISDK sdk) {
- return sdk instanceof IScratchboxSDK;
- }
-
- public boolean accept(ISDKTarget sdkTarget) {
- return sdkTarget instanceof IScratchboxSDKTarget;
- }
-}
Copied: trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java (from rev 2497, branches/work_mmad/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java)
===================================================================
--- trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java (rev 0)
+++ trunk/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/debian/ScratchboxTargetFilter.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * 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:
+ * Ilja Pyykkönen (Digia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.api.scratchbox.ui.wizards.debian;
+
+import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDK;
+import org.maemo.esbox.scratchbox.core.sdk.IScratchboxSDKTarget;
+import org.maemo.mica.common.core.sdk.IBuildTargetFilter;
+import org.maemo.mica.common.core.sdk.ISDK;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+
+/**
+ * Target filter. Accepts Scratchbox targets.
+ */
+public class ScratchboxTargetFilter implements IBuildTargetFilter {
+
+ public boolean accept(ISDK sdk) {
+ return sdk instanceof IScratchboxSDK;
+ }
+
+ public boolean accept(ISDKTarget sdkTarget) {
+ return sdkTarget instanceof IScratchboxSDKTarget;
+ }
+}
Modified: trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/linux/TestDebianStructureGenerator4CppProject.java
===================================================================
--- trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/linux/TestDebianStructureGenerator4CppProject.java 2009-12-21 08:37:03 UTC (rev 2497)
+++ trunk/org.maemo.esbox.tests/src/org/maemo/esbox/tests/linux/TestDebianStructureGenerator4CppProject.java 2010-01-04 11:36:36 UTC (rev 2498)
@@ -18,6 +18,7 @@
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.cpp.project.core.MicaCppProjectConstants;
import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureGenerator;
+import org.maemo.mica.internal.api.linux.packages.core.debian.DebianPackageStructureValues;
import org.maemo.mica.linux.tests.AbstractTestDebianStructureGenerator4CppProject;
/**
@@ -46,8 +47,9 @@
project = createSingleConfigProject(theSB1SDKTarget, "testOnSB1", MicaCppProjectConstants.C_PROJECT_TYPE_ID);
- DebianPackageStructureGenerator.create().execute(project, null);
-
+ DebianPackageStructureValues values = new DebianPackageStructureValues();
+ new DebianPackageStructureGenerator(project, values).execute(null);
+
assertTrue(DebianPackageStructureGenerator.verifyPackageStructureGenerated(project));
}
@@ -58,7 +60,8 @@
project = createSingleConfigProject(theSB2SDKTarget, "testOnSB2", MicaCppProjectConstants.C_PROJECT_TYPE_ID);
- DebianPackageStructureGenerator.create().execute(project, null);
+ DebianPackageStructureValues values = new DebianPackageStructureValues();
+ new DebianPackageStructureGenerator(project, values).execute(null);
assertTrue(DebianPackageStructureGenerator.verifyPackageStructureGenerated(project));
}
More information about the Esbox-commits
mailing list