[Uml-devel] KDE/kdesdk/umbrello/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Fri Aug 31 15:03:12 UTC 2007
SVN commit 706922 by okellogg:
CodeGenerationPolicy::ScopePolicy: Use natural enum representation.
M +2 -2 codegenerationpolicy.h
M +1 -1 codegenerators/dcodeaccessormethod.cpp
M +1 -1 codegenerators/dcodeclassfielddeclarationblock.cpp
M +4 -4 codegenerators/dcodegenerationpolicypage.cpp
M +1 -1 codegenerators/javacodeaccessormethod.cpp
M +2 -2 codegenerators/javacodeclassfielddeclarationblock.cpp
M +5 -5 codegenerators/javacodegenerationpolicypage.cpp
M +1 -1 codegenerators/rubycodeaccessormethod.cpp
M +2 -2 codegenerators/rubycodeclassfielddeclarationblock.cpp
M +4 -4 codegenerators/rubycodegenerationpolicypage.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerationpolicy.h #706921:706922
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2004-2006 *
+ * copyright (C) 2004-2007 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -53,7 +53,7 @@
enum NewLineType {UNIX=0, DOS, MAC};
enum IndentationType {NONE=0, TAB, SPACE};
enum CommentStyle { SingleLine=0, MultiLine };
- enum ScopePolicy { Public=200, Private, Protected, FromParent };
+ enum ScopePolicy { Public=0, Private, Protected, FromParent };
// Constructors/Destructors
//
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodeaccessormethod.cpp #706921:706922
@@ -150,7 +150,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- strVis = ddoc->scopeToDDecl((Uml::Visibility::Value) scopePolicy);
+ strVis = ddoc->scopeToDDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodeclassfielddeclarationblock.cpp #706921:706922
@@ -69,7 +69,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- scopeStr = jdoc->scopeToDDecl((Uml::Visibility::Value) scopePolicy);
+ scopeStr = jdoc->scopeToDDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/dcodegenerationpolicypage.cpp #706921:706922
@@ -30,8 +30,8 @@
form->m_generateConstructors->setChecked(commonPolicy->getAutoGenerateConstructors());
form->m_generateAttribAccessors->setChecked(policy->getAutoGenerateAttribAccessors());
form->m_generateAssocAccessors->setChecked(policy->getAutoGenerateAssocAccessors());
- form->m_accessorScopeCB->setCurrentItem(commonPolicy->getAttributeAccessorScope() - 200);
- form->m_assocFieldScopeCB->setCurrentItem(commonPolicy->getAssociationFieldScope() - 200);
+ form->m_accessorScopeCB->setCurrentItem(commonPolicy->getAttributeAccessorScope());
+ form->m_assocFieldScopeCB->setCurrentItem(commonPolicy->getAssociationFieldScope());
/**
* @todo unclean - CreateANTBuildFile attribute should be in d policy
@@ -55,8 +55,8 @@
commonPolicy->blockSignals(true);
commonPolicy->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
- commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
- commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
+ commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()));
+ commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()));
commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp #706921:706922
@@ -155,7 +155,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- strVis = javadoc->scopeToJavaDecl((Uml::Visibility::Value) scopePolicy);
+ strVis = javadoc->scopeToJavaDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp #706921:706922
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2004-2006 *
+ * copyright (C) 2004-2007 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -73,7 +73,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- scopeStr = jdoc->scopeToJavaDecl((Uml::Visibility::Value) scopePolicy);
+ scopeStr = jdoc->scopeToJavaDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp #706921:706922
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2004-2006 *
+ * copyright (C) 2004-2007 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -34,8 +34,8 @@
form->m_generateConstructors->setChecked(commonPolicy->getAutoGenerateConstructors());
form->m_generateAttribAccessors->setChecked(policy->getAutoGenerateAttribAccessors());
form->m_generateAssocAccessors->setChecked(policy->getAutoGenerateAssocAccessors());
- form->m_accessorScopeCB->setCurrentItem(commonPolicy->getAttributeAccessorScope() - 200);
- form->m_assocFieldScopeCB->setCurrentItem(commonPolicy->getAssociationFieldScope() - 200);
+ form->m_accessorScopeCB->setCurrentItem(commonPolicy->getAttributeAccessorScope());
+ form->m_assocFieldScopeCB->setCurrentItem(commonPolicy->getAssociationFieldScope());
/**
* @todo unclean - CreateANTBuildFile attribute should be in java policy
@@ -59,8 +59,8 @@
commonPolicy->blockSignals(true);
commonPolicy->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem());
- commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200));
- commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200));
+ commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()));
+ commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()));
commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked());
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp #706921:706922
@@ -163,7 +163,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- strVis = rubydoc->scopeToRubyDecl((Uml::Visibility::Value) scopePolicy);
+ strVis = rubydoc->scopeToRubyDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp #706921:706922
@@ -5,7 +5,7 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
- * copyright (C) 2006 *
+ * copyright (C) 2006-2007 *
* Umbrello UML Modeller Authors <uml-devel at uml.sf.net> *
***************************************************************************/
@@ -67,7 +67,7 @@
case CodeGenerationPolicy::Public:
case CodeGenerationPolicy::Private:
case CodeGenerationPolicy::Protected:
- scopeStr = rdoc->scopeToRubyDecl((Uml::Visibility::Value) scopePolicy);
+ scopeStr = rdoc->scopeToRubyDecl((Uml::Visibility::Value) (scopePolicy + 200));
break;
default:
case CodeGenerationPolicy::FromParent:
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp #706921:706922
@@ -38,8 +38,8 @@
form.m_generateConstructors->setChecked(common->getAutoGenerateConstructors());
form.m_generateAttribAccessors->setChecked(policy->getAutoGenerateAttribAccessors());
form.m_generateAssocAccessors->setChecked(policy->getAutoGenerateAssocAccessors());
- form.m_accessorScopeCB->setCurrentItem((common->getAttributeAccessorScope() - 200));
- form.m_assocFieldScopeCB->setCurrentItem((common->getAssociationFieldScope() - 200));
+ form.m_accessorScopeCB->setCurrentItem(common->getAttributeAccessorScope());
+ form.m_assocFieldScopeCB->setCurrentItem(common->getAssociationFieldScope());
}
RubyCodeGenerationPolicyPage::~RubyCodeGenerationPolicyPage()
@@ -57,8 +57,8 @@
parent->blockSignals(true);
common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form.m_SelectCommentStyle->currentItem());
- common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form.m_accessorScopeCB->currentItem()+200));
- common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form.m_assocFieldScopeCB->currentItem()+200));
+ common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) form.m_accessorScopeCB->currentItem());
+ common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) form.m_assocFieldScopeCB->currentItem());
common->setAutoGenerateConstructors(form.m_generateConstructors->isChecked());
parent->setAutoGenerateAttribAccessors(form.m_generateAttribAccessors->isChecked());
parent->setAutoGenerateAssocAccessors(form.m_generateAssocAccessors->isChecked());
More information about the umbrello-devel
mailing list