Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java6
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java10
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
index 29277827..c00bf3ad 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/OperationOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: OperationOperations.java,v 1.10 2006/03/13 20:50:41 khussey Exp $
+ * $Id: OperationOperations.java,v 1.11 2006/06/05 20:32:55 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.operations;
@@ -372,8 +372,8 @@ public class OperationOperations
public static boolean isConsistentWith(Operation operation,
RedefinableElement redefinee) {
- if (redefinee.isRedefinitionContextValid(operation)
- && redefinee instanceof Operation) {
+ if (redefinee instanceof Operation
+ && redefinee.isRedefinitionContextValid(operation)) {
Operation op = (Operation) redefinee;
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
index 0086281e..f2fea6cf 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PropertyOperations.java,v 1.29 2006/05/12 20:17:54 khussey Exp $
+ * $Id: PropertyOperations.java,v 1.30 2006/06/05 20:32:55 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.operations;
@@ -857,8 +857,8 @@ public class PropertyOperations
public static boolean isConsistentWith(Property property,
RedefinableElement redefinee) {
- if (redefinee.isRedefinitionContextValid(property)
- && redefinee instanceof Property) {
+ if (redefinee instanceof Property
+ && redefinee.isRedefinitionContextValid(property)) {
Property prop = (Property) redefinee;
@@ -868,8 +868,8 @@ public class PropertyOperations
Type propType = prop.getType();
int propUpperBound = prop.upperBound();
- return (type == null
- ? propType == null
+ return (propType == null
+ ? type == null
: propType.conformsTo(type))
&& prop.lowerBound() >= property.lowerBound()
&& (upperBound == LiteralUnlimitedNatural.UNLIMITED || (propUpperBound != LiteralUnlimitedNatural.UNLIMITED && propUpperBound <= upperBound))

Back to the top