[Esbox-commits] r1211 - in branches/work_Petr: org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters
baranov at garage.maemo.org
baranov at garage.maemo.org
Tue Feb 10 12:05:28 EET 2009
Author: baranov
Date: 2009-02-10 12:05:28 +0200 (Tue, 10 Feb 2009)
New Revision: 1211
Modified:
branches/work_Petr/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
branches/work_Petr/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
Log:
fix for bug 3431
Modified: branches/work_Petr/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2009-02-09 09:51:27 UTC (rev 1210)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/adapters/MaemoScratchbox1SDKManageTargetAdapter.java 2009-02-10 10:05:28 UTC (rev 1211)
@@ -77,14 +77,8 @@
*/
protected MaemoTargetRemover createTargetRemover(Shell shell,
ISDKTarget target, boolean deleteRootstrap) {
- return new MaemoTargetRemover(shell, target, deleteRootstrap) {
+ return new MaemoTargetRemover(shell, target) {
- @Override
- protected void doDeleteTargetRootstrap(IProgressMonitor monitor,
- ISDK sdk) {
- monitor.worked(1);
- }
-
/* (non-Javadoc)
* @see org.maemo.mica.internal.api.maemosdk.ui.adapters.ESboxTargetRemover#doRemoveTarget(org.maemo.mica.common.core.sdk.ISDK, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/
Modified: branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2009-02-09 09:51:27 UTC (rev 1210)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/core/Scratchbox2SDK.java 2009-02-10 10:05:28 UTC (rev 1211)
@@ -353,20 +353,6 @@
return createTargetCommand.performCommand(params);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.maemo.mica.maemosdk.sb2.core.IScratchbox2SDK#removeRootstrap(java
- * .lang.String, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
- public void removeRootstrap(String targetName, boolean force,
- IProgressMonitor monitor) throws MicaException {
- if (maemoRootstrapCommand == null)
- throw new MicaException("Cannot launch programs for "+ getName());
- maemoRootstrapCommand.remove(targetName);
- }
-
/**
* Invoke sb2-show path on the given path(s) to return the mappings.
*
Modified: branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2009-02-09 09:51:27 UTC (rev 1210)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/adapters/MaemoScratchbox2SDKManageTargetAdapter.java 2009-02-10 10:05:28 UTC (rev 1211)
@@ -72,15 +72,8 @@
protected MaemoTargetRemover createTargetRemover(Shell shell,
ISDKTarget target, boolean deleteRootstrap) {
- return new MaemoTargetRemover(shell, target, deleteRootstrap) {
+ return new MaemoTargetRemover(shell, target) {
- protected void doDeleteTargetRootstrap(IProgressMonitor monitor,
- ISDK sdk) throws MicaException {
- ((IScratchbox2SDK) sdk).removeRootstrap(
- sdkTarget.getName(), true, new SubProgressMonitor(
- monitor, 1));
- };
-
/* (non-Javadoc)
* @see org.maemo.mica.internal.api.maemosdk.ui.adapters.ESboxTargetRemover#doRemoveTarget(org.maemo.mica.common.core.sdk.ISDK, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
*/
@@ -94,14 +87,12 @@
display.syncExec(new Runnable(){
public void run() {
Shell shell = display.getActiveShell();
- final MessageBox message = new MessageBox(shell,SWT.OK|SWT.ICON_WARNING);
- message.setText("Can not remove rootstrap");
- message.setMessage("Rootstrap "+targetName+" has probably been removed by some other application.\n" +
- "Please, click \"Refresh\" button to update the cache.");
+ final MessageBox message = new MessageBox(shell,SWT.OK|SWT.ICON_INFORMATION);
+ message.setText("Rootstrap already removed.");
+ message.setMessage("Rootstrap "+targetName+" has probably been removed by some other application.\n");
message.open();
}
});
-
}
monitor.worked(1);
Modified: branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java 2009-02-09 09:51:27 UTC (rev 1210)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/scratchbox/sb2/sdk/IScratchbox2SDK.java 2009-02-10 10:05:28 UTC (rev 1211)
@@ -27,11 +27,6 @@
/** Map<String,String> of sb2 target names to rootstrap paths */
static final String SB2_TARGET_TO_ROOTSTRAP_MAP = "sb2_target_to_rootstrap_map";
-// /**
-// * @return
-// */
-// public IPath getScratchbox2ConfigDirectory();
-
/**
* Create a new rootstrap target for Scratchbox 2. The target is named after
* a maemo-rootstrap available target.
@@ -53,24 +48,8 @@
boolean useHostTools, boolean force, IProgressMonitor monitor)
throws MicaException;
+
/**
- * Create a new rootstrap target for Scratchbox 2. The target is named after
- * a maemo-rootstrap available target.
- *
- * @param targetName
- * the name of the new target.
- * @param force
- * if true, then overwrite any existing rootstrap; if false, then
- * let the user choose (in the console :/) whether to overwrite
- * or keep an existing one
- * @return true if succeeded, false if failed
- * @throws MicaException
- * if some problem related to Scratchbox communication occurs.
- */
- public void removeRootstrap(String targetName, boolean force,
- IProgressMonitor monitor) throws MicaException;
-
- /**
* Get the names of rootstraps already installed. This may inclue those that
* do not have targets associated.
*
Modified: branches/work_Petr/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java
===================================================================
--- branches/work_Petr/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java 2009-02-09 09:51:27 UTC (rev 1210)
+++ branches/work_Petr/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/adapters/MaemoScratchboxSDKManageTargetAdapterBase.java 2009-02-10 10:05:28 UTC (rev 1211)
@@ -11,14 +11,22 @@
package org.maemo.esbox.internal.api.scratchbox.ui.adapters;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.dialogs.*;
+import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
import org.maemo.esbox.internal.api.scratchbox.core.sdk.CacheUtils;
import org.maemo.esbox.internal.scratchbox.ui.UIActivator;
import org.maemo.mica.common.core.MicaException;
@@ -27,9 +35,6 @@
import org.maemo.mica.common.core.sdk.ISDKTarget;
import org.maemo.mica.internal.api.maemosdk.ui.adapters.MaemoTargetRemover;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-
/**
* This is the base implementation of the adapter for installing and removing
* scratchbox SDK targets.
@@ -56,7 +61,6 @@
* (org.eclipse.swt.widgets.Shell, org.maemo.mica.common.core.sdk.ISDKTarget)
*/
public IStatus removeSDKTarget(Shell shell, ISDKTarget selectedTarget) {
- final boolean[] deleteRootstrap = { false };
final boolean rootstrapUsed = isRootStrapUsed(selectedTarget);
String header = "Really delete SDK target ''{0}''?\n\n";
@@ -86,28 +90,13 @@
Label spacer = new Label(composite, SWT.NONE);
spacer.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true,
false));
-
- final Button removeRootstrap = new Button(composite,
- SWT.CHECK);
- removeRootstrap
- .setText("Also delete rootstrap (target filesystem)");
- removeRootstrap.setLayoutData(new GridData(SWT.FILL,
- SWT.TOP, true, false));
- removeRootstrap
- .addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- deleteRootstrap[0] = removeRootstrap
- .getSelection();
- }
- });
}
return composite;
}
};
if (dialog.open() == 0) {
- return removeTarget(shell, selectedTarget, deleteRootstrap[0]);
+ return removeTarget(shell, selectedTarget);
} else {
return Policy.getCancelStatus(UIActivator.getDefault());
}
@@ -119,14 +108,14 @@
*/
protected abstract boolean isRootStrapUsed(ISDKTarget selectedTarget);
- protected IStatus removeTarget(final Shell shell, final ISDKTarget selectedTarget, final boolean deleteRootstrap) {
+ protected IStatus removeTarget(final Shell shell, final ISDKTarget selectedTarget) {
ProgressMonitorDialog dialog = new ProgressMonitorDialog(shell);
try {
dialog.run(true, true, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- MaemoTargetRemover remover = createTargetRemover(shell, selectedTarget, deleteRootstrap);
+ MaemoTargetRemover remover = createTargetRemover(shell, selectedTarget,true);
try {
remover.run(monitor);
} catch (MicaException e) {
@@ -134,6 +123,7 @@
}
}
});
+
return Status.OK_STATUS;
} catch (Exception e) {
if (e.getCause() instanceof MicaException)
More information about the Esbox-commits
mailing list