Merge "Switched to Oxygen repository"
diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ScenarioProperties.java b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ScenarioProperties.java
index d7682c1..d372944 100644
--- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ScenarioProperties.java
+++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/editors/ScenarioProperties.java
@@ -177,7 +177,6 @@
public void keyPressed(KeyEvent e) {
switch (e.keyCode) {
case SWT.DEL:
- case SWT.BS:
removeSelected();
break;
case SWT.INSERT:
diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/DestinationsBox.java b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/DestinationsBox.java
index bf806ef..35e0384 100644
--- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/DestinationsBox.java
+++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/DestinationsBox.java
@@ -19,6 +19,7 @@
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.rcptt.ui.commons.SWTFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -28,8 +29,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.rcptt.ui.commons.SWTFactory;
-
public abstract class DestinationsBox {
private DataBindingContext dbc;
@@ -112,14 +111,14 @@
SWTFactory.setButtonDimensionHint(browseFilesystem);
dbc.bindValue(SWTObservables.observeSelection(filesystemRadio),
- fsSelected, new SelectionToModel(Selection.Filesystem), null);
+ fsSelected, new SelectionToModel(Selection.Filesystem), new ModelToSelection(Selection.Filesystem));
dbc.bindValue(SWTObservables.observeSelection(clipboardRadio),
- fsSelected, new SelectionToModel(Selection.Clipboard), null);
+ fsSelected, new SelectionToModel(Selection.Clipboard), new ModelToSelection(Selection.Clipboard));
dbc.bindValue(SWTObservables.observeEnabled(browseFilesystem),
- fsSelected, null, new ModelToSelection(Selection.Filesystem));
+ fsSelected, new SelectionToModel(Selection.Filesystem), new ModelToSelection(Selection.Filesystem));
dbc.bindValue(SWTObservables.observeEnabled(filesystemPath),
- fsSelected, null, new ModelToSelection(Selection.Filesystem));
+ fsSelected, new SelectionToModel(Selection.Filesystem), new ModelToSelection(Selection.Filesystem));
dbc.bindValue(SWTObservables.observeText(filesystemPath, SWT.Modify),
filesystemPathValue);
diff --git a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/Q7PortableFormatImportPage.java b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/Q7PortableFormatImportPage.java
index 8ea2b58..f0df8c5 100644
--- a/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/Q7PortableFormatImportPage.java
+++ b/rcp/org.eclipse.rcptt.ui/src/org/eclipse/rcptt/ui/wizards/plain/Q7PortableFormatImportPage.java
@@ -61,7 +61,6 @@
import org.eclipse.rcptt.core.scenario.Scenario;
import org.eclipse.rcptt.core.workspace.RcpttCore;
import org.eclipse.rcptt.ecl.core.Script;
-import org.eclipse.rcptt.internal.core.RcpttPlugin;
import org.eclipse.rcptt.internal.core.model.Q7Folder;
import org.eclipse.rcptt.internal.core.model.Q7ResourceInfo;
import org.eclipse.rcptt.internal.core.model.ReferencedProjectScope;
@@ -307,7 +306,9 @@
model.dispose();
isValid = true;
} catch (ModelException e) {
- RcpttPlugin.log(e);
+ // Don't log exceptions, because error message about
+ // invalid content will be shown in the header
+ // RcpttPlugin.log(e);
}
validate();
}
