Menu
▾
▴
kuml-cvs — This list receives CVS logging messages for kuml.
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(8) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(12) |
Jun
(14) |
Jul
(56) |
Aug
(6) |
Sep
(24) |
Oct
(1) |
Nov
(3) |
Dec
(5) |
| 2002 |
Jan
(2) |
Feb
(6) |
Mar
(22) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:32
|
Update of /cvsroot/kuml/kuml_old/kuml/overview
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/overview
Modified Files:
winoverview.cpp
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: winoverview.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/overview/winoverview.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** winoverview.cpp 8 Oct 2000 04:23:23 -0000 1.1.1.1
--- winoverview.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 219,223 ****
// setColumnWidthMode(0, Maximum);
// setColumnWidth(0, width());
! setColumnWidth(0, 150);
setSorting(true);
setRootIsDecorated(true);
--- 219,224 ----
// setColumnWidthMode(0, Maximum);
// setColumnWidth(0, width());
! setColumnWidth(0, 150);
!
setSorting(true);
setRootIsDecorated(true);
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:32
|
Update of /cvsroot/kuml/kuml_old/kuml/diagrams
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/diagrams
Modified Files:
diagram.cpp diagramloader.cpp
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: diagram.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagram.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** diagram.cpp 3 Mar 2002 22:03:41 -0000 1.2
--- diagram.cpp 17 Mar 2002 22:56:28 -0000 1.3
***************
*** 20,23 ****
--- 20,24 ----
//#include<typeinfo>
#include "../drawobj/drawingconnection.h"
+ #include "../drawobj/drawinggeneralization.h"
#include "../drawobj/drawingrectangle.h"
#include "../drawobj/drawingtext.h"
***************
*** 143,149 ****
continue;
}
debug("Diagram::readAsKuml(): Unrecognized group found !");
! // stream.skipGroup(); // Skip the unrecognized group
break;
--- 144,171 ----
continue;
}
+ //*********************************************************
+ // Added 2002-03-10 by Gerard Flynn.
+ if( stream.getGroupType() == "drawingclass" ) {
+ debug( "Diagram::readAsKuml handling drawingclass" );
+ item = new DrawingClass( NULL, NULL, getPtrDrawingArea() );
+ item->setLabel( stream.getGroupName() );
+ // item->setAutoRepaint( true );
+ item->readAsKuml( stream );
+ // dynamic_cast<DrawingRect*>( item )->setWidth( 300 );
+ addDrawingItem( item );
+ continue;
+ }
+ if( stream.getGroupType() == "drawinggeneralization" ) {
+ debug( "Diagram::readAsKuml handling drawinggeneralization" );
+ item = new DrawingGeneralization( NULL,
+ getPtrDrawingArea(),
+ stream.getGroupName() );
+ item->readAsKuml( stream );
+ addDrawingItem( item );
+ }
+ //*********************************************************
debug("Diagram::readAsKuml(): Unrecognized group found !");
! stream.skipGroup(); // Skip the unrecognized group
break;
***************
*** 285,289 ****
DrawingItem* Diagram::getItemByLabel(const QString& itemlabel) {
ListOfDrawingItemsIterator iter(listOfDrawingItems);
! for(iter.toFirst() ; iter.current() ; ++iter)
if(iter.current()->getLabel() == itemlabel)
return iter.current();
--- 307,311 ----
DrawingItem* Diagram::getItemByLabel(const QString& itemlabel) {
ListOfDrawingItemsIterator iter(listOfDrawingItems);
! for(iter.toFirst() ; iter.current() ; ++iter)
if(iter.current()->getLabel() == itemlabel)
return iter.current();
***************
*** 420,433 ****
////////////////////////////////////////////////////////////////////////
void Diagram::addDrawingItem(DrawingItem* item) {
! if(item->isConnection())
listOfDrawingItems.insert(0, item);
else
listOfDrawingItems.append(item);
!
! if(item->isAutoResize())
! item->doAutoResize(getPtrDrawingArea());
!
! if(item->isAutoRepaint() && !item->isAutoResize())
! getPtrDrawingArea()->repaint(item->getUpdateRect(), false);
}
--- 442,455 ----
////////////////////////////////////////////////////////////////////////
void Diagram::addDrawingItem(DrawingItem* item) {
! if(item->isConnection())
listOfDrawingItems.insert(0, item);
else
listOfDrawingItems.append(item);
!
! if(item->isAutoResize())
! item->doAutoResize(getPtrDrawingArea());
!
! if(item->isAutoRepaint() && !item->isAutoResize())
! getPtrDrawingArea()->repaint(item->getUpdateRect(), false);
}
Index: diagramloader.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagramloader.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** diagramloader.cpp 3 Mar 2002 22:03:41 -0000 1.2
--- diagramloader.cpp 17 Mar 2002 22:56:28 -0000 1.3
***************
*** 74,77 ****
--- 74,78 ----
debug("DiagramLoader::load : non-experimental section.");
+ debug( QString( "Group type: " + utilstream.getGroupType() ) );
// Create the diagram by given diagram name as string
DiagramFactory factory(area);
***************
*** 119,139 ****
if(overview) {
LVIDiagrams *listviewitem = NULL;
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
!
! // Overview
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
debug("DiagramLoader::load : before diagram->readAsKuml");
!
diagram->readAsKuml(utilstream);
debug("DiagramLoader::load : after diagram->readAsKuml");
! if(overview) {
// Larry Anderson : commented out the following line and changed the next from
// getDraingArea() to area
--- 120,140 ----
if(overview) {
LVIDiagrams *listviewitem = NULL;
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
!
! // Overview
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
debug("DiagramLoader::load : before diagram->readAsKuml");
!
diagram->readAsKuml(utilstream);
debug("DiagramLoader::load : after diagram->readAsKuml");
! if(overview) {
// Larry Anderson : commented out the following line and changed the next from
// getDraingArea() to area
***************
*** 142,147 ****
// Fill the toolbox with items of the diagram
! // diagram->fillToolBox(getDrawingArea()->getMainApp()->toolbox);
! // getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
--- 143,148 ----
// Fill the toolbox with items of the diagram
! // diagram->fillToolBox(getDrawingArea()->getMainApp()->toolbox);
! // getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
***************
*** 150,154 ****
// Larry Anderson : added the following
area->getMainApp()->show();
!
--- 151,155 ----
// Larry Anderson : added the following
area->getMainApp()->show();
!
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:32
|
Update of /cvsroot/kuml/kuml_old/kuml/drawobj
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/drawobj
Modified Files:
drawingclass.cpp drawingclass.h drawingrect.cpp
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: drawingclass.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingclass.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingclass.cpp 8 Oct 2000 04:22:44 -0000 1.1.1.1
--- drawingclass.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 69,104 ****
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
switch(type) {
! case IOKumlUtility::GroupItem:
! if(stream.getGroupType() == "class") {
! getClass()->readAsKuml(stream);
! continue;
! }
! if(stream.getGroupType() == "drawingrect") {
! DrawingRect::readAsKuml(stream);
! continue;
! }
! debug("DrawingClass::readAsKuml(): Unrecognized group found !");
! stream.skipGroup(); // Skip the unrecognized group
! break;
!
! case IOKumlUtility::Assignment:
! if(stream.getAssignmentName() == "Autosize") {
! // Darius: Moved to DrawingItem
! // if(stream.getAssignmentValue() == "true")
! // setAutosize("true");
! continue;
! }
! /* if(stream.getAssignmentName() == "Superclass") {
! dcl = (DrawingClass*)getDrawingArea()->getDiagram()->getItemByLabel(stream.getAssignmentValue());
! cl->addSuperClass(dcl->getClass());
! continue;
}*/
! debug("DrawingClass::readAsKuml(): Unknown assignment found ! Ignored ...");
! break;
!
! case IOKumlUtility::Error:
! debug("DrawingClass::readAsKuml(): Parse error !");
! break;
}
} // end of while
--- 69,107 ----
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
switch(type) {
! case IOKumlUtility::GroupItem:
! if(stream.getGroupType() == "class") {
! debug( QString( "DrawingClass::readAsKuml, class name:" ) +
! stream.getGroupName() );
! cl = new Classes( stream.getGroupName() );
! cl->readAsKuml(stream);
! continue;
! }
! if(stream.getGroupType() == "drawingrect") {
! DrawingRect::readAsKuml(stream);
! continue;
! }
! debug("DrawingClass::readAsKuml(): Unrecognized group found !");
! stream.skipGroup(); // Skip the unrecognized group
! break;
!
! case IOKumlUtility::Assignment:
! if(stream.getAssignmentName() == "Autosize") {
! // Darius: Moved to DrawingItem
! // if(stream.getAssignmentValue() == "true")
! // setAutosize("true");
! continue;
! }
! /* if(stream.getAssignmentName() == "Superclass") {
! dcl = (DrawingClass*)getDrawingArea()->getDiagram()->getItemByLabel(stream.getAssignmentValue());
! cl->addSuperClass(dcl->getClass());
! continue;
}*/
! debug("DrawingClass::readAsKuml(): Unknown assignment found ! Ignored ...");
! break;
!
! case IOKumlUtility::Error:
! debug("DrawingClass::readAsKuml(): Parse error !");
! break;
}
} // end of while
***************
*** 722,726 ****
////////////////////////////////////////////////////////////////////////
DrawingClass::DrawingClass(QObject *parent, Classes* cls, DrawingArea *area)
! : DrawingRect(parent, area, "") {
cl = cls;
offsetFromTop = 0;
--- 725,729 ----
////////////////////////////////////////////////////////////////////////
DrawingClass::DrawingClass(QObject *parent, Classes* cls, DrawingArea *area)
! : DrawingRect(parent, area, "") {
cl = cls;
offsetFromTop = 0;
Index: drawingclass.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingclass.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingclass.h 8 Oct 2000 04:22:44 -0000 1.1.1.1
--- drawingclass.h 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 42,48 ****
*/
enum DetailLevel { DisableAutoDetails = 1,
! DetailsSuppressed = 2,
! AnalysisLevelDetails = 3,
! ImplementationLevelDetails = 4 };
--- 42,48 ----
*/
enum DetailLevel { DisableAutoDetails = 1,
! DetailsSuppressed = 2,
! AnalysisLevelDetails = 3,
! ImplementationLevelDetails = 4 };
***************
*** 59,62 ****
--- 59,63 ----
DrawingClass(QObject *parent, Classes* cls, DrawingArea *area);
+
DrawingClass(QObject *parent, Classes* cls, DrawingArea *area, int x, int y);
***************
*** 67,71 ****
/** Open the edit dialog for this item */
! virtual bool showPropertiesDialog(QWidget *parent);
// virtual QString getLabel();
--- 68,72 ----
/** Open the edit dialog for this item */
! virtual bool showPropertiesDialog(QWidget *parent);
// virtual QString getLabel();
***************
*** 74,78 ****
Classes* getClass() { return cl; }
! void setClass(Classes* value) { cl = value; doAutoResize(getDrawingArea()); }
/**
--- 75,79 ----
Classes* getClass() { return cl; }
! void setClass(Classes* value) { cl = value; doAutoResize(getDrawingArea()); }
/**
Index: drawingrect.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/drawobj/drawingrect.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** drawingrect.cpp 8 Oct 2000 04:22:52 -0000 1.1.1.1
--- drawingrect.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 78,81 ****
--- 78,83 ----
case IOKumlUtility::Assignment:
+ debug( "DrawingRect::readAsKuml, handling Assignment:" );
+ debug( stream.getAssignmentName() );
if(stream.getAssignmentName() == "Shadow") {
if(stream.getAssignmentValue() == "true")
***************
*** 94,97 ****
--- 96,101 ----
}
if(stream.getAssignmentName() == "Width") {
+ debug( "Setting width:" );
+ cerr << " " << stream.getAssignmentValueAsInt() << endl;
setWidth(stream.getAssignmentValueAsInt());
continue;
***************
*** 628,630 ****
}
! ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
--- 632,634 ----
}
! ////////////////////////////////////////////////////////////////////////
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:31
|
Update of /cvsroot/kuml/kuml_old/kuml/data
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml/data
Modified Files:
classes.cpp element.cpp package.cpp repository.cpp
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: classes.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/classes.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** classes.cpp 8 Oct 2000 04:21:58 -0000 1.1.1.1
--- classes.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 27,31 ****
////////////////////////////////////////////////////////////////////////
void Classes::writeAsKuml(IOKumlUtility &stream) {
! stream.writeGroupItem("class");
// Write all properties
SimpleElement::writeAsKuml(stream);
--- 27,31 ----
////////////////////////////////////////////////////////////////////////
void Classes::writeAsKuml(IOKumlUtility &stream) {
! stream.writeGroupItem( "class", getName() );
// Write all properties
SimpleElement::writeAsKuml(stream);
***************
*** 72,75 ****
--- 72,77 ----
int type;
+ ASSERT( Repository::getRepository()->getPackage( "project" ) != NULL );
+ setParent( Repository::getRepository()->getPackage( "project" ) );
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
switch(type) {
Index: element.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/element.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** element.cpp 8 Oct 2000 04:22:02 -0000 1.1.1.1
--- element.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 60,67 ****
Element::Element() : IOInterface()
{
! miComputeId ();
! // Darius:
! parent = NULL;
! stereotype = NULL;
}
--- 60,67 ----
Element::Element() : IOInterface()
{
! miComputeId ();
! // Darius:
! parent = NULL;
! stereotype = NULL;
}
***************
*** 69,83 ****
Element::Element(const QString & name) : IOInterface()
{
! miComputeId ();
! this->name = name;
! // Darius:
! parent = NULL;
! stereotype = NULL;
}
/////////////////////////////////////////////////
Element::~Element() {
! if(stereotype)
! delete stereotype;
}
--- 69,83 ----
Element::Element(const QString & name) : IOInterface()
{
! miComputeId ();
! this->name = name;
! // Darius:
! parent = NULL;
! stereotype = NULL;
}
/////////////////////////////////////////////////
Element::~Element() {
! if(stereotype)
! delete stereotype;
}
***************
*** 97,108 ****
Path* Element::getPath() {
! Path* path = NULL;
! if (parent != NULL) {
! path = parent->getPath();
! } else {
! path = new Path();
! }
! path->append(getName());
! return path;
}
--- 97,108 ----
Path* Element::getPath() {
! Path* path = NULL;
! if (parent != NULL) {
! path = parent->getPath();
! } else {
! path = new Path();
! }
! path->append(getName());
! return path;
}
***************
*** 111,130 ****
void Element::readAsKuml(IOKumlUtility &stream) {
int type;
!
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
switch(type) {
! case IOKumlUtility::Assignment:
! if (stream.getAssignmentName() == "name") {
name = stream.getAssignmentValue();
continue;
! }
! if (stream.getAssignmentName() == "description") {
description = stream.getAssignmentValue();
continue;
! }
!
! case IOKumlUtility::Error:
! debug("usecase::readAsKuml(): Parse error !");
! break;
}
}
--- 111,130 ----
void Element::readAsKuml(IOKumlUtility &stream) {
int type;
!
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
switch(type) {
! case IOKumlUtility::Assignment:
! if (stream.getAssignmentName() == "name") {
name = stream.getAssignmentValue();
continue;
! }
! if (stream.getAssignmentName() == "description") {
description = stream.getAssignmentValue();
continue;
! }
!
! case IOKumlUtility::Error:
! debug("usecase::readAsKuml(): Parse error !");
! break;
}
}
***************
*** 133,193 ****
////////////////////////////////////////////////////////////////////////
void Element::setStereotype(Stereotype *st) {
! // Delete a previous stereotype object
! if(stereotype)
! delete stereotype;
!
! stereotype = st;
}
////////////////////////////////////////////////////////////////////////
void Element::setStereotype(const QString &name, const QString &baseClass = NULL) {
! if(stereotype == NULL) {
! if(name.isEmpty() == false)
! stereotype = new Stereotype(name, baseClass);
! } else
! if(name.isEmpty()) {
! delete stereotype;
! stereotype = NULL;
! } else {
! stereotype->setName(name);
! stereotype->setBaseClass(baseClass);
! }
!
! /* if((stereotype == NULL) && (!name.isEmpty()))
! stereotype = new Stereotype(name, baseClass);
else {
! // Pass an empty name to delete the stereotype object
! if(name.isEmpty()) {
! delete stereotype;
! stereotype = NULL;
! }
! else {
! stereotype->setName(name);
! stereotype->setBaseClass(baseClass);
! }
} */
}
////////////////////////////////////////////////////////////////////////
Stereotype *Element::getStereotype() {
! return stereotype;
}
////////////////////////////////////////////////////////////////////////
void Element::setName( const QString newName ) throw ( InvalidNameException ) {
if ( newName == 0 || newName == "" ) {
! throw InvalidNameException("The name can not be empty");
} else if (newName == name) {
! // Then do nothing, it would be quite pointless...
! return;
}
- ASSERT(parent != NULL);
- if (!parent->containsElement(newName)) {
- parent->removeElement(this);
- name = newName;
- parent->addElement(this);
- } else {
- throw InvalidNameException("That name is a duplicate name");
- }
}
--- 133,198 ----
////////////////////////////////////////////////////////////////////////
void Element::setStereotype(Stereotype *st) {
! // Delete a previous stereotype object
! if(stereotype)
! delete stereotype;
!
! stereotype = st;
}
////////////////////////////////////////////////////////////////////////
void Element::setStereotype(const QString &name, const QString &baseClass = NULL) {
! if(stereotype == NULL) {
! if(name.isEmpty() == false)
! stereotype = new Stereotype(name, baseClass);
! } else
! if(name.isEmpty()) {
! delete stereotype;
! stereotype = NULL;
! } else {
! stereotype->setName(name);
! stereotype->setBaseClass(baseClass);
! }
!
! /* if((stereotype == NULL) && (!name.isEmpty()))
! stereotype = new Stereotype(name, baseClass);
else {
! // Pass an empty name to delete the stereotype object
! if(name.isEmpty()) {
! delete stereotype;
! stereotype = NULL;
! }
! else {
! stereotype->setName(name);
! stereotype->setBaseClass(baseClass);
! }
} */
}
////////////////////////////////////////////////////////////////////////
Stereotype *Element::getStereotype() {
! return stereotype;
}
////////////////////////////////////////////////////////////////////////
void Element::setName( const QString newName ) throw ( InvalidNameException ) {
+
+ debug( "In Element::setName" );
if ( newName == 0 || newName == "" ) {
! throw InvalidNameException("The name can not be empty");
} else if (newName == name) {
! // Then do nothing, it would be quite pointless...
! return;
! }
! debug( QString( " newName = " ) + newName );
! cerr << " &parent: " << parent << endl;
! ASSERT(parent != NULL);
! if (!parent->containsElement(newName)) {
! debug( " in if" );
! parent->removeElement(this);
! name = newName;
! parent->addElement(this);
! } else {
! throw InvalidNameException("That name is a duplicate name");
}
}
Index: package.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/package.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** package.cpp 8 Oct 2000 04:22:03 -0000 1.1.1.1
--- package.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 27,36 ****
////////////////////////////////////////////////////////////
Package::Package(const char* name) : SimpleElement( name) {
! classMap = new ElementMap();
! packageMap = new ElementMap();
! useCaseMap = new ElementMap();
! actorMap = new ElementMap();
! associationMap = new ElementMap();
! generalizationMap = new ElementMap();
}
--- 27,38 ----
////////////////////////////////////////////////////////////
Package::Package(const char* name) : SimpleElement( name) {
!
! debug( QString( "Call to Package constructor, name : " ) + QString( name ) );
! classMap = new ElementMap();
! packageMap = new ElementMap();
! useCaseMap = new ElementMap();
! actorMap = new ElementMap();
! associationMap = new ElementMap();
! generalizationMap = new ElementMap();
}
***************
*** 371,373 ****
void Package::readAsKuml(IOKumlUtility& stream) {
! }
\ No newline at end of file
--- 373,375 ----
void Package::readAsKuml(IOKumlUtility& stream) {
! }
Index: repository.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/repository.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** repository.cpp 8 Oct 2000 04:22:04 -0000 1.1.1.1
--- repository.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 30,34 ****
///////////////////////////////////////////////////////////
Repository::Repository(void) : Package("project") {
! setParent(NULL);
}
--- 30,34 ----
///////////////////////////////////////////////////////////
Repository::Repository(void) : Package("project") {
! setParent(NULL);
}
***************
*** 41,48 ****
*/
Repository* Repository::getRepository() {
! if (singleton == 0) {
! singleton = new Repository();
! }
! return singleton;
}
--- 41,48 ----
*/
Repository* Repository::getRepository() {
! if (singleton == 0) {
! singleton = new Repository();
! }
! return singleton;
}
***************
*** 51,80 ****
*/
Repository::~Repository() {
! if(singleton) {
! delete singleton;
! singleton = 0;
! }
! // Package::~Package();
}
///////////////////////////////////////////////////////////
bool Repository::containsElement(Element* element) {
! return Package::containsElement( element->getName() );
}
///////////////////////////////////////////////////////////
bool Repository::containsElement( Path path ) {
! return (getElement(path) != NULL);
}
///////////////////////////////////////////////////////////
bool Repository::containsPackage( Path path ) {
! Element* e = getElement( path );
! PackageChecker pc;
! if ( e == NULL || !pc.isPackage(e)) {
! return false;
! } else {
! return true;
! }
}
--- 51,80 ----
*/
Repository::~Repository() {
! if(singleton) {
! delete singleton;
! singleton = 0;
! }
! // Package::~Package();
}
///////////////////////////////////////////////////////////
bool Repository::containsElement(Element* element) {
! return Package::containsElement( element->getName() );
}
///////////////////////////////////////////////////////////
bool Repository::containsElement( Path path ) {
! return (getElement(path) != NULL);
}
///////////////////////////////////////////////////////////
bool Repository::containsPackage( Path path ) {
! Element* e = getElement( path );
! PackageChecker pc;
! if ( e == NULL || !pc.isPackage(e)) {
! return false;
! } else {
! return true;
! }
}
***************
*** 83,90 ****
*/
Element* Repository::takeElement( const char* name ) {
! Element* e = getElement( name );
! if ( e != 0 ) {
! removeElement( e );
! }
return e;
}
--- 83,90 ----
*/
Element* Repository::takeElement( const char* name ) {
! Element* e = getElement( name );
! if ( e != 0 ) {
! removeElement( e );
! }
return e;
}
***************
*** 92,130 ****
/////////////////////////////////////////////////////////////////
Element* Repository::getElement( Path path ) {
!
! // If the path is empty, just return this.
! if ( path.count() == 0 || ( path.count() == 1 &&
! ( path.at( 0 ) == NULL || path.at( 0 ) == "" ))) {
! return this;
! } else {
! PackageChecker packageChecker;
! Package* currentPackage = this;
! Element* element = NULL;
! char* name = NULL;
!
! for (unsigned int i = 0; i < path.count(); i++) {
! name = path.at( i );
! element = currentPackage->getElement( name );
! if (element != NULL && packageChecker.isPackage( element )) {
currentPackage = (Package*)element;
! // else if no element or we arrived at a dead end in the path.
! } else if (element == NULL || (element != NULL && path.count() < i+1)) {
! return NULL;
! }
! }
! // The code will reach here if the requested element IS a package.
! return element;
! }
}
/////////////////////////////////////////////////////////////////
Package* Repository::getPackage( Path path ) {
! Element* e = getElement( path );
PackageChecker pc;
! if (pc.isPackage( e )) {
! return (Package*)e;
! } else {
! return NULL;
! }
}
--- 92,130 ----
/////////////////////////////////////////////////////////////////
Element* Repository::getElement( Path path ) {
!
! // If the path is empty, just return this.
! if ( path.count() == 0 || ( path.count() == 1 &&
! ( path.at( 0 ) == NULL || path.at( 0 ) == "" ))) {
! return this;
! } else {
! PackageChecker packageChecker;
! Package* currentPackage = this;
! Element* element = NULL;
! char* name = NULL;
!
! for (unsigned int i = 0; i < path.count(); i++) {
! name = path.at( i );
! element = currentPackage->getElement( name );
! if (element != NULL && packageChecker.isPackage( element )) {
currentPackage = (Package*)element;
! // else if no element or we arrived at a dead end in the path.
! } else if (element == NULL || (element != NULL && path.count() < i+1)) {
! return NULL;
! }
! }
! // The code will reach here if the requested element IS a package.
! return element;
! }
}
/////////////////////////////////////////////////////////////////
Package* Repository::getPackage( Path path ) {
! Element* e = getElement( path );
PackageChecker pc;
! if (pc.isPackage( e )) {
! return (Package*)e;
! } else {
! return NULL;
! }
}
***************
*** 134,162 ****
*/
void Repository::readAsKuml(IOKumlUtility& stream) {
! int type;
Element* e = 0;
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
! switch (type) {
! case IOKumlUtility::GroupItem: {
! if(stream.getGroupType() == "class") {
! // PENDING (JF): We need a bunch more checks here, or a better way to do this.
! // This is (once again) making use of RTTI of some form and probably should be
! // (at the very least) captured in some deserialization mechanism sepperate from
! // this class.
! e = new Classes("");
! e->readAsKuml(stream);
! addElement( e );
! }
! break;
! } case IOKumlUtility::Error: {
! debug("Repository::readAsKuml(): Parse error !");
! break;
! } default: {
! debug("Unexpected groupType: " + stream.getGroupType());
! break;
! }
! } // end switch
! } // end while
!
}
--- 134,161 ----
*/
void Repository::readAsKuml(IOKumlUtility& stream) {
! int type;
Element* e = 0;
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
! switch (type) {
! case IOKumlUtility::GroupItem: {
! if(stream.getGroupType() == "class") {
! // PENDING (JF): We need a bunch more checks here, or a better way to do this.
! // This is (once again) making use of RTTI of some form and probably should be
! // (at the very least) captured in some deserialization mechanism sepperate from
! // this class.
! e = new Classes("");
! e->readAsKuml(stream);
! addElement( e );
! }
! break;
! } case IOKumlUtility::Error: {
! debug("Repository::readAsKuml(): Parse error !");
! break;
! } default: {
! debug("Unexpected groupType: " + stream.getGroupType());
! break;
! }
! } // end switch
! } // end while
}
***************
*** 165,169 ****
*/
void Repository::writeAsKuml(IOKumlUtility& stream) {
! stream.writeGroupItem("classrepository");
// The entire state of the repository consists of nothing more than
--- 164,168 ----
*/
void Repository::writeAsKuml(IOKumlUtility& stream) {
! stream.writeGroupItem("classrepository");
// The entire state of the repository consists of nothing more than
***************
*** 171,178 ****
// writing each of them to the stream.
/*ElementIterator* itr = getElementIterator();
! for ( itr->toFirst(); itr->current(); ++(*itr) ) {
! itr->current()->writeAsKuml( stream );
! }*/
!
stream.closeGroup();
}
--- 170,177 ----
// writing each of them to the stream.
/*ElementIterator* itr = getElementIterator();
! for ( itr->toFirst(); itr->current(); ++(*itr) ) {
! itr->current()->writeAsKuml( stream );
! }*/
!
stream.closeGroup();
}
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:31
|
Update of /cvsroot/kuml/kuml_old/kuml
In directory usw-pr-cvs1:/tmp/cvs-serv1995/kuml
Modified Files:
iokumlutility.cpp kuml.cpp kumlview.cpp kumlview.h
Log Message:
2002-03-17 Gerard Flynn <ger...@li...>
* save/load of classes in class diagrams now works, connexions still
broken
* added loaded classes to the "project" package (multiple packages are
not supported at this time)
* changed the initial sizes of the 2 halfs of the kUML screen so that
most space is reserved for the diagram (KumlApp::initView)
* changed Classes::writeAsKuml to output the class name
* added loading of drawingclass to Diagram::readAsKuml
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp
VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp
VS: kuml/data/element.cpp kuml/data/package.cpp
VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp
VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp
VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp
VS: kuml/overview/winoverview.cpp
VS: ----------------------------------------------------------------------
Index: iokumlutility.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/iokumlutility.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** iokumlutility.cpp 3 Mar 2002 22:03:41 -0000 1.2
--- iokumlutility.cpp 17 Mar 2002 22:56:28 -0000 1.3
***************
*** 88,91 ****
--- 88,93 ----
debug( "IOKumlUtility::readStatement handling GroupItem" );
groupType = firstToken;
+ debug( QString( " groupType : " ) + groupType );
+ debug( QString( " secondToken : " ) + secondToken );
if(secondToken == openGroupChar)
groupName = "";
***************
*** 95,98 ****
--- 97,101 ----
groupName += QString(" ") + nextToken;
}
+ debug( QString( " groupName : " ) + groupName );
debug( "IOKumlUtility::readStatement returning GroupItem" );
return GroupItem;
Index: kuml.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kuml.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** kuml.cpp 3 Mar 2002 22:03:41 -0000 1.3
--- kuml.cpp 17 Mar 2002 22:56:28 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
#include <qfile.h>
#include <qfiledialog.h>
+ #include <qvaluelist.h>
#if defined (KDE2)
***************
*** 193,238 ****
KumlApp::KumlApp()
{
! GlobalInformation::getInstance().setApplication(this);
! flag = noFlag;
toolbox = NULL;
setCaption("kUML " VERSION);
! project = new Projects("oo chart","Path");
! ///////////////////////////////////////////////////////////////////
! // read the config file options
! readOptions();
! ///////////////////////////////////////////////////////////////////
! // call inits to invoke all other construction parts
! initMenuBar();
! initToolBar();
! initStatusBar();
! initView();
! ///////////////////////////////////////////////////////////////////
! // enable bars dependend on config file setups
! if (!bViewToolbar)
! enableToolBar(KToolBar::Hide,0);
! if (!bViewStatusbar)
! enableStatusBar(KStatusBar::Hide);
#if !defined (KDE2)
! menuBar()->setMenuBarPos(menu_bar_pos);
! toolBar()->setBarPos(tool_bar_pos);
#else // defined (KDE2)
!
! //
! // TODO: Figure out where to place the menubar and tool bar.
! //
#endif // defined (KDE2)
! ///////////////////////////////////////////////////////////////////
! // disable menu and toolbar items at startup
! resize(850,650);
}
////////////////////////////////////////////////////////////////////////
--- 194,239 ----
KumlApp::KumlApp()
{
! GlobalInformation::getInstance().setApplication(this);
! flag = noFlag;
toolbox = NULL;
setCaption("kUML " VERSION);
! project = new Projects("oo chart","Path");
! ///////////////////////////////////////////////////////////////////
! // read the config file options
! readOptions();
! ///////////////////////////////////////////////////////////////////
! // call inits to invoke all other construction parts
! initMenuBar();
! initToolBar();
! initStatusBar();
! initView();
! ///////////////////////////////////////////////////////////////////
! // enable bars dependend on config file setups
! if (!bViewToolbar)
! enableToolBar(KToolBar::Hide,0);
! if (!bViewStatusbar)
! enableStatusBar(KStatusBar::Hide);
#if !defined (KDE2)
! menuBar()->setMenuBarPos(menu_bar_pos);
! toolBar()->setBarPos(tool_bar_pos);
#else // defined (KDE2)
!
! //
! // TODO: Figure out where to place the menubar and tool bar.
! //
#endif // defined (KDE2)
! ///////////////////////////////////////////////////////////////////
! // disable menu and toolbar items at startup
! resize(850,650);
}
////////////////////////////////////////////////////////////////////////
***************
*** 547,550 ****
--- 548,556 ----
splitleft = new QSplitter (split, "panner1");
splitleft->setOrientation (QFrame::Vertical);
+
+ QValueList<int> i_sizes_h;
+ i_sizes_h.append( (int)( 0.1 * width() ) );
+ i_sizes_h.append( (int)( 0.9 * width() ) );
+ split->setSizes( i_sizes_h );
#endif // defined (KDE2)
***************
*** 1418,1441 ****
LVIDiagrams *listviewitem = NULL;
! DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
! if(newdialog->exec()) {
! diagram = newdialog->getCreatedDiagram();
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
! //listviewitem = (LVIDiagrams*)overview->getLVIForDiagram(newdialog->getCreatedDiagram());
overview->setSelected(listviewitem, true);
newdialog->getCreatedDiagram()->setLVI(listviewitem);
!
// Fill the toolbox with items of the diagram
! // newdialog->getCreatedDiagram()->fillToolBox(toolbox);
! // toolbox->enable(KToolBar::Show);
! // show();
!
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
!
! getPtrDrawingArea()->slotSetDiagram(diagram);
}
--- 1424,1448 ----
LVIDiagrams *listviewitem = NULL;
! DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
! if(newdialog->exec()) {
! diagram = newdialog->getCreatedDiagram();
! DiagramLVIFactory lviFactory(overview->getLVIForDiagram(diagram));
! listviewitem = lviFactory.createLVI(diagram);
! //listviewitem = (LVIDiagrams*)overview->getLVIForDiagram(newdialog->getCreatedDiagram());
overview->setSelected(listviewitem, true);
newdialog->getCreatedDiagram()->setLVI(listviewitem);
!
// Fill the toolbox with items of the diagram
! // newdialog->getCreatedDiagram()->fillToolBox(toolbox);
! // toolbox->enable(KToolBar::Show);
! // show();
!
! connect( listviewitem, SIGNAL( sigSetDiagram( Diagram* ) ),
! getPtrDrawingArea(), SLOT( slotSetDiagram( Diagram* ) ) );
listviewitem->setOpen(true);
!
! getPtrDrawingArea()->slotSetDiagram(diagram);
}
Index: kumlview.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kumlview.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** kumlview.cpp 8 Oct 2000 04:21:54 -0000 1.1.1.1
--- kumlview.cpp 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 23,26 ****
--- 23,30 ----
#include "resource.h"
+ #define DRAWING_WIDTH 1200
+ #define DRAWING_HEIGHT 900
+
+
////////////////////////////////////////////////////////////////////////
void KumlView::resizeScrollview(int width, int height) {
***************
*** 67,71 ****
drawingArea = new DrawingArea(/*(QWidget*)*/scrollView, main);
! drawingArea->setGeometry(0,0,DRAWING_AREA_WIDTH,DRAWING_AREA_HEIGHT);
// connect( drawingArea, SIGNAL(sigMouseMoveX(int)),
// rulh, SLOT(slotNewValue(int)) );
--- 71,75 ----
drawingArea = new DrawingArea(/*(QWidget*)*/scrollView, main);
! drawingArea->setGeometry(0,0,DRAWING_WIDTH,DRAWING_HEIGHT);
// connect( drawingArea, SIGNAL(sigMouseMoveX(int)),
// rulh, SLOT(slotNewValue(int)) );
***************
*** 80,87 ****
drawingArea->setMouseTracking(TRUE);
! drawingArea = new DrawingArea((QWidget*)scrollView, main);
! drawingArea->setGeometry(0,0,DRAWING_AREA_WIDTH,DRAWING_AREA_HEIGHT);
!
! scrollView->addChild(drawingArea);
}
////////////////////////////////////////////////////////////////////////
--- 84,91 ----
drawingArea->setMouseTracking(TRUE);
! drawingArea = new DrawingArea((QWidget*)scrollView, main);
! drawingArea->setGeometry(0,0,DRAWING_WIDTH,DRAWING_HEIGHT);
!
! scrollView->addChild(drawingArea);
}
////////////////////////////////////////////////////////////////////////
Index: kumlview.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kumlview.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** kumlview.h 8 Oct 2000 04:21:54 -0000 1.1.1.1
--- kumlview.h 17 Mar 2002 22:56:28 -0000 1.2
***************
*** 58,72 ****
~KumlView();
! DrawingArea *getDrawingArea() { return drawingArea; }
! QScrollView *scrollView;
////////////////////////////////////////////////////////////////////////
protected:
! void resizeEvent ( QResizeEvent *e ) ;
void mouseMoveEvent ( QMouseEvent *e );
!
! void updateRulers(QMouseEvent *e);
////////////////////////////////////////////////////////////////////////
public slots:
! void resizeScrollview(int,int);
private slots:
--- 58,72 ----
~KumlView();
! DrawingArea *getDrawingArea() { return drawingArea; }
! QScrollView *scrollView;
////////////////////////////////////////////////////////////////////////
protected:
! void resizeEvent ( QResizeEvent *e ) ;
void mouseMoveEvent ( QMouseEvent *e );
!
! void updateRulers(QMouseEvent *e);
////////////////////////////////////////////////////////////////////////
public slots:
! void resizeScrollview(int,int);
private slots:
***************
*** 75,81 ****
private:
! DrawingArea *drawingArea;
! Projects *project;
! ////////////////////////////////////////////////////////////////////////
};
--- 75,81 ----
private:
! DrawingArea *drawingArea;
! Projects *project;
! ////////////////////////////////////////////////////////////////////////
};
|
|
From: Gerard F. <ger...@us...> - 2002-03-17 22:56:31
|
Update of /cvsroot/kuml/kuml_old In directory usw-pr-cvs1:/tmp/cvs-serv1995 Modified Files: ChangeLog Log Message: 2002-03-17 Gerard Flynn <ger...@li...> * save/load of classes in class diagrams now works, connexions still broken * added loaded classes to the "project" package (multiple packages are not supported at this time) * changed the initial sizes of the 2 halfs of the kUML screen so that most space is reserved for the diagram (KumlApp::initView) * changed Classes::writeAsKuml to output the class name * added loading of drawingclass to Diagram::readAsKuml VS: Committing in . VS: VS: Modified Files: VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp VS: kuml/kumlview.cpp kuml/kumlview.h kuml/data/classes.cpp VS: kuml/data/element.cpp kuml/data/package.cpp VS: kuml/data/repository.cpp kuml/diagrams/diagram.cpp VS: kuml/diagrams/diagramloader.cpp kuml/drawobj/drawingclass.cpp VS: kuml/drawobj/drawingclass.h kuml/drawobj/drawingrect.cpp VS: kuml/overview/winoverview.cpp VS: ---------------------------------------------------------------------- Index: ChangeLog =================================================================== RCS file: /cvsroot/kuml/kuml_old/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** ChangeLog 3 Mar 2002 22:03:41 -0000 1.3 --- ChangeLog 17 Mar 2002 22:56:27 -0000 1.4 *************** *** 1,2 **** --- 1,12 ---- + 2002-03-17 Gerard Flynn <ger...@li...> + * save/load of classes in class diagrams now works, connexions still + broken + * added loaded classes to the "project" package (multiple packages are + not supported at this time) + * changed the initial sizes of the 2 halfs of the kUML screen so that + most space is reserved for the diagram (KumlApp::initView) + * changed Classes::writeAsKuml to output the class name + * added loading of drawingclass to Diagram::readAsKuml + 2002-03-03 Gerard Flynn <ger...@li...> * iokumlutility.cpp fixed parsing problem in readStatement |
|
From: Chris M. <zm...@us...> - 2002-03-08 19:20:20
|
Update of /cvsroot/kuml/kuml/libkuml/uml/tools
In directory usw-pr-cvs1:/tmp/cvs-serv4731
Modified Files:
gen_class_ccs.xsl
Log Message:
Mod to generate a #include <algorithm> for files with multivalues attributes.
Index: gen_class_ccs.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/gen_class_ccs.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** gen_class_ccs.xsl 27 Feb 2002 22:25:46 -0000 1.13
--- gen_class_ccs.xsl 8 Mar 2002 19:20:15 -0000 1.14
***************
*** 112,115 ****
--- 112,120 ----
<xsl:text>#include <string.h> </xsl:text>
+ <!-- Find a multiple-valued Attribute. -->
+ <xsl:if test='count(descendant::Model:Attribute/Model:StructuralFeature.multiplicity/XMI.field[position()=2][self::XMI.field > 1 or self::XMI.field = -1]) > 0'>
+ <xsl:text>#include <algorithm> </xsl:text>
+ </xsl:if>
+
<xsl:text> </xsl:text>
|
Update of /cvsroot/kuml/kuml/libkuml/uml/Foundation In directory usw-pr-cvs1:/tmp/cvs-serv10577 Removed Files: AAssociationConnection_impl.cc AAssociationConnection_impl.h ABehavioralFeatureParameter_impl.cc ABehavioralFeatureParameter_impl.h ABindingArgument_impl.cc ABindingArgument_impl.h AChildGeneralization_impl.cc AChildGeneralization_impl.h AClientClientDependency_impl.cc AClientClientDependency_impl.h ACommentAnnotatedElement_impl.cc ACommentAnnotatedElement_impl.h AConstrainedElement2StereotypeConstraint_impl.cc AConstrainedElement2StereotypeConstraint_impl.h AConstrainedElementConstraint_impl.cc AConstrainedElementConstraint_impl.h ADefaultElementTemplateParameter3_impl.cc ADefaultElementTemplateParameter3_impl.h ADeploymentLocationResident_impl.cc ADeploymentLocationResident_impl.h AImplementationLocationResidentElement_impl.cc AImplementationLocationResidentElement_impl.h AModelElement2TemplateParameter2_impl.cc AModelElement2TemplateParameter2_impl.h AModelElementTaggedValue_impl.cc AModelElementTaggedValue_impl.h AModelElementTemplateParameter_impl.cc AModelElementTemplateParameter_impl.h ANamespaceOwnedElement_impl.cc ANamespaceOwnedElement_impl.h AOwnerFeature_impl.cc AOwnerFeature_impl.h AParameterType_impl.cc AParameterType_impl.h AParentSpecialization_impl.cc AParentSpecialization_impl.h AParticipantSpecification_impl.cc AParticipantSpecification_impl.h APowertypePowertypeRange_impl.cc APowertypePowertypeRange_impl.h APresentationSubject_impl.cc APresentationSubject_impl.h AQualifierAssociationEnd_impl.cc AQualifierAssociationEnd_impl.h ARequiredTagStereotype_impl.cc ARequiredTagStereotype_impl.h AResidentElementResidence_impl.cc AResidentElementResidence_impl.h ASourceFlowSource_impl.cc ASourceFlowSource_impl.h ASpecificationMethod_impl.cc ASpecificationMethod_impl.h AStereotypeExtendedElement_impl.cc AStereotypeExtendedElement_impl.h AStructuralFeatureType_impl.cc AStructuralFeatureType_impl.h ASupplierSupplierDependency_impl.cc ASupplierSupplierDependency_impl.h ATargetFlowTarget_impl.cc ATargetFlowTarget_impl.h ATypeAssociationEnd_impl.cc ATypeAssociationEnd_impl.h AbstractionClass_impl.cc AbstractionClass_impl.h Abstraction_impl.cc Abstraction_impl.h AssociationClass_impl.cc AssociationClass_impl.h AssociationEndClass_impl.cc AssociationEndClass_impl.h AssociationEnd_impl.cc AssociationEnd_impl.h Association_impl.cc Association_impl.h BehavioralFeatureClass_impl.cc BehavioralFeatureClass_impl.h BehavioralFeature_impl.cc BehavioralFeature_impl.h BindingClass_impl.cc BindingClass_impl.h Binding_impl.cc Binding_impl.h ClassClass_impl.cc ClassClass_impl.h Class_impl.cc Class_impl.h ClassifierClass_impl.cc ClassifierClass_impl.h Classifier_impl.cc Classifier_impl.h CommentClass_impl.cc CommentClass_impl.h Comment_impl.cc Comment_impl.h ComponentClass_impl.cc ComponentClass_impl.h Component_impl.cc Component_impl.h CorePackage_impl.cc CorePackage_impl.h DataTypeClass_impl.cc DataTypeClass_impl.h DataType_impl.cc DataType_impl.h DataTypesPackage_impl.cc DataTypesPackage_impl.h DependencyClass_impl.cc DependencyClass_impl.h Dependency_impl.cc Dependency_impl.h ElementClass_impl.cc ElementClass_impl.h ElementResidenceClass_impl.cc ElementResidenceClass_impl.h ElementResidence_impl.cc ElementResidence_impl.h Element_impl.cc Element_impl.h ExtensionMechanismsPackage_impl.cc ExtensionMechanismsPackage_impl.h FeatureClass_impl.cc FeatureClass_impl.h Feature_impl.cc Feature_impl.h FlowClass_impl.cc FlowClass_impl.h Flow_impl.cc Flow_impl.h Foundation.h Foundation1.cc Foundation2.cc Foundation3.cc Foundation4.cc FoundationPackageFactory_impl.cc FoundationPackageFactory_impl.h FoundationPackage_impl.cc FoundationPackage_impl.h GeneralizableElementClass_impl.cc GeneralizableElementClass_impl.h GeneralizableElement_impl.cc GeneralizableElement_impl.h GeneralizationClass_impl.cc GeneralizationClass_impl.h Generalization_impl.cc Generalization_impl.h Makefile MethodClass_impl.cc MethodClass_impl.h Method_impl.cc Method_impl.h ModelElementClass_impl.cc ModelElementClass_impl.h ModelElement_impl.cc ModelElement_impl.h NamespaceClass_impl.cc NamespaceClass_impl.h Namespace_impl.cc Namespace_impl.h NodeClass_impl.cc NodeClass_impl.h Node_impl.cc Node_impl.h OperationClass_impl.cc OperationClass_impl.h Operation_impl.cc Operation_impl.h ParameterClass_impl.cc ParameterClass_impl.h Parameter_impl.cc Parameter_impl.h PermissionClass_impl.cc PermissionClass_impl.h Permission_impl.cc Permission_impl.h PresentationElementClass_impl.cc PresentationElementClass_impl.h PresentationElement_impl.cc PresentationElement_impl.h RelationshipClass_impl.cc RelationshipClass_impl.h Relationship_impl.cc Relationship_impl.h StereotypeClass_impl.cc StereotypeClass_impl.h Stereotype_impl.cc Stereotype_impl.h StructuralFeatureClass_impl.cc StructuralFeatureClass_impl.h StructuralFeature_impl.cc StructuralFeature_impl.h TaggedValueClass_impl.cc TaggedValueClass_impl.h TaggedValue_impl.cc TaggedValue_impl.h TemplateParameterClass_impl.cc TemplateParameterClass_impl.h TemplateParameter_impl.cc TemplateParameter_impl.h UmlAssociationClassClass_impl.cc UmlAssociationClassClass_impl.h UmlAssociationClass_impl.cc UmlAssociationClass_impl.h UmlAttributeClass_impl.cc UmlAttributeClass_impl.h UmlAttribute_impl.cc UmlAttribute_impl.h UmlConstraintClass_impl.cc UmlConstraintClass_impl.h UmlConstraint_impl.cc UmlConstraint_impl.h UmlInterfaceClass_impl.cc UmlInterfaceClass_impl.h UmlInterface_impl.cc UmlInterface_impl.h UsageClass_impl.cc UsageClass_impl.h Usage_impl.cc Usage_impl.h makefile.mk Log Message: Removed all the old UML 1.3 classes. Some of the .h files may be useful later? --- AAssociationConnection_impl.cc DELETED --- --- AAssociationConnection_impl.h DELETED --- --- ABehavioralFeatureParameter_impl.cc DELETED --- --- ABehavioralFeatureParameter_impl.h DELETED --- --- ABindingArgument_impl.cc DELETED --- --- ABindingArgument_impl.h DELETED --- --- AChildGeneralization_impl.cc DELETED --- --- AChildGeneralization_impl.h DELETED --- --- AClientClientDependency_impl.cc DELETED --- --- AClientClientDependency_impl.h DELETED --- --- ACommentAnnotatedElement_impl.cc DELETED --- --- ACommentAnnotatedElement_impl.h DELETED --- --- AConstrainedElement2StereotypeConstraint_impl.cc DELETED --- --- AConstrainedElement2StereotypeConstraint_impl.h DELETED --- --- AConstrainedElementConstraint_impl.cc DELETED --- --- AConstrainedElementConstraint_impl.h DELETED --- --- ADefaultElementTemplateParameter3_impl.cc DELETED --- --- ADefaultElementTemplateParameter3_impl.h DELETED --- --- ADeploymentLocationResident_impl.cc DELETED --- --- ADeploymentLocationResident_impl.h DELETED --- --- AImplementationLocationResidentElement_impl.cc DELETED --- --- AImplementationLocationResidentElement_impl.h DELETED --- --- AModelElement2TemplateParameter2_impl.cc DELETED --- --- AModelElement2TemplateParameter2_impl.h DELETED --- --- AModelElementTaggedValue_impl.cc DELETED --- --- AModelElementTaggedValue_impl.h DELETED --- --- AModelElementTemplateParameter_impl.cc DELETED --- --- AModelElementTemplateParameter_impl.h DELETED --- --- ANamespaceOwnedElement_impl.cc DELETED --- --- ANamespaceOwnedElement_impl.h DELETED --- --- AOwnerFeature_impl.cc DELETED --- --- AOwnerFeature_impl.h DELETED --- --- AParameterType_impl.cc DELETED --- --- AParameterType_impl.h DELETED --- --- AParentSpecialization_impl.cc DELETED --- --- AParentSpecialization_impl.h DELETED --- --- AParticipantSpecification_impl.cc DELETED --- --- AParticipantSpecification_impl.h DELETED --- --- APowertypePowertypeRange_impl.cc DELETED --- --- APowertypePowertypeRange_impl.h DELETED --- --- APresentationSubject_impl.cc DELETED --- --- APresentationSubject_impl.h DELETED --- --- AQualifierAssociationEnd_impl.cc DELETED --- --- AQualifierAssociationEnd_impl.h DELETED --- --- ARequiredTagStereotype_impl.cc DELETED --- --- ARequiredTagStereotype_impl.h DELETED --- --- AResidentElementResidence_impl.cc DELETED --- --- AResidentElementResidence_impl.h DELETED --- --- ASourceFlowSource_impl.cc DELETED --- --- ASourceFlowSource_impl.h DELETED --- --- ASpecificationMethod_impl.cc DELETED --- --- ASpecificationMethod_impl.h DELETED --- --- AStereotypeExtendedElement_impl.cc DELETED --- --- AStereotypeExtendedElement_impl.h DELETED --- --- AStructuralFeatureType_impl.cc DELETED --- --- AStructuralFeatureType_impl.h DELETED --- --- ASupplierSupplierDependency_impl.cc DELETED --- --- ASupplierSupplierDependency_impl.h DELETED --- --- ATargetFlowTarget_impl.cc DELETED --- --- ATargetFlowTarget_impl.h DELETED --- --- ATypeAssociationEnd_impl.cc DELETED --- --- ATypeAssociationEnd_impl.h DELETED --- --- AbstractionClass_impl.cc DELETED --- --- AbstractionClass_impl.h DELETED --- --- Abstraction_impl.cc DELETED --- --- Abstraction_impl.h DELETED --- --- AssociationClass_impl.cc DELETED --- --- AssociationClass_impl.h DELETED --- --- AssociationEndClass_impl.cc DELETED --- --- AssociationEndClass_impl.h DELETED --- --- AssociationEnd_impl.cc DELETED --- --- AssociationEnd_impl.h DELETED --- --- Association_impl.cc DELETED --- --- Association_impl.h DELETED --- --- BehavioralFeatureClass_impl.cc DELETED --- --- BehavioralFeatureClass_impl.h DELETED --- --- BehavioralFeature_impl.cc DELETED --- --- BehavioralFeature_impl.h DELETED --- --- BindingClass_impl.cc DELETED --- --- BindingClass_impl.h DELETED --- --- Binding_impl.cc DELETED --- --- Binding_impl.h DELETED --- --- ClassClass_impl.cc DELETED --- --- ClassClass_impl.h DELETED --- --- Class_impl.cc DELETED --- --- Class_impl.h DELETED --- --- ClassifierClass_impl.cc DELETED --- --- ClassifierClass_impl.h DELETED --- --- Classifier_impl.cc DELETED --- --- Classifier_impl.h DELETED --- --- CommentClass_impl.cc DELETED --- --- CommentClass_impl.h DELETED --- --- Comment_impl.cc DELETED --- --- Comment_impl.h DELETED --- --- ComponentClass_impl.cc DELETED --- --- ComponentClass_impl.h DELETED --- --- Component_impl.cc DELETED --- --- Component_impl.h DELETED --- --- CorePackage_impl.cc DELETED --- --- CorePackage_impl.h DELETED --- --- DataTypeClass_impl.cc DELETED --- --- DataTypeClass_impl.h DELETED --- --- DataType_impl.cc DELETED --- --- DataType_impl.h DELETED --- --- DataTypesPackage_impl.cc DELETED --- --- DataTypesPackage_impl.h DELETED --- --- DependencyClass_impl.cc DELETED --- --- DependencyClass_impl.h DELETED --- --- Dependency_impl.cc DELETED --- --- Dependency_impl.h DELETED --- --- ElementClass_impl.cc DELETED --- --- ElementClass_impl.h DELETED --- --- ElementResidenceClass_impl.cc DELETED --- --- ElementResidenceClass_impl.h DELETED --- --- ElementResidence_impl.cc DELETED --- --- ElementResidence_impl.h DELETED --- --- Element_impl.cc DELETED --- --- Element_impl.h DELETED --- --- ExtensionMechanismsPackage_impl.cc DELETED --- --- ExtensionMechanismsPackage_impl.h DELETED --- --- FeatureClass_impl.cc DELETED --- --- FeatureClass_impl.h DELETED --- --- Feature_impl.cc DELETED --- --- Feature_impl.h DELETED --- --- FlowClass_impl.cc DELETED --- --- FlowClass_impl.h DELETED --- --- Flow_impl.cc DELETED --- --- Flow_impl.h DELETED --- --- Foundation.h DELETED --- --- Foundation1.cc DELETED --- --- Foundation2.cc DELETED --- --- Foundation3.cc DELETED --- --- Foundation4.cc DELETED --- --- FoundationPackageFactory_impl.cc DELETED --- --- FoundationPackageFactory_impl.h DELETED --- --- FoundationPackage_impl.cc DELETED --- --- FoundationPackage_impl.h DELETED --- --- GeneralizableElementClass_impl.cc DELETED --- --- GeneralizableElementClass_impl.h DELETED --- --- GeneralizableElement_impl.cc DELETED --- --- GeneralizableElement_impl.h DELETED --- --- GeneralizationClass_impl.cc DELETED --- --- GeneralizationClass_impl.h DELETED --- --- Generalization_impl.cc DELETED --- --- Generalization_impl.h DELETED --- --- Makefile DELETED --- --- MethodClass_impl.cc DELETED --- --- MethodClass_impl.h DELETED --- --- Method_impl.cc DELETED --- --- Method_impl.h DELETED --- --- ModelElementClass_impl.cc DELETED --- --- ModelElementClass_impl.h DELETED --- --- ModelElement_impl.cc DELETED --- --- ModelElement_impl.h DELETED --- --- NamespaceClass_impl.cc DELETED --- --- NamespaceClass_impl.h DELETED --- --- Namespace_impl.cc DELETED --- --- Namespace_impl.h DELETED --- --- NodeClass_impl.cc DELETED --- --- NodeClass_impl.h DELETED --- --- Node_impl.cc DELETED --- --- Node_impl.h DELETED --- --- OperationClass_impl.cc DELETED --- --- OperationClass_impl.h DELETED --- --- Operation_impl.cc DELETED --- --- Operation_impl.h DELETED --- --- ParameterClass_impl.cc DELETED --- --- ParameterClass_impl.h DELETED --- --- Parameter_impl.cc DELETED --- --- Parameter_impl.h DELETED --- --- PermissionClass_impl.cc DELETED --- --- PermissionClass_impl.h DELETED --- --- Permission_impl.cc DELETED --- --- Permission_impl.h DELETED --- --- PresentationElementClass_impl.cc DELETED --- --- PresentationElementClass_impl.h DELETED --- --- PresentationElement_impl.cc DELETED --- --- PresentationElement_impl.h DELETED --- --- RelationshipClass_impl.cc DELETED --- --- RelationshipClass_impl.h DELETED --- --- Relationship_impl.cc DELETED --- --- Relationship_impl.h DELETED --- --- StereotypeClass_impl.cc DELETED --- --- StereotypeClass_impl.h DELETED --- --- Stereotype_impl.cc DELETED --- --- Stereotype_impl.h DELETED --- --- StructuralFeatureClass_impl.cc DELETED --- --- StructuralFeatureClass_impl.h DELETED --- --- StructuralFeature_impl.cc DELETED --- --- StructuralFeature_impl.h DELETED --- --- TaggedValueClass_impl.cc DELETED --- --- TaggedValueClass_impl.h DELETED --- --- TaggedValue_impl.cc DELETED --- --- TaggedValue_impl.h DELETED --- --- TemplateParameterClass_impl.cc DELETED --- --- TemplateParameterClass_impl.h DELETED --- --- TemplateParameter_impl.cc DELETED --- --- TemplateParameter_impl.h DELETED --- --- UmlAssociationClassClass_impl.cc DELETED --- --- UmlAssociationClassClass_impl.h DELETED --- --- UmlAssociationClass_impl.cc DELETED --- --- UmlAssociationClass_impl.h DELETED --- --- UmlAttributeClass_impl.cc DELETED --- --- UmlAttributeClass_impl.h DELETED --- --- UmlAttribute_impl.cc DELETED --- --- UmlAttribute_impl.h DELETED --- --- UmlConstraintClass_impl.cc DELETED --- --- UmlConstraintClass_impl.h DELETED --- --- UmlConstraint_impl.cc DELETED --- --- UmlConstraint_impl.h DELETED --- --- UmlInterfaceClass_impl.cc DELETED --- --- UmlInterfaceClass_impl.h DELETED --- --- UmlInterface_impl.cc DELETED --- --- UmlInterface_impl.h DELETED --- --- UsageClass_impl.cc DELETED --- --- UsageClass_impl.h DELETED --- --- Usage_impl.cc DELETED --- --- Usage_impl.h DELETED --- --- makefile.mk DELETED --- |
|
From: Chris M. <zm...@us...> - 2002-03-06 22:31:04
|
Update of /cvsroot/kuml/kuml/libkuml/uml In directory usw-pr-cvs1:/tmp/cvs-serv2502 Modified Files: codegen.mf Log Message: Remove all target as I never used it. Added the missing targets. Played with a newer version of Xalan. Index: codegen.mf =================================================================== RCS file: /cvsroot/kuml/kuml/libkuml/uml/codegen.mf,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** codegen.mf 7 Aug 2001 22:39:13 -0000 1.2 --- codegen.mf 6 Mar 2002 22:30:57 -0000 1.3 *************** *** 1,3 **** --- 1,4 ---- CLASSPATH='/opt/xalan-j_2_0_1/bin/xalan.jar:/opt/xalan-j_2_0_1/bin/xerces.jar' + #CLASSPATH='/opt/xalan-j_2_2_D6/bin/xalan.jar:/opt/xalan-j_2_2_D6/bin/xerces.jar' JAVACOMM=java -Xmx150000000 -classpath $(CLASSPATH) XALANCOMM=$(JAVACOMM) org.apache.xalan.xslt.Process *************** *** 5,10 **** XSL_DIR=tools - all: class_hs class_ccs assoc_hs proxy_hs - class_hs: $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_class_hs.xsl --- 6,9 ---- *************** *** 16,19 **** --- 15,21 ---- $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_assoc_hs.xsl + assoc_ccs: + $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_assoc_ccs.xsl + proxy_hs: $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_proxy_hs.xsl *************** *** 21,24 **** --- 23,38 ---- proxy_ccs: $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_proxy_ccs.xsl + + factory_hs: + $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_factory_hs.xsl + + factory_ccs: + $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_factory_ccs.xsl + + package_hs: + $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_package_hs.xsl + + package_ccs: + $(XALANCOMM) -IN $(MOF_MODEL_OF_UML) -XSL $(XSL_DIR)/gen_package_ccs.xsl clean: |
|
From: Chris M. <zm...@us...> - 2002-03-06 22:27:07
|
Update of /cvsroot/kuml/kuml/libkuml/uml/tools
In directory usw-pr-cvs1:/tmp/cvs-serv763
Modified Files:
common_code.xsl common_proxy_code.xsl gen_proxy_ccs.xsl
gen_proxy_hs.xsl
Log Message:
Mods to generate the commas between parameters properly.
This is a big mod for such a small bug.
Index: common_code.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/common_code.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** common_code.xsl 26 Dec 2001 00:03:36 -0000 1.11
--- common_code.xsl 6 Mar 2002 22:27:03 -0000 1.12
***************
*** 218,221 ****
--- 218,353 ----
+ <xsl:template name="append-to-bag">
+ <xsl:param name="old_bag"/>
+ <xsl:param name="new_elems"/>
+
+ <xsl:choose>
+
+ <xsl:when test='string-length($old_bag) = 0'>
+
+ <xsl:value-of select="$new_elems"/>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+
+ <xsl:value-of select="$old_bag"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$new_elems"/>
+
+ </xsl:otherwise>
+
+ </xsl:choose>
+
+ </xsl:template>
+
+
+ <!-- Insert an element into a set (space-separated list of unique elements)
+ -->
+ <xsl:template name="insert-in-set">
+ <xsl:param name="old_set"/>
+ <xsl:param name="new_elems"/>
+
+ <xsl:choose>
+
+ <xsl:when test='contains($new_elems," ")'>
+
+ <xsl:variable name="new_set">
+
+ <xsl:call-template name="insert-in-set">
+ <xsl:with-param name="old_set" select="$old_set"/>
+ <xsl:with-param name="new_elems"
+ select='substring-before($new_elems," ")'/>
+ </xsl:call-template>
+
+ </xsl:variable>
+
+ <xsl:call-template name="insert-in-set">
+ <xsl:with-param name="old_set" select="$new_set"/>
+ <xsl:with-param name="new_elems"
+ select='substring-after($new_elems," ")'/>
+ </xsl:call-template>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+
+ <xsl:variable name="in_set">
+
+ <xsl:call-template name="list-contains">
+ <xsl:with-param name="the_list" select="$old_set"/>
+ <xsl:with-param name="the_item" select="$new_elems"/>
+ </xsl:call-template>
+
+ </xsl:variable>
+
+ <xsl:choose>
+ <xsl:when test='$in_set = "true"'>
+ <xsl:value-of select="$old_set"/>
+ </xsl:when>
+ <xsl:when test='string-length($old_set) = 0'>
+ <xsl:value-of select="$new_elems"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$old_set"/>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$new_elems"/>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:otherwise>
+
+ </xsl:choose>
+
+ </xsl:template>
+
+
+ <!-- Make a set of space-separated items from a bag of same -->
+ <xsl:template name="make-unique">
+ <xsl:param name="the_bag"/>
+ <xsl:param name="the_set"/>
+
+ <xsl:choose>
+
+ <xsl:when test='string-length($the_bag) = 0'>
+
+ <xsl:value-of select="$the_set"/>
+
+ </xsl:when>
+
+ <xsl:when test='contains($the_bag," ")'>
+
+ <xsl:variable name="new_set">
+
+ <xsl:call-template name="insert-in-set">
+ <xsl:with-param name="old_set" select="$the_set"/>
+ <xsl:with-param name="new_elems"
+ select='substring-before($the_bag," ")'/>
+ </xsl:call-template>
+
+ </xsl:variable>
+
+ <xsl:call-template name="make-unique">
+ <xsl:with-param name="the_bag"
+ select='substring-after($the_bag," ")'/>
+ <xsl:with-param name="the_set" select="$new_set"/>
+ </xsl:call-template>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+
+ <xsl:call-template name="insert-in-set">
+ <xsl:with-param name="old_set" select="$the_set"/>
+ <xsl:with-param name="new_elems" select="$the_bag"/>
+ </xsl:call-template>
+
+ </xsl:otherwise>
+
+ </xsl:choose>
+
+ </xsl:template>
+
+
<!-- Template for mangling names.
Special care must be taken to process idl_substitute name tags.
Index: common_proxy_code.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/common_proxy_code.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** common_proxy_code.xsl 26 Dec 2001 00:03:36 -0000 1.4
--- common_proxy_code.xsl 6 Mar 2002 22:27:03 -0000 1.5
***************
*** 38,50 ****
<xsl:param name="collection"/>
- <!-- xsl:variable name="package_name">
- <xsl:call-template name="toName">
- <xsl:with-param name="text">
- <xsl:value-of select="ancestor::Model:Package/@name"/>
- </xsl:with-param>
- <xsl:with-param name="position" select="1"/>
- </xsl:call-template>
- </xsl:variable -->
-
<xsl:variable name="type_name" select="ancestor::Model:DataType/@name"/>
--- 38,41 ----
***************
*** 59,63 ****
</xsl:when>
<xsl:otherwise>
- <!-- xsl:value-of select="$package_name"/ -->
<xsl:text>const char*</xsl:text>
</xsl:otherwise>
--- 50,53 ----
***************
*** 183,186 ****
--- 173,251 ----
+ <!-- Replace the default rule. -->
+ <xsl:template match="*" mode="walk_supertypes_tree_for_commas"/>
+
+
+ <!-- Template to walk the tree of supertypes for a class and
+ see if they have any attributes. If they have
+ we need to output a comma separator.
+ All this processing for a comma? Mad.
+ -->
+ <xsl:template match="Model:Class" mode="walk_supertypes_tree_for_commas">
+
+ <xsl:choose>
+
+ <xsl:when test='count(Model:Namespace.contents/Model:Attribute) > 0'>
+
+ <xsl:text>, </xsl:text>
+
+ </xsl:when>
+
+ </xsl:choose>
+
+ </xsl:template>
+
+
+ <!-- Template to split a supertype attribute string
+ (space separated xmi.id list) into its individual items
+ and apply templates to the corresponding Model:Class nodes.
+ -->
+ <xsl:template name="split_supertypes_for_commas">
+ <xsl:param name="supertypes"/>
+
+ <xsl:choose>
+
+ <xsl:when test='contains($supertypes," ")'>
+
+ <xsl:variable name="result">
+
+ <xsl:apply-templates mode="walk_supertypes_tree_for_commas"
+ select='/descendant::Model:Class[@xmi.id=substring-before($supertypes," ")]'/>
+
+ </xsl:variable>
+
+ <xsl:choose>
+
+ <xsl:when test='string-length($result) = 0'>
+
+ <xsl:call-template name="split_supertypes_for_commas">
+ <xsl:with-param name="supertypes"
+ select='substring-after($supertypes," ")'/>
+ </xsl:call-template>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+
+ <xsl:value-of select="$result"/>
+
+ </xsl:otherwise>
+
+ </xsl:choose>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+
+ <xsl:apply-templates mode="walk_supertypes_tree_for_commas"
+ select='/descendant::Model:Class[@xmi.id=$supertypes]'/>
+
+ </xsl:otherwise>
+
+ </xsl:choose>
+
+ </xsl:template>
+
+
<!-- Templates to do parameters to the create_<class> methods parameters.
These templates all use the create_params mode.
***************
*** 194,202 ****
<!-- Certain nodes do nothing. -->
<xsl:template mode="create_params"
! match="/ | XMI | XMI.content | Model:Package | Model:Namespace.contents | Model:DataType.typeCode | XMI.CorbaTypeCode">
<xsl:param name="package_name"/>
<xsl:apply-templates mode="create_params">
<xsl:with-param name="package_name" select="$package_name"/>
</xsl:apply-templates>
--- 259,269 ----
<!-- Certain nodes do nothing. -->
<xsl:template mode="create_params"
! match="/ | XMI | XMI.content | Model:Package | Model:Class | Model:Namespace.contents | Model:DataType.typeCode | XMI.CorbaTypeCode">
<xsl:param name="package_name"/>
+ <xsl:param name="supertypes"/>
<xsl:apply-templates mode="create_params">
<xsl:with-param name="package_name" select="$package_name"/>
+ <xsl:with-param name="supertypes" select="$supertypes"/>
</xsl:apply-templates>
***************
*** 206,215 ****
<xsl:template match="Model:Attribute" mode="create_params">
<xsl:param name="package_name"/>
! <!-- Hack!! If class name != ModelElement or attribute name != name.. -->
! <xsl:if
! test='not(ancestor::Model:Class/@name = "ModelElement" and @name = "name")'>
! <xsl:text>, </xsl:text>
! </xsl:if>
<xsl:variable name="collection">
--- 273,295 ----
<xsl:template match="Model:Attribute" mode="create_params">
<xsl:param name="package_name"/>
+ <xsl:param name="supertypes"/>
!
! <!-- If there is a previous attribute
! (i.e. one in this class or in a supertype)
! then output a comma.
! -->
! <xsl:choose>
! <xsl:when test='count(preceding-sibling::Model:Attribute) > 0'>
! <xsl:text>, </xsl:text>
! </xsl:when>
! <xsl:otherwise>
! <xsl:call-template name="split_supertypes_for_commas">
! <xsl:with-param name="supertypes">
! <xsl:value-of select="$supertypes"/>
! </xsl:with-param>
! </xsl:call-template>
! </xsl:otherwise>
! </xsl:choose>
<xsl:variable name="collection">
***************
*** 259,310 ****
! <xsl:template match="Model:Class" mode="create_params">
<xsl:param name="package_name"/>
! <!-- attempt to find this class's supertype -->
! <xsl:variable name="supertypes" select="@supertypes"/>
! <!-- if a supertype exists recurse on supertype -->
! <xsl:if test='count(attribute::supertypes) > 0'>
! <xsl:choose>
! <xsl:when test='contains(@supertypes," ")'>
! <xsl:apply-templates mode="create_params"
! select='/descendant::Model:Class[@xmi.id=substring-before($supertypes," ")]'>
! <xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates>
! <!-- Hack!!
! xsl:apply-templates mode="create_params"
! select='/descendant::Model:Class[@xmi.id=substring-after($supertypes," ")]'
! <xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates
! End Hack!! -->
! </xsl:when>
! <xsl:otherwise>
! <xsl:apply-templates mode="create_params"
! select='/descendant::Model:Class[@xmi.id=$supertypes]'>
! <xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates>
- </xsl:otherwise>
! </xsl:choose>
! </xsl:if>
! <!-- output the current nodes attributes -->
! <xsl:apply-templates mode="create_params">
! <xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates>
</xsl:template>
</xsl:transform>
--- 339,475 ----
! <!-- Split the supertype_set parameter up into its individual referneces.
! Nodes we have visited get stored in previous_supertypes
! (so we can se if they contain any attributes
! (damn those commas are tricky))
! -->
! <xsl:template name="split_supertypes_for_create_params">
<xsl:param name="package_name"/>
+ <xsl:param name="supertype_set"/>
+ <xsl:param name="previous_supertypes"/>
! <xsl:choose>
! <xsl:when test='contains($supertype_set," ")'>
! <xsl:variable name="new_supertype"
! select='substring-before($supertype_set," ")'/>
! <xsl:apply-templates mode="create_params"
! select='/descendant::Model:Class[@xmi.id=$new_supertype]'>
! <xsl:with-param name="package_name" select="$package_name"/>
! <xsl:with-param name="supertypes" select="$previous_supertypes"/>
! </xsl:apply-templates>
!
! <xsl:variable name="old_supertypes">
! <xsl:call-template name="append-to-bag">
! <xsl:with-param name="old_bag" select="$previous_supertypes"/>
! <xsl:with-param name="new_elems" select="$new_supertype"/>
! </xsl:call-template>
! </xsl:variable>
!
! <xsl:call-template name="split_supertypes_for_create_params">
! <xsl:with-param name="package_name" select="$package_name"/>
! <xsl:with-param name="supertype_set"
! select='substring-after($supertype_set," ")'/>
! <xsl:with-param name="previous_supertypes" select="$old_supertypes"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:otherwise>
!
! <xsl:apply-templates mode="create_params"
! select='/descendant::Model:Class[@xmi.id=$supertype_set]'>
! <xsl:with-param name="package_name" select="$package_name"/>
! <xsl:with-param name="supertypes" select="$previous_supertypes"/>
! </xsl:apply-templates>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:template>
! <xsl:template name="split_supertypes_for_form_supertype_set">
! <xsl:param name="supertypes"/>
! <xsl:choose>
! <xsl:when test='contains($supertypes," ")'>
!
! <xsl:apply-templates mode="form_supertype_set"
! select='/descendant::Model:Class[@xmi.id=substring-before($supertypes," ")]'/>
!
! <xsl:text> </xsl:text>
!
! <xsl:call-template name="split_supertypes_for_form_supertype_set">
! <xsl:with-param name="supertypes"
! select='substring-after($supertypes," ")'/>
! </xsl:call-template>
!
! </xsl:when>
!
! <xsl:otherwise>
!
! <xsl:apply-templates mode="form_supertype_set"
! select='/descendant::Model:Class[@xmi.id=$supertypes]'/>
!
! </xsl:otherwise>
!
! </xsl:choose>
!
! </xsl:template>
!
!
! <!-- Replace the default rule. -->
! <xsl:template match="*" mode="form_supertype_set"/>
!
!
! <!-- Template to walk tree and form unique set of uperclasses. -->
! <xsl:template match="Model:Class" mode="form_supertype_set">
!
! <xsl:choose>
!
! <xsl:when test='count(attribute::supertypes) > 0'>
!
! <xsl:call-template name="split_supertypes_for_form_supertype_set">
! <xsl:with-param name="supertypes" select="@supertypes"/>
! </xsl:call-template>
!
! <xsl:text> </xsl:text>
!
! </xsl:when>
!
! </xsl:choose>
!
! <xsl:value-of select="@xmi.id"/>
</xsl:template>
+ <!-- Template to use unique set and apply templates for attrs etc. -->
+ <xsl:template name="create_unique_params">
+ <xsl:param name="package_name"/>
+
+ <xsl:variable name="supertype_bag">
+ <xsl:apply-templates mode="form_supertype_set" select="."/>
+ </xsl:variable>
+
+ <xsl:variable name="supertype_set">
+ <xsl:call-template name="make-unique">
+ <xsl:with-param name="the_bag" select="$supertype_bag"/>
+ <!-- Pass the empty string as the start condition -->
+ <xsl:with-param name="the_set" select='substring-before("a","b")'/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <xsl:call-template name="split_supertypes_for_create_params">
+ <xsl:with-param name="supertype_set" select="$supertype_set"/>
+ <xsl:with-param name="package_name" select="$package_name"/>
+ </xsl:call-template>
+
+ </xsl:template>
</xsl:transform>
Index: gen_proxy_ccs.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/gen_proxy_ccs.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gen_proxy_ccs.xsl 30 Jan 2002 20:41:04 -0000 1.5
--- gen_proxy_ccs.xsl 6 Mar 2002 22:27:03 -0000 1.6
***************
*** 352,358 ****
<xsl:text>( </xsl:text>
! <xsl:apply-templates mode="create_params" select=".">
<xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates>
<xsl:text> ) </xsl:text>
--- 352,358 ----
<xsl:text>( </xsl:text>
! <xsl:call-template name="create_unique_params">
<xsl:with-param name="package_name" select="$package_name"/>
! </xsl:call-template>
<xsl:text> ) </xsl:text>
Index: gen_proxy_hs.xsl
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/tools/gen_proxy_hs.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** gen_proxy_hs.xsl 30 Jan 2002 20:41:04 -0000 1.12
--- gen_proxy_hs.xsl 6 Mar 2002 22:27:03 -0000 1.13
***************
*** 261,267 ****
<xsl:text>( </xsl:text>
! <xsl:apply-templates mode="create_params" select=".">
<xsl:with-param name="package_name" select="$package_name"/>
! </xsl:apply-templates>
<xsl:text> ) </xsl:text>
--- 261,267 ----
<xsl:text>( </xsl:text>
! <xsl:call-template name ="create_unique_params">
<xsl:with-param name="package_name" select="$package_name"/>
! </xsl:call-template>
<xsl:text> ) </xsl:text>
***************
*** 276,284 ****
</xsl:if>
! <xsl:text> Reflective::RefPackage_ptr get_parent_package(); </xsl:text>
<xsl:text> </xsl:text>
! <xsl:text> void set_parent_package(Reflective::RefPackage_ptr new_value); </xsl:text>
<xsl:text> </xsl:text>
--- 276,284 ----
</xsl:if>
! <xsl:text> Reflective::RefPackage_ptr get_parent_package(); </xsl:text>
<xsl:text> </xsl:text>
! <xsl:text> void set_parent_package(Reflective::RefPackage_ptr new_value); </xsl:text>
<xsl:text> </xsl:text>
|
|
From: Gerard F. <ger...@us...> - 2002-03-03 22:03:44
|
Update of /cvsroot/kuml/kuml_old/kuml/diagrams
In directory usw-pr-cvs1:/tmp/cvs-serv2699/kuml/diagrams
Modified Files:
diagram.cpp diagramloader.cpp
Log Message:
2002-03-03 Gerard Flynn <ger...@li...>
* iokumlutility.cpp fixed parsing problem in readStatement
* kuml.cpp commented PopUp warnings for save/restore functions
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp kuml/resource.h
VS: kuml/diagrams/diagram.cpp kuml/diagrams/diagramloader.cpp
VS: ----------------------------------------------------------------------
Index: diagram.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagram.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** diagram.cpp 8 Oct 2000 04:22:25 -0000 1.1.1.1
--- diagram.cpp 3 Mar 2002 22:03:41 -0000 1.2
***************
*** 56,59 ****
--- 56,60 ----
void Diagram::writeAllItemsAsKuml(IOKumlUtility &stream, int filter) {
// Write all operations
+ debug( "Call to Diagram::writeAllItemsAsKuml" );
ListOfDrawingItemsIterator iter(listOfDrawingItems);
for(unsigned int i = 0; i < iter.count(); i++) {
***************
*** 65,68 ****
--- 66,71 ----
////////////////////////////////////////////////////////////////////////
void Diagram::writeAsKuml(IOKumlUtility &stream) {
+
+ debug( "Call to Diagram::writeAsKuml" );
stream.writeGroupItem("diagram", getNameDiagram());
#if !defined (KDE2)
***************
*** 85,91 ****
--- 88,99 ----
name;
int type;
+
+ debug( "Call to Diagram::readAsKuml" );
+
while((type = stream.readStatement()) != IOKumlUtility::CloseGroup) {
+ debug( "Diagram::readAsKuml in while loop" );
switch(type) {
case IOKumlUtility::Assignment:
+ debug( "Diagram::readAsKuml handling assignment" );
value = stream.getAssignmentValue();
name = stream.getAssignmentName();
***************
*** 109,113 ****
--- 117,124 ----
case IOKumlUtility::GroupItem:
+ debug( "Diagram::readAsKuml handling GroupItem : " );
+ debug( stream.getGroupType() );
if(stream.getGroupType() == "drawingrectangle") {
+ debug( "Diagram::readAsKuml handling drawingrectangle" );
item = new DrawingRectangle(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 117,120 ****
--- 128,132 ----
}
if(stream.getGroupType() == "drawingtext") {
+ debug( "Diagram::readAsKuml handling drawingtext" );
item = new DrawingText(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 124,127 ****
--- 136,140 ----
}
if(stream.getGroupType() == "drawingtextnotelink") {
+ debug( "Diagram::readAsKuml handling drawingtextnotelink" );
item = new DrawingTextnoteLink(NULL, getPtrDrawingArea());
item->setLabel(stream.getGroupName());
***************
*** 606,608 ****
}
! ////////////////////////////////////////////////////////////////////////
\ No newline at end of file
--- 619,621 ----
}
! ////////////////////////////////////////////////////////////////////////
Index: diagramloader.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/diagrams/diagramloader.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** diagramloader.cpp 8 Oct 2000 04:22:25 -0000 1.1.1.1
--- diagramloader.cpp 3 Mar 2002 22:03:41 -0000 1.2
***************
*** 50,53 ****
--- 50,55 ----
Diagram* DiagramLoader::load(const QString& filename, WinOverView *overview) {
+ debug("Call to DiagramLoader::load.");
+
QFile file(filename);
if(file.open(IO_ReadOnly) == false) {
***************
*** 70,73 ****
--- 72,77 ----
#if !defined (EXPERIMENTAL_PERSISTENCE)
+ debug("DiagramLoader::load : non-experimental section.");
+
// Create the diagram by given diagram name as string
DiagramFactory factory(area);
***************
*** 79,84 ****
--- 83,92 ----
}
+ debug("DiagramLoader::load : after diagram creation");
+
area->slotSetDiagram(diagram);
+ debug("DiagramLoader::load : after slotSetDiagram");
+
***************
*** 87,91 ****
DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
if(newdialog->exec()) {
--- 95,100 ----
DlgNewDiagram *newdialog = new DlgNewDiagram((QWidget*)0,"Create new diagram", getPtrDrawingArea());
! connect(newdialog, SIGNAL(sigNewDiagram(Diagram*)),
! getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
if(newdialog->exec()) {
***************
*** 102,106 ****
show();
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)), getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);*/
--- 111,116 ----
show();
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getPtrDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);*/
***************
*** 115,123 ****
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)), getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
diagram->readAsKuml(utilstream);
if(overview) {
// Larry Anderson : commented out the following line and changed the next from
--- 125,138 ----
overview->setSelected(listviewitem, true);
diagram->setLVI(listviewitem);
! connect(listviewitem, SIGNAL(sigSetDiagram(Diagram*)),
! getDrawingArea(), SLOT(slotSetDiagram(Diagram*)));
listviewitem->setOpen(true);
}
+ debug("DiagramLoader::load : before diagram->readAsKuml");
+
diagram->readAsKuml(utilstream);
+ debug("DiagramLoader::load : after diagram->readAsKuml");
+
if(overview) {
// Larry Anderson : commented out the following line and changed the next from
***************
*** 130,133 ****
--- 145,150 ----
// getDrawingArea()->getMainApp()->toolbox->enable(KToolBar::Show);
}
+
+ debug("DiagramLoader::load : before area->show");
area->show();
// Larry Anderson : added the following
|
|
From: Gerard F. <ger...@us...> - 2002-03-03 22:03:44
|
Update of /cvsroot/kuml/kuml_old/kuml
In directory usw-pr-cvs1:/tmp/cvs-serv2699/kuml
Modified Files:
iokumlutility.cpp kuml.cpp
Log Message:
2002-03-03 Gerard Flynn <ger...@li...>
* iokumlutility.cpp fixed parsing problem in readStatement
* kuml.cpp commented PopUp warnings for save/restore functions
VS: Committing in .
VS:
VS: Modified Files:
VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp kuml/resource.h
VS: kuml/diagrams/diagram.cpp kuml/diagrams/diagramloader.cpp
VS: ----------------------------------------------------------------------
Index: iokumlutility.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/iokumlutility.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** iokumlutility.cpp 8 Oct 2000 04:21:47 -0000 1.1.1.1
--- iokumlutility.cpp 3 Mar 2002 22:03:41 -0000 1.2
***************
*** 46,52 ****
restOfLine;
firstToken = readToken();
! if(firstToken == closeGroupChar)
return CloseGroup;
secondToken = readToken();
--- 46,56 ----
restOfLine;
+ debug( "Call to IOKumlUtility::readStatement" );
+
firstToken = readToken();
! if(firstToken == closeGroupChar) {
! debug( "IOKumlUtility::readStatement returning CloseGroup" );
return CloseGroup;
+ }
secondToken = readToken();
***************
*** 54,59 ****
--- 58,68 ----
// Assignment recognized
if(secondToken == "=") {
+ debug( "IOKumlUtility::readStatement handling Assignment" );
assignmentName = firstToken;
assignmentValue = readToken();
+ debug( "IOKumlUtility::readStatement handling Assignment, after readToken" );
+ debug( "assignmentValue :" );
+ debug( assignmentValue );
+
#if !defined (KDE2)
***************
*** 65,78 ****
#else // defined (KDE2)
// Get the rest of the value (the end is marked with a semicolon)
! while(assignmentValue.at(assignmentValue.length () -2) != ';')
assignmentValue = assignmentValue + QString (" ") + readToken();
! assignmentValue.truncate(assignmentValue.length () -2); // remove the trailing semicolon
#endif // defined (KDE2)
return Assignment;
}
// Group item recognized
else {
groupType = firstToken;
if(secondToken == openGroupChar)
--- 74,90 ----
#else // defined (KDE2)
// Get the rest of the value (the end is marked with a semicolon)
! debug( QString( assignmentValue.at( assignmentValue.length() - 2 ) ) );
! while( assignmentValue.at( assignmentValue.length () - 1 ) != ';' )
assignmentValue = assignmentValue + QString (" ") + readToken();
! assignmentValue.truncate( assignmentValue.length () - 1 ); // remove the trailing semicolon
#endif // defined (KDE2)
+ debug( "IOKumlUtility::readStatement returning Assignement" );
return Assignment;
}
// Group item recognized
else {
+ debug( "IOKumlUtility::readStatement handling GroupItem" );
groupType = firstToken;
if(secondToken == openGroupChar)
***************
*** 83,88 ****
--- 95,102 ----
groupName += QString(" ") + nextToken;
}
+ debug( "IOKumlUtility::readStatement returning GroupItem" );
return GroupItem;
}
+ debug( "End IOKumlUtility::readStatement" );
}
////////////////////////////////////////////////////////////////////////
Index: kuml.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kuml.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** kuml.cpp 2 Mar 2002 17:31:04 -0000 1.2
--- kuml.cpp 3 Mar 2002 22:03:41 -0000 1.3
***************
*** 704,712 ****
{
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER) // Sorry Darius it was
// pissing me off - Geoff
///////////////// Darius: just temporarly //////////////////////////
! QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 704,714 ----
{
+ debug( "Call to KumlApp::slotProjectOpen" );
+
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER) // Sorry Darius it was
// pissing me off - Geoff
///////////////// Darius: just temporarly //////////////////////////
! // QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! // return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
***************
*** 756,761 ****
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
///////////////// Darius: just temporarly //////////////////////////
! QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 758,763 ----
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
///////////////// Darius: just temporarly //////////////////////////
! // QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! // return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
***************
*** 823,828 ****
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
///////////////// Darius: just temporarly //////////////////////////
! QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 825,830 ----
#if !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
///////////////// Darius: just temporarly //////////////////////////
! // QMessageBox::information(this, i18n("IO Error"), i18n("This function is under construction"));
! // return;
////////////////////////////////////////////////////////////////////
#endif // !defined (EXPERIMENTAL_PERSISTENCE_LAYER)
|
|
From: Gerard F. <ger...@us...> - 2002-03-03 22:03:43
|
Update of /cvsroot/kuml/kuml_old In directory usw-pr-cvs1:/tmp/cvs-serv2699 Modified Files: ChangeLog Log Message: 2002-03-03 Gerard Flynn <ger...@li...> * iokumlutility.cpp fixed parsing problem in readStatement * kuml.cpp commented PopUp warnings for save/restore functions VS: Committing in . VS: VS: Modified Files: VS: ChangeLog kuml/iokumlutility.cpp kuml/kuml.cpp kuml/resource.h VS: kuml/diagrams/diagram.cpp kuml/diagrams/diagramloader.cpp VS: ---------------------------------------------------------------------- Index: ChangeLog =================================================================== RCS file: /cvsroot/kuml/kuml_old/ChangeLog,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ChangeLog 2 Mar 2002 17:33:55 -0000 1.2 --- ChangeLog 3 Mar 2002 22:03:41 -0000 1.3 *************** *** 1,2 **** --- 1,6 ---- + 2002-03-03 Gerard Flynn <ger...@li...> + * iokumlutility.cpp fixed parsing problem in readStatement + * kuml.cpp commented PopUp warnings for save/restore functions + 2002-03-02 Gerard Flynn <ger...@li...> * Made some changes to allow the experimental XML persistence layer |
|
From: Gerard F. <ger...@us...> - 2002-03-03 11:18:35
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence In directory usw-pr-cvs1:/tmp/cvs-serv24874 Removed Files: clDataSourceFactory.cpp clDataSourceFactory.h Log Message: Fixed problem with last commit. Had forgotten adds/removes (actually moved files into a new directory/library to correct interdependency problem). VS: Modified Files: VS: XML/clXmlDataSource.cpp VS: Added Files: VS: factories/Makefile.am factories/clDataSourceFactory.cpp VS: factories/clDataSourceFactory.h VS: Removed Files: VS: clDataSourceFactory.cpp clDataSourceFactory.h VS: ---------------------------------------------------------------------- --- clDataSourceFactory.cpp DELETED --- --- clDataSourceFactory.h DELETED --- |
|
From: Gerard F. <ger...@us...> - 2002-03-03 11:18:35
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence/factories
In directory usw-pr-cvs1:/tmp/cvs-serv24874/factories
Added Files:
Makefile.am clDataSourceFactory.cpp clDataSourceFactory.h
Log Message:
Fixed problem with last commit. Had forgotten adds/removes (actually
moved files into a new directory/library to correct interdependency
problem).
VS: Modified Files:
VS: XML/clXmlDataSource.cpp
VS: Added Files:
VS: factories/Makefile.am factories/clDataSourceFactory.cpp
VS: factories/clDataSourceFactory.h
VS: Removed Files:
VS: clDataSourceFactory.cpp clDataSourceFactory.h
VS: ----------------------------------------------------------------------
--- NEW FILE ---
####### kdevelop will overwrite this part!!! (begin)##########
INCLUDES = $(all_includes)
libp_factories_a_METASOURCES = USE_AUTOMOC
noinst_LIBRARIES = libp_factories.a
libp_factories_a_SOURCES = clDataSourceFactory.cpp
EXTRA_DIST = clDataSourceFactory.h
####### kdevelop will overwrite this part!!! (end)############
--- NEW FILE ---
#include <exception>
#include "config.h"
#include "clDataSourceFactory.h"
#if defined (HAVE_XML_SUPPORT)
#include "../XML/clXmlDataSource.h"
#include "../XML/clXmlDataSourceFactory.h"
#endif // defined (HAVE_XML_SUPPORT)
clDataSourceFactory *clDataSourceFactory::mvSingleton = 0;
ifDataSource *clDataSourceFactory::meGetDataSource (
const QString &pFormat)
throw (clPersistentOperationException)
{
ifDataSourceFactory *lvDataSourceFactory = 0;
#if defined (HAVE_GNOME_XML)
if ("XML" == pFormat)
{
lvDataSourceFactory =
clXmlDataSourceFactory::meGetDataSourceFactory ();
}
#endif // defined (HAVE_GNOME_XML)
if (0 != lvDataSourceFactory)
{
return (lvDataSourceFactory->meGetDataSource (pFormat));
}
//
// No data sources.
//
throw clPersistentOperationException ();
}
ifDataSourceFactory *clDataSourceFactory::meGetDataSourceFactory ()
throw (clPersistentOperationException)
{
if (0 == mvSingleton)
{
// try
// {
mvSingleton = new clDataSourceFactory;
// }
// catch (...)
// {
// throw clPersistentOperationException ();
// }
}
return (mvSingleton);
}
--- NEW FILE ---
#if !defined (__clDataSourceFactory_h__)
#define __clDataSourceFactory_h__
#include "../ifDataSourceFactory.h"
#include "../../../diagrams/diagram.h"
class clDataSourceFactory : public ifDataSourceFactory
{
private:
static clDataSourceFactory *mvSingleton;
//
// Disabled methods.
//
clDataSourceFactory (const clDataSourceFactory &);
clDataSourceFactory &operator= (const clDataSourceFactory &);
//
// Hidden methods.
//
clDataSourceFactory () {};
virtual ~clDataSourceFactory () {};
public:
static ifDataSourceFactory *meGetDataSourceFactory ()
throw (clPersistentOperationException);
ifDataSource *meGetDataSource (const QString &pFormat)
throw (clPersistentOperationException);
};
#endif // !defined (__clDataSourceFactory_h__)
|
|
From: Gerard F. <ger...@us...> - 2002-03-03 11:18:34
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence/XML
In directory usw-pr-cvs1:/tmp/cvs-serv24874/XML
Modified Files:
clXmlDataSource.cpp
Log Message:
Fixed problem with last commit. Had forgotten adds/removes (actually
moved files into a new directory/library to correct interdependency
problem).
VS: Modified Files:
VS: XML/clXmlDataSource.cpp
VS: Added Files:
VS: factories/Makefile.am factories/clDataSourceFactory.cpp
VS: factories/clDataSourceFactory.h
VS: Removed Files:
VS: clDataSourceFactory.cpp clDataSourceFactory.h
VS: ----------------------------------------------------------------------
Index: clXmlDataSource.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/XML/clXmlDataSource.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** clXmlDataSource.cpp 2 Mar 2002 17:31:08 -0000 1.2
--- clXmlDataSource.cpp 3 Mar 2002 11:18:28 -0000 1.3
***************
*** 419,422 ****
--- 419,424 ----
throw (clPersistentOperationException)
{
+ debug( "Call to clXmlDataSource::meLoadProject" );
+
try
{
|
|
From: Gerard F. <ger...@us...> - 2002-03-03 11:15:58
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence/factories In directory usw-pr-cvs1:/tmp/cvs-serv24630/factories Log Message: Directory /cvsroot/kuml/kuml_old/kuml/data/persistence/factories added to the repository |
|
From: Gerard F. <ger...@us...> - 2002-03-02 17:33:58
|
Update of /cvsroot/kuml/kuml_old In directory usw-pr-cvs1:/tmp/cvs-serv344 Modified Files: ChangeLog Log Message: Corrected ChangeLog problem. VS: Committing in . VS: VS: Modified Files: VS: ChangeLog VS: ---------------------------------------------------------------------- Index: ChangeLog =================================================================== RCS file: /cvsroot/kuml/kuml_old/ChangeLog,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** ChangeLog 8 Oct 2000 04:21:09 -0000 1.1.1.1 --- ChangeLog 2 Mar 2002 17:33:55 -0000 1.2 *************** *** 1,2 **** --- 1,7 ---- + 2002-03-02 Gerard Flynn <ger...@li...> + * Made some changes to allow the experimental XML persistence layer + to compile + * Uncommented save file code in kuml.cpp + 2000-09-17 Keith Isdale <z14...@ci...> * Popup menu suport framework complete, just need for people to |
|
From: Gerard F. <ger...@us...> - 2002-03-02 17:31:38
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence
In directory usw-pr-cvs1:/tmp/cvs-serv31264/kuml/data/persistence
Modified Files:
Makefile.am clKumlObjectMemento.h clMementoLibrary.cpp
clMementoLibrary.h ifKumlObjectMemento.h
Log Message:
2000-09-17 Keith Isdale <z14...@ci...>
* Popup menu suport framework complete, just need for people to
* add the needed menus. See kuml/overview/lviclass.cpp for complete
* example. Menus are now built on demand and take advantage of fact
* that derrived classes will normally share base menus.
* Reccomend clean build from cvs - tested ok
2000-09-08 Keith Isdale <z14...@ci...>
* Updated Popup menu suport so menus are consistant across
* whole program - change all item from QPopupMenu to KPopupMenu
* Work in progress. Recommend rebuild of kUML on cvs update
2000-09-08 Keith Isdale <z14...@ci...>
* Rebuilt header and other files needed for label suport to reduce dependencies
* Label support functional
* Changed overview support so that all code for popupMenu support
* is only in class files not header files
* Activated popup menus for drawing items in oveview
* Changes menus in Drawing item classes consistantly use KPopupMenu
2000-09-08 Darius Stachow <sta...@in...>
* Applied patch from Gerard Flynn <ger...@fr...> on the file acinclude.m4.
Now the configuration files search in $KDEDIR for the KDE2 installation now.
2000-09-03 Darius Stachow <sta...@in...>
* Started to rewrite the metamodels for relationship types. I'll try to use the nsuml library as pattern for that
* Added new (empty) classes (AssociationEnd, GeneralizableElement, Dependency, ...)
* Renamed GeneralizationRelationship to Generalization and AssociationRelationship to Association. A lot of files
have been changed but the sources are still buildable
* Current Version is now 0.5.1. Tagged the 0.5.0 files in cvs (KUML050).
* Done some work on the zigzag line again (still not finished). Want to finish the work on the meta model first
2000-08-24 Keith Isdale <z14...@ci...>
* Added default font and label position support new new Labels
* Files affected kuml.cpp,LabelGroup.cpp LabelGroup
* Added (create/remove)LinkToLines in DrawingConnection
* Files affected DrawingConnection.cpp and DrawingConnection.h
2000-08-23 Keith Isdale <z14...@ci...>
* New label support now partially function, all lines for associations are draw as
horizontal lines
2000-08-20 Keith Isdale <z14...@ci...>
* Started porting all classes to use LabelLayouter classes
* Changed all references of LineDrawLabels to LabelLayouterAB or LabelGroup
* Fixed queryExit() in Kumlapp class by using variable exitNow - dodgy but it works
2000-08-19 Keith Isdale <z14...@ci...>
* Aborted some features of LabelLayouter classes - too complex for pre beta
* Put on hold ideas to create automatic line positioning
* Made a start on a scope definition for labelLayout to avoid getting distracted by working on
unnecessary tasks. And started on use case diagrams for this section
* Added helper methods to ConnectionLine : getFirstLine() , getMiddleLine(),
getLastLine(), getLineCount(), getLineByIndex(uint index)
* Changed abstract methods to virtual to enable me to cast *Line to ConnectionLine
getCenter() and isMouseOver(const QPoint &mousepos). Also that I had to
change linenode.h and resizebuttonfactor.h
* Fixed adjustlabels method in LabelGroup so it called accept methods
* Added LineVisitor *getVisitor() method to LabelGroup
* Added LineNode to the base class of ConnectionLine
* Changed destructors to NON-vertual in ALL classes based on ConnectionLine
2000-08-02 Geoff Glasson <gla...@ii...>
* Located graphical class representations in correct locations
* Linked graphical class representation to element stored in repository
* Create a multi-diagram, multi-class model, saved and loaded it
2000-08-01 Geoff Glasson <gla...@ii...>
* Re-enabled the open project command when using the experimental persistence layer only
* Persistence layer now creates empty class diagrams and displays the tool palette
* Added ability to load (extremely) basic graphical representation of class from XML file
- class data is not loaded
2000-07-30 Darius Stachow <sta...@in...>
* Set mouse cursor when resizing
* Removed directory drawobj/helper
* Added factory classes for diagram elements (views) in directory kuml/factories
* Fixed wrong parameter order in calling KMsgBox functions (Thanks to Montel Laurent)
2000-07-26 Darius Stachow <sta...@in...>
* Added metamodel for stereotypes. Every model element can have 0..1 stereotypes
* A package now stores relationships (associations and generalizations).
* Added factory class for relationship objects.
* Reactivated resize buttons for lines and made them a little bit smaller
* Fixed crash when pasting elements
* The properties dialog for classes works again
* Started to decouple the creation of model and view
* Further bug fixes
2000-07-23 Darius Stachow <sta...@in...>
* Added auto detail feature for uml classes. The classes can be shown in three
different detail levels: details suppressed, analysis-level details and
implementation-level details. The uml classes will be automaticly resized to fit best.
* Updated toolbar: now KDE2 (png) icons are used instead xpm
* Fixed font bug when scaling is active
* Updated menubar
* Other bug fixes
2000-07-19 Darius Stachow <sta...@in...>
* Removed item resizing and moving code from view controller class [DrawingArea]
and put them into class SelectionTool.
* Removed all switch statements from the view controller class. The class
is now less complex as most features are implemented as editor tools.
* Fixed crash when trying to open a popup menu in the project browser window.
2000-07-18 Darius Stachow <sta...@in...>
* Added icons for the project browser view
* Added snapshot editor tool that allows to save a rectangular diagram
area as bitmap. All Qt supported file formats can be used
for saving (png, bmp, ...)
2000-07-16 Keith Isdale <z14...@ci...>
* Added Label
* classes nearly ready for testsing, need to convert
* ConnectionLine based classes to use them
2000-07-14 Geoff Glasson <gla...@ii...>
* Added detection of Gnome XML to configuration process
* Added detection of unique identifier generator to configuration process
* Added unique identifier attribute to element.h
* Added generation of unique identifier up construction to element.cpp
* Added method to retrieve unique identifier to element.h
2000-07-13 Darius Stachow <sta...@in...>
* Bugfixes. Many crashes caused by the editor are fixed :-)
2000-07-10 Darius Stachow <sta...@in...>
* Added possibility to enhance the capabilities of the editor by so called editor tools
* Started replacing the CreationHelper classes with the new CreationTool classes
* The item selection code has been reimplemented as editor tool (SelectionTool)
* The width of the column in the project browser view will be updated correctly now
2000-04-30 Darius Stachow <sta...@in...>
* Change in drawingclass.cpp. In order to follow the UML style guidelines the
class name will be printed in boldface.
2000-04-29 Darius Stachow <sta...@in...>
* Added directory data/persistance to project file
* Added empty method definition for slotExportDiagram() in class DrawingArea
* Added empty method definition for initDialog() in class DlgClassImportDeleted
* Changed path for include file types.h in kuml/data/persistance/ifModelFile.h
* Commented "if (!mouseButtonPressed) return;" in DrawingArea::mouseMoveEvent()
* Changed default background color to white for diagrams
* Disabled shadow for drawing items
* Changed application name "KUML" to "kUML" in main.cpp
2000-03-14 Pascal Georges <p_g...@cl...>
* Added declaredInFile attribute to Classes to keep track of the file
that generated the class (useful to detect that the user deleted a class).
* Work progresses well to import extra code in an existing project. Should
be finished in 1 week.
2000-02-09 Pascal Georges <p_g...@cl...>
* Association links are drawn when code is reverse engineered.
It still needs some work to differentiate composition from
aggregation.
* The Project->information feature is back alive.
2000-02-06 Pascal Georges <p_g...@cl...>
* The drawing area is resized to give room to the imported classes.
2000-02-05 Jake Fear <fe...@ho...>
* Added description to class editing capability. This should be
used as header documentation when code generating.
2000-02-01 Jake Fear <fe...@ho...>
* Objects in the repository can now be recovered by path. Each
UML element can provide its own path to an caller. In this way
the path of an object in the repository can effectively be
used as a reference to any UML element within a project.
2000-02-01 Jake Fear <fe...@ho...>
* Basic data transfer from repository to diagram objects
is now implemented. Lots of solidifying also done on
the repository data structure.
2000-01-31 Jake Fear <fe...@ho...>
* Checked in massive changes to data structure for UML repository
and associated overview structures. Tweaked listview that holds
over elements so that top level/root nodes show expansion
graphic. Implemented signals for updating overview with changes
to state of actual UML elements.
2000-01-29 Pascal Georges <p_g...@cl...>
* Kuml now parses Java (with ANTLR parser)
2000-01-26 Darius Stachow <sta...@in...>
* Rewritten the resize button stuff in order to handle them as objects.
* Added raise()/lower() to DrawingItem.
* Added class SwitchLine that encapsulates two different line object
and just delegate the incoming calls to one of them or both.
* Changed order of Makefiles in project file.
2000-01-21 Darius Stachow <sta...@in...>
* Added new classes for resize buttons. They are not yet finished.
I just wanted to have them in the project.
2000-01-19 Pascal Georges <p_g...@cl...>
* The import feature is now usable (for C++)
2000-01-07 Darius Stachow <sta...@in...>
* Completed (almost) label support for all kinds of lines.
2000-01-07 Pascal Georges <p_g...@cl...>
* The C++ parser of kdevelop is included
2000-01-03 Jake Fear <fe...@ho...>
* Added basics of visitor pattern implementation to the data
directory. There are no concrete implementations at this time
but all other infrastructure is in place.
1999-12-31 Pascal Georges <p_g...@cl...>
* When attributes or methods of a class are hidden,
"..." is displayed instead.
* The cloning of classes has been modified, but still needs more work.
1999-12-29 Darius Stachow <sta...@in...>
* Commited patch by Larry Anderson <la...@me...>:
Both changes were made to the DiagramLoader::load method.
They have to do with the toolbar not updating properly when opening a diagram.
* Added setMultiSelectable(false) to constructor of DrawingLabel to prevent
the line labels to be selected by the selection rectangle.
1999-12-27 Pascal Georges <p_g...@cl...>
* Changed the menus to be more in accordance to kuml's goals.
* Added files to /data directory to separate data and view
for use case diagrams.
* Added a SimpleProperties class to hold 'description' and 'name' strings.
1999-12-21 Darius Stachow <sta...@in...>
* Added support for six labels (A1-A3, B1-B3) on a diagonal line.
The other line types will be supported later.
* Started to decouple view/data in DrawingGeneralization and DrawingAssociation.
Both have a data object now (of type GeneralizationRelationship and AssociationRelationship)
1999-12-18 Pascal Georges <p_g...@cl...>
* The toolbar is now in accordance with the current diagram.
KDE doc says there is no way to avoid the flicker ...
1999-12-16 Jake Fear <fe...@ho...>
* Changed the DrawingClass constructor to take a class instead of
creating a class internally. Started decoupling the dlgpropclass
from the drawing item. Cleaned up a couple kludgy spots in the
name code of classes.
1999-12-16 Pascal Georges <p_g...@cl...>
* the function unselectAll() of class DrawingArea is now public
instead of protected (this will help the handling of the selected
items from kumlApp).
1999-12-13 Jake Fear <fe...@ho...>
* Made all internal lists of Classes private and fixed code that
was using those public members. This should make Classes a
reliable source of Qt signals for drawing items of all kinds
to put slots on.
1999-12-13 Jake Fear <fe...@ho...>
* Added dialog boxes to notify of duplicate class names in several
locations. Fixed a bug in the ClassFactory::createPackage function.
1999-12-13 Michel Wichers <wic...@in...>
* Added some DrawingObjects and Creationhelper for the state diagram.
1999-12-11 Pascal Georges <p_g...@cl...>
* Added push buttons to the class drawing item to
show/hide methods and attributes.
The autosize attributes has been added to the properties
dialog of classes.
1999-12-07 Jake Fear <fe...@ho...>
* Added LVIClass and got the basics of the class
repository view finished. Refined class/package
creation logic considerably.
1999-12-06 Jake Fear <fe...@ho...>
* Added a basic tree view of the class repository. Still in progress.
1999-12-06 Jake Fear <fe...@ho...>
* Added the basic implementation for
UML packages. Integrated packages into class repository and
factory. Added PopupProvider interface for overview, provided
VERY basic implementation for the PopupProvider. Fixed some
bugs in class repository and class factory. Added
LVIClassRepository. These are all still works in progress,
but I don't think they are going to hurt anyone else too bad ;-)
1999-12-04 Darius Stachow <sta...@in...>
* Added abstract data types for relationships
1999-12-04 Pascal Georges <p_g...@cl...>
* Fixed a bug in the DrawingClass/Classes clone method.
1999-11-30 Darius Stachow <sta...@in...>
* Added the diagram repository
1999-11-29 Pascal Georges <p_g...@cl...>
* Started clipboard implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Added a the KumlException class. The "main" catches this exception
(which should be super class of all exceptions) in order to assist
in debugging "checked" exceptions. Created the InvalidNameException
and added it to the setName(QString) signature in the Classes class
in order to clarify control over naming of classes. No duplicates
and no NULLS allowed by implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Setup signal in Properties class for setName. Overrode setname
in Classes to manage the repository when name is changed (needed
because the classes name is used as a key).
1999-11-27 Jake Fear <fe...@ho...>
* Made data/Classes a QObject that emits signals for the addition
and mutation of several attributes.
1999-11-27 Jake Fear <fe...@ho...>
* Added the IOInterface implementation to the ClassRepository. Did
some general code cleanup based on review from Darius.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassFactory implementation, it does not yet implement
the required IO interfaces. Should be useable now minus IO.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassRepository implementation
1999-11-19 Martin Schmitz <msc...@te...>
Joerg Habenicht <jha...@cr...>
* Started source generation support
1999-11-19 Michel Wichers <wic...@in...>
* Started state diagram implementation
1999-11-19 Albert Ries <ri...@bi...>
* Started deployment diagram implementation
1999-11-16 Darius Stachow <sta...@in...>
* Added empty diagram implementations:
Sequence diagram, Deployment diagram, Object diagram
1999-11-09 Michel Wichers <wic...@in...>
* Primitive rectangle added.
1999-11-09 Pascal Georges <p_g...@cl...>
* Added first version of use case diagram implementation.
1999-11-02 Pascal Georges <p_g...@cl...>
* Started the implementation of the use case diagram.
1999-11-01 Darius Stachow <sta...@in...>
* Included patch from Pascal Georges.
* Now font and color information will be read and written.
* File open dialog shows *.kuml files.
1999-10-20 Holger Knust <hk...@ad...>
* Started the XML/XMI support.
1999-03-01 Darius Stachow <sta...@in...>
* KUML started.
tik.fh-hamburg.de>
* KUML started.
VS: Committing in .
VS:
VS: Modified Files:
VS: configure.in kuml/Makefile.am kuml/kuml.cpp
VS: kuml/data/persistence/Makefile.am
VS: kuml/data/persistence/clKumlObjectMemento.h
VS: kuml/data/persistence/clMementoLibrary.cpp
VS: kuml/data/persistence/clMementoLibrary.h
VS: kuml/data/persistence/ifKumlObjectMemento.h
VS: kuml/data/persistence/XML/clXmlDataSource.cpp
VS: ----------------------------------------------------------------------
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.am 8 Oct 2000 04:22:07 -0000 1.1.1.1
--- Makefile.am 2 Mar 2002 17:31:06 -0000 1.2
***************
*** 7,15 ****
noinst_LIBRARIES = libpersistence.a
! libpersistence_a_SOURCES = clMementoLibrary.cpp clDataSource.cpp clPersistentOperationException.cpp clPersistentModel.cpp clKumlDataParser.cpp
- SUBDIRS = XML
! EXTRA_DIST = clKumlAssociationMemento.h clKumlClassMemento.h clKumlDataParser.cpp clKumlDataParser.h clKumlObjectMemento.h clPersistentModel.cpp clPersistentModel.h clPersistentOperationException.cpp clPersistentOperationException.h ifKumlObject.h ifKumlObjectMemento.h ifModelFile.h ifParserNode.h clDataSource.cpp clDataSource.h clMementoLibrary.cpp clMementoLibrary.h ifDataSource.h ifDataSourceFactory.h ifMementoLibrary.h
####### kdevelop will overwrite this part!!! (end)############
--- 7,21 ----
noinst_LIBRARIES = libpersistence.a
! libpersistence_a_SOURCES = clMementoLibrary.cpp clDataSource.cpp \
! clPersistentOperationException.cpp clPersistentModel.cpp \
! clKumlDataParser.cpp
! SUBDIRS = factories XML
!
! EXTRA_DIST = clKumlAssociationMemento.h clKumlClassMemento.h clKumlDataParser.cpp clKumlDataParser.h clKumlObjectMemento.h \
! clPersistentModel.cpp clPersistentModel.h clPersistentOperationException.cpp clPersistentOperationException.h \
! ifKumlObject.h ifKumlObjectMemento.h ifModelFile.h ifParserNode.h clDataSource.h clDataSource.h clMementoLibrary.cpp \
! clMementoLibrary.h ifDataSource.h ifDataSourceFactory.h ifMementoLibrary.h
####### kdevelop will overwrite this part!!! (end)############
Index: clKumlObjectMemento.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/clKumlObjectMemento.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** clKumlObjectMemento.h 8 Oct 2000 04:22:08 -0000 1.1.1.1
--- clKumlObjectMemento.h 2 Mar 2002 17:31:06 -0000 1.2
***************
*** 1,71 ****
! #ifndef clKumlObjectMemento_h
! #define clKumlObjectMemento_h 1
!
! #include <typeinfo>
! #include "../../drawobj/drawingitem.h"
! #include "clPersistentOperationException.h"
! #include "ifKumlObjectMemento.h"
!
! /**
! * This class is the base class for all object import/export adapters. It
! * conforms to the interface if KumlObjectAdapter.
! */
! class clKumlObjectMemento : public ifKumlObjectMemento
! {
!
! public:
! clKumlObjectMemento() {};
! virtual ~clKumlObjectMemento() {};
!
!
! //
! // This method retrieves a KUML object from the data source.
! // format.
! //
! virtual DrawingItem *meRetrieve (ifDataSource &pSource)
! throw (clPersistentOperationException) = 0;
!
! /**
! * This method stores a KUML object in the data source.
! */
! virtual bool meStore (ifDataSource &pSource, const DrawingItem *pObject)
! throw (clPersistentOperationException) = 0;
!
! protected:
!
! /**
! * Convert a boolean value to its textual representation.
! *
! * @param bool pValue - value to convert
! *
! * @see clKumlObjectMemento#miTextToBool
! */
! inline const QString miBoolToText (bool pValue) const
! {
! return ((true == pValue) ? "true" : "false");
! }
!
! /**
! * Convert a text value into a boolean value.
! *
! * @param const QString &pValue - value to convert
! *
! * @see clKumlObjectMemento#miBoolToText
! */
! inline bool miTextToBool (const QString &pValue) const
! {
! return (("true" == pValue) ? true : false);
! }
!
! private:
!
! //
! // Disabled methods.
! //
! clKumlObjectMemento(const clKumlObjectMemento &right);
! const clKumlObjectMemento & operator=(const clKumlObjectMemento &right);
! int operator==(const clKumlObjectMemento &right) const;
! int operator!=(const clKumlObjectMemento &right) const;
! };
!
! #endif
--- 1,71 ----
! #ifndef clKumlObjectMemento_h
! #define clKumlObjectMemento_h 1
!
! #include <typeinfo>
! #include "../../drawobj/drawingitem.h"
! #include "clPersistentOperationException.h"
! #include "ifKumlObjectMemento.h"
!
! /**
! * This class is the base class for all object import/export adapters. It
! * conforms to the interface if KumlObjectAdapter.
! */
! class clKumlObjectMemento : public ifKumlObjectMemento
! {
!
! public:
! clKumlObjectMemento() {};
! virtual ~clKumlObjectMemento() {};
!
!
! //
! // This method retrieves a KUML object from the data source.
! // format.
! //
! virtual IOInterface *meRetrieve (ifDataSource &pSource)
! throw (clPersistentOperationException) = 0;
!
! /**
! * This method stores a KUML object in the data source.
! */
! virtual bool meStore (ifDataSource &pSource, const IOInterface *pObject)
! throw (clPersistentOperationException) = 0;
!
! protected:
!
! /**
! * Convert a boolean value to its textual representation.
! *
! * @param bool pValue - value to convert
! *
! * @see clKumlObjectMemento#miTextToBool
! */
! inline const QString miBoolToText (bool pValue) const
! {
! return ((true == pValue) ? "true" : "false");
! }
!
! /**
! * Convert a text value into a boolean value.
! *
! * @param const QString &pValue - value to convert
! *
! * @see clKumlObjectMemento#miBoolToText
! */
! inline bool miTextToBool (const QString &pValue) const
! {
! return (("true" == pValue) ? true : false);
! }
!
! private:
!
! //
! // Disabled methods.
! //
! clKumlObjectMemento(const clKumlObjectMemento &right);
! const clKumlObjectMemento & operator=(const clKumlObjectMemento &right);
! int operator==(const clKumlObjectMemento &right) const;
! int operator!=(const clKumlObjectMemento &right) const;
! };
!
! #endif
Index: clMementoLibrary.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/clMementoLibrary.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** clMementoLibrary.cpp 8 Oct 2000 04:22:08 -0000 1.1.1.1
--- clMementoLibrary.cpp 2 Mar 2002 17:31:06 -0000 1.2
***************
*** 6,10 ****
DrawingItem *pKuml,
ifKumlObjectMemento *pMemento,
! const QString &pPersistentType)
: mvRtti (typeid (*pKuml).name ()),
mvMemento (*pMemento),
--- 6,10 ----
DrawingItem *pKuml,
ifKumlObjectMemento *pMemento,
! const QList<QString> &pPersistentType)
: mvRtti (typeid (*pKuml).name ()),
mvMemento (*pMemento),
***************
*** 72,76 ****
DrawingItem *pObject,
ifKumlObjectMemento *pMemento,
! const QString &pPersistentType)
throw (clPersistentOperationException)
{
--- 72,76 ----
DrawingItem *pObject,
ifKumlObjectMemento *pMemento,
! const QList<QString> &pPersistentType)
throw (clPersistentOperationException)
{
Index: clMementoLibrary.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/clMementoLibrary.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** clMementoLibrary.h 8 Oct 2000 04:22:08 -0000 1.1.1.1
--- clMementoLibrary.h 2 Mar 2002 17:31:06 -0000 1.2
***************
*** 17,21 ****
QString mvRtti;
ifKumlObjectMemento &mvMemento;
! QString mvPersistentType;
public:
--- 17,21 ----
QString mvRtti;
ifKumlObjectMemento &mvMemento;
! QList<QString> mvPersistentType;
public:
***************
*** 23,27 ****
clTranslationEntry (DrawingItem *pKuml,
ifKumlObjectMemento *pMemento,
! const QString & pPersistentType);
~clTranslationEntry () {};
--- 23,27 ----
clTranslationEntry (DrawingItem *pKuml,
ifKumlObjectMemento *pMemento,
! const QList<QString> & pPersistentType);
~clTranslationEntry () {};
***************
*** 42,46 ****
int meSameType (const QString &pPersistentType) const
{
! return (mvPersistentType == pPersistentType);
}
--- 42,46 ----
int meSameType (const QString &pPersistentType) const
{
! return (*mvPersistentType.getLast() == pPersistentType);
}
***************
*** 72,76 ****
void meAddMementoTranslation (DrawingItem *pObject,
ifKumlObjectMemento *pMemento,
! const QString &pPersistentType)
throw (clPersistentOperationException);
};
--- 72,76 ----
void meAddMementoTranslation (DrawingItem *pObject,
ifKumlObjectMemento *pMemento,
! const QList<QString> &pPersistentType)
throw (clPersistentOperationException);
};
Index: ifKumlObjectMemento.h
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/ifKumlObjectMemento.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ifKumlObjectMemento.h 8 Oct 2000 04:22:10 -0000 1.1.1.1
--- ifKumlObjectMemento.h 2 Mar 2002 17:31:06 -0000 1.2
***************
*** 19,23 ****
// Retrieve a UML object from a data file.
//
! virtual DrawingItem * meRetrieve (ifDataSource &pSource)
throw (clPersistentOperationException) = 0;
--- 19,23 ----
// Retrieve a UML object from a data file.
//
! virtual IOInterface * meRetrieve (ifDataSource &pSource)
throw (clPersistentOperationException) = 0;
***************
*** 26,30 ****
//
virtual bool meStore (ifDataSource &pSource,
! const DrawingItem *pItem)
throw (clPersistentOperationException) = 0;
};
--- 26,30 ----
//
virtual bool meStore (ifDataSource &pSource,
! const IOInterface *pItem)
throw (clPersistentOperationException) = 0;
};
|
|
From: Gerard F. <ger...@us...> - 2002-03-02 17:31:37
|
Update of /cvsroot/kuml/kuml_old/kuml
In directory usw-pr-cvs1:/tmp/cvs-serv31264/kuml
Modified Files:
Makefile.am kuml.cpp
Log Message:
2000-09-17 Keith Isdale <z14...@ci...>
* Popup menu suport framework complete, just need for people to
* add the needed menus. See kuml/overview/lviclass.cpp for complete
* example. Menus are now built on demand and take advantage of fact
* that derrived classes will normally share base menus.
* Reccomend clean build from cvs - tested ok
2000-09-08 Keith Isdale <z14...@ci...>
* Updated Popup menu suport so menus are consistant across
* whole program - change all item from QPopupMenu to KPopupMenu
* Work in progress. Recommend rebuild of kUML on cvs update
2000-09-08 Keith Isdale <z14...@ci...>
* Rebuilt header and other files needed for label suport to reduce dependencies
* Label support functional
* Changed overview support so that all code for popupMenu support
* is only in class files not header files
* Activated popup menus for drawing items in oveview
* Changes menus in Drawing item classes consistantly use KPopupMenu
2000-09-08 Darius Stachow <sta...@in...>
* Applied patch from Gerard Flynn <ger...@fr...> on the file acinclude.m4.
Now the configuration files search in $KDEDIR for the KDE2 installation now.
2000-09-03 Darius Stachow <sta...@in...>
* Started to rewrite the metamodels for relationship types. I'll try to use the nsuml library as pattern for that
* Added new (empty) classes (AssociationEnd, GeneralizableElement, Dependency, ...)
* Renamed GeneralizationRelationship to Generalization and AssociationRelationship to Association. A lot of files
have been changed but the sources are still buildable
* Current Version is now 0.5.1. Tagged the 0.5.0 files in cvs (KUML050).
* Done some work on the zigzag line again (still not finished). Want to finish the work on the meta model first
2000-08-24 Keith Isdale <z14...@ci...>
* Added default font and label position support new new Labels
* Files affected kuml.cpp,LabelGroup.cpp LabelGroup
* Added (create/remove)LinkToLines in DrawingConnection
* Files affected DrawingConnection.cpp and DrawingConnection.h
2000-08-23 Keith Isdale <z14...@ci...>
* New label support now partially function, all lines for associations are draw as
horizontal lines
2000-08-20 Keith Isdale <z14...@ci...>
* Started porting all classes to use LabelLayouter classes
* Changed all references of LineDrawLabels to LabelLayouterAB or LabelGroup
* Fixed queryExit() in Kumlapp class by using variable exitNow - dodgy but it works
2000-08-19 Keith Isdale <z14...@ci...>
* Aborted some features of LabelLayouter classes - too complex for pre beta
* Put on hold ideas to create automatic line positioning
* Made a start on a scope definition for labelLayout to avoid getting distracted by working on
unnecessary tasks. And started on use case diagrams for this section
* Added helper methods to ConnectionLine : getFirstLine() , getMiddleLine(),
getLastLine(), getLineCount(), getLineByIndex(uint index)
* Changed abstract methods to virtual to enable me to cast *Line to ConnectionLine
getCenter() and isMouseOver(const QPoint &mousepos). Also that I had to
change linenode.h and resizebuttonfactor.h
* Fixed adjustlabels method in LabelGroup so it called accept methods
* Added LineVisitor *getVisitor() method to LabelGroup
* Added LineNode to the base class of ConnectionLine
* Changed destructors to NON-vertual in ALL classes based on ConnectionLine
2000-08-02 Geoff Glasson <gla...@ii...>
* Located graphical class representations in correct locations
* Linked graphical class representation to element stored in repository
* Create a multi-diagram, multi-class model, saved and loaded it
2000-08-01 Geoff Glasson <gla...@ii...>
* Re-enabled the open project command when using the experimental persistence layer only
* Persistence layer now creates empty class diagrams and displays the tool palette
* Added ability to load (extremely) basic graphical representation of class from XML file
- class data is not loaded
2000-07-30 Darius Stachow <sta...@in...>
* Set mouse cursor when resizing
* Removed directory drawobj/helper
* Added factory classes for diagram elements (views) in directory kuml/factories
* Fixed wrong parameter order in calling KMsgBox functions (Thanks to Montel Laurent)
2000-07-26 Darius Stachow <sta...@in...>
* Added metamodel for stereotypes. Every model element can have 0..1 stereotypes
* A package now stores relationships (associations and generalizations).
* Added factory class for relationship objects.
* Reactivated resize buttons for lines and made them a little bit smaller
* Fixed crash when pasting elements
* The properties dialog for classes works again
* Started to decouple the creation of model and view
* Further bug fixes
2000-07-23 Darius Stachow <sta...@in...>
* Added auto detail feature for uml classes. The classes can be shown in three
different detail levels: details suppressed, analysis-level details and
implementation-level details. The uml classes will be automaticly resized to fit best.
* Updated toolbar: now KDE2 (png) icons are used instead xpm
* Fixed font bug when scaling is active
* Updated menubar
* Other bug fixes
2000-07-19 Darius Stachow <sta...@in...>
* Removed item resizing and moving code from view controller class [DrawingArea]
and put them into class SelectionTool.
* Removed all switch statements from the view controller class. The class
is now less complex as most features are implemented as editor tools.
* Fixed crash when trying to open a popup menu in the project browser window.
2000-07-18 Darius Stachow <sta...@in...>
* Added icons for the project browser view
* Added snapshot editor tool that allows to save a rectangular diagram
area as bitmap. All Qt supported file formats can be used
for saving (png, bmp, ...)
2000-07-16 Keith Isdale <z14...@ci...>
* Added Label
* classes nearly ready for testsing, need to convert
* ConnectionLine based classes to use them
2000-07-14 Geoff Glasson <gla...@ii...>
* Added detection of Gnome XML to configuration process
* Added detection of unique identifier generator to configuration process
* Added unique identifier attribute to element.h
* Added generation of unique identifier up construction to element.cpp
* Added method to retrieve unique identifier to element.h
2000-07-13 Darius Stachow <sta...@in...>
* Bugfixes. Many crashes caused by the editor are fixed :-)
2000-07-10 Darius Stachow <sta...@in...>
* Added possibility to enhance the capabilities of the editor by so called editor tools
* Started replacing the CreationHelper classes with the new CreationTool classes
* The item selection code has been reimplemented as editor tool (SelectionTool)
* The width of the column in the project browser view will be updated correctly now
2000-04-30 Darius Stachow <sta...@in...>
* Change in drawingclass.cpp. In order to follow the UML style guidelines the
class name will be printed in boldface.
2000-04-29 Darius Stachow <sta...@in...>
* Added directory data/persistance to project file
* Added empty method definition for slotExportDiagram() in class DrawingArea
* Added empty method definition for initDialog() in class DlgClassImportDeleted
* Changed path for include file types.h in kuml/data/persistance/ifModelFile.h
* Commented "if (!mouseButtonPressed) return;" in DrawingArea::mouseMoveEvent()
* Changed default background color to white for diagrams
* Disabled shadow for drawing items
* Changed application name "KUML" to "kUML" in main.cpp
2000-03-14 Pascal Georges <p_g...@cl...>
* Added declaredInFile attribute to Classes to keep track of the file
that generated the class (useful to detect that the user deleted a class).
* Work progresses well to import extra code in an existing project. Should
be finished in 1 week.
2000-02-09 Pascal Georges <p_g...@cl...>
* Association links are drawn when code is reverse engineered.
It still needs some work to differentiate composition from
aggregation.
* The Project->information feature is back alive.
2000-02-06 Pascal Georges <p_g...@cl...>
* The drawing area is resized to give room to the imported classes.
2000-02-05 Jake Fear <fe...@ho...>
* Added description to class editing capability. This should be
used as header documentation when code generating.
2000-02-01 Jake Fear <fe...@ho...>
* Objects in the repository can now be recovered by path. Each
UML element can provide its own path to an caller. In this way
the path of an object in the repository can effectively be
used as a reference to any UML element within a project.
2000-02-01 Jake Fear <fe...@ho...>
* Basic data transfer from repository to diagram objects
is now implemented. Lots of solidifying also done on
the repository data structure.
2000-01-31 Jake Fear <fe...@ho...>
* Checked in massive changes to data structure for UML repository
and associated overview structures. Tweaked listview that holds
over elements so that top level/root nodes show expansion
graphic. Implemented signals for updating overview with changes
to state of actual UML elements.
2000-01-29 Pascal Georges <p_g...@cl...>
* Kuml now parses Java (with ANTLR parser)
2000-01-26 Darius Stachow <sta...@in...>
* Rewritten the resize button stuff in order to handle them as objects.
* Added raise()/lower() to DrawingItem.
* Added class SwitchLine that encapsulates two different line object
and just delegate the incoming calls to one of them or both.
* Changed order of Makefiles in project file.
2000-01-21 Darius Stachow <sta...@in...>
* Added new classes for resize buttons. They are not yet finished.
I just wanted to have them in the project.
2000-01-19 Pascal Georges <p_g...@cl...>
* The import feature is now usable (for C++)
2000-01-07 Darius Stachow <sta...@in...>
* Completed (almost) label support for all kinds of lines.
2000-01-07 Pascal Georges <p_g...@cl...>
* The C++ parser of kdevelop is included
2000-01-03 Jake Fear <fe...@ho...>
* Added basics of visitor pattern implementation to the data
directory. There are no concrete implementations at this time
but all other infrastructure is in place.
1999-12-31 Pascal Georges <p_g...@cl...>
* When attributes or methods of a class are hidden,
"..." is displayed instead.
* The cloning of classes has been modified, but still needs more work.
1999-12-29 Darius Stachow <sta...@in...>
* Commited patch by Larry Anderson <la...@me...>:
Both changes were made to the DiagramLoader::load method.
They have to do with the toolbar not updating properly when opening a diagram.
* Added setMultiSelectable(false) to constructor of DrawingLabel to prevent
the line labels to be selected by the selection rectangle.
1999-12-27 Pascal Georges <p_g...@cl...>
* Changed the menus to be more in accordance to kuml's goals.
* Added files to /data directory to separate data and view
for use case diagrams.
* Added a SimpleProperties class to hold 'description' and 'name' strings.
1999-12-21 Darius Stachow <sta...@in...>
* Added support for six labels (A1-A3, B1-B3) on a diagonal line.
The other line types will be supported later.
* Started to decouple view/data in DrawingGeneralization and DrawingAssociation.
Both have a data object now (of type GeneralizationRelationship and AssociationRelationship)
1999-12-18 Pascal Georges <p_g...@cl...>
* The toolbar is now in accordance with the current diagram.
KDE doc says there is no way to avoid the flicker ...
1999-12-16 Jake Fear <fe...@ho...>
* Changed the DrawingClass constructor to take a class instead of
creating a class internally. Started decoupling the dlgpropclass
from the drawing item. Cleaned up a couple kludgy spots in the
name code of classes.
1999-12-16 Pascal Georges <p_g...@cl...>
* the function unselectAll() of class DrawingArea is now public
instead of protected (this will help the handling of the selected
items from kumlApp).
1999-12-13 Jake Fear <fe...@ho...>
* Made all internal lists of Classes private and fixed code that
was using those public members. This should make Classes a
reliable source of Qt signals for drawing items of all kinds
to put slots on.
1999-12-13 Jake Fear <fe...@ho...>
* Added dialog boxes to notify of duplicate class names in several
locations. Fixed a bug in the ClassFactory::createPackage function.
1999-12-13 Michel Wichers <wic...@in...>
* Added some DrawingObjects and Creationhelper for the state diagram.
1999-12-11 Pascal Georges <p_g...@cl...>
* Added push buttons to the class drawing item to
show/hide methods and attributes.
The autosize attributes has been added to the properties
dialog of classes.
1999-12-07 Jake Fear <fe...@ho...>
* Added LVIClass and got the basics of the class
repository view finished. Refined class/package
creation logic considerably.
1999-12-06 Jake Fear <fe...@ho...>
* Added a basic tree view of the class repository. Still in progress.
1999-12-06 Jake Fear <fe...@ho...>
* Added the basic implementation for
UML packages. Integrated packages into class repository and
factory. Added PopupProvider interface for overview, provided
VERY basic implementation for the PopupProvider. Fixed some
bugs in class repository and class factory. Added
LVIClassRepository. These are all still works in progress,
but I don't think they are going to hurt anyone else too bad ;-)
1999-12-04 Darius Stachow <sta...@in...>
* Added abstract data types for relationships
1999-12-04 Pascal Georges <p_g...@cl...>
* Fixed a bug in the DrawingClass/Classes clone method.
1999-11-30 Darius Stachow <sta...@in...>
* Added the diagram repository
1999-11-29 Pascal Georges <p_g...@cl...>
* Started clipboard implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Added a the KumlException class. The "main" catches this exception
(which should be super class of all exceptions) in order to assist
in debugging "checked" exceptions. Created the InvalidNameException
and added it to the setName(QString) signature in the Classes class
in order to clarify control over naming of classes. No duplicates
and no NULLS allowed by implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Setup signal in Properties class for setName. Overrode setname
in Classes to manage the repository when name is changed (needed
because the classes name is used as a key).
1999-11-27 Jake Fear <fe...@ho...>
* Made data/Classes a QObject that emits signals for the addition
and mutation of several attributes.
1999-11-27 Jake Fear <fe...@ho...>
* Added the IOInterface implementation to the ClassRepository. Did
some general code cleanup based on review from Darius.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassFactory implementation, it does not yet implement
the required IO interfaces. Should be useable now minus IO.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassRepository implementation
1999-11-19 Martin Schmitz <msc...@te...>
Joerg Habenicht <jha...@cr...>
* Started source generation support
1999-11-19 Michel Wichers <wic...@in...>
* Started state diagram implementation
1999-11-19 Albert Ries <ri...@bi...>
* Started deployment diagram implementation
1999-11-16 Darius Stachow <sta...@in...>
* Added empty diagram implementations:
Sequence diagram, Deployment diagram, Object diagram
1999-11-09 Michel Wichers <wic...@in...>
* Primitive rectangle added.
1999-11-09 Pascal Georges <p_g...@cl...>
* Added first version of use case diagram implementation.
1999-11-02 Pascal Georges <p_g...@cl...>
* Started the implementation of the use case diagram.
1999-11-01 Darius Stachow <sta...@in...>
* Included patch from Pascal Georges.
* Now font and color information will be read and written.
* File open dialog shows *.kuml files.
1999-10-20 Holger Knust <hk...@ad...>
* Started the XML/XMI support.
1999-03-01 Darius Stachow <sta...@in...>
* KUML started.
tik.fh-hamburg.de>
* KUML started.
VS: Committing in .
VS:
VS: Modified Files:
VS: configure.in kuml/Makefile.am kuml/kuml.cpp
VS: kuml/data/persistence/Makefile.am
VS: kuml/data/persistence/clKumlObjectMemento.h
VS: kuml/data/persistence/clMementoLibrary.cpp
VS: kuml/data/persistence/clMementoLibrary.h
VS: kuml/data/persistence/ifKumlObjectMemento.h
VS: kuml/data/persistence/XML/clXmlDataSource.cpp
VS: ----------------------------------------------------------------------
Index: Makefile.am
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.am 8 Oct 2000 04:21:43 -0000 1.1.1.1
--- Makefile.am 2 Mar 2002 17:31:04 -0000 1.2
***************
*** 2,10 ****
bin_PROGRAMS = kuml
kuml_SOURCES = globalinformation.cpp importcode.cpp kumlexception.cpp objectinfomixin.cpp filterutility.cpp iokumlutility.cpp projects.cpp main.cpp kumlview.cpp kumldoc.cpp kuml.cpp
! kuml_LDADD = ./diagrams/libdiagrams.a ./drawobj/libdrawobj.a ./lines/liblines.a ./dlgs/libdlgs.a ./overview/liboverview.a ./data/libdata.a ./parser/libparser.a ./parser/cpp/libcpp.a ./parser/java/libjava.a ./parser/antlr/libantlr.a ./codegen/libcodegen.a ./codegen/cpp/libcpp.a ./data/persistence/libpersistence.a ./data/persistence/XML/libXML.a ./drawobj/tools/libtools.a ./factories/libfactories.a -lfl -lkfile -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET)
SUBDIRS = data diagrams dlgs drawobj pixmaps lines overview parser codegen factories
! EXTRA_DIST = kuml.xpm mini-kuml.xpm defines.h kuml.cpp kuml.h kumldoc.cpp kumldoc.h kumlview.cpp kumlview.h main.cpp projects.cpp projects.h resource.h types.h iointerface.h iokumlutility.cpp iokumlutility.h kuml.lsm filterutility.cpp filterutility.h objectinfomixin.cpp objectinfomixin.h kumlexception.cpp kumlexception.h importcode.cpp importcode.h resizebutton.h globalinformation.cpp globalinformation.h resizebuttonfactory.h
install-data-local:
--- 2,18 ----
bin_PROGRAMS = kuml
kuml_SOURCES = globalinformation.cpp importcode.cpp kumlexception.cpp objectinfomixin.cpp filterutility.cpp iokumlutility.cpp projects.cpp main.cpp kumlview.cpp kumldoc.cpp kuml.cpp
! kuml_LDADD = ./diagrams/libdiagrams.a ./drawobj/libdrawobj.a ./lines/liblines.a ./dlgs/libdlgs.a \
! ./overview/liboverview.a ./data/libdata.a ./parser/libparser.a ./parser/cpp/libcpp.a \
! ./parser/java/libjava.a ./parser/antlr/libantlr.a ./codegen/libcodegen.a ./codegen/cpp/libcpp.a \
! ./data/persistence/factories/libp_factories.a \
! ./data/persistence/XML/libXML.a ./data/persistence/libpersistence.a ./drawobj/tools/libtools.a \
! ./factories/libfactories.a -lfl -lkfile -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET)
SUBDIRS = data diagrams dlgs drawobj pixmaps lines overview parser codegen factories
! EXTRA_DIST = kuml.xpm mini-kuml.xpm defines.h kuml.cpp kuml.h kumldoc.cpp kumldoc.h kumlview.cpp kumlview.h \
! main.cpp projects.cpp projects.h resource.h types.h iointerface.h iokumlutility.cpp iokumlutility.h kuml.lsm \
! filterutility.cpp filterutility.h objectinfomixin.cpp objectinfomixin.h kumlexception.cpp kumlexception.h \
! importcode.cpp importcode.h resizebutton.h globalinformation.cpp globalinformation.h resizebuttonfactory.h
install-data-local:
Index: kuml.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/kuml.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** kuml.cpp 8 Oct 2000 04:21:53 -0000 1.1.1.1
--- kuml.cpp 2 Mar 2002 17:31:04 -0000 1.2
***************
*** 70,74 ****
#if defined (EXPERIMENTAL_PERSISTENCE_LAYER)
#include "data/persistence/ifDataSource.h"
! #include "data/persistence/clDataSourceFactory.h"
#endif // defined (EXPERIMENTAL_PERSISTENCE_LAYER)
--- 70,74 ----
#if defined (EXPERIMENTAL_PERSISTENCE_LAYER)
#include "data/persistence/ifDataSource.h"
! #include "data/persistence/factories/clDataSourceFactory.h"
#endif // defined (EXPERIMENTAL_PERSISTENCE_LAYER)
***************
*** 844,857 ****
return;
! #if !defined (KDE2)
QFile file (s);
if (file.open (IO_WriteOnly) == false)
{
! KMsgBox ().message (this, "IO Error","Couldn´t open file for saving",
! KMsgBox::EXCLAMATION);
return;
}
! #endif // !defined (KDE2)
! /*QTextStream stream(&file);
IOKumlUtility utilstream(stream);
--- 844,857 ----
return;
! //#if !defined (KDE2)
QFile file (s);
if (file.open (IO_WriteOnly) == false)
{
! /* KMsgBox ().message (this, "IO Error","Couldn´t open file for saving",
! KMsgBox::EXCLAMATION); */
return;
}
! //#endif // !defined (KDE2)
! QTextStream stream(&file);
IOKumlUtility utilstream(stream);
***************
*** 861,865 ****
diagram->setPathDiagram(s);
diagram->writeAsKuml(utilstream);
! file.close(); */
slotStatusMsg(IDS_DEFAULT);
--- 861,865 ----
diagram->setPathDiagram(s);
diagram->writeAsKuml(utilstream);
! file.close();
slotStatusMsg(IDS_DEFAULT);
|
|
From: Gerard F. <ger...@us...> - 2002-03-02 17:31:34
|
Update of /cvsroot/kuml/kuml_old
In directory usw-pr-cvs1:/tmp/cvs-serv31264
Modified Files:
configure.in
Log Message:
2000-09-17 Keith Isdale <z14...@ci...>
* Popup menu suport framework complete, just need for people to
* add the needed menus. See kuml/overview/lviclass.cpp for complete
* example. Menus are now built on demand and take advantage of fact
* that derrived classes will normally share base menus.
* Reccomend clean build from cvs - tested ok
2000-09-08 Keith Isdale <z14...@ci...>
* Updated Popup menu suport so menus are consistant across
* whole program - change all item from QPopupMenu to KPopupMenu
* Work in progress. Recommend rebuild of kUML on cvs update
2000-09-08 Keith Isdale <z14...@ci...>
* Rebuilt header and other files needed for label suport to reduce dependencies
* Label support functional
* Changed overview support so that all code for popupMenu support
* is only in class files not header files
* Activated popup menus for drawing items in oveview
* Changes menus in Drawing item classes consistantly use KPopupMenu
2000-09-08 Darius Stachow <sta...@in...>
* Applied patch from Gerard Flynn <ger...@fr...> on the file acinclude.m4.
Now the configuration files search in $KDEDIR for the KDE2 installation now.
2000-09-03 Darius Stachow <sta...@in...>
* Started to rewrite the metamodels for relationship types. I'll try to use the nsuml library as pattern for that
* Added new (empty) classes (AssociationEnd, GeneralizableElement, Dependency, ...)
* Renamed GeneralizationRelationship to Generalization and AssociationRelationship to Association. A lot of files
have been changed but the sources are still buildable
* Current Version is now 0.5.1. Tagged the 0.5.0 files in cvs (KUML050).
* Done some work on the zigzag line again (still not finished). Want to finish the work on the meta model first
2000-08-24 Keith Isdale <z14...@ci...>
* Added default font and label position support new new Labels
* Files affected kuml.cpp,LabelGroup.cpp LabelGroup
* Added (create/remove)LinkToLines in DrawingConnection
* Files affected DrawingConnection.cpp and DrawingConnection.h
2000-08-23 Keith Isdale <z14...@ci...>
* New label support now partially function, all lines for associations are draw as
horizontal lines
2000-08-20 Keith Isdale <z14...@ci...>
* Started porting all classes to use LabelLayouter classes
* Changed all references of LineDrawLabels to LabelLayouterAB or LabelGroup
* Fixed queryExit() in Kumlapp class by using variable exitNow - dodgy but it works
2000-08-19 Keith Isdale <z14...@ci...>
* Aborted some features of LabelLayouter classes - too complex for pre beta
* Put on hold ideas to create automatic line positioning
* Made a start on a scope definition for labelLayout to avoid getting distracted by working on
unnecessary tasks. And started on use case diagrams for this section
* Added helper methods to ConnectionLine : getFirstLine() , getMiddleLine(),
getLastLine(), getLineCount(), getLineByIndex(uint index)
* Changed abstract methods to virtual to enable me to cast *Line to ConnectionLine
getCenter() and isMouseOver(const QPoint &mousepos). Also that I had to
change linenode.h and resizebuttonfactor.h
* Fixed adjustlabels method in LabelGroup so it called accept methods
* Added LineVisitor *getVisitor() method to LabelGroup
* Added LineNode to the base class of ConnectionLine
* Changed destructors to NON-vertual in ALL classes based on ConnectionLine
2000-08-02 Geoff Glasson <gla...@ii...>
* Located graphical class representations in correct locations
* Linked graphical class representation to element stored in repository
* Create a multi-diagram, multi-class model, saved and loaded it
2000-08-01 Geoff Glasson <gla...@ii...>
* Re-enabled the open project command when using the experimental persistence layer only
* Persistence layer now creates empty class diagrams and displays the tool palette
* Added ability to load (extremely) basic graphical representation of class from XML file
- class data is not loaded
2000-07-30 Darius Stachow <sta...@in...>
* Set mouse cursor when resizing
* Removed directory drawobj/helper
* Added factory classes for diagram elements (views) in directory kuml/factories
* Fixed wrong parameter order in calling KMsgBox functions (Thanks to Montel Laurent)
2000-07-26 Darius Stachow <sta...@in...>
* Added metamodel for stereotypes. Every model element can have 0..1 stereotypes
* A package now stores relationships (associations and generalizations).
* Added factory class for relationship objects.
* Reactivated resize buttons for lines and made them a little bit smaller
* Fixed crash when pasting elements
* The properties dialog for classes works again
* Started to decouple the creation of model and view
* Further bug fixes
2000-07-23 Darius Stachow <sta...@in...>
* Added auto detail feature for uml classes. The classes can be shown in three
different detail levels: details suppressed, analysis-level details and
implementation-level details. The uml classes will be automaticly resized to fit best.
* Updated toolbar: now KDE2 (png) icons are used instead xpm
* Fixed font bug when scaling is active
* Updated menubar
* Other bug fixes
2000-07-19 Darius Stachow <sta...@in...>
* Removed item resizing and moving code from view controller class [DrawingArea]
and put them into class SelectionTool.
* Removed all switch statements from the view controller class. The class
is now less complex as most features are implemented as editor tools.
* Fixed crash when trying to open a popup menu in the project browser window.
2000-07-18 Darius Stachow <sta...@in...>
* Added icons for the project browser view
* Added snapshot editor tool that allows to save a rectangular diagram
area as bitmap. All Qt supported file formats can be used
for saving (png, bmp, ...)
2000-07-16 Keith Isdale <z14...@ci...>
* Added Label
* classes nearly ready for testsing, need to convert
* ConnectionLine based classes to use them
2000-07-14 Geoff Glasson <gla...@ii...>
* Added detection of Gnome XML to configuration process
* Added detection of unique identifier generator to configuration process
* Added unique identifier attribute to element.h
* Added generation of unique identifier up construction to element.cpp
* Added method to retrieve unique identifier to element.h
2000-07-13 Darius Stachow <sta...@in...>
* Bugfixes. Many crashes caused by the editor are fixed :-)
2000-07-10 Darius Stachow <sta...@in...>
* Added possibility to enhance the capabilities of the editor by so called editor tools
* Started replacing the CreationHelper classes with the new CreationTool classes
* The item selection code has been reimplemented as editor tool (SelectionTool)
* The width of the column in the project browser view will be updated correctly now
2000-04-30 Darius Stachow <sta...@in...>
* Change in drawingclass.cpp. In order to follow the UML style guidelines the
class name will be printed in boldface.
2000-04-29 Darius Stachow <sta...@in...>
* Added directory data/persistance to project file
* Added empty method definition for slotExportDiagram() in class DrawingArea
* Added empty method definition for initDialog() in class DlgClassImportDeleted
* Changed path for include file types.h in kuml/data/persistance/ifModelFile.h
* Commented "if (!mouseButtonPressed) return;" in DrawingArea::mouseMoveEvent()
* Changed default background color to white for diagrams
* Disabled shadow for drawing items
* Changed application name "KUML" to "kUML" in main.cpp
2000-03-14 Pascal Georges <p_g...@cl...>
* Added declaredInFile attribute to Classes to keep track of the file
that generated the class (useful to detect that the user deleted a class).
* Work progresses well to import extra code in an existing project. Should
be finished in 1 week.
2000-02-09 Pascal Georges <p_g...@cl...>
* Association links are drawn when code is reverse engineered.
It still needs some work to differentiate composition from
aggregation.
* The Project->information feature is back alive.
2000-02-06 Pascal Georges <p_g...@cl...>
* The drawing area is resized to give room to the imported classes.
2000-02-05 Jake Fear <fe...@ho...>
* Added description to class editing capability. This should be
used as header documentation when code generating.
2000-02-01 Jake Fear <fe...@ho...>
* Objects in the repository can now be recovered by path. Each
UML element can provide its own path to an caller. In this way
the path of an object in the repository can effectively be
used as a reference to any UML element within a project.
2000-02-01 Jake Fear <fe...@ho...>
* Basic data transfer from repository to diagram objects
is now implemented. Lots of solidifying also done on
the repository data structure.
2000-01-31 Jake Fear <fe...@ho...>
* Checked in massive changes to data structure for UML repository
and associated overview structures. Tweaked listview that holds
over elements so that top level/root nodes show expansion
graphic. Implemented signals for updating overview with changes
to state of actual UML elements.
2000-01-29 Pascal Georges <p_g...@cl...>
* Kuml now parses Java (with ANTLR parser)
2000-01-26 Darius Stachow <sta...@in...>
* Rewritten the resize button stuff in order to handle them as objects.
* Added raise()/lower() to DrawingItem.
* Added class SwitchLine that encapsulates two different line object
and just delegate the incoming calls to one of them or both.
* Changed order of Makefiles in project file.
2000-01-21 Darius Stachow <sta...@in...>
* Added new classes for resize buttons. They are not yet finished.
I just wanted to have them in the project.
2000-01-19 Pascal Georges <p_g...@cl...>
* The import feature is now usable (for C++)
2000-01-07 Darius Stachow <sta...@in...>
* Completed (almost) label support for all kinds of lines.
2000-01-07 Pascal Georges <p_g...@cl...>
* The C++ parser of kdevelop is included
2000-01-03 Jake Fear <fe...@ho...>
* Added basics of visitor pattern implementation to the data
directory. There are no concrete implementations at this time
but all other infrastructure is in place.
1999-12-31 Pascal Georges <p_g...@cl...>
* When attributes or methods of a class are hidden,
"..." is displayed instead.
* The cloning of classes has been modified, but still needs more work.
1999-12-29 Darius Stachow <sta...@in...>
* Commited patch by Larry Anderson <la...@me...>:
Both changes were made to the DiagramLoader::load method.
They have to do with the toolbar not updating properly when opening a diagram.
* Added setMultiSelectable(false) to constructor of DrawingLabel to prevent
the line labels to be selected by the selection rectangle.
1999-12-27 Pascal Georges <p_g...@cl...>
* Changed the menus to be more in accordance to kuml's goals.
* Added files to /data directory to separate data and view
for use case diagrams.
* Added a SimpleProperties class to hold 'description' and 'name' strings.
1999-12-21 Darius Stachow <sta...@in...>
* Added support for six labels (A1-A3, B1-B3) on a diagonal line.
The other line types will be supported later.
* Started to decouple view/data in DrawingGeneralization and DrawingAssociation.
Both have a data object now (of type GeneralizationRelationship and AssociationRelationship)
1999-12-18 Pascal Georges <p_g...@cl...>
* The toolbar is now in accordance with the current diagram.
KDE doc says there is no way to avoid the flicker ...
1999-12-16 Jake Fear <fe...@ho...>
* Changed the DrawingClass constructor to take a class instead of
creating a class internally. Started decoupling the dlgpropclass
from the drawing item. Cleaned up a couple kludgy spots in the
name code of classes.
1999-12-16 Pascal Georges <p_g...@cl...>
* the function unselectAll() of class DrawingArea is now public
instead of protected (this will help the handling of the selected
items from kumlApp).
1999-12-13 Jake Fear <fe...@ho...>
* Made all internal lists of Classes private and fixed code that
was using those public members. This should make Classes a
reliable source of Qt signals for drawing items of all kinds
to put slots on.
1999-12-13 Jake Fear <fe...@ho...>
* Added dialog boxes to notify of duplicate class names in several
locations. Fixed a bug in the ClassFactory::createPackage function.
1999-12-13 Michel Wichers <wic...@in...>
* Added some DrawingObjects and Creationhelper for the state diagram.
1999-12-11 Pascal Georges <p_g...@cl...>
* Added push buttons to the class drawing item to
show/hide methods and attributes.
The autosize attributes has been added to the properties
dialog of classes.
1999-12-07 Jake Fear <fe...@ho...>
* Added LVIClass and got the basics of the class
repository view finished. Refined class/package
creation logic considerably.
1999-12-06 Jake Fear <fe...@ho...>
* Added a basic tree view of the class repository. Still in progress.
1999-12-06 Jake Fear <fe...@ho...>
* Added the basic implementation for
UML packages. Integrated packages into class repository and
factory. Added PopupProvider interface for overview, provided
VERY basic implementation for the PopupProvider. Fixed some
bugs in class repository and class factory. Added
LVIClassRepository. These are all still works in progress,
but I don't think they are going to hurt anyone else too bad ;-)
1999-12-04 Darius Stachow <sta...@in...>
* Added abstract data types for relationships
1999-12-04 Pascal Georges <p_g...@cl...>
* Fixed a bug in the DrawingClass/Classes clone method.
1999-11-30 Darius Stachow <sta...@in...>
* Added the diagram repository
1999-11-29 Pascal Georges <p_g...@cl...>
* Started clipboard implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Added a the KumlException class. The "main" catches this exception
(which should be super class of all exceptions) in order to assist
in debugging "checked" exceptions. Created the InvalidNameException
and added it to the setName(QString) signature in the Classes class
in order to clarify control over naming of classes. No duplicates
and no NULLS allowed by implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Setup signal in Properties class for setName. Overrode setname
in Classes to manage the repository when name is changed (needed
because the classes name is used as a key).
1999-11-27 Jake Fear <fe...@ho...>
* Made data/Classes a QObject that emits signals for the addition
and mutation of several attributes.
1999-11-27 Jake Fear <fe...@ho...>
* Added the IOInterface implementation to the ClassRepository. Did
some general code cleanup based on review from Darius.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassFactory implementation, it does not yet implement
the required IO interfaces. Should be useable now minus IO.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassRepository implementation
1999-11-19 Martin Schmitz <msc...@te...>
Joerg Habenicht <jha...@cr...>
* Started source generation support
1999-11-19 Michel Wichers <wic...@in...>
* Started state diagram implementation
1999-11-19 Albert Ries <ri...@bi...>
* Started deployment diagram implementation
1999-11-16 Darius Stachow <sta...@in...>
* Added empty diagram implementations:
Sequence diagram, Deployment diagram, Object diagram
1999-11-09 Michel Wichers <wic...@in...>
* Primitive rectangle added.
1999-11-09 Pascal Georges <p_g...@cl...>
* Added first version of use case diagram implementation.
1999-11-02 Pascal Georges <p_g...@cl...>
* Started the implementation of the use case diagram.
1999-11-01 Darius Stachow <sta...@in...>
* Included patch from Pascal Georges.
* Now font and color information will be read and written.
* File open dialog shows *.kuml files.
1999-10-20 Holger Knust <hk...@ad...>
* Started the XML/XMI support.
1999-03-01 Darius Stachow <sta...@in...>
* KUML started.
tik.fh-hamburg.de>
* KUML started.
VS: Committing in .
VS:
VS: Modified Files:
VS: configure.in kuml/Makefile.am kuml/kuml.cpp
VS: kuml/data/persistence/Makefile.am
VS: kuml/data/persistence/clKumlObjectMemento.h
VS: kuml/data/persistence/clMementoLibrary.cpp
VS: kuml/data/persistence/clMementoLibrary.h
VS: kuml/data/persistence/ifKumlObjectMemento.h
VS: kuml/data/persistence/XML/clXmlDataSource.cpp
VS: ----------------------------------------------------------------------
Index: configure.in
===================================================================
RCS file: /cvsroot/kuml/kuml_old/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure.in 8 Oct 2000 04:21:19 -0000 1.1.1.1
--- configure.in 2 Mar 2002 17:31:01 -0000 1.2
***************
*** 28,30 ****
dnl add here all your Makefiles. This are created by configure
! AC_OUTPUT(Makefile kuml/Makefile po/Makefile kuml/diagrams/Makefile kuml/drawobj/Makefile kuml/lines/Makefile kuml/dlgs/Makefile kuml/overview/Makefile kuml/pixmaps/Makefile kuml/data/Makefile kuml/parser/Makefile kuml/parser/cpp/Makefile kuml/parser/java/Makefile kuml/parser/antlr/Makefile kuml/codegen/Makefile kuml/codegen/cpp/Makefile kuml/data/persistence/Makefile kuml/data/persistence/XML/Makefile kuml/drawobj/tools/Makefile kuml/factories/Makefile )
--- 28,30 ----
dnl add here all your Makefiles. This are created by configure
! AC_OUTPUT(Makefile kuml/Makefile po/Makefile kuml/diagrams/Makefile kuml/drawobj/Makefile kuml/lines/Makefile kuml/dlgs/Makefile kuml/overview/Makefile kuml/pixmaps/Makefile kuml/data/Makefile kuml/parser/Makefile kuml/parser/cpp/Makefile kuml/parser/java/Makefile kuml/parser/antlr/Makefile kuml/codegen/Makefile kuml/codegen/cpp/Makefile kuml/data/persistence/Makefile kuml/data/persistence/XML/Makefile kuml/drawobj/tools/Makefile kuml/factories/Makefile kuml/data/persistence/factories/Makefile )
|
|
From: Gerard F. <ger...@us...> - 2002-03-02 17:31:11
|
Update of /cvsroot/kuml/kuml_old/kuml/data/persistence/XML
In directory usw-pr-cvs1:/tmp/cvs-serv31264/kuml/data/persistence/XML
Modified Files:
clXmlDataSource.cpp
Log Message:
2000-09-17 Keith Isdale <z14...@ci...>
* Popup menu suport framework complete, just need for people to
* add the needed menus. See kuml/overview/lviclass.cpp for complete
* example. Menus are now built on demand and take advantage of fact
* that derrived classes will normally share base menus.
* Reccomend clean build from cvs - tested ok
2000-09-08 Keith Isdale <z14...@ci...>
* Updated Popup menu suport so menus are consistant across
* whole program - change all item from QPopupMenu to KPopupMenu
* Work in progress. Recommend rebuild of kUML on cvs update
2000-09-08 Keith Isdale <z14...@ci...>
* Rebuilt header and other files needed for label suport to reduce dependencies
* Label support functional
* Changed overview support so that all code for popupMenu support
* is only in class files not header files
* Activated popup menus for drawing items in oveview
* Changes menus in Drawing item classes consistantly use KPopupMenu
2000-09-08 Darius Stachow <sta...@in...>
* Applied patch from Gerard Flynn <ger...@fr...> on the file acinclude.m4.
Now the configuration files search in $KDEDIR for the KDE2 installation now.
2000-09-03 Darius Stachow <sta...@in...>
* Started to rewrite the metamodels for relationship types. I'll try to use the nsuml library as pattern for that
* Added new (empty) classes (AssociationEnd, GeneralizableElement, Dependency, ...)
* Renamed GeneralizationRelationship to Generalization and AssociationRelationship to Association. A lot of files
have been changed but the sources are still buildable
* Current Version is now 0.5.1. Tagged the 0.5.0 files in cvs (KUML050).
* Done some work on the zigzag line again (still not finished). Want to finish the work on the meta model first
2000-08-24 Keith Isdale <z14...@ci...>
* Added default font and label position support new new Labels
* Files affected kuml.cpp,LabelGroup.cpp LabelGroup
* Added (create/remove)LinkToLines in DrawingConnection
* Files affected DrawingConnection.cpp and DrawingConnection.h
2000-08-23 Keith Isdale <z14...@ci...>
* New label support now partially function, all lines for associations are draw as
horizontal lines
2000-08-20 Keith Isdale <z14...@ci...>
* Started porting all classes to use LabelLayouter classes
* Changed all references of LineDrawLabels to LabelLayouterAB or LabelGroup
* Fixed queryExit() in Kumlapp class by using variable exitNow - dodgy but it works
2000-08-19 Keith Isdale <z14...@ci...>
* Aborted some features of LabelLayouter classes - too complex for pre beta
* Put on hold ideas to create automatic line positioning
* Made a start on a scope definition for labelLayout to avoid getting distracted by working on
unnecessary tasks. And started on use case diagrams for this section
* Added helper methods to ConnectionLine : getFirstLine() , getMiddleLine(),
getLastLine(), getLineCount(), getLineByIndex(uint index)
* Changed abstract methods to virtual to enable me to cast *Line to ConnectionLine
getCenter() and isMouseOver(const QPoint &mousepos). Also that I had to
change linenode.h and resizebuttonfactor.h
* Fixed adjustlabels method in LabelGroup so it called accept methods
* Added LineVisitor *getVisitor() method to LabelGroup
* Added LineNode to the base class of ConnectionLine
* Changed destructors to NON-vertual in ALL classes based on ConnectionLine
2000-08-02 Geoff Glasson <gla...@ii...>
* Located graphical class representations in correct locations
* Linked graphical class representation to element stored in repository
* Create a multi-diagram, multi-class model, saved and loaded it
2000-08-01 Geoff Glasson <gla...@ii...>
* Re-enabled the open project command when using the experimental persistence layer only
* Persistence layer now creates empty class diagrams and displays the tool palette
* Added ability to load (extremely) basic graphical representation of class from XML file
- class data is not loaded
2000-07-30 Darius Stachow <sta...@in...>
* Set mouse cursor when resizing
* Removed directory drawobj/helper
* Added factory classes for diagram elements (views) in directory kuml/factories
* Fixed wrong parameter order in calling KMsgBox functions (Thanks to Montel Laurent)
2000-07-26 Darius Stachow <sta...@in...>
* Added metamodel for stereotypes. Every model element can have 0..1 stereotypes
* A package now stores relationships (associations and generalizations).
* Added factory class for relationship objects.
* Reactivated resize buttons for lines and made them a little bit smaller
* Fixed crash when pasting elements
* The properties dialog for classes works again
* Started to decouple the creation of model and view
* Further bug fixes
2000-07-23 Darius Stachow <sta...@in...>
* Added auto detail feature for uml classes. The classes can be shown in three
different detail levels: details suppressed, analysis-level details and
implementation-level details. The uml classes will be automaticly resized to fit best.
* Updated toolbar: now KDE2 (png) icons are used instead xpm
* Fixed font bug when scaling is active
* Updated menubar
* Other bug fixes
2000-07-19 Darius Stachow <sta...@in...>
* Removed item resizing and moving code from view controller class [DrawingArea]
and put them into class SelectionTool.
* Removed all switch statements from the view controller class. The class
is now less complex as most features are implemented as editor tools.
* Fixed crash when trying to open a popup menu in the project browser window.
2000-07-18 Darius Stachow <sta...@in...>
* Added icons for the project browser view
* Added snapshot editor tool that allows to save a rectangular diagram
area as bitmap. All Qt supported file formats can be used
for saving (png, bmp, ...)
2000-07-16 Keith Isdale <z14...@ci...>
* Added Label
* classes nearly ready for testsing, need to convert
* ConnectionLine based classes to use them
2000-07-14 Geoff Glasson <gla...@ii...>
* Added detection of Gnome XML to configuration process
* Added detection of unique identifier generator to configuration process
* Added unique identifier attribute to element.h
* Added generation of unique identifier up construction to element.cpp
* Added method to retrieve unique identifier to element.h
2000-07-13 Darius Stachow <sta...@in...>
* Bugfixes. Many crashes caused by the editor are fixed :-)
2000-07-10 Darius Stachow <sta...@in...>
* Added possibility to enhance the capabilities of the editor by so called editor tools
* Started replacing the CreationHelper classes with the new CreationTool classes
* The item selection code has been reimplemented as editor tool (SelectionTool)
* The width of the column in the project browser view will be updated correctly now
2000-04-30 Darius Stachow <sta...@in...>
* Change in drawingclass.cpp. In order to follow the UML style guidelines the
class name will be printed in boldface.
2000-04-29 Darius Stachow <sta...@in...>
* Added directory data/persistance to project file
* Added empty method definition for slotExportDiagram() in class DrawingArea
* Added empty method definition for initDialog() in class DlgClassImportDeleted
* Changed path for include file types.h in kuml/data/persistance/ifModelFile.h
* Commented "if (!mouseButtonPressed) return;" in DrawingArea::mouseMoveEvent()
* Changed default background color to white for diagrams
* Disabled shadow for drawing items
* Changed application name "KUML" to "kUML" in main.cpp
2000-03-14 Pascal Georges <p_g...@cl...>
* Added declaredInFile attribute to Classes to keep track of the file
that generated the class (useful to detect that the user deleted a class).
* Work progresses well to import extra code in an existing project. Should
be finished in 1 week.
2000-02-09 Pascal Georges <p_g...@cl...>
* Association links are drawn when code is reverse engineered.
It still needs some work to differentiate composition from
aggregation.
* The Project->information feature is back alive.
2000-02-06 Pascal Georges <p_g...@cl...>
* The drawing area is resized to give room to the imported classes.
2000-02-05 Jake Fear <fe...@ho...>
* Added description to class editing capability. This should be
used as header documentation when code generating.
2000-02-01 Jake Fear <fe...@ho...>
* Objects in the repository can now be recovered by path. Each
UML element can provide its own path to an caller. In this way
the path of an object in the repository can effectively be
used as a reference to any UML element within a project.
2000-02-01 Jake Fear <fe...@ho...>
* Basic data transfer from repository to diagram objects
is now implemented. Lots of solidifying also done on
the repository data structure.
2000-01-31 Jake Fear <fe...@ho...>
* Checked in massive changes to data structure for UML repository
and associated overview structures. Tweaked listview that holds
over elements so that top level/root nodes show expansion
graphic. Implemented signals for updating overview with changes
to state of actual UML elements.
2000-01-29 Pascal Georges <p_g...@cl...>
* Kuml now parses Java (with ANTLR parser)
2000-01-26 Darius Stachow <sta...@in...>
* Rewritten the resize button stuff in order to handle them as objects.
* Added raise()/lower() to DrawingItem.
* Added class SwitchLine that encapsulates two different line object
and just delegate the incoming calls to one of them or both.
* Changed order of Makefiles in project file.
2000-01-21 Darius Stachow <sta...@in...>
* Added new classes for resize buttons. They are not yet finished.
I just wanted to have them in the project.
2000-01-19 Pascal Georges <p_g...@cl...>
* The import feature is now usable (for C++)
2000-01-07 Darius Stachow <sta...@in...>
* Completed (almost) label support for all kinds of lines.
2000-01-07 Pascal Georges <p_g...@cl...>
* The C++ parser of kdevelop is included
2000-01-03 Jake Fear <fe...@ho...>
* Added basics of visitor pattern implementation to the data
directory. There are no concrete implementations at this time
but all other infrastructure is in place.
1999-12-31 Pascal Georges <p_g...@cl...>
* When attributes or methods of a class are hidden,
"..." is displayed instead.
* The cloning of classes has been modified, but still needs more work.
1999-12-29 Darius Stachow <sta...@in...>
* Commited patch by Larry Anderson <la...@me...>:
Both changes were made to the DiagramLoader::load method.
They have to do with the toolbar not updating properly when opening a diagram.
* Added setMultiSelectable(false) to constructor of DrawingLabel to prevent
the line labels to be selected by the selection rectangle.
1999-12-27 Pascal Georges <p_g...@cl...>
* Changed the menus to be more in accordance to kuml's goals.
* Added files to /data directory to separate data and view
for use case diagrams.
* Added a SimpleProperties class to hold 'description' and 'name' strings.
1999-12-21 Darius Stachow <sta...@in...>
* Added support for six labels (A1-A3, B1-B3) on a diagonal line.
The other line types will be supported later.
* Started to decouple view/data in DrawingGeneralization and DrawingAssociation.
Both have a data object now (of type GeneralizationRelationship and AssociationRelationship)
1999-12-18 Pascal Georges <p_g...@cl...>
* The toolbar is now in accordance with the current diagram.
KDE doc says there is no way to avoid the flicker ...
1999-12-16 Jake Fear <fe...@ho...>
* Changed the DrawingClass constructor to take a class instead of
creating a class internally. Started decoupling the dlgpropclass
from the drawing item. Cleaned up a couple kludgy spots in the
name code of classes.
1999-12-16 Pascal Georges <p_g...@cl...>
* the function unselectAll() of class DrawingArea is now public
instead of protected (this will help the handling of the selected
items from kumlApp).
1999-12-13 Jake Fear <fe...@ho...>
* Made all internal lists of Classes private and fixed code that
was using those public members. This should make Classes a
reliable source of Qt signals for drawing items of all kinds
to put slots on.
1999-12-13 Jake Fear <fe...@ho...>
* Added dialog boxes to notify of duplicate class names in several
locations. Fixed a bug in the ClassFactory::createPackage function.
1999-12-13 Michel Wichers <wic...@in...>
* Added some DrawingObjects and Creationhelper for the state diagram.
1999-12-11 Pascal Georges <p_g...@cl...>
* Added push buttons to the class drawing item to
show/hide methods and attributes.
The autosize attributes has been added to the properties
dialog of classes.
1999-12-07 Jake Fear <fe...@ho...>
* Added LVIClass and got the basics of the class
repository view finished. Refined class/package
creation logic considerably.
1999-12-06 Jake Fear <fe...@ho...>
* Added a basic tree view of the class repository. Still in progress.
1999-12-06 Jake Fear <fe...@ho...>
* Added the basic implementation for
UML packages. Integrated packages into class repository and
factory. Added PopupProvider interface for overview, provided
VERY basic implementation for the PopupProvider. Fixed some
bugs in class repository and class factory. Added
LVIClassRepository. These are all still works in progress,
but I don't think they are going to hurt anyone else too bad ;-)
1999-12-04 Darius Stachow <sta...@in...>
* Added abstract data types for relationships
1999-12-04 Pascal Georges <p_g...@cl...>
* Fixed a bug in the DrawingClass/Classes clone method.
1999-11-30 Darius Stachow <sta...@in...>
* Added the diagram repository
1999-11-29 Pascal Georges <p_g...@cl...>
* Started clipboard implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Added a the KumlException class. The "main" catches this exception
(which should be super class of all exceptions) in order to assist
in debugging "checked" exceptions. Created the InvalidNameException
and added it to the setName(QString) signature in the Classes class
in order to clarify control over naming of classes. No duplicates
and no NULLS allowed by implementation.
1999-11-27 Jake Fear <fe...@ho...>
* Setup signal in Properties class for setName. Overrode setname
in Classes to manage the repository when name is changed (needed
because the classes name is used as a key).
1999-11-27 Jake Fear <fe...@ho...>
* Made data/Classes a QObject that emits signals for the addition
and mutation of several attributes.
1999-11-27 Jake Fear <fe...@ho...>
* Added the IOInterface implementation to the ClassRepository. Did
some general code cleanup based on review from Darius.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassFactory implementation, it does not yet implement
the required IO interfaces. Should be useable now minus IO.
1999-11-22 Jake Fear <fe...@ho...>
* Added the ClassRepository implementation
1999-11-19 Martin Schmitz <msc...@te...>
Joerg Habenicht <jha...@cr...>
* Started source generation support
1999-11-19 Michel Wichers <wic...@in...>
* Started state diagram implementation
1999-11-19 Albert Ries <ri...@bi...>
* Started deployment diagram implementation
1999-11-16 Darius Stachow <sta...@in...>
* Added empty diagram implementations:
Sequence diagram, Deployment diagram, Object diagram
1999-11-09 Michel Wichers <wic...@in...>
* Primitive rectangle added.
1999-11-09 Pascal Georges <p_g...@cl...>
* Added first version of use case diagram implementation.
1999-11-02 Pascal Georges <p_g...@cl...>
* Started the implementation of the use case diagram.
1999-11-01 Darius Stachow <sta...@in...>
* Included patch from Pascal Georges.
* Now font and color information will be read and written.
* File open dialog shows *.kuml files.
1999-10-20 Holger Knust <hk...@ad...>
* Started the XML/XMI support.
1999-03-01 Darius Stachow <sta...@in...>
* KUML started.
tik.fh-hamburg.de>
* KUML started.
VS: Committing in .
VS:
VS: Modified Files:
VS: configure.in kuml/Makefile.am kuml/kuml.cpp
VS: kuml/data/persistence/Makefile.am
VS: kuml/data/persistence/clKumlObjectMemento.h
VS: kuml/data/persistence/clMementoLibrary.cpp
VS: kuml/data/persistence/clMementoLibrary.h
VS: kuml/data/persistence/ifKumlObjectMemento.h
VS: kuml/data/persistence/XML/clXmlDataSource.cpp
VS: ----------------------------------------------------------------------
Index: clXmlDataSource.cpp
===================================================================
RCS file: /cvsroot/kuml/kuml_old/kuml/data/persistence/XML/clXmlDataSource.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** clXmlDataSource.cpp 8 Oct 2000 04:22:15 -0000 1.1.1.1
--- clXmlDataSource.cpp 2 Mar 2002 17:31:08 -0000 1.2
***************
*** 76,79 ****
--- 76,80 ----
lvClassTags);
+ /*
QList<QString> lvClassAttributeTags;
lvClassAttributeTags.append (new QString ("Attribute"));
***************
*** 90,93 ****
--- 91,96 ----
lvClassOperationTags);
+ */
+
QList<QString> lvAssociationTags;
lvAssociationTags.append (new QString ("Association"));
***************
*** 110,116 ****
//
// *****************************************
mvMementos.meAddMementoTranslation (
new DrawingClass (0, 0, 0), new clXmlGraphicalClassMemento,
! "drawingclass");
}
catch (...)
--- 113,121 ----
//
// *****************************************
+ QList<QString> lvGraphicalTags;
+ lvGraphicalTags.append (new QString ("drawingclass"));
mvMementos.meAddMementoTranslation (
new DrawingClass (0, 0, 0), new clXmlGraphicalClassMemento,
! lvGraphicalTags);
}
catch (...)
|
|
From: Chris M. <zm...@us...> - 2002-02-27 22:37:25
|
Update of /cvsroot/kuml/kuml/libkuml/uml
In directory usw-pr-cvs1:/tmp/cvs-serv24259
Modified Files:
freecase
Log Message:
Minor mod to specify current directory to find start_fcd.
I think I caught this while running as root (naughty!)
Index: freecase
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/freecase,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** freecase 16 Oct 2000 04:01:59 -0000 1.1.1.1
--- freecase 27 Feb 2002 22:37:22 -0000 1.2
***************
*** 1,5 ****
#!/bin/sh
case $1 in
! start) start_fcd ;;
stop) killall -TERM fcd
killall -TERM nsd
--- 1,5 ----
#!/bin/sh
case $1 in
! start) ./start_fcd ;;
stop) killall -TERM fcd
killall -TERM nsd
|
|
From: Chris M. <zm...@us...> - 2002-02-27 22:35:27
|
Update of /cvsroot/kuml/kuml/libkuml/uml In directory usw-pr-cvs1:/tmp/cvs-serv24099 Modified Files: start_fcd Makefile CHANGES.txt Log Message: Mods for change to UML 1.4. Index: start_fcd =================================================================== RCS file: /cvsroot/kuml/kuml/libkuml/uml/start_fcd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** start_fcd 16 Oct 2000 04:01:59 -0000 1.1.1.1 --- start_fcd 27 Feb 2002 22:35:24 -0000 1.2 *************** *** 13,20 **** IDL:omg.org/CosNaming/NamingContext:1.0#NameService $RC ! imr create UmlCorePackageFactory poa "`pwd`/fcd $RC" \ ! IDL:UmlCorePackageFactory:1.0 $RC sleep 1 ! imr activate UmlCorePackageFactory $RC #echo $RC --- 13,20 ---- IDL:omg.org/CosNaming/NamingContext:1.0#NameService $RC ! imr create UMLPackageFactory poa "`pwd`/fcd $RC" \ ! IDL:UMLPackageFactory:1.0 $RC sleep 1 ! imr activate UMLPackageFactory $RC #echo $RC Index: Makefile =================================================================== RCS file: /cvsroot/kuml/kuml/libkuml/uml/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile 16 Oct 2000 04:01:59 -0000 1.1.1.1 --- Makefile 27 Feb 2002 22:35:24 -0000 1.2 *************** *** 1,17 **** - MICO_VERSION=2.3.0 - .PHONY: all clean all: fcd ! fcd: Reflective/*.h Foundation/*.h main/*.cc Reflective/*.cc Foundation/*.cc ! ( cd Reflective; make all ) ! ( cd Foundation; make all ) ! ( cd main; make all ) ! mico-ld -o fcd main/*.o Reflective/*.o Foundation/*.o \ ! -lmico${MICO_VERSION} -lmicocoss${MICO_VERSION} clean: ! ( cd Foundation; make clean ) ( cd Reflective; make clean ) ( cd main; make clean ) --- 1,19 ---- .PHONY: all clean + PACKAGES=ActivityGraphs Collaborations CommonBehavior Core DataTypes main ModelManagement Reflective StateMachines UML UseCases + all: fcd ! fcd: Reflective/*.h Core/*.h main/*.cc Reflective/*.cc Core/*.cc ! ( for PACKAGE in ${PACKAGES}; do \ ! cd $${PACKAGE}; make all; cd ..; \ ! done ) ! mico-ld -o fcd ActivityGraphs/*.o Collaborations/*.o \ ! CommonBehavior/*.o Core/*.o DataTypes/*.o main/*.o \ ! ModelManagement/*.o Reflective/*.o StateMachines/*.o UML/*.o \ ! UseCases/*.o -lmico${MICOVERSION} -lmicocoss${MICOVERSION} clean: ! ( cd Core; make clean ) ( cd Reflective; make clean ) ( cd main; make clean ) Index: CHANGES.txt =================================================================== RCS file: /cvsroot/kuml/kuml/libkuml/uml/CHANGES.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** CHANGES.txt 20 Dec 2000 20:37:16 -0000 1.2 --- CHANGES.txt 27 Feb 2002 22:35:24 -0000 1.3 *************** *** 1,2 **** --- 1,3 ---- + 0.6 XSLT based generation from XMI. 0.5 Auto-generation. Associations partially implemented and wrong? 0.4 Added attributes and a host of other features. Base for kUML. |
|
From: Chris M. <zm...@us...> - 2002-02-27 22:30:13
|
Update of /cvsroot/kuml/kuml/libkuml/uml/main
In directory usw-pr-cvs1:/tmp/cvs-serv22382
Modified Files:
Makefile main.cc
Log Message:
Mods for UML 1.4.
Now puts the UMLPackageFactory in the nameserver.
Index: Makefile
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/main/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile 16 Oct 2000 04:02:12 -0000 1.1.1.1
--- Makefile 27 Feb 2002 22:30:07 -0000 1.2
***************
*** 1,5 ****
CPROGS:=${shell ls *.cc}
OBJS=${CPROGS:.cc=.o}
! MICO_CPP_FLAGS= -I../Reflective -I../Foundation
.SUFFIXES : .cc .o
--- 1,5 ----
CPROGS:=${shell ls *.cc}
OBJS=${CPROGS:.cc=.o}
! MICO_CPP_FLAGS= -I../Reflective -I../DataTypes -I../Core -I../CommonBehavior -I../StateMachines -I../Collaborations -I../UseCases -I../ActivityGraphs -I../ModelManagement -I../UML
.SUFFIXES : .cc .o
Index: main.cc
===================================================================
RCS file: /cvsroot/kuml/kuml/libkuml/uml/main/main.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** main.cc 16 Oct 2000 04:02:12 -0000 1.1.1.1
--- main.cc 27 Feb 2002 22:30:07 -0000 1.2
***************
*** 2,7 ****
#include <CORBA.h>
#include <mico/CosNaming.h>
! #include "Foundation.h"
! #include "FoundationPackageFactory_impl.h"
--- 2,7 ----
#include <CORBA.h>
#include <mico/CosNaming.h>
!
! #include "UMLPackageFactory_impl.h"
***************
*** 16,49 ****
PortableServer::POAManager_var mgr = poa->the_POAManager();
! // Create the Core Factory object
! FoundationPackageFactory_impl* ucf =
! new FoundationPackageFactory_impl;
! // activate the server to register with the POA
! PortableServer::ObjectId_var oid = poa->activate_object(ucf);
// Activate POAs and start serving requests.
mgr->activate ();
! // create reference for naming service
CORBA::Object_var objRef = poa->id_to_reference(oid);
! // register the server object with the naming service
! // obtain reference to naming service daemon
CORBA::Object_var nsobj = orb->resolve_initial_references( "NameService" );
! // downcast to type
CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow( nsobj );
! // create binding
CosNaming::Name name;
name.length(1);
! name[0].id = CORBA::string_dup( "fcCoreFactory" );
! name[0].kind = CORBA::string_dup( "UmlCoreFactory" );
nc->bind( name, objRef );
orb->run ();
! /* Shutdown. This calls etherealize() for our UmlCorePackage. */
poa->destroy (TRUE, TRUE);
--- 16,49 ----
PortableServer::POAManager_var mgr = poa->the_POAManager();
! // Create the UML Factory object.
! UMLPackageFactory_impl* upf =
! new UMLPackageFactory_impl;
! // Activate the server to register with the POA.
! PortableServer::ObjectId_var oid = poa->activate_object(upf);
// Activate POAs and start serving requests.
mgr->activate ();
! // Create reference for naming service.
CORBA::Object_var objRef = poa->id_to_reference(oid);
! // Register the server object with the naming service.
! // Obtain reference to naming service daemon
CORBA::Object_var nsobj = orb->resolve_initial_references( "NameService" );
! // Downcast to type.
CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow( nsobj );
! // Create binding
CosNaming::Name name;
name.length(1);
! name[0].id = CORBA::string_dup( "fcUMLPackageFactory" );
! name[0].kind = CORBA::string_dup( "UMLPackageFactory" );
nc->bind( name, objRef );
orb->run ();
! /* Shutdown. This calls etherealize() for our UmlPackagePackage. */
poa->destroy (TRUE, TRUE);
|
