[Uml-devel] KDE/kdesdk/umbrello
Oliver Kellogg
okellogg at users.sourceforge.net
Tue Apr 17 21:04:47 UTC 2007
SVN commit 655180 by okellogg:
merge r653888:655114 from branches/KDE/3.5/kdesdk
M +1 -1 ChangeLog
M +1 -1 VERSION
M +3 -8 make-umbrello-release.sh
M +1 -1 umbrello/associationwidget.cpp
M +1 -1 umbrello/associationwidget.h
M +3 -3 umbrello/cmds/cmd_set_stereotype.cpp
M +2 -1 umbrello/cmds/cmd_set_visibility.cpp
M +3 -2 umbrello/dialogs/activitydialog.h
M +26 -22 umbrello/messagewidget.cpp
M +4 -0 umbrello/uml.cpp
--- trunk/KDE/kdesdk/umbrello/ChangeLog #655179:655180
@@ -8,7 +8,6 @@
* %date% and %time% not being parsed (96612)
* Operations of the Interface are not implemented in the class automatically (111593)
* Relationships for entities do not live outside of the diagram (125146)
-* Crashes while loading file (Advanced Code Generators enabled) (126262)
* Multiplicity labels often are placed incorrectly (127628)
* Association role labels are duplicated (130172)
* Crash on adding operation to class with Advanced Code Generators enabled (131528)
@@ -30,6 +29,7 @@
* Support duplication of diagrams (139856, 143581)
* Crash on changing multiplicity in an association in ERD (143909)
* Class diagram in folder not loaded correctly from xmi (144119)
+* Sequence diagram crashes during message inserting (144293)
Version 1.5.61
--- trunk/KDE/kdesdk/umbrello/VERSION #655179:655180
@@ -1 +1 @@
-1.5.7
+1.5.7beta1
--- trunk/KDE/kdesdk/umbrello/make-umbrello-release.sh #655179:655180
@@ -3,8 +3,7 @@
# Make a release from the current branches/KDE/3.5/kdesdk/umbrello
#
# Run this script as follows:
-# . make-umbrello-release.sh VERSION [BRANCH_VERSION]
-# VERSION is the version to release.
+# . make-umbrello-release.sh [BRANCH_VERSION]
# BRANCH_VERSION defaults to 3.5.
# @todo Create release from trunk if BRANCH_VERSION not given.
# Note: trunk uses the cmake based build process.
@@ -12,18 +11,14 @@
# The script creates a directory, /tmp/kdesdk, which is used
# as the work area for building the release.
# The release tarfile will be placed in the current working dir.
+# The release version is taken from the VERSION file.
#
-if [ $# -lt 1 ]; then
- echo "usage:"
- echo " . make-umbrello-release.sh VERSION [BRANCH_VERSION]"
- exit 1
-fi
-version=$1
branchver=3.5
if [ $# -gt 1 ]; then
branchver=$2
fi
origdir=`pwd`
+version=`grep "^[1-9]" VERSION`
udir=umbrello-$version
svnroot=svn://anonsvn.kde.org:/home/kde/branches/KDE/$branchver
cd /tmp
--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #655179:655180
@@ -1225,7 +1225,7 @@
}
/** Read property of bool m_bActivated. */
-const bool AssociationWidget::isActivated() {
+bool AssociationWidget::isActivated() {
return m_bActivated;
}
--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.h #655179:655180
@@ -279,7 +279,7 @@
*
* @return True if this AssociationWidget has been activated.
*/
- const bool isActivated();
+ bool isActivated();
/**
* Set the m_bActivated flag of a widget but does not perform the
--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/cmd_set_stereotype.cpp #655179:655180
@@ -32,10 +32,10 @@
namespace Uml
{
- cmdSetStereotype::cmdSetStereotype(UMLObject * _UMLObj, QString stereo):UMLObj(_UMLObj), st (stereo)
+ cmdSetStereotype::cmdSetStereotype(UMLObject * _UMLObj, QString stereo)
+ : st(stereo), UMLObj(_UMLObj)
{
- //oldst = _UMLObj->getStereotype();
-
+ oldst = _UMLObj->getStereotype();
}
cmdSetStereotype::~cmdSetStereotype()
--- trunk/KDE/kdesdk/umbrello/umbrello/cmds/cmd_set_visibility.cpp #655179:655180
@@ -32,7 +32,8 @@
namespace Uml
{
- cmdSetVisibility::cmdSetVisibility(UMLObject * _UMLObj, Uml::Visibility _visib):UMLObj(_UMLObj), visib (_visib)
+ cmdSetVisibility::cmdSetVisibility(UMLObject * _UMLObj, Uml::Visibility _visib)
+ : visib(_visib), UMLObj(_UMLObj)
{
setText(i18n("Change visibility : ") + _UMLObj->getName());
oldvisibility = _UMLObj->getVisibility();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/activitydialog.h #655179:655180
@@ -55,7 +55,6 @@
protected slots:
-
/**
* Entered when OK button pressed.
*/
@@ -68,7 +67,9 @@
void slotShowActivityParameter();
void slotHideActivityParameter();
+
protected:
+
/**
* Sets up the pages of the dialog.
*/
@@ -80,7 +81,7 @@
void setupGeneralPage();
/**
- * Sets up the color page.
+ * Sets up the color page.
*/
void setupColorPage();
--- trunk/KDE/kdesdk/umbrello/umbrello/messagewidget.cpp #655179:655180
@@ -513,35 +513,39 @@
bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) {
m_pView->resetPastePoint();
// UMLWidget::activate(Log); CHECK: I don't think we need this ?
- UMLWidget *pWA = m_pView->findWidget(m_widgetAId);
- if (pWA == NULL) {
- kDebug() << "MessageWidget::activate: role A object "
- << ID2STR(m_widgetAId) << " not found" << endl;
- return false;
- }
- UMLWidget *pWB = m_pView->findWidget(m_widgetBId);
- if (pWB == NULL) {
- kDebug() << "MessageWidget::activate: role B object "
- << ID2STR(m_widgetBId) << " not found" << endl;
- return false;
- }
- m_pOw[Uml::A] = dynamic_cast<ObjectWidget*>(pWA);
if (m_pOw[Uml::A] == NULL) {
- kDebug() << "MessageWidget::activate: role A widget "
- << ID2STR(m_widgetAId) << " is not an ObjectWidget" << endl;
- return false;
+ UMLWidget *pWA = m_pView->findWidget(m_widgetAId);
+ if (pWA == NULL) {
+ kDebug() << "MessageWidget::activate: role A object "
+ << ID2STR(m_widgetAId) << " not found" << endl;
+ return false;
+ }
+ m_pOw[Uml::A] = dynamic_cast<ObjectWidget*>(pWA);
+ if (m_pOw[Uml::A] == NULL) {
+ kDebug() << "MessageWidget::activate: role A widget "
+ << ID2STR(m_widgetAId) << " is not an ObjectWidget" << endl;
+ return false;
+ }
}
- m_pOw[Uml::B] = dynamic_cast<ObjectWidget*>(pWB);
if (m_pOw[Uml::B] == NULL) {
- kDebug() << "MessageWidget::activate: role B widget "
- << ID2STR(m_widgetBId) << " is not an ObjectWidget" << endl;
- return false;
+ UMLWidget *pWB = m_pView->findWidget(m_widgetBId);
+ if (pWB == NULL) {
+ kDebug() << "MessageWidget::activate: role B object "
+ << ID2STR(m_widgetBId) << " not found" << endl;
+ return false;
+ }
+ m_pOw[Uml::B] = dynamic_cast<ObjectWidget*>(pWB);
+ if (m_pOw[Uml::B] == NULL) {
+ kDebug() << "MessageWidget::activate: role B widget "
+ << ID2STR(m_widgetBId) << " is not an ObjectWidget" << endl;
+ return false;
+ }
}
updateResizability();
- UMLClassifier *c = dynamic_cast<UMLClassifier*>(pWB->getUMLObject());
+ UMLClassifier *c = dynamic_cast<UMLClassifier*>(m_pOw[Uml::B]->getUMLObject());
UMLOperation *op = NULL;
- if (c) {
+ if (c && !m_CustomOp.isEmpty()) {
Uml::IDType opId = STR2ID(m_CustomOp);
op = dynamic_cast<UMLOperation*>( c->findChildObjectById(opId, true) );
if (op) {
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #655179:655180
@@ -1180,7 +1180,11 @@
Settings::OptionState& optionState = Settings::getOptionState();
optionState.generalState.undo = generalGroup.readEntry( "undo", true );
optionState.generalState.tabdiagrams = generalGroup.readEntry( "tabdiagrams", false );
+#if defined (WORK_ON_BUG_126262)
optionState.generalState.newcodegen = generalGroup.readEntry("newcodegen", false );
+#else
+ optionState.generalState.newcodegen = false;
+#endif
optionState.generalState.angularlines = generalGroup.readEntry("angularlines", false);
optionState.generalState.footerPrinting = generalGroup.readEntry("footerPrinting", true);
optionState.generalState.autosave = generalGroup.readEntry("autosave", true);
More information about the umbrello-devel
mailing list