Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.cdo.dawn-feature/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.common/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF24
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/bundle/OM.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF36
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java1
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF34
-rw-r--r--plugins/org.eclipse.net4j.util.ui/pom.xml2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java1
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java1
-rw-r--r--plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java1
-rw-r--r--plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java1
-rw-r--r--plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java1
37 files changed, 126 insertions, 79 deletions
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
index 2cfa4d27a3..c7c47621eb 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.dawn"
label="%featureName"
- version="2.1.500.qualifier"
+ version="2.1.600.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.cdo.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
index 3f5948ed22..2abcb1fddd 100644
--- a/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.dawn-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.dawn</artifactId>
- <version>2.1.500-SNAPSHOT</version>
+ <version>2.1.600-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
index c6834ca82c..a4a60d1e07 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
@@ -14,6 +14,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginDescriptor">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.core.runtime.IPluginDescriptor"/>
+ <message_argument value="org.eclipse.emf.cdo.common_4.7.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDByteArray">
<filter id="305324134">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
index daa814e272..e28513d567 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.dawn.ui;singleton:=true
-Bundle-Version: 2.0.500.qualifier
+Bundle-Version: 2.0.600.qualifier
Bundle-Activator: org.eclipse.emf.cdo.dawn.internal.ui.bundle.OM$Activator
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
@@ -14,15 +14,15 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.500";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.500";x-internal:=true,
- org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.views;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.500",
- org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.500"
+Export-Package: org.eclipse.emf.cdo.dawn.internal.ui.bundle;version="2.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.composites;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.handlers;version="2.0.600";x-internal:=true,
+ org.eclipse.emf.cdo.dawn.ui.helper;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.icons;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.messages;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.stylizer;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.views;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.wizards;version="2.0.600",
+ org.eclipse.emf.cdo.dawn.ui.wizards.dialogs;version="2.0.600"
Automatic-Module-Name: org.eclipse.emf.cdo.dawn.ui
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml b/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
index ce7bbf8558..19c7246de0 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.dawn.ui</artifactId>
- <version>2.0.500-SNAPSHOT</version>
+ <version>2.0.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
index 0fd50086d6..59ee6a3dec 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/icons/DawnIconRegistry.java
@@ -76,6 +76,7 @@ public class DawnIconRegistry
private static ImageDescriptor createDescriptor(String key)
{
+ @SuppressWarnings("deprecation")
ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
if (descriptor != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
index c55a2f4eea..63ecbda54c 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
@@ -80,6 +80,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
index 15213f1c8f..820387542b 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
@@ -80,6 +80,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
index de45470cce..2bb7d3e249 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
@@ -98,6 +98,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);
diff --git a/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters
index b4c283ed48..48eb2c1945 100644
--- a/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.expressions.editor/.settings/.api_filters
@@ -1,5 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.expressions.editor" version="2">
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor"/>
+ <message_argument value="org.eclipse.emf.cdo.expressions.editor_4.3.400"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.views.tasklist.TaskList">
<filter id="305422471">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters
index b185cd705c..efeca66249 100644
--- a/plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.security.editor/.settings/.api_filters
@@ -8,6 +8,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor"/>
+ <message_argument value="org.eclipse.emf.cdo.security.editor_4.2.500"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.views.tasklist.TaskList">
<filter id="305422471">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java
index fae1e18f47..1582bf482d 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/dialogs/FilterTreeSelectionDialog.java
@@ -37,6 +37,7 @@ public class FilterTreeSelectionDialog extends ElementTreeSelectionDialog
@Override
protected TreeViewer doCreateTreeViewer(Composite parent, int style)
{
+ @SuppressWarnings("deprecation")
FilteredTree tree = new FilteredTree(parent, style, filter, true);
tree.setLayoutData(new GridData(GridData.FILL_BOTH));
tree.setQuickSelectionMode(false);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
index 2daddc2131..6796fd8ac6 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java
@@ -31,8 +31,8 @@ import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
@@ -287,7 +287,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec
result.setContentProvider(new ArrayContentProvider());
result.setInput(attribute.getEAttributeType().getInstanceClass().getEnumConstants());
- getContext().bindValue(ViewersObservables.observeSingleSelection(result),
+ getContext().bindValue(ViewerProperties.singleSelection().observe(result),
EMFEditObservables.observeDetailValue(getRealm(), getEditingDomain(), getValue(), attribute));
getContext().bindValue(WidgetProperties.enabled().observe(result.getControl()), getValue(), null,
ObjectWritableConverter.createUpdateValueStrategy(attribute));
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
index 37df5f6398..98c11a6e7b 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractSectionPart.java
@@ -21,7 +21,7 @@ import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
@@ -172,7 +172,7 @@ public abstract class AbstractSectionPart<T extends EObject> extends AbstractFor
return value;
}
- protected ISWTObservableValue observeText(Text text)
+ protected ISWTObservableValue<?> observeText(Text text)
{
return WidgetProperties.text(new int[] { SWT.DefaultSelection, SWT.FocusOut }).observe(text);
}
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
index c661c10054..0b4f58f5ef 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
@@ -39,12 +39,12 @@ import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.core.databinding.beans.PojoProperties;
+import org.eclipse.core.databinding.beans.typed.PojoProperties;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -108,7 +108,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
addFilters(viewer);
forwardSelection(viewer);
- getContext().bindValue(ViewersObservables.observeInput(viewer), getValue());
+ getContext().bindValue(ViewerProperties.<StructuredViewer, Object> input().observe(viewer), getValue());
configureDragSupport(viewer);
configureDropSupport(viewer);
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
index 693fe066dd..f52313a1de 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java
@@ -50,9 +50,9 @@ import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.databinding.viewers.ViewersObservables;
+import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.layout.TableColumnLayout;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.IFilter;
@@ -186,7 +186,7 @@ public class OneToManyBlock
viewer.setLabelProvider(labels);
}
- viewer.setContentProvider(new ObservableListContentProvider());
+ viewer.setContentProvider(new ObservableListContentProvider<Object>());
SecurityUIUtil.applySupportedElementFilter(viewer, itemType);
if (itemType != reference.getEReferenceType())
{
@@ -226,7 +226,7 @@ public class OneToManyBlock
removeButton = toolkit.createButton(buttons, Messages.OneToManyBlock_2, SWT.PUSH);
- final IObservableValue<?> selection = ViewersObservables.observeSingleSelection(viewer);
+ final IObservableValue<?> selection = ViewerProperties.singleSelection().observe(viewer);
context.bindValue(WidgetProperties.enabled().observe(newButton), input, null, ObjectWritableConverter.createUpdateValueStrategy());
if (addButton != null)
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
index 06367a0d2c..3b82ffa2e2 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.admin;singleton:=true
-Bundle-Version: 4.1.500.qualifier
+Bundle-Version: 4.1.600.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)",
org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.ui.internal.admin;version="4.1.500";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.actions;version="4.1.500";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.bundle;version="4.1.500";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.messages;version="4.1.500";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.admin.wizards;version="4.1.500";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.internal.admin;version="4.1.600";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.actions;version="4.1.600";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.bundle;version="4.1.600";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.messages;version="4.1.600";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.admin.wizards;version="4.1.600";x-internal:=true
Automatic-Module-Name: org.eclipse.emf.cdo.ui.admin
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/pom.xml b/plugins/org.eclipse.emf.cdo.ui.admin/pom.xml
index f359c34181..dbbc860df3 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.ui.admin</artifactId>
- <version>4.1.500-SNAPSHOT</version>
+ <version>4.1.600-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/bundle/OM.java
index a41ce4ee28..e83e15d223 100644
--- a/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui.admin/src/org/eclipse/emf/cdo/ui/internal/admin/bundle/OM.java
@@ -60,6 +60,7 @@ public abstract class OM
OM.lastURL = lastURL;
}
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String imageFilePath)
{
return Activator.imageDescriptorFromPlugin(BUNDLE_ID, imageFilePath);
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
index 59b4edb260..374a2941c4 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.ui.shared;singleton:=true
-Bundle-Version: 4.3.100.qualifier
+Bundle-Version: 4.3.200.qualifier
Bundle-Activator: org.eclipse.emf.cdo.ui.internal.shared.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.3.100",
- org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.3.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.3.200",
+ org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.3.200";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/pom.xml b/plugins/org.eclipse.emf.cdo.ui.shared/pom.xml
index 39c2aad396..328ccfea4c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.ui.shared</artifactId>
- <version>4.3.100-SNAPSHOT</version>
+ <version>4.3.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 a17e90c9a9..ff9e2bc73e 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
@@ -300,6 +300,7 @@ public class SharedIcons
private static ImageDescriptor createDescriptor(String key)
{
+ @SuppressWarnings("deprecation")
ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
if (descriptor != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters
index 0f01c031c4..d976b9d578 100644
--- a/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.ui/.settings/.api_filters
@@ -14,6 +14,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor">
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTableTreeEditor"/>
+ <message_argument value="org.eclipse.emf.cdo.ui_4.6.100"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.ui.IContributorResourceAdapter">
<filter id="305422471">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
index d9504363ec..136c9bf392 100644
--- a/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.ui;singleton:=true
-Bundle-Version: 4.6.100.qualifier
+Bundle-Version: 4.6.200.qualifier
Bundle-Activator: org.eclipse.emf.cdo.internal.ui.bundle.OM$Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";reso
org.eclipse.emf.ecp.edit;bundle-version="[1.5.0,2.0.0)";resolution:=optional,
org.eclipse.emf.ecp.edit.swt;bundle-version="[1.5.0,2.0.0)";resolution:=optional,
org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.5.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
+Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -36,7 +36,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.actions;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.actions;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -45,7 +45,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.handlers;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.handlers;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -54,9 +54,9 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.actions.delegates;version="4.6.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.bundle;version="4.6.100";x-internal:=true,
- org.eclipse.emf.cdo.internal.ui.dialogs;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.actions.delegates;version="4.6.200";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.bundle;version="4.6.200";x-internal:=true,
+ org.eclipse.emf.cdo.internal.ui.dialogs;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -65,7 +65,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.dnd;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.dnd;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -74,7 +74,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.editor;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.editor;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -83,7 +83,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.filters;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.filters;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -92,7 +92,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.history;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.history;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -101,7 +101,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.messages;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.messages;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -110,7 +110,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.perspectives;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.perspectives;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -119,7 +119,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.preferences;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.preferences;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -128,7 +128,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.transfer;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.transfer;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -137,7 +137,7 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.internal.ui.views;version="4.6.100";
+ org.eclipse.emf.cdo.internal.ui.views;version="4.6.200";
x-friends:="org.eclipse.emf.cdo.ui.ide,
org.eclipse.emf.cdo.ui.location,
org.eclipse.emf.cdo.tests.ui,
@@ -146,6 +146,6 @@ Export-Package: org.eclipse.emf.cdo.internal.ui;version="4.6.100";
org.eclipse.emf.cdo.explorer.ui,
org.eclipse.emf.cdo.ui.team,
org.eclipse.emf.cdo.ui.compare",
- org.eclipse.emf.cdo.ui;version="4.6.100",
- org.eclipse.emf.cdo.ui.widgets;version="4.6.100"
+ org.eclipse.emf.cdo.ui;version="4.6.200",
+ org.eclipse.emf.cdo.ui.widgets;version="4.6.200"
Automatic-Module-Name: org.eclipse.emf.cdo.ui
diff --git a/plugins/org.eclipse.emf.cdo.ui/pom.xml b/plugins/org.eclipse.emf.cdo.ui/pom.xml
index 93c435b264..39272971c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.ui/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.ui</artifactId>
- <version>4.6.100-SNAPSHOT</version>
+ <version>4.6.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java
index 877a4f306e..2da85425f4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java
@@ -429,6 +429,7 @@ public interface CDOEditorOpener
return value;
}
+ @SuppressWarnings("deprecation")
private static ImageDescriptor getIcon(IConfigurationElement element)
{
String icon = element.getAttribute("icon"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
index 9ef756e454..d77351b79e 100644
--- a/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.ui.shared;singleton:=true
-Bundle-Version: 4.3.200.qualifier
+Bundle-Version: 4.3.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.net4j.ui.internal.shared.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
-Export-Package: org.eclipse.net4j.ui.shared;version="4.3.200";uses:="org.eclipse.jface.resource,org.eclipse.swt.graphics",
- org.eclipse.net4j.ui.internal.shared.bundle;version="4.3.200";x-internal:=true
+Export-Package: org.eclipse.net4j.ui.shared;version="4.3.300";uses:="org.eclipse.jface.resource,org.eclipse.swt.graphics",
+ org.eclipse.net4j.ui.internal.shared.bundle;version="4.3.300";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)"
diff --git a/plugins/org.eclipse.net4j.ui.shared/pom.xml b/plugins/org.eclipse.net4j.ui.shared/pom.xml
index a6c023ff53..9981538a47 100644
--- a/plugins/org.eclipse.net4j.ui.shared/pom.xml
+++ b/plugins/org.eclipse.net4j.ui.shared/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.ui.shared</artifactId>
- <version>4.3.200-SNAPSHOT</version>
+ <version>4.3.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
index bb4fdd5020..5866c3788f 100644
--- a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
+++ b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
@@ -140,6 +140,7 @@ public class SharedIcons
private static ImageDescriptor createDescriptor(String key)
{
+ @SuppressWarnings("deprecation")
ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
if (descriptor != null)
{
diff --git a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
index 57ced6f8aa..c5baa420d8 100644
--- a/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.net4j.util.ui;singleton:=true
-Bundle-Version: 3.6.200.qualifier
+Bundle-Version: 3.6.300.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -15,20 +15,20 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.net4j.util.internal.ui;version="3.6.200";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.actions;version="3.6.200";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.bundle;version="3.6.200";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.messages;version="3.6.200";x-internal:=true,
- org.eclipse.net4j.util.internal.ui.views;version="3.6.200";x-internal:=true,
- org.eclipse.net4j.util.ui;version="3.6.200",
- org.eclipse.net4j.util.ui.actions;version="3.6.200",
- org.eclipse.net4j.util.ui.confirmation;version="3.6.200",
- org.eclipse.net4j.util.ui.container;version="3.6.200",
- org.eclipse.net4j.util.ui.dnd;version="3.6.200",
- org.eclipse.net4j.util.ui.handlers;version="3.6.200",
- org.eclipse.net4j.util.ui.prefs;version="3.6.200",
- org.eclipse.net4j.util.ui.proposals;version="3.6.200",
- org.eclipse.net4j.util.ui.security;version="3.6.200",
- org.eclipse.net4j.util.ui.views;version="3.6.200",
- org.eclipse.net4j.util.ui.widgets;version="3.6.200"
+Export-Package: org.eclipse.net4j.util.internal.ui;version="3.6.300";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.actions;version="3.6.300";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.bundle;version="3.6.300";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.messages;version="3.6.300";x-internal:=true,
+ org.eclipse.net4j.util.internal.ui.views;version="3.6.300";x-internal:=true,
+ org.eclipse.net4j.util.ui;version="3.6.300",
+ org.eclipse.net4j.util.ui.actions;version="3.6.300",
+ org.eclipse.net4j.util.ui.confirmation;version="3.6.300",
+ org.eclipse.net4j.util.ui.container;version="3.6.300",
+ org.eclipse.net4j.util.ui.dnd;version="3.6.300",
+ org.eclipse.net4j.util.ui.handlers;version="3.6.300",
+ org.eclipse.net4j.util.ui.prefs;version="3.6.300",
+ org.eclipse.net4j.util.ui.proposals;version="3.6.300",
+ org.eclipse.net4j.util.ui.security;version="3.6.300",
+ org.eclipse.net4j.util.ui.views;version="3.6.300",
+ org.eclipse.net4j.util.ui.widgets;version="3.6.300"
Automatic-Module-Name: org.eclipse.net4j.util.ui
diff --git a/plugins/org.eclipse.net4j.util.ui/pom.xml b/plugins/org.eclipse.net4j.util.ui/pom.xml
index 43e1e7c79e..3ed15d5a85 100644
--- a/plugins/org.eclipse.net4j.util.ui/pom.xml
+++ b/plugins/org.eclipse.net4j.util.ui/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.net4j.util.ui</artifactId>
- <version>3.6.200-SNAPSHOT</version>
+ <version>3.6.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
index c151c7de1f..c671ec548d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/bundle/OM.java
@@ -33,6 +33,7 @@ public abstract class OM
public static final OMLogger LOG = BUNDLE.logger();
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String imageFilePath)
{
return Activator.imageDescriptorFromPlugin(BUNDLE_ID, imageFilePath);
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
index 13f0792319..7421876b15 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java
@@ -48,6 +48,7 @@ public class UIActivator extends AbstractUIPlugin
/**
* @since 3.1
*/
+ @SuppressWarnings("deprecation")
public ImageDescriptor loadImageDescriptor(String path)
{
return imageDescriptorFromPlugin(omBundle.getBundleID(), path);
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
index 33b7393b9c..8ec92e61ad 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SearchField.java
@@ -159,6 +159,7 @@ public class SearchField extends Composite
{
private final PatternFilter patternFilter;
+ @SuppressWarnings("deprecation")
private InternalTree(Composite parent, int treeStyle, PatternFilter filter, boolean useNewLook, PatternFilter patternFilter)
{
super(parent, treeStyle, filter, useNewLook);
diff --git a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
index c55a2f4eea..63ecbda54c 100644
--- a/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
+++ b/plugins/org.gastro.rcp.department/src/org/gastro/rcp/internal/department/Activator.java
@@ -80,6 +80,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);
diff --git a/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java b/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
index 15213f1c8f..820387542b 100644
--- a/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
+++ b/plugins/org.gastro.rcp.table/src/org/gastro/rcp/internal/table/Activator.java
@@ -80,6 +80,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);
diff --git a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
index de45470cce..2bb7d3e249 100644
--- a/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
+++ b/plugins/org.gastro.rcp/src/org/gastro/internal/rcp/Activator.java
@@ -98,6 +98,7 @@ public class Activator extends AbstractUIPlugin
* the path
* @return the image descriptor
*/
+ @SuppressWarnings("deprecation")
public static ImageDescriptor getImageDescriptor(String path)
{
return imageDescriptorFromPlugin(PLUGIN_ID, path);

Back to the top