Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r78 - trunk: . src/org/dbuml/argo/uml/diagram/ui src/org/dbuml/argo/uml/ui

argouml-db
Discussion topic

Back to topic list

svn commit: r78 - trunk: . src/org/dbuml/argo/uml/diagram/ui src/org/dbuml/argo/uml/ui

Author lepekhine
Full name Alexander Lepekhine
Date 2010-05-25 06:51:17 PDT
Message Author: lepekhine
Date: 2010-05-25 06:51:16-0700
New Revision: 78

Modified:
   trunk/.classpath
   trunk/build.xml
   trunk/module.properties
   trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBDeploymentDiagram.​java
   trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBSchemaDiagram.java​
   trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigDatabase.java
   trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigRegistry.java
   trunk/src/org/dbuml/​argo/uml/ui/DBModule​.java

Log:
resolved issue 8: compatibility with the latest argouml release

Modified: trunk/.classpath
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​.classpath?view=diff​&pathrev=78&​r1=77&r2=78
====================​====================​====================​==================
--- trunk/.classpath (original)
+++ trunk/.classpath 2010-05-25 06:51:16-0700
@@ -1,8 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/velocity-1​.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jd​t.launching.JRE_CONT​AINER"/>
- <classpathentry kind="con" path="org.eclipse.pd​e.core.requiredPlugi​ns"/>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry exported="true" kind="lib" path="lib/velocity-1​.4.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jd​t.launching.JRE_CONT​AINER"/>
+ <classpathentry kind="con" path="org.eclipse.pd​e.core.requiredPlugi​ns"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/argouml"/>
+ <classpathentry kind="lib" path="/argouml/src/a​rgouml-build/build/l​og4j-1.2.6.jar"/>​
+ <classpathentry kind="lib" path="/argouml/src/a​rgouml-build/build/g​ef-0.13.1.jar"/>
+ <classpathentry kind="lib" path="/argouml/src/a​rgouml-build/build/s​widgets-0.1.4.jar"/​>
+ <classpathentry kind="lib" path="/argouml/src/a​rgouml-build/build/t​oolbar-1.4.1-2007122​7.jar"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>

Modified: trunk/build.xml
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​build.xml?view=diff​&pathrev=78&r​1=77&r2=78
====================​====================​====================​==================
--- trunk/build.xml (original)
+++ trunk/build.xml 2010-05-25 06:51:16-0700
@@ -66,7 +66,7 @@
 
     <property name="module.jarfile.name" value="dbuml.jar"/>
     <property name="module.jarfile"
- value="${argo.root.​dir}/build/ext/${mo​dule.jarfile.name}"/​>
+ value="${module.bui​ld.dir}/${module.ja​rfile.name}"/>
 
    
     <echo message="${argo.root.dir} ${argo.src.dir} ${junit.jar.path} ${ant.home}"/>

Modified: trunk/module.properties
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​module.properties?vi​ew=diff&pathrev=​78&r1=77&r2=​78
====================​====================​====================​==================
--- trunk/module.properties (original)
+++ trunk/module.properties 2010-05-25 06:51:16-0700
@@ -1,4 +1,6 @@
 argo.module.name=dbuml
 argo.module.jarfile=dbuml
-argo.root.dir=../argouml-build
+# argo.root.dir is a directory where argouml is deployed. It contains argouml.jar and "ext" subdirectory.
+# The next line assumes db module is checkouted into the same directory as argouml itself (into one workspace)
+argo.root.dir=../ar​gouml/src/argouml-bu​ild
 

Modified: trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBDeploymentDiagram.​java
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​src/org/dbuml/argo/u​ml/diagram/ui/DBDepl​oymentDiagram.java?v​iew=diff&pathrev​=78&r1=77&r2​=78
====================​====================​====================​==================
--- trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBDeploymentDiagram.​java (original)
+++ trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBDeploymentDiagram.​java 2010-05-25 06:51:16-0700
@@ -137,12 +137,11 @@
         lay.setGraphNodeRenderer(rend);
         lay.setGraphEdgeRenderer(rend);
         setLayer(lay);
-
- // If primitive datatypes are not defined, add them.
- String sTypes[] = DBMetadata.getPrimitiveTypes();
- if (!(DBModelFacade.get​Instance().checkType​s(sTypes))) {
- DBModelFacade.getIns​tance().addTypes(sTy​pes, "types.sql");
- }
+// // If primitive datatypes are not defined, add them.
+// String sTypes[] = DBMetadata.getPrimitiveTypes();
+// if (!(DBModelFacade.get​Instance().checkType​s(sTypes))) {
+// DBModelFacade.getIns​tance().addTypes(sTy​pes, "types.sql");
+// }
     }
     
     

Modified: trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBSchemaDiagram.java​
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​src/org/dbuml/argo/u​ml/diagram/ui/DBSche​maDiagram.java?view=​diff&pathrev=78​&r1=77&r2=78
====================​====================​====================​==================
--- trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBSchemaDiagram.java​ (original)
+++ trunk/src/org/dbuml/​argo/uml/diagram/ui/​DBSchemaDiagram.java​ 2010-05-25 06:51:16-0700
@@ -142,12 +142,6 @@
         ClassDiagramRenderer rend = new DBSchemaDiagramRenderer(); // singleton
         lay.setGraphNodeRenderer(rend);
         lay.setGraphEdgeRenderer(rend);
-
- // If primitive datatypes are not defined, add them.
- String sTypes[] = DBMetadata.getPrimitiveTypes();
- if (!(DBModelFacade.get​Instance().checkType​s(sTypes))) {
- DBModelFacade.getIns​tance().addTypes(sTy​pes, "types.sql");
- }
     }
     
     /**

Modified: trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigDatabase.java
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​src/org/dbuml/argo/u​ml/diagram/ui/FigDat​abase.java?view=diff​&pathrev=78&​r1=77&r2=78
====================​====================​====================​==================
--- trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigDatabase.java (original)
+++ trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigDatabase.java 2010-05-25 06:51:16-0700
@@ -43,11 +43,11 @@
     /**
      * Creates new FigDatabase instance.
      */
- public FigDatabase() {
- super(null, new Rectangle(0, 0, 0, 0), new DiagramSettings());
+ public FigDatabase(Object owner, Rectangle bounds, DiagramSettings settings) {
+ super(owner, bounds, settings);
         setFillColor(filler);
     }
-
+
     /**
      * Gets dbuml added actions.
      * @return A vector of actions.

Modified: trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigRegistry.java
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​src/org/dbuml/argo/u​ml/diagram/ui/FigReg​istry.java?view=diff​&pathrev=78&​r1=77&r2=78
====================​====================​====================​==================
--- trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigRegistry.java (original)
+++ trunk/src/org/dbuml/​argo/uml/diagram/ui/​FigRegistry.java 2010-05-25 06:51:16-0700
@@ -36,8 +36,8 @@
     /**
      * Creates new FigRegistry.
      */
- public FigRegistry() {
- super(null, new Rectangle(0, 0, 0, 0), new DiagramSettings());
+ public FigRegistry(Object owner, Rectangle bounds, DiagramSettings settings) {
+ super(owner, bounds, settings);
         setFillColor(filler);
     }
     

Modified: trunk/src/org/dbuml/​argo/uml/ui/DBModule​.java
Url: http://argouml-db.ti​gris.org/source/brow​se/argouml-db/trunk/​src/org/dbuml/argo/u​ml/ui/DBModule.java?​view=diff&pathre​v=78&r1=77&r​2=78
====================​====================​====================​==================
--- trunk/src/org/dbuml/​argo/uml/ui/DBModule​.java (original)
+++ trunk/src/org/dbuml/​argo/uml/ui/DBModule​.java 2010-05-25 06:51:16-0700
@@ -17,7 +17,9 @@
 
 import org.dbuml.argo.model​.ArgoDBModelFacade;
 import org.dbuml.argo.uml.d​iagram.ui.FigureFact​ory;
+import org.dbuml.base.datab​ase.DBMetadata;
 import org.dbuml.base.i18n.Translator;
+import org.dbuml.base.model​.DBModelFacade;
 
 
 /**
@@ -108,6 +110,12 @@
         menubar.getTools().a​dd(_deployMenu);
         
         this.initializeFactories();
+
+ // If primitive datatypes are not defined, add them.
+ String sTypes[] = DBMetadata.getPrimitiveTypes();
+ if (!(DBModelFacade.get​Instance().checkType​s(sTypes))) {
+ DBModelFacade.getIns​tance().addTypes(sTy​pes, "types.sql");
+ }
         
         //create default dbuml diagrams
 // createDefaultDiagrams();

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r78 - trunk: . src/org/dbuml/argo/uml/diagram/ui src/org/dbuml/argo/uml/ui lepekhine Alexander Lepekhine 2010-05-25 06:51:17 PDT
Messages per page: