Author: tfmorris Date: 2008-05-05 00:55:25-0700 New Revision: 14623 Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java
Log: Issue 5072: deprecate buildPackage() method with UUID parameter Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java?view=diff&rev=14623&p1=trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java&p2=trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/reveng/java/Modeller.java 2008-05-05 00:55:25-0700 @@ -1414,8 +1414,10 @@ if (mPackage == null) { mPackage = Model.getModelManagementFactory() - .buildPackage(getRelativePackageName(name), name); + .buildPackage(getRelativePackageName(name)); newElements.add(mPackage); + + // TODO: This is redundant with addOwnedElement code below - tfm Model.getCoreHelper().setNamespace(mPackage, model); // Find the owner for this package. Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=diff&rev=14623&p1=trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&p2=trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java 2008-05-05 00:55:25-0700 @@ -717,7 +717,7 @@ // must be a package element = Model.getModelManagementFactory() - .buildPackage(s, type.substring(0, pos)); + .buildPackage(s); } else { // must be a classifier, let's assume a class element = Model.getCoreFactory().buildClass(s); Modified: trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java&p2=trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java (original) +++ trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java 2008-05-05 00:55:25-0700 @@ -120,7 +120,7 @@ Project p = ProjectManager.getManager().getCurrentProject(); // test with a class in a package Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Model.getCoreHelper().setNamespace(package1, p.getRoot()); Object cls1 = Model.getCoreFactory().buildClass(package1); Object cls2 = Model.getCoreFactory().buildClass(package1); @@ -198,10 +198,10 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); assertNotNull(package1); Object package2 = - Model.getModelManagementFactory().buildPackage("test2", null); + Model.getModelManagementFactory().buildPackage("test2"); UMLClassDiagram cDiag = new UMLClassDiagram(package2); p.addMember(cDiag); @@ -227,7 +227,7 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); @@ -266,7 +266,7 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); @@ -318,7 +318,7 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); p.moveToTrash(package1); @@ -342,7 +342,7 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); @@ -381,7 +381,7 @@ // test with a class and class diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); Object voidType = p.getDefaultReturnType(); @@ -429,7 +429,7 @@ // test with a package and a class and activity diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object aClass = Model.getCoreFactory().buildClass(package1); // build the Activity Diagram @@ -468,10 +468,10 @@ // test with a package and a class and activity diagram Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Model.getCoreHelper().setNamespace(package1, p.getModel()); Object package2 = - Model.getModelManagementFactory().buildPackage("test2", null); + Model.getModelManagementFactory().buildPackage("test2"); Model.getCoreHelper().setNamespace(package2, package1); // build the Activity Diagram Modified: trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java&p2=trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java (original) +++ trunk/src/argouml-app/tests/org/argouml/model/TestCoreFactory.java 2008-05-05 00:55:25-0700 @@ -576,11 +576,11 @@ public void testBuildAssociation() { Object model = Model.getModelManagementFactory().createModel(); Object packA = Model.getModelManagementFactory().buildPackage( - "package-a", "111"); + "package-a"); Object packB = Model.getModelManagementFactory().buildPackage( - "package-b", "222"); + "package-b"); Object packC = Model.getModelManagementFactory().buildPackage( - "package-c", "222"); + "package-c"); Model.getCoreHelper().setNamespace(packA, model); Model.getCoreHelper().setNamespace(packB, packA); Modified: trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java&p2=trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java (original) +++ trunk/src/argouml-app/tests/org/argouml/model/TestExtensionMechanismsHelper.java 2008-05-05 00:55:25-0700 @@ -69,8 +69,7 @@ model = Model.getModelManagementFactory().createModel(); pack = - Model.getModelManagementFactory().buildPackage("pack", - UUIDManager.getInstance().getNewUUID()); + Model.getModelManagementFactory().buildPackage("pack"); Model.getCoreHelper().setNamespace(pack, model); theClass = Model.getCoreFactory().buildClass("TheClass", pack); @@ -100,9 +99,9 @@ * where the model element is, is applicable to the model element. */ public void testGetAllPossibleStereotypesStereotypeInContainingPackage() { - Object subpack = + Object subpack = Model.getModelManagementFactory().buildPackage( - "subpack", UUIDManager.getInstance().getNewUUID()); + "subpack"); Model.getCoreHelper().setNamespace(subpack, pack); theClass = Model.getCoreFactory().buildClass("TheClassInSubpack", subpack); Modified: trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java&p2=trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java (original) +++ trunk/src/argouml-app/tests/org/argouml/ui/GUITestProjectBrowser.java 2008-05-05 00:55:25-0700 @@ -120,9 +120,9 @@ public void testSetTarget() { Project p = ProjectManager.getManager().getCurrentProject(); Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object package2 = - Model.getModelManagementFactory().buildPackage("test2", null); + Model.getModelManagementFactory().buildPackage("test2"); UMLClassDiagram diagram1 = new UMLClassDiagram(package1); UMLClassDiagram diagram2 = new UMLClassDiagram(package2); p.addMember(diagram1); @@ -151,9 +151,9 @@ TargetManager tm = TargetManager.getInstance(); Object package1 = - Model.getModelManagementFactory().buildPackage("test1", null); + Model.getModelManagementFactory().buildPackage("test1"); Object package2 = - Model.getModelManagementFactory().buildPackage("test2", null); + Model.getModelManagementFactory().buildPackage("test2"); UMLClassDiagram diagram1 = new UMLClassDiagram(package1); UMLClassDiagram diagram2 = new UMLClassDiagram(package2); try { Modified: trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrAssocNameConflict.java 2008-05-05 00:55:25-0700 @@ -46,8 +46,8 @@ protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); - ns1 = Model.getModelManagementFactory().buildPackage("P1", null); - ns2 = Model.getModelManagementFactory().buildPackage("P2", null); + ns1 = Model.getModelManagementFactory().buildPackage("P1"); + ns2 = Model.getModelManagementFactory().buildPackage("P2"); c1 = Model.getCoreFactory().buildClass("A", ns1); c2 = Model.getCoreFactory().buildClass("A", ns1); c3 = Model.getCoreFactory().buildClass("B", ns1); Modified: trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNameConflict.java 2008-05-05 00:55:25-0700 @@ -50,8 +50,8 @@ protected void setUp() throws Exception { super.setUp(); InitializeModel.initializeDefault(); - ns1 = Model.getModelManagementFactory().buildPackage("P1", null); - ns2 = Model.getModelManagementFactory().buildPackage("P2", null); + ns1 = Model.getModelManagementFactory().buildPackage("P1"); + ns2 = Model.getModelManagementFactory().buildPackage("P2"); c1 = Model.getCoreFactory().buildClass("A", ns1); c2 = Model.getCoreFactory().buildClass("A", ns1); c3 = Model.getCoreFactory().buildClass("B", ns1); Modified: trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java?view=diff&rev=14623&p1=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java&p2=trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java&r1=14622&r2=14623 ============================================================================== --- trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java (original) +++ trunk/src/argouml-app/tests/org/argouml/uml/cognitive/critics/TestCrNoAssociations.java 2008-05-05 00:55:25-0700 @@ -53,7 +53,7 @@ InitializeModel.initializeDefault(); critic = new CrNoAssociations(); - ns = Model.getModelManagementFactory().buildPackage("Test", null); + ns = Model.getModelManagementFactory().buildPackage("Test"); useCase1 = Model.getUseCasesFactory().createUseCase(); Model.getCoreHelper().setName(useCase1, "A"); Model.getCoreHelper().setNamespace(useCase1, ns); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
