Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-09-17 04:17:23 +0000
committerEike Stepper2012-09-17 04:17:23 +0000
commit94e9d7dccf553650b9f0f8c5858087962a9445c7 (patch)
treeb719fcb72004fe9b918c1bc3a4f2bc46eec2b829 /plugins
parenta893926fcbd35f9f3a96e9e4bc7d6f4fd4656851 (diff)
downloadcdo-94e9d7dccf553650b9f0f8c5858087962a9445c7.tar.gz
cdo-94e9d7dccf553650b9f0f8c5858087962a9445c7.tar.xz
cdo-94e9d7dccf553650b9f0f8c5858087962a9445c7.zip
UI overhaul: actions, menus, labels, icons
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/build.properties3
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/export.gifbin0 -> 329 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/import.gifbin0 -> 327 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/save.gifbin0 -> 639 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gifbin0 -> 325 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gifbin325 -> 925 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/export_wiz.png (renamed from plugins/org.eclipse.emf.cdo.transfer.ui/icons/export_wiz.png)bin6675 -> 6675 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/import_wiz.png (renamed from plugins/org.eclipse.emf.cdo.transfer.ui/icons/import_wiz.png)bin6650 -> 6650 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/transfer_wiz.png (renamed from plugins/org.eclipse.emf.cdo.transfer.ui/icons/transfer_wiz.png)bin6417 -> 6417 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java52
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java (renamed from plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceNodeAction.java)4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties14
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java43
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java13
26 files changed, 161 insertions, 47 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/build.properties b/plugins/org.eclipse.emf.cdo.transfer.ui/build.properties
index cacfa9776a..e07e9fa27f 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/build.properties
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/build.properties
@@ -15,8 +15,7 @@ bin.includes = .,\
.options,\
about.html,\
copyright.txt,\
- plugin.xml,\
- icons/
+ plugin.xml
src.includes = about.html,\
copyright.txt
jars.compile.order = .
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
index 8c7db273d0..41254f2382 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java
@@ -11,8 +11,8 @@
package org.eclipse.emf.cdo.transfer.ui;
import org.eclipse.emf.cdo.transfer.CDOTransfer;
-import org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.transfer.ui.swt.TransferComposite;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
@@ -53,7 +53,7 @@ public class TransferDialog extends TitleAreaDialog
@Override
protected Control createDialogArea(Composite parent)
{
- ImageDescriptor descriptor = OM.Activator.INSTANCE.loadImageDescriptor("icons/transfer_wiz.png");
+ ImageDescriptor descriptor = SharedIcons.getDescriptor(SharedIcons.WIZBAN_TRANSFER);
Display display = parent.getDisplay();
wizban = descriptor.createImage(display);
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/export.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/export.gif
new file mode 100644
index 0000000000..5a0837d1e4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/export.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/import.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/import.gif
new file mode 100644
index 0000000000..d38085ad9c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/import.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/save.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/save.gif
new file mode 100644
index 0000000000..499dd0ca60
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/save.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif
new file mode 100644
index 0000000000..513329b428
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif
index 513329b428..152ce470c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/export_wiz.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/export_wiz.png
index aa787ef561..aa787ef561 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/export_wiz.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/export_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/import_wiz.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/import_wiz.png
index 732631c0ac..732631c0ac 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/import_wiz.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/import_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/transfer_wiz.png b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/transfer_wiz.png
index 72ab80ff94..72ab80ff94 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/icons/transfer_wiz.png
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/transfer_wiz.png
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
index 03452476c9..aaa87908fe 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
@@ -62,6 +62,43 @@ public class SharedIcons
*/
public static final String ETOOL_NEW_RESOURCE_FOLDER = ETOOL + "NewCDOResourceFolder" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+ /**
+ * @since 4.1
+ */
+ public static final String ETOOL_CLOCK = ETOOL + "clock" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+
+ /**
+ * @deprecated As of 4.1 use {@link #ETOOL_CLOCK}
+ */
+ @Deprecated
+ public static final String ETOOL_TIME_PICK_BUTTON_ICON = ETOOL_CLOCK;
+
+ /**
+ * @since 4.1
+ */
+ public static final String ETOOL_SLIDER = ETOOL + "slider" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+
+ /**
+ * @deprecated As of 4.1 use {@link #ETOOL_CLOCK}
+ */
+ @Deprecated
+ public static final String ETOOL_SLIDER_ICON = ETOOL_SLIDER;
+
+ /**
+ * @since 4.1
+ */
+ public static final String ETOOL_SAVE = ETOOL + "save" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+
+ /**
+ * @since 4.1
+ */
+ public static final String ETOOL_IMPORT = ETOOL + "import" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+
+ /**
+ * @since 4.1
+ */
+ public static final String ETOOL_EXPORT = ETOOL + "export" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+
public static final String OBJ_SESSION = OBJ + "cdo_session" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
public static final String OBJ_SESSION_SYNCING = OBJ + "cdo_session_syncing" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
@@ -128,9 +165,20 @@ public class SharedIcons
public static final String WIZBAN_TIME_SELECTION = WIZBAN + "TimeBanner" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
- public static final String ETOOL_TIME_PICK_BUTTON_ICON = ETOOL + "clock" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+ /**
+ * @since 4.1
+ */
+ public static final String WIZBAN_TRANSFER = WIZBAN + "transfer_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+
+ /**
+ * @since 4.1
+ */
+ public static final String WIZBAN_IMPORT = WIZBAN + "import_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
- public static final String ETOOL_SLIDER_ICON = ETOOL + "slider" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
+ /**
+ * @since 4.1
+ */
+ public static final String WIZBAN_EXPOR = WIZBAN + "export_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$
public static Image getImage(String key)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
index f82ea660f4..7ecc158bd2 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java
@@ -4,7 +4,7 @@
* 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:
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - maintenance
@@ -12,6 +12,7 @@
package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -28,7 +29,7 @@ public final class CommitTransactionAction extends ViewAction
public CommitTransactionAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE, TOOL_TIP, null, view);
+ super(page, TITLE, TOOL_TIP, SharedIcons.getDescriptor(SharedIcons.ETOOL_SAVE), view);
setEnabled(getTransaction().isDirty());
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
index 29f8911974..bf05d7375c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java
@@ -4,7 +4,7 @@
* 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:
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - bug 244801
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.dialogs.ExportResourceDialog;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.net4j.util.io.IORuntimeException;
@@ -46,7 +47,8 @@ public class ExportResourceAction extends ViewAction
public ExportResourceAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE + INTERACTIVE, Messages.getString("ExportResourceAction.2"), null, view); //$NON-NLS-1$
+ super(page, TITLE + INTERACTIVE,
+ Messages.getString("ExportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_EXPORT), view); //$NON-NLS-1$
setId(ID);
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
index 6217de18ae..a851d3d864 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java
@@ -4,7 +4,7 @@
* 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:
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - maintenance
@@ -15,6 +15,7 @@ import org.eclipse.emf.cdo.internal.ui.dialogs.ImportResourceDialog;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.common.util.EList;
@@ -47,7 +48,8 @@ public class ImportResourceAction extends ViewAction
public ImportResourceAction(IWorkbenchPage page, CDOView view)
{
- super(page, TITLE + INTERACTIVE, Messages.getString("ImportResourceAction.2"), null, view); //$NON-NLS-1$
+ super(page, TITLE + INTERACTIVE,
+ Messages.getString("ImportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_IMPORT), view); //$NON-NLS-1$
setId(ID);
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
index 83bcb17c10..d3a1e51086 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewResourceNodeAction.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.IWorkbenchPage;
/**
* @author Eike Stepper
*/
-public class CreateResourceNodeAction extends ViewAction
+public class NewResourceNodeAction extends ViewAction
{
private CDOItemProvider itemProvider;
@@ -40,7 +40,7 @@ public class CreateResourceNodeAction extends ViewAction
private String resourceNodeName;
- public CreateResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view,
+ public NewResourceNodeAction(CDOItemProvider itemProvider, IWorkbenchPage page, CDOView view,
CDOResourceNode node, Type type)
{
super(page, type.getTitle() + INTERACTIVE, type.getTooltip(), type.getImageDescriptor(), view);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
index 5fc2f47c53..918248ac6d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java
@@ -65,7 +65,7 @@ public final class OpenResourceEditorAction extends ResourceNodeAction
{
try
{
- IEditorInput input = new CDOLobEditorInput((CDOFileResource<?>)resource);
+ IEditorInput input = new CDOLobEditorInput(resource);
page.openEditor(input, "org.eclipse.ui.DefaultTextEditor");
}
catch (Exception ex)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
index 10633ed604..e6c4867d48 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.common.model.CDOPackageRegistryPopulator;
import org.eclipse.emf.cdo.common.util.NotAuthenticatedException;
+import org.eclipse.emf.cdo.internal.ui.LegacyModeRegistry;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.dialogs.OpenSessionDialog;
import org.eclipse.emf.cdo.internal.ui.messages.Messages;
@@ -77,29 +78,32 @@ public final class OpenSessionAction extends LongRunningAction
{
CDOPackageRegistryPopulator.populate(session.getPackageRegistry());
}
+
+ if (sessionComposite.isLegacyMode())
+ {
+ LegacyModeRegistry.setLegacyEnabled(session, true);
+ }
}
catch (RemoteException ex)
{
Throwable cause = ex.getCause();
- if (cause instanceof NotAuthenticatedException)
- {
- // Skip silently because user has canceled the authentication
- }
- else
- {
- showError(cause);
- }
+ handleError(cause);
}
catch (Exception ex)
{
- if (ex instanceof NotAuthenticatedException)
- {
- // Skip silently because user has canceled the authentication
- }
- else
- {
- showError(ex);
- }
+ handleError(ex);
+ }
+ }
+
+ protected void handleError(Throwable ex)
+ {
+ if (ex instanceof NotAuthenticatedException)
+ {
+ // Skip silently because user has canceled the authentication
+ }
+ else
+ {
+ showError(ex);
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
index 1681bd662a..bd818c0b2c 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java
@@ -4,7 +4,7 @@
* 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:
* Eike Stepper - initial API and implementation
* Victor Roldan Betancort - maintenance
@@ -20,7 +20,9 @@ import org.eclipse.ui.IWorkbenchPage;
/**
* @author Eike Stepper
+ * @deprecated As of 4.2
*/
+@Deprecated
public final class OpenViewEditorAction extends ViewAction
{
private static final String TITLE = Messages.getString("OpenViewEditorAction.0"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
index 7a7f20e3b9..f121cd2225 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java
@@ -54,8 +54,8 @@ public class ResourceNodeNameInputValidator implements IInputValidator
CDOResourceNode node = (CDOResourceNode)nodeObject;
if (node.getName().equals(newText))
{
- return isFolder ? Messages.getString("CreateResourceNodeAction.5") + newText : Messages.getString("CreateResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$
- + newText;
+ return isFolder ? Messages.getString("CreateResourceNodeAction.5") + " " + newText : Messages.getString("CreateResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$
+ + " " + newText;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 3f6c73d863..6de3f452d4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -23,7 +23,7 @@ import org.eclipse.net4j.util.ui.UIActivator;
/**
* The <em>Operations & Maintenance</em> class of this bundle.
- *
+ *
* @author Eike Stepper
*/
public abstract class OM
@@ -55,6 +55,9 @@ public abstract class OM
public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTRY = //
PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$
+ public static final OMPreference<Boolean> PREF_LEGACY_MODE_DEFAULT = //
+ PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$
+
public static final OMPreference<Boolean> PREF_EDITOR_AUTO_RELOAD = //
PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index ce1bc0fcad..ef227a9895 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -1533,7 +1533,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
action.setEnabled(true);
action.setChecked(false);
- action.setImageDescriptor(SharedIcons.getDescriptor(SharedIcons.ETOOL_SLIDER_ICON));
+ action.setImageDescriptor(SharedIcons.getDescriptor(SharedIcons.ETOOL_SLIDER));
action.setToolTipText(Messages.getString("CDOEditor.1")); //$NON-NLS-1$
getActionBars().getToolBarManager().add(action);
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
index 9256f03cc7..2a7cd987b8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties
@@ -109,20 +109,21 @@ CreateResourceAction.2=Enter resource name:
CreateResourceAction.4=Resource already exists
CreateResourceAction.5=There already exists a resource with path "{0}". Do you want to edit the resource?
-Title.Folder=Create Folder
+Title.Folder=New Folder
Tooltip.Folder=Create a new resource folder
-Title.Model=Create Resource
+Title.Model=New Model Resource
Tooltip.Model=Create a new model resource
-Title.Text=Create Text Resource
+Title.Text=New Text Resource
Tooltip.Text=Create a new text resource
-Title.Binary=Create Binary Resource
+Title.Binary=New Binary Resource
Tooltip.Binary=Create a new binary resource
CreateResourceNodeAction.2=Relative names not allowed
CreateResourceNodeAction.3=Folder name cannot be empty
CreateResourceNodeAction.4=Resource name cannot be empty
-CreateResourceNodeAction.5=There exist a folder with name
-CreateResourceNodeAction.6=There exist a resource with name
+CreateResourceNodeAction.5=There exists a folder with name
+CreateResourceNodeAction.6=There exists a resource with name
+CreateResourceNodeAction.8=Please enter the name:
ExportResourceAction.1=Export Resource
ExportResourceAction.2=Export a CDO resource
ExportResourceAction.3=A single URI must be entered\!
@@ -211,4 +212,5 @@ SessionComposite.0=Server Description:
SessionComposite.1=for example 'tcp://dev.eclipse.org:2036'
SessionComposite.2=Repository Name:
SessionComposite.3=Automatic Package Registry
+SessionComposite.4=Legacy Mode Default
WriteLockObjectsAction.1=Write Lock
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
index 2aa2204c10..7c5ec337a1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java
@@ -147,7 +147,7 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar
});
timeBrowseButton = new Button(pointGroup, SWT.NONE);
- timeBrowseButton.setImage(SharedIcons.getImage(SharedIcons.ETOOL_TIME_PICK_BUTTON_ICON));
+ timeBrowseButton.setImage(SharedIcons.getImage(SharedIcons.ETOOL_CLOCK));
timeBrowseButton.addSelectionListener(new SelectionAdapter()
{
@Override
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
index c5b94b54ec..7cd582dade 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java
@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Listener;
* Simple {@link org.eclipse.swt.widgets.Composite composite} allowing users to introduce connection information with a
* repository. The widget recalls connection history and provides some additional functionality tweakers, as automatic
* EPackage registration.
- *
+ *
* @author Victor Roldan Betancort
* @since 2.0
*/
@@ -58,12 +58,16 @@ public class SessionComposite extends Composite
private PreferenceButton automaticButton;
+ private PreferenceButton legacyButton;
+
private String connectorDescription;
private String repositoryName;
private boolean automaticRegistry;
+ private boolean legacyMode;
+
public SessionComposite(Composite parent, int style)
{
super(parent, style);
@@ -112,6 +116,18 @@ public class SessionComposite extends Composite
}
});
+ new Label(this, SWT.NONE);
+ legacyButton = new PreferenceButton(this, SWT.CHECK, Messages.getString("SessionComposite.4"), //$NON-NLS-1$
+ OM.PREF_LEGACY_MODE_DEFAULT);
+ legacyButton.getButton().addSelectionListener(new SelectionAdapter()
+ {
+ @Override
+ public void widgetSelected(SelectionEvent e)
+ {
+ legacyMode = legacyButton.getSelection();
+ }
+ });
+
connectorText.setFocus();
connectorText.getCombo().addFocusListener(new FocusListener()
{
@@ -135,6 +151,7 @@ public class SessionComposite extends Composite
connectorDescription = connectorText.getText();
repositoryName = repositoryText.getText();
automaticRegistry = automaticButton.getSelection();
+ legacyMode = legacyButton.getSelection();
}
public IHistory<String> getConnectorHistory()
@@ -167,11 +184,27 @@ public class SessionComposite extends Composite
return automaticButton;
}
+ /**
+ * @since 4.2
+ */
+ public PreferenceButton getLegacyButton()
+ {
+ return legacyButton;
+ }
+
public boolean isAutomaticRegistry()
{
return automaticRegistry;
}
+ /**
+ * @since 4.2
+ */
+ public boolean isLegacyMode()
+ {
+ return legacyMode;
+ }
+
public String getSessionDescription()
{
StringBuilder builder = new StringBuilder();
@@ -183,6 +216,11 @@ public class SessionComposite extends Composite
builder.append("&automaticPackageRegistry=true"); //$NON-NLS-1$
}
+ if (automaticRegistry)
+ {
+ builder.append("&legacyModeDefault=true"); //$NON-NLS-1$
+ }
+
return builder.toString();
}
@@ -201,6 +239,7 @@ public class SessionComposite extends Composite
connectorText.getHistory().add(connectorDescription);
repositoryText.getHistory().add(repositoryName);
automaticButton.getPreference().setValue(automaticRegistry);
+ legacyButton.getPreference().setValue(legacyMode);
}
@Override
@@ -210,6 +249,7 @@ public class SessionComposite extends Composite
connectorText.addListener(eventType, listener);
repositoryText.addListener(eventType, listener);
automaticButton.addListener(eventType, listener);
+ legacyButton.addListener(eventType, listener);
}
@Override
@@ -219,5 +259,6 @@ public class SessionComposite extends Composite
connectorText.removeListener(eventType, listener);
repositoryText.removeListener(eventType, listener);
automaticButton.removeListener(eventType, listener);
+ legacyButton.removeListener(eventType, listener);
}
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
index 2797d608f4..cc20503d32 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIUtil.java
@@ -132,8 +132,9 @@ public final class UIUtil
{
display = PlatformUI.getWorkbench().getDisplay();
}
- catch (RuntimeException ignore)
+ catch (Throwable ignore)
{
+ //$FALL-THROUGH$
}
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index 7ee9383bcd..dcb297fc85 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -40,6 +40,7 @@ import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
@@ -224,11 +225,19 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
itemProvider = createContainerItemProvider();
viewer.setContentProvider(createContentProvider());
viewer.setLabelProvider(createLabelProvider());
- viewer.setSorter(new ContainerNameSorter());
+ viewer.setSorter(createViewerSorter());
resetInput();
}
/**
+ * @since 3.3
+ */
+ protected ViewerSorter createViewerSorter()
+ {
+ return new ContainerNameSorter();
+ }
+
+ /**
* @since 3.0
*/
protected IContentProvider createContentProvider()
@@ -412,8 +421,8 @@ public abstract class ContainerView extends ViewPart implements ISelectionProvid
protected void fillContextMenu(IMenuManager manager, ITreeSelection selection)
{
- manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
itemProvider.fillContextMenu(manager, selection);
+ manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
protected void selectionChanged(IActionBars bars, ITreeSelection selection)

Back to the top