Fix compatibility with Eclipse 4.18 - import Assert from core.runtime package instead of jface.util
Change-Id: Iddc3b280251253a3c7edacf35759d8f8860a7826
diff --git a/plugins/org.eclipse.tigerstripe.workbench.base/.classpath b/plugins/org.eclipse.tigerstripe.workbench.base/.classpath
index 20f7922..ed859ff 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base/.classpath
+++ b/plugins/org.eclipse.tigerstripe.workbench.base/.classpath
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry exported="true" kind="lib" path="lib/tigerstripe-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/tigerstripe-core.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/velocity-1.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/qdox-1.6.3.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry exported="true" kind="lib" path="lib/tigerstripe-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/tigerstripe-core.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/velocity-1.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/qdox-1.6.3.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-cli-1.0.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/views/explorerview/actions/ViewAction.java b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/views/explorerview/actions/ViewAction.java
index f35b82f..c5eddb2 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/views/explorerview/actions/ViewAction.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.base/src/java/org/eclipse/tigerstripe/workbench/ui/internal/views/explorerview/actions/ViewAction.java
@@ -12,7 +12,7 @@
import org.eclipse.jdt.internal.ui.workingsets.ViewActionGroup;
import org.eclipse.jface.action.Action;
-import org.eclipse.jface.util.Assert;
+import org.eclipse.core.runtime.Assert;
public class ViewAction extends Action {
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/META-INF/MANIFEST.MF
index c1d0ee9..863b437 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.providers.ide,
org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.ui.navigator
+ org.eclipse.ui.navigator,
+ org.apache.commons.lang;bundle-version="2.1.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-BundleShape: jar
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/ClassInstanceItemSemanticEditPolicy.java b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/ClassInstanceItemSemanticEditPolicy.java
index e485fe0..b86728f 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/ClassInstanceItemSemanticEditPolicy.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/ClassInstanceItemSemanticEditPolicy.java
@@ -17,6 +17,7 @@
import java.util.Map;
import java.util.Set;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -446,14 +447,13 @@
IAssociationArtifact artifact = (IAssociationArtifact) rel;
// loop through associations in the map and look for an existing
// association that matches this one
- List<AssociationInstance> assocsInMap = instanceMap
- .getAssociationInstances();
+ List<AssociationInstance> assocsInMap = instanceMap.getAssociationInstances();
boolean matchingLinkExists = false;
for (AssociationInstance instance : assocsInMap) {
try {
- if (instance.getArtifact().getFullyQualifiedName()
- .equals(artifact.getFullyQualifiedName())) {
+ if (StringUtils.equals(instance.getArtifact().getFullyQualifiedName(),
+ artifact.getFullyQualifiedName())) {
if ( aEndIsSingle ) {
if (getTarget() == instance.getZEnd()
|| getSource() == instance.getZEnd()) {
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/InstanceReferenceConnectionEditPolicy.java b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/InstanceReferenceConnectionEditPolicy.java
index 2a88107..aa7d4db 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/InstanceReferenceConnectionEditPolicy.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram/src/org/eclipse/tigerstripe/workbench/ui/instancediagram/diagram/edit/policies/InstanceReferenceConnectionEditPolicy.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram.edit.policies;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
@@ -32,7 +33,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.Assert;
import org.eclipse.swt.widgets.Display;
/**
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.sdk/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.workbench.ui.sdk/META-INF/MANIFEST.MF
index bd9d6ac..2bb3a27 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.sdk/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.sdk/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@
Bundle-Version: 0.10.0.qualifier
Bundle-Activator: org.eclipse.tigerstripe.workbench.sdk.internal.Activator
Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.tigerstripe.workbench.base,
org.eclipse.tigerstripe.workbench.ui.base,
diff --git a/plugins/org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram/src/org/eclipse/tigerstripe/workbench/ui/visualeditor/diagram/edit/policies/TigerstripeReferenceConnectionEditPolicy.java b/plugins/org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram/src/org/eclipse/tigerstripe/workbench/ui/visualeditor/diagram/edit/policies/TigerstripeReferenceConnectionEditPolicy.java
index cb9f4d1..f8efc51 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram/src/org/eclipse/tigerstripe/workbench/ui/visualeditor/diagram/edit/policies/TigerstripeReferenceConnectionEditPolicy.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram/src/org/eclipse/tigerstripe/workbench/ui/visualeditor/diagram/edit/policies/TigerstripeReferenceConnectionEditPolicy.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram.edit.policies;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
@@ -32,7 +33,6 @@
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.Assert;
import org.eclipse.swt.widgets.Display;
/**
