429744: [UML 2.5] Migrate Papyrus to UML 2.5

https://bugs.eclipse.org/bugs/show_bug.cgi?id=429744

- Remove references to Property#isSetDefault(), which doesn't exist
anymore

2 files changed, 8 insertions, 8 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java
index cf39c632ac7..53a91778369 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/ui/dialogs/InputDialogPrimitiveType.java
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * Copyright (c) 2008 CEA LIST.
  *
- *    
+ *
  * 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
@@ -52,7 +52,7 @@ public class InputDialogPrimitiveType {
 
 	/**
 	 * The Constructor.
-	 * 
+	 *
 	 * @param index
 	 *        the index
 	 * @param property
@@ -68,7 +68,7 @@ public class InputDialogPrimitiveType {
 			// Call dialog constructor
 			iDialog = new InputDialog(shell, TITLE, LABEL, initialValue.toString(), null);
 
-		} else if(property.isSetDefault()) {
+		} else if(property.getDefaultValue() != null) {
 			iDialog = new InputDialog(shell, TITLE, LABEL, property.getDefault(), null);
 
 		} else if(property.getType().getName().equals("Boolean")) {
@@ -81,7 +81,7 @@ public class InputDialogPrimitiveType {
 
 	/**
 	 * Open.
-	 * 
+	 *
 	 * @return the int
 	 */
 	public int open() {
@@ -97,7 +97,7 @@ public class InputDialogPrimitiveType {
 
 	/**
 	 * Gets the value.
-	 * 
+	 *
 	 * @return the value
 	 */
 	public String getValue() {
diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java
index 2cea2ce31c3..20adc5c5727 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.profile/src/org/eclipse/papyrus/uml/profile/utils/ProfileConstraintUtils.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2008 CEA LIST.

  *

- *    

+ *

  * 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

@@ -53,7 +53,7 @@ public class ProfileConstraintUtils {
 			Type type = property.getType();

 

 			if((type instanceof PrimitiveType) || (type instanceof Enumeration)) {

-				if((property.getLower() != 0) && !(property.isSetDefault())) {

+				if((property.getLower() != 0) && !(property.getDefaultValue() != null)) {

 					hasDefaultValueRequired = false;

 				}

 			}

@@ -88,7 +88,7 @@ public class ProfileConstraintUtils {
 			Stereotype owner = (Stereotype)property.getOwner();

 			Iterator<Property> it = owner.getAllAttributes().iterator();

 			while(it.hasNext()) {

-				Property current = (Property)it.next();

+				Property current = it.next();

 				if(current.isSetName() && (current != property) && (current.getName().equals(property.getName()))) {

 					hasUniqueName = false;

 				}