*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/about.properties b/deprecated/plugins/org.eclipse.uml2/about.properties
index 331f6a3..fbdb7a7 100644
--- a/deprecated/plugins/org.eclipse.uml2/about.properties
+++ b/deprecated/plugins/org.eclipse.uml2/about.properties
@@ -1,5 +1,5 @@
#/*
-# * Copyright (c) 2003, 2004 IBM Corporation and others.
+# * Copyright (c) 2003, 2005 IBM Corporation and others.
# * All rights reserved. This program and the accompanying materials
# * are made available under the terms of the Common Public License v1.0
# * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
# * Contributors:
# * IBM - Initial API and implementation
# *
-# * $Id: about.properties,v 1.6 2004/11/02 15:00:29 khussey Exp $
+# * $Id: about.properties,v 1.7 2005/02/10 18:09:50 khussey Exp $
# */
# about.properties
@@ -29,7 +29,7 @@
Version: 1.1.0\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2003, 2004. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2005. All rights reserved.\n\
Visit http://www.eclipse.org/uml2
# ==============================================================================
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
index 0bc2de0..61b8be4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/NamespaceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: NamespaceImpl.java,v 1.13 2004/06/18 04:34:31 khussey Exp $
+ * $Id: NamespaceImpl.java,v 1.14 2005/02/10 18:09:50 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -690,7 +690,7 @@
* org.eclipse.uml2.PackageableElement)
*/
public void importElement(VisibilityKind visibility, PackageableElement element) {
- NamespaceOperations.importElement(this, this.visibility, element);
+ NamespaceOperations.importElement(this, visibility, element);
}
/* (non-Javadoc)
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
index f4139ac..5403068 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/OperationImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: OperationImpl.java,v 1.15 2004/10/01 19:36:27 khussey Exp $
+ * $Id: OperationImpl.java,v 1.16 2005/02/10 18:09:50 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -1725,6 +1725,12 @@
switch (eDerivedStructuralFeatureID(eFeature)) {
case UML2Package.OPERATION__FORMAL_PARAMETER:
return false;
+ case UML2Package.OPERATION__TYPE:
+ return null != returnResult
+ && 1 == returnResult.size()
+ && ((Parameter) returnResult.get(0))
+ .eIsSet(UML2Package.eINSTANCE
+ .getTypedElement_Type());
}
return eIsSetGen(eFeature);
}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
index ab6fe0e..895e4e3 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/impl/StructuredActivityNodeImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: StructuredActivityNodeImpl.java,v 1.16 2004/10/01 19:36:27 khussey Exp $
+ * $Id: StructuredActivityNodeImpl.java,v 1.17 2005/02/10 18:09:50 khussey Exp $
*/
package org.eclipse.uml2.impl;
@@ -1353,7 +1353,7 @@
* org.eclipse.uml2.PackageableElement)
*/
public void importElement(VisibilityKind visibility, PackageableElement element) {
- NamespaceOperations.importElement(this, this.visibility, element);
+ NamespaceOperations.importElement(this, visibility, element);
}
/* (non-Javadoc)
