[Uml-devel] branches/work/isi-umbrello/umbrello

[Thibault Normand]

SVN commit 652507 by tnormand:

SVN MERGE #652043

 M  +13 -10    ChangeLog  
 M  +1 -0      THANKS  
 M  +1 -2      umbrello/CMakeLists.txt  
 M  +2 -1      umbrello/aligntoolbar.cpp  
 M  +3 -1      umbrello/association.cpp  
 M  +45 -72    umbrello/associationwidget.cpp  
 M  +20 -7     umbrello/associationwidget.h  
 M  +15 -3     umbrello/assocrules.cpp  
 M  +3 -1      umbrello/attribute.cpp  
 M  +46 -17    umbrello/classifier.cpp  
 M  +13 -8     umbrello/classifiercodedocument.cpp  
 M  +6 -2      umbrello/classifierlistitem.cpp  
 M  +0 -3      umbrello/codeaccessormethod.h  
 M  +16 -10    umbrello/codeclassfield.cpp  
 M  +12 -2     umbrello/codeclassfield.h  
 M  +2 -1      umbrello/codecomment.cpp  
 M  +16 -12    umbrello/codegenerator.cpp  
 M  +8 -1      umbrello/codegenerator.h  
 M  +11 -3     umbrello/codegenerators/codegenfactory.cpp  
 M  +6 -6      umbrello/codegenerators/cppcodegenerationformbase.ui  
 M  +3 -1      umbrello/codegenerators/cppcodegenerator.cpp  
 M  +4 -3      umbrello/codegenerators/cppheaderclassdeclarationblock.cpp  
 M  +2 -2      umbrello/codegenerators/cppheadercodeaccessormethod.cpp  
 M  +1 -1      umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp  
 M  +6 -5      umbrello/codegenerators/cppheadercodeoperation.cpp  
 M  +2 -2      umbrello/codegenerators/cppsourcecodeaccessormethod.cpp  
 M  +2 -2      umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp  
 M  +1 -1      umbrello/codegenerators/cppsourcecodedocument.cpp  
 M  +2 -2      umbrello/codegenerators/cppsourcecodeoperation.cpp  
 M  +4 -3      umbrello/codegenerators/javaclassdeclarationblock.cpp  
 M  +5 -5      umbrello/codegenerators/javacodeaccessormethod.cpp  
 M  +2 -2      umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp  
 M  +1 -1      umbrello/codegenerators/javacodedocumentation.cpp  
 M  +4 -8      umbrello/codegenerators/javacodegenerator.cpp  
 M  +1 -1      umbrello/codegenerators/javacodegenerator.h  
 M  +4 -3      umbrello/codegenerators/javacodeoperation.cpp  
 M  +4 -3      umbrello/codegenerators/rubyclassdeclarationblock.cpp  
 M  +6 -7      umbrello/codegenerators/rubycodeaccessormethod.cpp  
 M  +2 -2      umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp  
 M  +4 -6      umbrello/codegenerators/rubycodegenerator.cpp  
 M  +0 -3      umbrello/codegenerators/rubycodegenerator.h  
 M  +2 -2      umbrello/codegenerators/rubycodeoperation.cpp  
 M  +4 -3      umbrello/codegenobjectwithtextblocks.cpp  
 M  +1 -1      umbrello/codeimport/javaimport.cpp  
 M  +1 -1      umbrello/codeimport/nativeimportbase.cpp  
 M  +2 -1      umbrello/codeoperation.cpp  
 M  +1 -1      umbrello/configurable.cpp  
 M  +4 -0      umbrello/dialogs/umloperationdialog.cpp  
 M  +19 -7     umbrello/entity.cpp  
 M  +19 -7     umbrello/enum.cpp  
 M  +2 -1      umbrello/floatingtextwidget.cpp  
 M  +5 -3      umbrello/hierarchicalcodeblock.cpp  
 M  +1 -1      umbrello/import_rose.cpp  
 M  +1 -0      umbrello/linepath.cpp  
 M  +3 -3      umbrello/main.cpp  
 M  +1 -1      umbrello/messagewidgetcontroller.cpp  
 M  +1 -1      umbrello/model_utils.cpp  
 M  +7 -6      umbrello/notewidget.cpp  
 M  +1 -1      umbrello/objectwidgetcontroller.cpp  
 M  +3 -1      umbrello/operation.cpp  
 M  +1 -1      umbrello/petalnode.cpp  
 M  +2 -2      umbrello/toolbarstate.cpp  
 M  +6 -1      umbrello/toolbarstatearrow.cpp  
 M  +1 -1      umbrello/toolbarstatemessages.cpp  
 M  +1 -1      umbrello/toolbarstateonewidget.cpp  
 M  +10 -38    umbrello/uml.cpp  
 M  +0 -14     umbrello/uml.h  
 M  +1 -1      umbrello/umlcanvasobject.cpp  
 M  +4 -1      umbrello/umldoc.cpp  
 M  +24 -8     umbrello/umlobject.cpp  
 M  +9 -3      umbrello/umlrole.cpp  
 M  +4 -3      umbrello/umlview.cpp  
 M  +1 -1      umbrello/umlview.h  
 M  +0 -8      umbrello/umlviewimageexporterall.cpp  
 M  +3 -1      umbrello/umlwidget.cpp  
 M  +4 -4      umbrello/umlwidgetcontroller.cpp  
 D             umbrello/x-umbrello.desktop