summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Drossel2009-01-14 06:52:43 (EST)
committerCarsten Drossel2009-01-14 06:52:43 (EST)
commit84205a0e29574160079be074bd3748e209438bee (patch)
tree41ba24ec2c24c71741e9865a7ea4887fe405904b
parent998d3437f1bc23e06b6cf7248c791225dd83dd57 (diff)
downloadorg.eclipse.riena-84205a0e29574160079be074bd3748e209438bee.zip
org.eclipse.riena-84205a0e29574160079be074bd3748e209438bee.tar.gz
org.eclipse.riena-84205a0e29574160079be074bd3748e209438bee.tar.bz2
removed code marked as deprecated
-rw-r--r--org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/config/SymbolConfigPlugin.java81
-rw-r--r--org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServicePublishEventDispatcher.java236
-rw-r--r--org.eclipse.riena.core/src/org/eclipse/riena/core/extension/ExtensionInjector.java12
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidgetTest.java25
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidgetTest.java36
-rw-r--r--org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidgetTest.java15
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractValueRidget.java5
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidget.java16
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidget.java6
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidget.java5
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget.java6
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ToggleButtonRidget.java6
-rw-r--r--org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IComboRidget.java34
-rw-r--r--org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/ISingleChoiceRidget.java9
-rw-r--r--org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueProvider.java42
-rw-r--r--org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueRidget.java13
16 files changed, 8 insertions, 539 deletions
diff --git a/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/config/SymbolConfigPlugin.java b/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/config/SymbolConfigPlugin.java
deleted file mode 100644
index b9c2371..0000000
--- a/org.eclipse.riena.communication.core/src/org/eclipse/riena/communication/core/config/SymbolConfigPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 compeople AG and others.
- * 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:
- * compeople AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.riena.communication.core.config;
-
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.RegistryFactory;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.cm.ConfigurationPlugin;
-
-/**
- * @deprecated
- */
-public class SymbolConfigPlugin implements ConfigurationPlugin {
-
- private HashMap<String, String> symbolTable = new HashMap<String, String>();
-
- public SymbolConfigPlugin() {
- super();
-
- IExtensionRegistry registry = RegistryFactory.getRegistry();
- IExtension[] cfgExtensions = registry.getExtensionPoint("org.eclipse.riena.communication.core.configProxies").getExtensions(); //$NON-NLS-1$
- for (IExtension cfgExt : cfgExtensions) {
- IConfigurationElement[] configs = cfgExt.getConfigurationElements();
- for (IConfigurationElement config : configs) {
- IConfigurationElement[] properties = config.getChildren();
- for (IConfigurationElement prop : properties) {
- String name = prop.getAttribute("name"); //$NON-NLS-1$
- String value = prop.getAttribute("value"); //$NON-NLS-1$
- symbolTable.put(name, value);
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public void modifyConfiguration(ServiceReference servicereference, Dictionary dictionary) {
- Enumeration<String> keyEnum = dictionary.keys();
- while (keyEnum.hasMoreElements()) {
- String key = keyEnum.nextElement();
- String value = (String) dictionary.get(key);
- dictionary.put(key, replaceSymbol(value));
- }
- }
-
- private String replaceSymbol(String value) {
- StringBuilder sb = new StringBuilder(value);
- for (int i = 0; i < sb.length() - 1; i++) {
- if (sb.substring(i, i + 2).equals("${")) { //$NON-NLS-1$
- int x = sb.substring(i).indexOf('}');
- if (x > 0) {
- String key = value.substring(i + 2, i + x);
- sb.replace(i, i + x + 1, lookupSymbol(key));
- }
- }
- }
- return sb.toString();
- }
-
- private String lookupSymbol(String symbol) {
- String value = symbolTable.get(symbol);
- if (value == null) {
- return "${" + symbol + "}"; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- return value;
- }
- }
-}
diff --git a/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServicePublishEventDispatcher.java b/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServicePublishEventDispatcher.java
deleted file mode 100644
index f9a11a0..0000000
--- a/org.eclipse.riena.communication.publisher/src/org/eclipse/riena/internal/communication/publisher/ServicePublishEventDispatcher.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 compeople AG and others.
- * 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:
- * compeople AG - initial API and implementation
- *******************************************************************************/
-package org.eclipse.riena.internal.communication.publisher;
-
-import static org.eclipse.riena.communication.core.publisher.RSDPublisherProperties.PROP_IS_REMOTE;
-import static org.eclipse.riena.communication.core.publisher.RSDPublisherProperties.PROP_REMOTE_PATH;
-import static org.eclipse.riena.communication.core.publisher.RSDPublisherProperties.PROP_REMOTE_PROTOCOL;
-
-import java.lang.reflect.Proxy;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.equinox.log.Logger;
-import org.eclipse.riena.communication.core.RemoteServiceDescription;
-import org.eclipse.riena.communication.core.publisher.IServicePublishEventDispatcher;
-import org.eclipse.riena.communication.core.publisher.IServicePublisher;
-import org.eclipse.riena.communication.core.publisher.RSDPublisherProperties;
-import org.eclipse.riena.communication.core.util.CommunicationUtil;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogService;
-
-/**
- *
- * @author Alexander Ziegler
- * @author Christian Campo
- *
- * @deprecated
- */
-public class ServicePublishEventDispatcher implements IServicePublishEventDispatcher {
-
- public static final String FILTER_REMOTE = "(&(" + PROP_IS_REMOTE + "=true)(" + PROP_REMOTE_PROTOCOL + "=*)" + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- private Map<String, RemoteServiceDescription> rsDescs;
- private Map<String, IServicePublisher> servicePublishers;
-
- private BundleContext context;
-
- private final static Logger LOGGER = Activator.getDefault().getLogger(ServicePublishEventDispatcher.class);
-
- public ServicePublishEventDispatcher(BundleContext context) {
- super();
- this.context = context;
- rsDescs = new HashMap<String, RemoteServiceDescription>();
- servicePublishers = new HashMap<String, IServicePublisher>(3);
- }
-
- public void start() {
- update();
- }
-
- protected synchronized void update() {
- ServiceReference[] serviceReferences = null;
- try {
- serviceReferences = context.getAllServiceReferences(null, FILTER_REMOTE);
- } catch (InvalidSyntaxException e) {
- e.printStackTrace();
- }
- if (serviceReferences != null) {
-
- for (ServiceReference serviceReference : serviceReferences) {
- if (!isPublished(serviceReference)) {
- publish(serviceReference);
- }
- }
- }
- }
-
- private boolean isPublished(ServiceReference serviceRef) {
- String remoteType = CommunicationUtil.accessProperty(serviceRef
- .getProperty(RSDPublisherProperties.PROP_REMOTE_PROTOCOL), null);
- String path = CommunicationUtil.accessProperty(serviceRef.getProperty(PROP_REMOTE_PATH), null);
- RemoteServiceDescription rsDesc = rsDescs.get(remoteType + "::" + path); //$NON-NLS-1$
- if (rsDesc == null) {
- return false;
- }
- return rsDesc.getState() == RemoteServiceDescription.State.REGISTERED;
- }
-
- public void bind(IServicePublisher publisher) {
- servicePublishers.put(publisher.getProtocol(), publisher);
- LOGGER.log(LogService.LOG_DEBUG, "servicePublish=" + publisher.getProtocol() //$NON-NLS-1$
- + " REGISTER...publishing all services that were waiting for him"); //$NON-NLS-1$
- // check for services which are missing a publisher
-
- update();
- }
-
- public void unbind(IServicePublisher publisher) {
- String protocol = publisher.getProtocol();
- LOGGER.log(LogService.LOG_DEBUG, "servicePublish=" + publisher.getProtocol() //$NON-NLS-1$
- + " UNREGISTER...unpublishing all its services"); //$NON-NLS-1$
- // unregister all web services for this type
-
- for (RemoteServiceDescription rsDesc : rsDescs.values()) {
- if (protocol.equals(rsDesc.getProtocol())) {
- unpublish(rsDesc);
- }
- }
- servicePublishers.remove(protocol);
- }
-
- protected void publish(ServiceReference serviceRef) {
- if (servicePublishers.size() == 0) {
- return;
- }
- synchronized (rsDescs) {
- try {
- Object service = context.getService(serviceRef);
- ServiceHooksProxy handler = new ServiceHooksProxy(service);
- // create remote service description
- String[] interfaces = (String[]) serviceRef.getProperty(Constants.OBJECTCLASS);
- assert interfaces.length == 1 : "OSGi service registrations only with one interface supported"; //$NON-NLS-1$
- String interfaceName = interfaces[0];
- Class interfaceClazz = serviceRef.getBundle().loadClass(interfaceName);
- service = Proxy.newProxyInstance(interfaceClazz.getClassLoader(), new Class[] { interfaceClazz },
- handler);
- RemoteServiceDescription rsDesc = new RemoteServiceDescription(serviceRef, service, interfaceClazz);
- handler.setRemoteServiceDescription(rsDesc);
- RemoteServiceDescription rsDescFound = rsDescs.get(rsDesc.getProtocol() + "::" + rsDesc.getPath()); //$NON-NLS-1$
- if (rsDescFound != null && rsDescFound.getState() == RemoteServiceDescription.State.REGISTERED) {
- LOGGER.log(LogService.LOG_WARNING, "A service endpoint with path=[" + rsDesc.getPath() //$NON-NLS-1$
- + "] and remoteType=[" + rsDesc.getProtocol() + "] already published... ignored"); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
-
- if (rsDescFound == null) {
- if (rsDesc.getPath() == null) {
- LOGGER.log(LogService.LOG_WARNING, "no path for service: " + service.toString() //$NON-NLS-1$
- + " Service not published remote"); //$NON-NLS-1$
- return;
- }
- if (!servicePublishers.containsKey(rsDesc.getProtocol())) {
- LOGGER.log(LogService.LOG_DEBUG, "no publisher found for protocol " + rsDesc.getProtocol()); //$NON-NLS-1$
- return;
- }
- rsDescs.put(rsDesc.getProtocol() + "::" + rsDesc.getPath(), rsDesc); //$NON-NLS-1$
- LOGGER.log(LogService.LOG_DEBUG, "service endpoints count: " + rsDescs.size()); //$NON-NLS-1$
-
- } else if (rsDescFound.getState() == RemoteServiceDescription.State.UNREGISTERED) {
- rsDesc = rsDescFound;
- }
-
- publish(rsDesc, handler);
- } catch (ClassNotFoundException e) {
- LOGGER.log(LogService.LOG_DEBUG,
- "Could not load class for remote service interface for service reference " + serviceRef, e); //$NON-NLS-1$
- }
- }
-
- }
-
- private void publish(RemoteServiceDescription rsDesc, ServiceHooksProxy handler) {
- IServicePublisher publisher = servicePublishers.get(rsDesc.getProtocol());
- if (publisher == null) {
- return;
- }
- String url = publisher.publishService(rsDesc);
- // set full URL under which the service is available
- rsDesc.setURL(url);
- handler.setMessageContextAccessor(publisher.getMessageContextAccessor());
-
- rsDesc.setState(RemoteServiceDescription.State.REGISTERED);
-
- }
-
- // @remote
- public RemoteServiceDescription[] getAllServices() {
- RemoteServiceDescription[] result = new RemoteServiceDescription[rsDescs.size()];
- synchronized (rsDescs) {
- rsDescs.values().toArray(result);
- }
- return result;
- }
-
- protected void unpublish(ServiceReference serviceRef) {
- synchronized (rsDescs) {
- try {
-
- String path = CommunicationUtil.accessProperty(serviceRef.getProperty(PROP_REMOTE_PATH), null);
- String remoteType = CommunicationUtil
- .accessProperty(serviceRef.getProperty(PROP_REMOTE_PROTOCOL), null);
- RemoteServiceDescription toRemove = null;
- for (RemoteServiceDescription rsDesc : rsDescs.values()) {
- if (rsDesc.getPath().equals(path) && rsDesc.getProtocol().equals(remoteType)) {
- toRemove = rsDesc;
- break;
- }
- }
- if (toRemove != null) {
- rsDescs.remove(remoteType + "::" + path); //$NON-NLS-1$
- if (servicePublishers.containsKey(toRemove.getProtocol())) {
- unpublish(toRemove);
- }
- // TODO notify all discovery services about this
- }
- } finally {
- context.ungetService(serviceRef);
- }
- LOGGER.log(LogService.LOG_DEBUG, "service endpoints count: " + rsDescs.size()); //$NON-NLS-1$
- }
- }
-
- private void unpublish(RemoteServiceDescription rsDesc) {
- IServicePublisher publisher = servicePublishers.get(rsDesc.getProtocol());
- if (publisher == null) {
- return;
- }
-
- publisher.unpublishService(rsDesc);
-
- rsDesc.setState(RemoteServiceDescription.State.UNREGISTERED);
- }
-
- public void stop() {
- synchronized (rsDescs) {
- for (RemoteServiceDescription rsDesc : rsDescs.values()) {
- if (servicePublishers.containsKey(rsDesc.getProtocol())) {
- unpublish(rsDesc);
- }
- rsDesc.dispose();
- }
- rsDescs.clear();
- }
- }
-}
diff --git a/org.eclipse.riena.core/src/org/eclipse/riena/core/extension/ExtensionInjector.java b/org.eclipse.riena.core/src/org/eclipse/riena/core/extension/ExtensionInjector.java
index 8f618e7..bb86c33 100644
--- a/org.eclipse.riena.core/src/org/eclipse/riena/core/extension/ExtensionInjector.java
+++ b/org.eclipse.riena.core/src/org/eclipse/riena/core/extension/ExtensionInjector.java
@@ -93,18 +93,6 @@ public class ExtensionInjector {
}
/**
- * Define the bind method name.<br>
- * If not given 'update' will be assumed.
- *
- * @param bindMethodName
- * @return itself
- */
- @Deprecated
- public ExtensionInjector bind(final String bindMethodName) {
- return update(bindMethodName);
- }
-
- /**
* Define the update method name.<br>
* If not given 'update' will be assumed.
*
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidgetTest.java
index 4e0b581..a4950f7 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidgetTest.java
@@ -17,7 +17,6 @@ import java.util.Collection;
import java.util.Iterator;
import org.eclipse.core.databinding.BindingException;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.riena.beans.common.Person;
import org.eclipse.riena.beans.common.PersonManager;
import org.eclipse.riena.beans.common.StringManager;
@@ -368,30 +367,6 @@ public class ComboRidgetTest extends AbstractSWTRidgetTest {
assertEquals("B", getRidget().getSelection());
}
- /**
- * Should be deleted when the deprecated method getSelectionObservable() is
- * removed.
- */
- @SuppressWarnings("deprecation")
- public void testGetSelectionObservable() {
- ComboRidget ridget = getRidget();
- StringManager aManager = new StringManager("A", "B", "C", "D", "E");
- ridget.bindToModel(aManager, "items", String.class, null, aManager, "selectedItem");
- ridget.updateFromModel();
-
- IObservableValue selectionObservable = getRidget().getSelectionObservable();
-
- assertEquals(null, selectionObservable.getValue());
-
- getWidget().select(1);
-
- assertEquals("B", selectionObservable.getValue());
-
- ridget.setUIControl(null);
-
- assertEquals("B", selectionObservable.getValue());
- }
-
public void testSetSelectionInt() {
ComboRidget ridget = getRidget();
Combo control = ridget.getUIControl();
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidgetTest.java
index 50659c4..358938a 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidgetTest.java
@@ -287,42 +287,6 @@ public class LabelRidgetTest extends AbstractSWTRidgetTest {
}
/**
- * Test deprecated method getRidgetObservable(). When this method is removed
- * the test may be removed too.
- */
- @SuppressWarnings("deprecation")
- public void testGetRidgetObservable() throws Exception {
- ILabelRidget ridget = getRidget();
- IObservableValue ridgetObservable = ridget.getRidgetObservable();
-
- assertNotNull(ridgetObservable);
-
- ridget.setText("huhu");
-
- assertEquals("huhu", ridgetObservable.getValue());
-
- TestBean bean = new TestBean();
- bean.setProperty("NewLabel");
- ridget.bindToModel(bean, TestBean.PROPERTY);
-
- assertEquals("huhu", ridgetObservable.getValue());
-
- ridget.updateFromModel();
-
- assertEquals("NewLabel", ridgetObservable.getValue());
- }
-
- /**
- * Test method getValueType(). When the deprecated method
- * getRidgetObservable() is removed this test may be removed too.
- */
- @SuppressWarnings("deprecation")
- public void testGetValueType() throws Exception {
- ILabelRidget ridget = getRidget();
- assertEquals(String.class, ridget.getRidgetObservable().getValueType());
- }
-
- /**
* Test method setUIControl().
*/
public void testSetUIControl() throws Exception {
diff --git a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidgetTest.java b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidgetTest.java
index aa7a654..ec56f6c 100644
--- a/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidgetTest.java
+++ b/org.eclipse.riena.tests/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidgetTest.java
@@ -92,21 +92,6 @@ public final class SingleChoiceRidgetTest extends MarkableRidgetTest {
}
/**
- * Test method getSelectionObservable(). This test may be deleted when this
- * deprecated method is removed.
- */
- @SuppressWarnings("deprecation")
- public void testGetSelectionObservable() {
- ISingleChoiceRidget ridget = getRidget();
-
- assertNotNull(ridget.getSelectionObservable());
-
- ridget.updateFromModel();
-
- assertEquals(optionProvider.getSelectedOption(), ridget.getSelectionObservable().getValue());
- }
-
- /**
* Test method updateFromModel().
*/
public void testUpdateFromModel() {
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractValueRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractValueRidget.java
index 07b77c0..2ca0b86 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractValueRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/AbstractValueRidget.java
@@ -27,6 +27,11 @@ public abstract class AbstractValueRidget extends AbstractSWTRidget implements I
valueBindingSupport.setMarkable(this);
}
+ /**
+ * @return The observable value of the Ridget.
+ */
+ abstract IObservableValue getRidgetObservable();
+
public void bindToModel(IObservableValue observableValue) {
valueBindingSupport.bindToModel(observableValue);
}
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidget.java
index c341599..0d2363e 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ComboRidget.java
@@ -239,14 +239,6 @@ public class ComboRidget extends AbstractSWTRidget implements IComboRidget {
return result;
}
- /**
- * @deprecated use BeansObservables.observeValue(this,
- * IComboRidget.PROPERTY_SELECTION);
- */
- public IObservableValue getSelectionObservable() {
- return BeansObservables.observeValue(this, IComboRidget.PROPERTY_SELECTION);
- }
-
public boolean isAddable() {
throw new UnsupportedOperationException(); // TODO implement
}
@@ -256,10 +248,6 @@ public class ComboRidget extends AbstractSWTRidget implements IComboRidget {
return hasInput();
}
- public boolean isEditable() {
- throw new UnsupportedOperationException(); // TODO implement
- }
-
public boolean isListMutable() {
throw new UnsupportedOperationException(); // TODO implement
}
@@ -272,10 +260,6 @@ public class ComboRidget extends AbstractSWTRidget implements IComboRidget {
throw new UnsupportedOperationException(); // TODO implement
}
- public void setEditable(boolean editable) {
- throw new UnsupportedOperationException(); // TODO implement
- }
-
public void setEmptySelectionItem(Object emptySelectionItem) {
this.emptySelection = emptySelectionItem;
}
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidget.java
index 447aab7..d05d21b 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/LabelRidget.java
@@ -40,11 +40,7 @@ public class LabelRidget extends AbstractValueRidget implements ILabelRidget {
setUIControl(label);
}
- /**
- * @deprecated use BeansObservables.observeValue(ridget instance,
- * ILabelRidget.PROPERTY_TEXT);
- */
- public IObservableValue getRidgetObservable() {
+ IObservableValue getRidgetObservable() {
return BeansObservables.observeValue(this, ILabelRidget.PROPERTY_TEXT);
}
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidget.java
index 88dc69e..317ea55 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/SingleChoiceRidget.java
@@ -144,11 +144,6 @@ public class SingleChoiceRidget extends AbstractSWTRidget implements ISingleChoi
return selectionObservable.getValue();
}
- @Deprecated
- public IObservableValue getSelectionObservable() {
- return selectionObservable;
- }
-
public void setSelection(Object candidate) {
assertIsBoundToModel();
if (candidate != null && !optionsObservable.contains(candidate)) {
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget.java
index a77b8d0..7424320 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TextRidget.java
@@ -78,11 +78,7 @@ public class TextRidget extends AbstractEditableRidget implements ITextRidget {
textValue = initialValue;
}
- /**
- * @deprecated use BeansObservables.observeValue(ridget instance,
- * ITextRidget.PROPERTY_TEXT);
- */
- public IObservableValue getRidgetObservable() {
+ IObservableValue getRidgetObservable() {
return BeansObservables.observeValue(this, ITextRidget.PROPERTY_TEXT);
}
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ToggleButtonRidget.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ToggleButtonRidget.java
index 5bf54c4..ef4a3ca 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ToggleButtonRidget.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/ToggleButtonRidget.java
@@ -97,11 +97,7 @@ public class ToggleButtonRidget extends AbstractValueRidget implements IToggleBu
}
}
- /**
- * @deprecated use BeansObservables.observeValue(ridget instance,
- * IToggleButtonRidget.PROPERTY_SELECTED);
- */
- public IObservableValue getRidgetObservable() {
+ IObservableValue getRidgetObservable() {
return BeansObservables.observeValue(this, IToggleButtonRidget.PROPERTY_SELECTED);
}
diff --git a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IComboRidget.java b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IComboRidget.java
index 218fd39..253a6de 100644
--- a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IComboRidget.java
+++ b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IComboRidget.java
@@ -84,16 +84,6 @@ public interface IComboRidget extends IMarkableRidget {
IObservableList getObservableList();
/**
- * Return the observable value holding the selection.
- *
- * @return the observable value.
- *
- * @deprecated use BeansObservables.observeValue(this,
- * IComboRidget.PROPERTY_SELECTION);
- */
- IObservableValue getSelectionObservable();
-
- /**
* Return the current selection. Will return null if either nothing or the
* "empty selection item" is selected.
*
@@ -146,30 +136,6 @@ public interface IComboRidget extends IMarkableRidget {
void setEmptySelectionItem(Object emptySelectionItem);
/**
- * Return true if the receiver is editable. By default, a
- * <code>IComboRidget</code> is not editable.
- *
- * @return true if the receiver is editable, otherwise false
- * @deprecated use isReadonly() instead
- */
- boolean isEditable();
-
- /**
- * Set the editability of the <code>IComboRidget</code> edit field. If the
- * edit field is editable arbitrary text can be entered into the entry field
- * - the text does need not to be an element of the
- * <code>IComboRidget</code> drop down list. Entering text not contained in
- * the <code>IComboRidget</code> drop down list will be added to the list if
- * and only if the <code>IComboRidget</code> is mutable
- * {@link IComboRidget#isListMutable()}.
- *
- * @param editable
- * true if the receiver is editable, otherwise false
- * @deprecated use setReadonly instead
- */
- void setEditable(boolean editable);
-
- /**
* Return true if the receivers drop down list is mutable, ie items not yet
* contained in the list will automatically be added if entered into the
* text field.
diff --git a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/ISingleChoiceRidget.java b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/ISingleChoiceRidget.java
index 4208ad6..0befe05 100644
--- a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/ISingleChoiceRidget.java
+++ b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/ISingleChoiceRidget.java
@@ -19,15 +19,6 @@ import org.eclipse.core.databinding.observable.value.IObservableValue;
* A single choice ridget that allows the selection of a single option.
*/
public interface ISingleChoiceRidget extends IChoiceRidget {
- /**
- * Return the observable value holding the selection.
- *
- * @return the observable value.
- *
- * @deprecated use BeansObservables.observeValue(this,
- * IChoiceRidget.PROPERTY_SELECTION);
- */
- IObservableValue getSelectionObservable();
/**
* @param optionValues
diff --git a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueProvider.java b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueProvider.java
deleted file mode 100644
index 538cb31..0000000
--- a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 compeople AG and others.
- * 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:
- * compeople AG - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.riena.ui.ridgets;
-
-/**
- * Gets and sets the value of a model object.
- *
- * @author Carsten Drossel
- * @author Sebastian Stanossek deprication of setModel
- */
-
-/**
- * @deprecated Use data binding of ridgets
- */
-@Deprecated
-public interface IValueProvider {
-
- /**
- * Returns the value.
- *
- * @return The value
- */
- Object getValue();
-
- /**
- * Sets the value.
- *
- * @param value
- * The new value
- */
- void setValue(Object value);
-
-}
diff --git a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueRidget.java b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueRidget.java
index 53a4c36..6870613 100644
--- a/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueRidget.java
+++ b/org.eclipse.riena.ui.ridgets/src/org/eclipse/riena/ui/ridgets/IValueRidget.java
@@ -10,7 +10,6 @@
*******************************************************************************/
package org.eclipse.riena.ui.ridgets;
-import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.conversion.IConverter;
import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -20,18 +19,6 @@ import org.eclipse.core.databinding.observable.value.IObservableValue;
public interface IValueRidget extends IRidget {
/**
- * @return The observable value of the Ridget. Can be used as target value
- * in a custom binding with a model value.
- *
- * @see DataBindingContext#bindValue(IObservableValue, IObservableValue,
- * org.eclipse.core.databinding.UpdateValueStrategy,
- * org.eclipse.core.databinding.UpdateValueStrategy)
- *
- * @deprecated use BeansObservables.observeValue(bean, propertyName)
- */
- IObservableValue getRidgetObservable();
-
- /**
* Creates a default binding between the Ridget value and the specified
* model value. The UpdateValueStrategy will be POLICY_UPDATE to the model
* value (automatic update) and POLICY_ON_REQUEST from the model value.