Remove uses of SWTObservables Use a newer version of Tycho and jarsigner. Eliminate some warnings. Change-Id: I0bf93a3413ee28c2c4e03d34db8275e2c867300a

diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF
index 8a3cafa..4d0c05a 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF

@@ -32,3 +32,4 @@
  org.eclipse.ui,
  org.eclipse.jdt.core
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.customtask

diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF
index 56ce409..6b04397 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF

@@ -18,3 +18,4 @@
  org.eclipse.bpmn2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.datatypes

diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF
index fa0cceb..8465818 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF

@@ -22,3 +22,4 @@
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.resources
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.dynamic

diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF
index ca58942..1b8ce57 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF

@@ -18,3 +18,4 @@
  org.eclipse.bpmn2.modeler.ui,
  org.eclipse.bpmn2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.examples.modelreader

diff --git a/parent/pom.xml b/parent/pom.xml
index 57f469b..b1c558a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml

@@ -30,7 +30,7 @@
 
 	<properties>
 		<!-- 1.3.0 2.7.2 -->
-		<tycho-version>1.3.0</tycho-version>
+		<tycho-version>2.7.5</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<BUILD_ALIAS>RC1</BUILD_ALIAS>
 		<BUILD_NUMBER>1</BUILD_NUMBER>
@@ -102,23 +102,9 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200a-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-normalize</id>
-								<goals>
-									<goal>normalize</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-		
-					<plugin>
 						<groupId>org.eclipse.cbi.maven.plugins</groupId>
 						<artifactId>eclipse-jarsigner-plugin</artifactId>
-						<version>1.3.1</version>
+						<version>1.3.2</version>
 						<executions>
 							<execution>
 								<id>sign</id>
@@ -129,20 +115,6 @@
 							</execution>
 						</executions>
 					</plugin>
-		
-					<plugin>
-						<groupId>org.eclipse.tycho.extras</groupId>
-						<artifactId>tycho-pack200b-plugin</artifactId>
-						<version>${tycho-extras-version}</version>
-						<executions>
-							<execution>
-								<id>pack200-pack</id>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
index 42807dd..c3c82ca 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF

@@ -1,5 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.core
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true
@@ -31,6 +32,7 @@
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.jface.databinding,
  org.eclipse.core.databinding,
+ org.eclipse.core.databinding.property,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
  org.eclipse.core.expressions,

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java
index 7cd395e..87fb7e7 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/FloatObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -78,10 +78,10 @@
 
 		updateText();
 
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 
 				try {
 					final Double i = Double.parseDouble(text.getText());
@@ -92,7 +92,6 @@
 				}
 			}
 
-			@SuppressWarnings("rawtypes")
 			private void setFeatureValue(final double i) {
 				getBusinessObjectDelegate().setValue(object, feature, Double.toString(i));
 			}
@@ -120,6 +119,6 @@
 				catch (Exception e){
 				}
 			}
-			return new Double(0);
+			return Double.valueOf(0);
 		}
 }

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java
index 802ea2d..1f7b365 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/IntObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -78,10 +78,10 @@
 
 		updateText();
 
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 
 				try {
 					final Long i = Long.parseLong(text.getText());
@@ -93,7 +93,6 @@
 				}
 			}
 
-			@SuppressWarnings("rawtypes")
 			private void setFeatureValue(final long i) {
 				getBusinessObjectDelegate().setValue(object, feature, Long.toString(i));
 			}
@@ -119,6 +118,6 @@
 			catch (Exception e){
 			}
 		}
-		return new Long(0);
+		return Long.valueOf(0);
 	}
 }

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java
index 351af05..e08a119 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaPackageNameObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -84,12 +84,11 @@
 		});
 
 		updateText();
-
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
-
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 				String s = text.getText();
 				if (!getValue().equals(s)) {
 					setValue(s);

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java
index e4ad9ab..01f77f4 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/JavaVariableNameObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -78,10 +78,10 @@
 
 		updateText();
 
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 
 				String s = text.getText();
 				if (!getValue().equals(s)) {

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java
index 51e9fef..c4f0815 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/NCNameObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -85,11 +85,11 @@
 
 		updateText();
 
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 				String s = text.getText();
 				if (!getValue().equals(s)) {
 					setValue(s);

diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java
index 0522767..2b60f84 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/dialogs/QNameObjectEditor.java

@@ -21,7 +21,7 @@
 import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
@@ -78,10 +78,10 @@
 
 		updateText();
 
-		IObservableValue textObserveTextObserveWidget = SWTObservables.observeText(text, SWT.Modify);
-		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener() {
+		IObservableValue<String> textObserveTextObserveWidget = WidgetProperties.text(SWT.Modify).observe((Control) text);
+		textObserveTextObserveWidget.addValueChangeListener(new IValueChangeListener<String>() {
 			@Override
-			public void handleValueChange(ValueChangeEvent event) {
+			public void handleValueChange(ValueChangeEvent<? extends String> event) {
 
 				String s = text.getText();
 				if (!getValue().equals(s)) {

diff --git a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF
index 27ef662..46a1578 100644
--- a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF

@@ -12,3 +12,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpmn2.modeler.help
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.help

diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF
index 0f69b7c..0f34993 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF

@@ -45,3 +45,4 @@
  org.eclipse.bpmn2.modeler.ui.features.activity.task,
  org.eclipse.bpmn2.modeler.ui.property,
  org.eclipse.bpmn2.modeler.ui.property.providers
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm

diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
index 4ac05f0..495f955 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF

@@ -77,4 +77,5 @@
  org.eclipse.emf.workspace,
  org.eclipse.emf.workspace.util,
  org.eclipse.wst.validation
+Automatic-Module-Name: org.eclipse.bpmn2.modeler.ui
 

diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java
index 20d1399..e969b78 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java

@@ -728,9 +728,7 @@
 		updateStatus ( new Status(IStatus.INFO, Activator.getDefault().getID(),0,msg,null));
 	}
 
-	
-	 
-	@SuppressWarnings("boxing")
+
 	protected void loadDone () {
 		
 		long elapsed = System.currentTimeMillis() - fRunnableStart;

diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java
index 995b4b7..9c8de83 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/SchemaSelectionDialog.java

@@ -372,7 +372,6 @@
 		return null;
 	}
 
-	@SuppressWarnings("boxing")
 	void loadDone() {
 
 		if (input == null || input instanceof Exception) {

diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java
index 8f51a9c..5076c3d 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/editors/NameAndURIObjectEditor.java

@@ -130,7 +130,7 @@
 		if ( dialog.open() == Window.OK) {
 			final String newURI = dialog.getURI();
 			final String newName = dialog.getName();
-			if (!newURI.equals(value)) {
+			if (!newURI.equals(oldURI)) {
 				final Definitions definitions = ModelUtil.getDefinitions(object);
 				if (definitions!=null) {
 					TransactionalEditingDomain domain = getDiagramEditor().getEditingDomain();