Author: b00__1
Date: 2007-09-26 23:17:41-0700
New Revision: 13613
Modified:
branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs
branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs
branches/gsoc2007/b00__1/model-euml/build.bat
branches/gsoc2007/b00__1/model-euml/build.sh
branches/gsoc2007/b00__1/model-euml/build.xml
branches/gsoc2007/b00__1/model-euml/build2.bat
branches/gsoc2007/b00__1/model-euml/build2.sh
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
Log:
Minor changes and overall synchronization with /trunk/src/model-euml
Modified: branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs&p2=branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs (original)
+++ branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.core.prefs 2007-09-26 23:17:41-0700
@@ -1,5 +1,14 @@
-#Tue Jul 24 15:27:52 EDT 2007
+#Wed Aug 29 16:56:59 EDT 2007
eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
@@ -68,21 +77,21 @@
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=32
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=32
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=32
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
Modified: branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs&p2=branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs (original)
+++ branches/gsoc2007/b00__1/model-euml/.settings/org.eclipse.jdt.ui.prefs 2007-09-26 23:17:41-0700
@@ -1,5 +1,10 @@
-#Thu Jul 19 11:03:47 EDT 2007
+#Wed Aug 29 16:56:59 EDT 2007
eclipse.preferences.version=1
-formatter_profile=_My ArgoUML
+formatter_profile=_ArgoUML
formatter_settings_version=11
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructor
s" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n *\r\n * ${tags}\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.
eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.t
ext.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">// $$Id\: eclipse-argo-codetemplates.xml,v 1.2 2006/05/25 12\:58\:04 linus Exp $$\r\n// Copyright (c) ${year} The Regents of the University of California. All\r\n// Rights Reserved. Permission to use, copy, modify, and distribute this\r\n// software and its documentation without fee, and without a written\r\n// agreement is hereby granted, provided that the above copyright notice\r\n// and this paragraph appear in all copies. This software program and\r\n// documentation are copyrigh
ted by The Regents of the University of\r\n// California. The software program and documentation are supplied "AS\r\n// IS", without any accompanying services from The Regents. The Regents\r\n// does not warrant that the operation of the program will be\r\n// uninterrupted or error-free. The end-user understands that the program\r\n// was developed for research purposes and is advised not to rely\r\n// exclusively on the program for any reason. IN NO EVENT SHALL THE\r\n// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,\r\n// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,\r\n// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF\r\n// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF\r\n// SUCH DAMAGE. THE
UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY\r\n// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r\n// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE\r\n// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF\r\n// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,\r\n// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in ne
w interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catch
block">// ${todo} Auto-generated catch block\r\nLOG.error("Exception", ${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo}\: Auto-generated method stub\r\nthrow new NotYetImplementedException();\r\n</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" descriptio
n\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return Returns the ${bare_field_name}.\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} The ${bare_field_name} to set.\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for cr
eated constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\r\n * \r\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n *\r\n * ${tags}\r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\
="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/*\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org
.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">// $$Id\: eclipse-argo-codetemplates.xml,v 1.2 2006/05/25 12\:58\:04 linus Exp $$\r\n// Copyright (c) ${year} The Regents of the University of California. All\r\n// Rights Reserved. Permission to use, copy, modify, and distribute this\r\n// software and its documentation without fee, and without a written\r\n// agreement is hereby granted, provided that the above copyright notice\r\n// and this paragraph appear in all copies. This software program and\r\n// documenta
tion are copyrighted by The Regents of the University of\r\n// California. The software program and documentation are supplied "AS\r\n// IS", without any accompanying services from The Regents. The Regents\r\n// does not warrant that the operation of the program will be\r\n// uninterrupted or error-free. The end-user understands that the program\r\n// was developed for research purposes and is advised not to rely\r\n// exclusively on the program for any reason. IN NO EVENT SHALL THE\r\n// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,\r\n// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,\r\n// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF\r\n// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF\r\n//
SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY\r\n// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r\n// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE\r\n// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF\r\n// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,\r\n// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\r\n\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" descrip
tion\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchbl
ock" name\="catchblock">// ${todo} Auto-generated catch block\r\nLOG.error("Exception", ${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo}\: Auto-generated method stub\r\nthrow new NotYetImplementedException();\r\n</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="
false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
Modified: branches/gsoc2007/b00__1/model-euml/build.bat
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/build.bat?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/build.bat&p2=branches/gsoc2007/b00__1/model-euml/build.bat&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/build.bat (original)
+++ branches/gsoc2007/b00__1/model-euml/build.bat 2007-09-26 23:17:41-0700
@@ -5,7 +5,7 @@
rem
set SAVE_ANT_HOME=%ANT_HOME%
-set ANT_HOME=..\..\tools\ant-1.6.2
+set ANT_HOME=..\..\tools\ant-1.7.0
call %ANT_HOME%\bin\ant %1 %2 %3 %4 %5 %6 %7 %8 %9
set ANT_HOME=%SAVE_ANT_HOME%
set SAVE_ANT_HOME=
Modified: branches/gsoc2007/b00__1/model-euml/build.sh
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/build.sh?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/build.sh&p2=branches/gsoc2007/b00__1/model-euml/build.sh&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/build.sh (original)
+++ branches/gsoc2007/b00__1/model-euml/build.sh 2007-09-26 23:17:41-0700
@@ -30,7 +30,7 @@
#
# build.sh always calls the version of ant distributed with ArgoUML
#
-ANT_HOME=../../tools/ant-1.6.2
+ANT_HOME=../../tools/ant-1.7.0
echo ANT_HOME is: $ANT_HOME
echo
Modified: branches/gsoc2007/b00__1/model-euml/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/build.xml?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/build.xml&p2=branches/gsoc2007/b00__1/model-euml/build.xml&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/build.xml (original)
+++ branches/gsoc2007/b00__1/model-euml/build.xml 2007-09-26 23:17:41-0700
@@ -261,6 +261,7 @@
<!-- =================================================================== -->
<target name="clean" depends="init"
description="Clean out all built files.">
+ <mkdir dir="${build.dir}"/>
<delete includeemptydirs="true">
<fileset dir="${build.dir}">
<exclude name="**/.cvsignore"/>
Modified: branches/gsoc2007/b00__1/model-euml/build2.bat
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/build2.bat?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/build2.bat&p2=branches/gsoc2007/b00__1/model-euml/build2.bat&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/build2.bat (original)
+++ branches/gsoc2007/b00__1/model-euml/build2.bat 2007-09-26 23:17:41-0700
@@ -5,7 +5,7 @@
rem
set SAVE_ANT_HOME=%ANT_HOME%
-set ANT_HOME=..\argouml-core-tools\ant-1.6.2
+set ANT_HOME=..\argouml-core-tools\ant-1.7.0
call %ANT_HOME%\bin\ant -Doverride.build.properties=..\argouml\eclipse-ant-build.properties -Dargo.root.dir=%CD%\.. %1 %2 %3 %4 %5 %6 %7 %8 %9
set ANT_HOME=%SAVE_ANT_HOME%
set SAVE_ANT_HOME=
Modified: branches/gsoc2007/b00__1/model-euml/build2.sh
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/build2.sh?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/build2.sh&p2=branches/gsoc2007/b00__1/model-euml/build2.sh&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/build2.sh (original)
+++ branches/gsoc2007/b00__1/model-euml/build2.sh 2007-09-26 23:17:41-0700
@@ -17,7 +17,7 @@
#
# build.sh always calls the version of ant distributed with ArgoUML
#
-ANT_HOME=../argouml-core-tools/ant-1.6.2
+ANT_HOME=../argouml-core-tools/ant-1.7.0
echo ANT_HOME is: $ANT_HOME
echo
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ChangeableKindEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -39,6 +39,8 @@
class ChangeableKindEUMLImpl implements ChangeableKind {
public Object getAddOnly() {
+ // TODO: Change to throw exception when uses are fixed
+// throw new NotImplementedException();
return "";
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -479,11 +479,11 @@
}
public org.eclipse.uml2.uml.Class buildClass(String name) {
- org.eclipse.uml2.uml.Class class_ = createClass();
+ org.eclipse.uml2.uml.Class clazz = createClass();
if (name != null) {
- class_.setName(name);
+ clazz.setName(name);
}
- return class_;
+ return clazz;
}
public org.eclipse.uml2.uml.Class buildClass(final String name,
@@ -496,19 +496,19 @@
}
RunnableClass run = new RunnableClass() {
public void run() {
- org.eclipse.uml2.uml.Class class_ = createClass();
+ org.eclipse.uml2.uml.Class clazz = createClass();
if (name != null) {
- class_.setName(name);
+ clazz.setName(name);
}
if (owner instanceof org.eclipse.uml2.uml.Package) {
- class_.setPackage((org.eclipse.uml2.uml.Package) owner);
+ clazz.setPackage((org.eclipse.uml2.uml.Package) owner);
} else if (owner instanceof org.eclipse.uml2.uml.Class) {
- ((org.eclipse.uml2.uml.Class) owner).getNestedClassifiers().add(
- class_);
+ ((org.eclipse.uml2.uml.Class) owner).getNestedClassifiers()
+ .add(clazz);
} else if (owner instanceof Interface) {
- ((Interface) owner).getNestedClassifiers().add(class_);
+ ((Interface) owner).getNestedClassifiers().add(clazz);
}
- getParams().add(class_);
+ getParams().add(clazz);
}
};
ChangeCommand cmd = new ChangeCommand(
@@ -658,7 +658,7 @@
}
public Object buildElementResidence(Object me, Object component) {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -797,7 +797,7 @@
}
public Object buildMethod(String name) {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -959,7 +959,7 @@
}
public Object buildTemplateArgument(Object element) {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -1069,7 +1069,7 @@
}
public Object createElementResidence() {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -1082,7 +1082,7 @@
}
public Object createFlow() {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -1095,7 +1095,7 @@
}
public Object createMethod() {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
@@ -1139,7 +1139,7 @@
}
public Object createTemplateArgument() {
- // TODO Is it removed from UML2 ?
+ // TODO: Is this removed from UML2 ?
throw new NotImplementedException();
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -753,7 +753,7 @@
return ((Classifier) element).getGenerals();
}
- public Collection getExtendingClassifiers(Object classifier) {
+ public Collection<Element> getExtendingClassifiers(Object classifier) {
// TODO: Does CoreHelper#getExtendingClassifiers(Object element) means
// all direct and indirect extending classifiers or only the direct
// extending classifiers?
@@ -761,7 +761,7 @@
throw new IllegalArgumentException(
"'classifier' must be instance of Classifier"); //$NON-NLS-1$
}
- Collection result = new HashSet();
+ Collection<Element> result = new HashSet<Element>();
for (Element e : getExtendingElements(classifier)) {
if (e instanceof Classifier) {
result.add(e);
@@ -775,8 +775,9 @@
throw new IllegalArgumentException(
"'element' must be instance of Classifier"); //$NON-NLS-1$
}
- Collection result = new HashSet();
- for (DirectedRelationship d : ((Classifier) element).getTargetDirectedRelationships(UMLPackage.Literals.GENERALIZATION)) {
+ Collection<Element> result = new HashSet<Element>();
+ for (DirectedRelationship d : ((Classifier) element)
+ .getTargetDirectedRelationships(UMLPackage.Literals.GENERALIZATION)) {
for (Element e : d.getSources()) {
result.add(e);
}
@@ -839,18 +840,20 @@
return ((org.eclipse.uml2.uml.Class) cls).getImplementedInterfaces();
}
- public Collection getRelationships(Object source, Object dest) {
+ public Collection<DirectedRelationship> getRelationships(Object source, Object dest) {
if (!(source instanceof Element) || !(dest instanceof Element)) {
throw new IllegalArgumentException(
"'source' and 'dest' must be instances of Element"); //$NON-NLS-1$
}
- Collection result = new ArrayList();
- for (DirectedRelationship d : ((Element) source).getSourceDirectedRelationships()) {
+ Collection<DirectedRelationship> result = new ArrayList<DirectedRelationship>();
+ for (DirectedRelationship d : ((Element) source)
+ .getSourceDirectedRelationships()) {
if (d.getTargets().contains(dest)) {
result.add(d);
}
}
- for (DirectedRelationship d : ((Element) source).getTargetDirectedRelationships()) {
+ for (DirectedRelationship d : ((Element) source)
+ .getTargetDirectedRelationships()) {
if (d.getSources().contains(dest)) {
result.add(d);
}
@@ -858,12 +861,12 @@
return result;
}
- public List getReturnParameters(Object operation) {
+ public List<Parameter> getReturnParameters(Object operation) {
if (!(operation instanceof Operation)) {
throw new IllegalArgumentException(
"'operation' must be instance of Operation"); //$NON-NLS-1$
}
- List result = new ArrayList();
+ List<Parameter> result = new ArrayList<Parameter>();
for (Parameter p : ((Operation) operation).getOwnedParameters()) {
if (p.getDirection() == ParameterDirectionKind.RETURN_LITERAL) {
result.add(p);
@@ -963,13 +966,14 @@
return getRealizedInterfaces(classifier);
}
- public Collection getSubtypes(Object cls) {
+ public Collection<Element> getSubtypes(Object cls) {
if (!(cls instanceof Classifier)) {
throw new IllegalArgumentException(
"'cls' must be instance of Classifier"); //$NON-NLS-1$
}
- Collection results = new HashSet();
- for (DirectedRelationship d : ((Classifier) cls).getTargetDirectedRelationships(UMLPackage.Literals.GENERALIZATION)) {
+ Collection<Element> results = new HashSet<Element>();
+ for (DirectedRelationship d : ((Classifier) cls)
+ .getTargetDirectedRelationships(UMLPackage.Literals.GENERALIZATION)) {
results.addAll(d.getSources());
}
return results;
@@ -1241,7 +1245,7 @@
throw new IllegalArgumentException(
"handle must be instance of Comment"); //$NON-NLS-1$
}
- if (!(elems == null)) {
+ if (elems == null) {
throw new NullPointerException("elems must be non-null"); //$NON-NLS-1$
}
for (Object o : elems) {
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -99,7 +99,7 @@
}
public Object createMultiplicity(String str) {
- // This does not exist as a specific element in UML2
+ // TODO: This does not exist as a specific element in UML2
// As a workaround we return the string as the multiplicity
return str;
}
@@ -156,7 +156,8 @@
return Integer.parseInt(b);
}
} catch (Exception ex) {
- throw new IllegalArgumentException("illegal range bound : " + b);
+ throw new IllegalArgumentException(
+ "illegal range bound : " + b); //$NON-NLS-1$
}
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsFactoryEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -75,6 +75,12 @@
// TODO Auto-generated method stub
return null;
}
+
+ public Object buildTagDefinition(String name, Object stereotype,
+ Object namespace, String tagType) {
+ // TODO Auto-generated method stub
+ return null;
+ }
public Object buildTaggedValue(String tag, String value) {
// TODO Auto-generated method stub
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -80,8 +80,7 @@
if (m instanceof Element) {
return getMetaModelName(m.getClass());
}
- throw new IllegalArgumentException("Not an Element");
-
+ throw new IllegalArgumentException("Not an Element"); //$NON-NLS-1$
}
/**
@@ -139,7 +138,9 @@
/**
* @deprecated Use {@link #isValidStereotype(Object,Object)} instead
*/
- public boolean isValidStereoType(Object theModelElement, Object theStereotype) {
+ @Deprecated
+ public boolean isValidStereoType(Object theModelElement,
+ Object theStereotype) {
return isValidStereotype(theModelElement, theStereotype);
}
@@ -163,6 +164,7 @@
}
+ @Deprecated
public void setTag(Object handle, Object tag) {
// TODO Auto-generated method stub
@@ -173,6 +175,10 @@
}
+ public void setTagType(Object handle, String tagType) {
+ // TODO Auto-generated method stub
+ }
+
public void setType(Object handle, Object type) {
// TODO Auto-generated method stub
@@ -180,7 +186,6 @@
public void setValueOfTag(Object handle, String value) {
// TODO Auto-generated method stub
-
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -142,7 +142,7 @@
public String getUmlVersion() {
// TODO: Can we get this from the metamodel?
- return "2.1.1";
+ return "2.1.1"; //$NON-NLS-1$
}
public boolean equalsPseudostateKind(Object ps1, Object ps2) {
@@ -236,7 +236,7 @@
}
if (!(association instanceof Association)) {
throw new IllegalArgumentException(
- "association must be instance of Association"); //$NON-NLS-1$
+ "association must be Association"); //$NON-NLS-1$
}
for (Property p : UMLUtil.getOwnedAttributes((Classifier) classifier)) {
if (p.getAssociation() == association) {
@@ -334,10 +334,11 @@
public Object getChangeability(Object handle) {
if (!(handle instanceof StructuralFeature)) {
throw new IllegalArgumentException(
- "handle must be instance of StructuralFeature"); //$NON-NLS-1$
+ "handle must be StructuralFeature"); //$NON-NLS-1$
}
- return ((StructuralFeature) handle).isReadOnly() ? modelImpl.getChangeableKind().getFrozen()
- : modelImpl.getChangeableKind().getChangeable();
+ return ((StructuralFeature) handle).isReadOnly() ? modelImpl
+ .getChangeableKind().getFrozen() : modelImpl
+ .getChangeableKind().getChangeable();
}
@SuppressWarnings("deprecation")
@@ -410,10 +411,11 @@
throw new IllegalArgumentException(
"handle must be instance of Element"); //$NON-NLS-1$
}
- Collection result = new HashSet();
- for (EStructuralFeature.Setting reference : UMLUtil.getInverseReferences((Element) handle)) {
+ Collection<Comment> result = new HashSet<Comment>();
+ for (EStructuralFeature.Setting reference : UMLUtil
+ .getInverseReferences((Element) handle)) {
if (reference.getEObject() instanceof Comment) {
- result.add(reference.getEObject());
+ result.add((Comment) reference.getEObject());
}
}
return result;
@@ -740,7 +742,7 @@
}
public String getLocation(Object handle) {
- // Removed from UML2
+ // TODO: Removed from UML2
return "";
}
@@ -1982,7 +1984,8 @@
} else if (handle instanceof BehavioralFeature) {
return ((BehavioralFeature) handle).isAbstract();
} else {
- throw new IllegalArgumentException();
+ return false;
+// throw new IllegalArgumentException();
}
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java?view=diff&rev=13613&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java&r1=13612&r2=13613
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java 2007-09-26 23:17:41-0700
@@ -33,6 +33,7 @@
import org.eclipse.uml2.uml.ActivityPartition;
import org.eclipse.uml2.uml.Actor;
import org.eclipse.uml2.uml.AggregationKind;
+import org.eclipse.uml2.uml.Artifact;
import org.eclipse.uml2.uml.Association;
import org.eclipse.uml2.uml.AssociationClass;
import org.eclipse.uml2.uml.BehavioralFeature;
@@ -42,12 +43,15 @@
import org.eclipse.uml2.uml.Collaboration;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Constraint;
import org.eclipse.uml2.uml.DataType;
import org.eclipse.uml2.uml.Dependency;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.ElementImport;
import org.eclipse.uml2.uml.Enumeration;
import org.eclipse.uml2.uml.EnumerationLiteral;
import org.eclipse.uml2.uml.Extend;
+import org.eclipse.uml2.uml.ExtensionPoint;
import org.eclipse.uml2.uml.FinalState;
import org.eclipse.uml2.uml.Generalization;
import org.eclipse.uml2.uml.Include;
@@ -115,6 +119,10 @@
// replaced in UML 2.0 by explicitly modeled Actions
return State.class;
}
+
+// public Object getActivityGraph() {
+// return ActivityGraph.class;
+// }
public Object getActor() {
return Actor.class;
@@ -123,6 +131,10 @@
public Object getAggregationKind() {
return AggregationKind.class;
}
+
+ public Object getArtifact() {
+ return Artifact.class;
+ }
public Object getAssociation() {
return Association.class;
@@ -211,6 +223,10 @@
// TODO: no separate CompositeState in UML 2.1 - tfm
return State.class;
}
+
+ public Object getConstraint() {
+ return Constraint.class;
+ }
public Object getCreateAction() {
// TODO Auto-generated method stub
@@ -229,6 +245,10 @@
// TODO Auto-generated method stub
throw new NotYetImplementedException();
}
+
+ public Object getElementImport() {
+ return ElementImport.class;
+ }
public Object getEnumeration() {
return Enumeration.class;
@@ -253,6 +273,10 @@
return Extend.class;
}
+ public Object getExtensionPoint() {
+ return ExtensionPoint.class;
+ }
+
public Object getFinalState() {
return FinalState.class;
}
@@ -477,10 +501,14 @@
public Object getTagDefinition() {
// TODO: In UML 2.x a TagDefinition has become a Property on a Stereotype
// Anything that uses this will probably need to be reviewed/changed.
- // Just return Propety for now.
+ // Just return Property for now.
return Property.class;
}
+ public Object getTaggedValue() {
+ throw new NotYetImplementedException();
+ }
+
public Object getTerminateAction() {
// TODO Auto-generated method stub
throw new NotYetImplementedException();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.