Author: maurelio1234
Date: 2007-07-18 22:27:26-0700
New Revision: 13096
Added:
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoStatusEvent.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/application/events/ArgoStatusEvent.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoStatusEventListener.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/application/events/ArgoStatusEventListener.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/TableCritics.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/cognitive/critics/ui/TableCritics.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/TableModelCritics.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/cognitive/critics/ui/TableModelCritics.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/Project.java
- copied, changed from r13095, /trunk/src_new/org/argouml/kernel/Project.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectFactory.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/kernel/ProjectFactory.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectImpl.java
- copied, changed from r13095, /trunk/src_new/org/argouml/kernel/ProjectImpl.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProvider.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/notation/NotationProvider.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/InitNotationJava.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/notation/providers/java/InitNotationJava.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/uml/InitNotationUml.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/notation/providers/uml/InitNotationUml.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/ArgoToolbarManager.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/swingext/ArgoToolbarManager.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ArgoStatusBar.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/ui/ArgoStatusBar.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectActions.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/ui/ProjectActions.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionNotation.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/ui/cmd/ActionNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ArgoDiagram.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ArgoDiagramImpl.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/AttributesCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ExtensionsCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/IItemUID.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/IItemUID.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/OperationsCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/PathContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/PathContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/StereotypeContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/StereotypeContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/VisibilityContainer.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/VisibilityContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ArgoFig.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoFig.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ArgoFigGroup.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ui/ArgoFigGroup.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/Clarifiable.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ui/Clarifiable.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/StatusBarAdapter.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/uml/diagram/ui/StatusBarAdapter.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/util/EnumerationIterator.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/util/EnumerationIterator.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/util/IteratorEnumeration.java
- copied unchanged from r13095, /trunk/src_new/org/argouml/util/IteratorEnumeration.java
Removed:
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationJava.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationUml.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NotationProvider.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/ui/ActionNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionProperties.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/PathContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java
Modified:
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties
branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties
branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties
branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties
branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee
branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java
branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
Log:
mermerged r13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/Main.java 2007-07-18 22:27:26-0700
@@ -67,6 +67,8 @@
import org.argouml.moduleloader.InitModuleLoader;
import org.argouml.moduleloader.ModuleLoader2;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.notation.ui.InitNotationUI;
import org.argouml.persistence.PersistenceManager;
import org.argouml.ui.ArgoFrame;
@@ -271,6 +273,8 @@
initSubsystem(new InitUiCmdSubsystem());
initSubsystem(new InitNotationUI());
initSubsystem(new InitNotation());
+ initSubsystem(new InitNotationUml());
+ initSubsystem(new InitNotationJava());
if (reloadRecent && projectName == null) {
// If no project was entered on the command line,
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/StartCritics.java 2007-07-18 22:27:26-0700
@@ -63,10 +63,8 @@
Configuration.addListener(Argo.KEY_USER_FULLNAME, dsgr); //MVW
dsgr.spawnCritiquer(p);
dsgr.setChildGenerator(new ChildGenUML());
- java.util.Enumeration models = (p.getUserDefinedModels()).elements();
- while (models.hasMoreElements()) {
- Object o = models.nextElement();
- Model.getPump().addModelEventListener(dsgr, o);
+ for (Object model : p.getUserDefinedModelList()) {
+ Model.getPump().addModelEventListener(dsgr, model);
}
LOG.info("spawned critiquing thread");
dsgr.getDecisionModel().startConsidering(UMLDecision.CLASS_SELECTION);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/api/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.application.api package</title>
<!--
- Copyright (c) 1996-2005 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -34,27 +34,19 @@
ArgoUML and ArgoUML modules.
<h3><a name="interfaces">Interfaces</a></h3>
- <code>SettingsTabPanel</code> defines the API that
+ <code>GUISettingsTabInterface</code> defines the API that
tabs on the settings dialog must extend
- to be used by <code>ActionSettings</code>.
+ to be used in the <code>SettingsDialog</code>.
<h3><a name="classes">Classes</a></h3>
<p>
The <code>Argo</code> class provides
<ul>
<li>static definitions of configuration keys</li>
<li>static definitions of resource bundle identifier strings</li>
- <li>static methods for localization using <code>gef</code></li>
<li>static methods for environment manipulation</li>
<li>static methods for console <code>log4j</code> logging</li>
- <li>definitions of plugin module APIs</li>
</ul>
<p>
- The <code>Configuration</code> class provides
- access to persistant configuration information
- stored for each user.
- Future enhancements will allow references to shared
- configuration information, allowing organizational defaults
- that could be overridden by individuals.
<h2>Package Specification</h2>
@@ -65,19 +57,6 @@
@since Argo 0.9.4
-<!--
-Comment for the editor:
- The local links to #interfaces and #classes does only work in the
- generated package-summary.html page and not in the generated
- overview-summary.html page or the generated index.
- There is probably some magic mangling of this file done by the
- javadoc generation.
-
- TODO:
- I will redirect to the package-summary.html page and hope that
- that page will be available in the generated javadoc.
- -->
-
</body>
</html>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventPump.java 2007-07-18 22:27:26-0700
@@ -199,6 +199,42 @@
}
}
+
+ /**
+ * Handle firing a status text event.
+ *
+ * @param event The event to be fired.
+ * @param listener The listener.
+ */
+ private void handleFireStatusEvent(
+ ArgoStatusEvent event,
+ ArgoStatusEventListener listener) {
+ switch (event.getEventType()) {
+ case ArgoEventTypes.STATUS_TEXT :
+ listener.statusText(event);
+ break;
+
+ case ArgoEventTypes.STATUS_CLEARED :
+ listener.statusCleared(event);
+ break;
+
+ case ArgoEventTypes.STATUS_PROJECT_SAVED :
+ listener.projectSaved(event);
+ break;
+
+ case ArgoEventTypes.STATUS_PROJECT_LOADED :
+ listener.projectLoaded(event);
+ break;
+
+ case ArgoEventTypes.STATUS_PROJECT_MODIFIED :
+ listener.projectModified(event);
+ break;
+
+ default :
+ LOG.error("Invalid event:" + event.getEventType());
+ break;
+ }
+ }
/**
* Handle firing a generator event.
*
@@ -237,6 +273,10 @@
handleFireHelpEvent((ArgoHelpEvent) event,
(ArgoHelpEventListener) listener);
}
+ if (listener instanceof ArgoStatusEventListener) {
+ handleFireStatusEvent((ArgoStatusEvent) event,
+ (ArgoStatusEventListener) listener);
+ }
} else {
if (event.getEventType() >= ArgoEventTypes.ANY_NOTATION_EVENT
&& event.getEventType() < ArgoEventTypes.LAST_NOTATION_EVENT) {
@@ -259,6 +299,13 @@
(ArgoGeneratorEventListener) listener);
}
}
+ if (event.getEventType() >= ArgoEventTypes.ANY_STATUS_EVENT
+ && event.getEventType() < ArgoEventTypes.LAST_STATUS_EVENT) {
+ if (listener instanceof ArgoStatusEventListener) {
+ handleFireStatusEvent((ArgoStatusEvent) event,
+ (ArgoStatusEventListener) listener);
+ }
+ }
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoEventTypes.java 2007-07-18 22:27:26-0700
@@ -131,25 +131,60 @@
/**
- * Id indicating any GENERATION event.
+ * Id indicating any HELP event.
*/
int ANY_HELP_EVENT = 1400;
/**
- * Id indicating the default GENERATION was changed.
+ * Id indicating the help text was changed.
*/
int HELP_CHANGED = 1401;
/**
- * Id indicating a GENERATION was removed.
+ * Id indicating a help text was removed.
*/
int HELP_REMOVED = 1403;
/**
- * Last generation event.
+ * Last help event.
*/
int LAST_HELP_EVENT = 1499;
+
+
+ /**
+ * Id indicating any STATUS event.
+ */
+ int ANY_STATUS_EVENT = 1500;
+
+ /**
+ * Id indicating the status text was changed.
+ */
+ int STATUS_TEXT = 1501;
+
+ /**
+ * Id indicating that there is no current status text.
+ */
+ int STATUS_CLEARED = 1503;
+
+ /**
+ * Id indicating that a project was saved.
+ */
+ int STATUS_PROJECT_SAVED = 1504;
+
+ /**
+ * Id indicating that a project was loaded.
+ */
+ int STATUS_PROJECT_LOADED = 1505;
+
+ /**
+ * Id indicating that a project was modified.
+ */
+ int STATUS_PROJECT_MODIFIED = 1506;
+ /**
+ * Last help event.
+ */
+ int LAST_STATUS_EVENT = 1599;
/**
* Id marker for the last Argo event.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/ArgoHelpEvent.java 2007-07-18 22:27:26-0700
@@ -50,7 +50,10 @@
*
* @return the first id reserved for events.
*/
- public int getEventStartRange() { return ANY_HELP_EVENT; }
+ @Override
+ public int getEventStartRange() {
+ return ANY_HELP_EVENT;
+ }
/**
* @return Returns the helpText.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/events/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.application.events package</title>
<!--
- Copyright (c) 1996-2001 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -28,7 +28,8 @@
-->
</head>
<body bgcolor="white">
-Provides for events generated and handled by the Argo application and plugins.
+Provides for events generated and handled by the ArgoUML
+application and plugins.
<h2>Package Specification</h2>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/helpers/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.application.helpers package</title>
<!--
- Copyright (c) 1996-2001 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -29,7 +29,8 @@
</head>
<body bgcolor="white">
- Provides "helper" classes that provide basic functionality for functional groups.
+ Provides "helper" classes that provide
+ basic functionality for the application.
<h2>Package Specification</h2>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.application package</title>
<!--
- Copyright (c) 1996-99 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -30,7 +30,11 @@
<body bgcolor="white">
-Contains the main class and starting point of the ArgoUML application and numerous helper classes and core definitions in its subpackages.
+ Contains the Main class and starting point
+ of the ArgoUML application.
+ This is the top level package, i.e.
+ no other packages may import anything
+ from org.argouml.application.
<h2>Related Documentation </h2>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/application/security/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.application.security package</title>
<!--
- Copyright (c) 1996-2001 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java 2007-07-18 22:27:26-0700
@@ -34,12 +34,6 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.VetoableChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
import java.util.Observable;
import java.util.Observer;
@@ -49,23 +43,17 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.table.TableColumn;
import javax.swing.text.Document;
import org.apache.log4j.Logger;
-import org.argouml.cognitive.Agency;
import org.argouml.cognitive.Critic;
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.Translator;
@@ -77,8 +65,7 @@
* Dialog box to list all critics and allow editing of some of their
* properties. <p>
*
- * TODO: knowledge type, supported goals,
- * supported decisions, critic network.
+ * TODO: supported goals, critic network.
*/
public class CriticBrowserDialog extends ArgoDialog
implements ActionListener,
@@ -92,11 +79,6 @@
private static int numCriticBrowser = 0;
- ////////////////////////////////////////////////////////////////
- // constants
- private static final String DESC_WIDTH_TEXT =
- "This is Sample Text for determining Column Width";
-
private static final int NUM_COLUMNS = 25;
private static final String HIGH =
@@ -139,8 +121,8 @@
private JLabel clarifierLabel = new JLabel(
Translator.localize("dialog.browse.label.use-clarifier"));
- private TableModelCritics tableModel = new TableModelCritics();
- private JTable table = new JTable();
+ private TableCritics table;
+
private JTextField className = new JTextField("", NUM_COLUMNS);
private JTextField headline = new JTextField("", NUM_COLUMNS);
private JComboBox priority = new JComboBox(PRIORITIES);
@@ -156,10 +138,11 @@
Translator.localize("dialog.browse.button.edit-network"));
private JButton goButton = new JButton(
Translator.localize("dialog.browse.button.go"));
+ private JButton advancedButton = new JButton(
+ Translator.localize("dialog.browse.button.advanced"));
private Critic target;
- private List<Critic> critics;
/**
* The constructor.
@@ -173,43 +156,16 @@
// Critics Table
JPanel tablePanel = new JPanel(new BorderLayout(5, 5));
-
- critics = new ArrayList<Critic>(Agency.getCriticList());
- Collections.sort(critics, new Comparator<Critic>() {
- public int compare(Critic o1, Critic o2) {
- return o1.getHeadline().compareTo(o2.getHeadline());
- }
- });
- tableModel.setTarget(critics);
- table.setModel(tableModel);
- table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- table.setShowVerticalLines(false);
- table.getSelectionModel().addListSelectionListener(this);
- table.getModel().addTableModelListener(this);
- table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
- TableColumn checkCol = table.getColumnModel().getColumn(0);
- TableColumn descCol = table.getColumnModel().getColumn(1);
- TableColumn actCol = table.getColumnModel().getColumn(2);
- checkCol.setMinWidth(35);
- checkCol.setMaxWidth(35);
- checkCol.setWidth(30);
- int descWidth = table.getFontMetrics(table.getFont())
- .stringWidth(DESC_WIDTH_TEXT);
- descCol.setMinWidth(descWidth);
- descCol.setWidth(descWidth); // no maximum set, so it will stretch...
- actCol.setMinWidth(50);
- actCol.setMaxWidth(50);
- actCol.setWidth(50);
-
- tablePanel.add(criticsLabel, BorderLayout.NORTH);
+ table = new TableCritics(new TableModelCritics(false), this, this);
+ criticsLabel.setText(criticsLabel.getText() + " ("
+ + table.getModel().getRowCount() + ")");
+ tablePanel.add(criticsLabel, BorderLayout.NORTH);
JScrollPane tableSP = new JScrollPane(table);
tablePanel.add(tableSP, BorderLayout.CENTER);
// Set tableSP's preferred height to 0 so that details height
// is used in pack()
- tableSP.setPreferredSize(new Dimension(checkCol.getWidth()
- + descCol.getWidth() + actCol.getWidth() + 20,
- 0));
+ tableSP.setPreferredSize(table.getInitialSize());
bsp.add(tablePanel, BorderSplitPane.CENTER);
// Critic Details panel
@@ -298,6 +254,7 @@
fieldConstraints.gridy = 6;
JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
buttonPanel.add(wakeButton);
+ buttonPanel.add(advancedButton);
/* TODO: These buttons for future enhancement:
buttonPanel.add(configButton);
buttonPanel.add(networkButton); */
@@ -318,6 +275,7 @@
goButton.addActionListener(this);
networkButton.addActionListener(this);
wakeButton.addActionListener(this);
+ advancedButton.addActionListener(this);
configButton.addActionListener(this);
headline.getDocument().addDocumentListener(this);
moreInfo.getDocument().addDocumentListener(this);
@@ -335,20 +293,33 @@
goButton.setEnabled(false);
wakeButton.setEnabled(false);
+ advancedButton.setEnabled(true);
networkButton.setEnabled(false);
configButton.setEnabled(false);
+
+ useClar.setSelectedItem(null);
+ useClar.repaint();
}
/**
* @param t the new target
*/
- private void setTarget(Object t) {
- target = (Critic) t;
+ private void setTarget(Critic cr) {
+ if (cr == null) {
+ enableFieldsAndButtons();
+ className.setText("");
+ headline.setText("");
+ priority.setSelectedItem(null);
+ priority.repaint();
+ moreInfo.setText("");
+ desc.setText("");
+ return;
+ }
updateButtonsEnabled();
- className.setText(target.getClass().getName());
- headline.setText(target.getHeadline());
+ className.setText(cr.getClass().getName());
+ headline.setText(cr.getHeadline());
- int p = target.getPriority();
+ int p = cr.getPriority();
if (p == ToDoItem.HIGH_PRIORITY) {
priority.setSelectedItem(HIGH);
} else if (p == ToDoItem.MED_PRIORITY) {
@@ -358,8 +329,8 @@
}
priority.repaint();
- moreInfo.setText(target.getMoreInfoURL());
- desc.setText(target.getDescriptionTemplate());
+ moreInfo.setText(cr.getMoreInfoURL());
+ desc.setText(cr.getDescriptionTemplate());
desc.setCaretPosition(0);
useClar.setSelectedItem(ALWAYS);
useClar.repaint();
@@ -367,7 +338,6 @@
/**
* Updates the states of the buttons
- *
*/
protected void updateButtonsEnabled() {
this.configButton.setEnabled(false);
@@ -441,6 +411,10 @@
table.repaint();
return;
}
+ if (e.getSource() == advancedButton) {
+ table.setAdvanced(true);
+ advancedButton.setEnabled(false);
+ }
LOG.debug("unknown src in CriticBrowserDialog: " + e.getSource());
}
@@ -459,7 +433,7 @@
if (this.target != null) {
this.target.deleteObserver(this);
}
- setTarget(critics.get(row));
+ setTarget((row == -1) ? null : table.getCriticAtRow(row));
if (this.target != null) {
this.target.addObserver(this);
}
@@ -525,121 +499,4 @@
table.repaint();
}
-} /* end class CriticBrowserDialog */
-
-
-
-
-class TableModelCritics extends AbstractTableModel
- implements VetoableChangeListener {
- private static final Logger LOG =
- Logger.getLogger(TableModelCritics.class);
-
- ////////////////
- // instance varables
- private List target;
-
- /**
- * Constructor.
- */
- public TableModelCritics() { }
-
- ////////////////
- // accessors
- /**
- * @param critics the list of critics
- */
- public void setTarget(List critics) {
- target = critics;
- //fireTableStructureChanged();
- }
-
- ////////////////
- // TableModel implemetation
- /*
- * @see javax.swing.table.TableModel#getColumnCount()
- */
- public int getColumnCount() { return 3; }
-
- /*
- * @see javax.swing.table.TableModel#getColumnName(int)
- */
- public String getColumnName(int c) {
- if (c == 0)
- return Translator.localize("dialog.browse.column-name.active");
- if (c == 1)
- return Translator.localize("dialog.browse.column-name.headline");
- if (c == 2)
- return Translator.localize("dialog.browse.column-name.snoozed");
- return "XXX";
- }
-
- /*
- * @see javax.swing.table.TableModel#getColumnClass(int)
- */
- public Class getColumnClass(int c) {
- if (c == 0) {
- return Boolean.class;
- }
- if (c == 1) {
- return String.class;
- }
- if (c == 2) {
- return String.class;
- }
- return String.class;
- }
-
- /*
- * @see javax.swing.table.TableModel#isCellEditable(int, int)
- */
- public boolean isCellEditable(int row, int col) {
- return col == 0;
- }
-
- /*
- * @see javax.swing.table.TableModel#getRowCount()
- */
- public int getRowCount() {
- if (target == null) return 0;
- return target.size();
- }
-
- /*
- * @see javax.swing.table.TableModel#getValueAt(int, int)
- */
- public Object getValueAt(int row, int col) {
- Critic cr = (Critic) target.get(row);
- if (col == 0) return cr.isEnabled() ? Boolean.TRUE : Boolean.FALSE;
- if (col == 1) return cr.getHeadline();
- if (col == 2) return cr.isActive() ? "no" : "yes";
- return "CR-" + row * 2 + col; // for debugging
- }
-
- /*
- * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int)
- */
- public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
- LOG.debug("setting table value " + rowIndex + ", " + columnIndex);
- if (columnIndex != 0) return;
- if (!(aValue instanceof Boolean)) return;
- Boolean enable = (Boolean) aValue;
- Critic cr = (Critic) target.get(rowIndex);
- cr.setEnabled(enable.booleanValue());
- fireTableRowsUpdated(rowIndex, rowIndex); //TODO:
- }
-
- ////////////////
- // event handlers
-
- /*
- * @see java.beans.VetoableChangeListener#vetoableChange(java.beans.PropertyChangeEvent)
- */
- public void vetoableChange(PropertyChangeEvent pce) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- fireTableStructureChanged();
- }
- });
- }
-} /* end class TableModelCritics */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/cognitive/ui/TabToDo.java 2007-07-18 22:27:26-0700
@@ -35,6 +35,8 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.cognitive.critics.Wizard;
import org.argouml.configuration.Configuration;
+import org.argouml.i18n.Translator;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.TabToDoTarget;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -96,7 +98,7 @@
factory.setFloatable(false);
factory.setOrientation(SwingConstants.VERTICAL);
JToolBar toolBar = factory.createToolBar();
-
+ toolBar.setName(getTitle());
add(toolBar, BorderLayout.WEST);
splitPane = new BorderSplitPane();
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/gefext/ArgoFigText.java 2007-07-18 22:27:26-0700
@@ -32,6 +32,14 @@
import javax.management.NotificationFilter;
import javax.management.NotificationListener;
+import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectManager;
+import org.argouml.uml.diagram.UMLMutableGraphSupport;
+import org.argouml.uml.diagram.ui.ArgoFig;
+import org.tigris.gef.base.Editor;
+import org.tigris.gef.base.Globals;
+import org.tigris.gef.base.Layer;
+import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.presentation.FigText;
/**
@@ -39,7 +47,7 @@
*
* @author Michiel
*/
-public class ArgoFigText extends FigText implements NotificationEmitter {
+public class ArgoFigText extends FigText implements NotificationEmitter, ArgoFig {
private NotificationBroadcasterSupport notifier =
new NotificationBroadcasterSupport();
@@ -48,7 +56,10 @@
super(x, y, w, h);
}
-
+ public ArgoFigText(int x, int y, int w, int h, boolean expandOnly) {
+ super(x, y, w, h, expandOnly);
+ }
+
/*
* @see org.tigris.gef.presentation.Fig#deleteFromModel()
*/
@@ -91,5 +102,37 @@
throws ListenerNotFoundException {
notifier.removeNotificationListener(listener);
}
+
+ /**
+ * This optional method is not implemented. It will throw an
+ * {@link UnsupportedOperationException} if used. Figs are
+ * added to a GraphModel which is, in turn, owned by a project.
+ */
+ public void setProject(Project project) {
+ throw new UnsupportedOperationException();
+ }
+
+ public Project getProject() {
+ LayerPerspective layer = (LayerPerspective) getLayer();
+ if (layer == null) {
+ /* TODO: Without this, we fail to draw e.g. a Class.
+ * But is this a good solution?
+ * Why is the Layer not set in the constructor? */
+ Editor editor = Globals.curEditor();
+ if (editor == null) {
+ // TODO: The above doesn't work reliably in a constructor. We
+ // need a better way of getting default fig settings for the owning
+ // project rather than using the project manager singleton. - tfm
+ return ProjectManager.getManager().getCurrentProject();
+ }
+ Layer lay = editor.getLayerManager().getActiveLayer();
+ if (lay instanceof LayerPerspective) {
+ layer = (LayerPerspective) lay;
+ }
+ }
+ UMLMutableGraphSupport gm =
+ (UMLMutableGraphSupport) layer.getGraphModel();
+ return gm.getProject();
+ }
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/critics.properties 2007-07-18 22:27:26-0700
@@ -224,8 +224,12 @@
highlighted element and use the Properties tab to give it a different \
name.
critics.CrIllegalName-head = Choose a Legal Name for <ocl>self</ocl>
-critics.CrInstanceWithoutClassifier-desc = Instances have a classifier
-critics.CrInstanceWithoutClassifier-head = Set Classifier
+critics.CrInstanceWithoutClassifier-desc = Instances are connected to \
+ at least one Classifier that declares their structure and behavior.\
+ \n\nTo address this, manually select the \
+ highlighted element and use the Properties tab to add \
+ at least one Classifier.
+critics.CrInstanceWithoutClassifier-head = Set Classifier for Instance
critics.CrInterfaceAllPublic-desc = Interfaces are intended to specify the set \
of operations that other classes must implement. They must be public. \
\n\nA well-designed set of interfaces is a good way to define the \
@@ -275,14 +279,14 @@
is needed to complete the behavioral specification part of your \
design. \n\nTo fix this, remove transitions by clicking on transition \
in the diagram and pressing the \"Ctrl-Delete\" key.
-critics.CrInvalidHistory-head = Remove Extra Outgoing Transitions
+critics.CrInvalidHistory-head = Remove Extra Outgoing Transitions for History State
critics.CrInvalidInitial-desc = This Initial state has an invalid number of \
transitions. Normally Initial states have at most one outgoing \
transition. \n\nDefining correct state transitions is needed to \
complete the behavioral specification part of your design. \n\nTo \
fix this, remove transitions by clicking on transition in the diagram \
and pressing the \"Ctrl-Delete\" key.
-critics.CrInvalidInitial-head = Remove Extra Outgoing Transitions
+critics.CrInvalidInitial-head = Remove Extra Outgoing Transitions for Initial State
critics.CrInvalidJoin-desc = This join state has an invalid number of \
transitions. Normally join states have two or more incoming and one \
outgoing transitions. \n\nDefining correct state transitions is needed \
@@ -339,8 +343,8 @@
However, you may find the combined class too large and complex, in \
which case separating them is usually better.\n\nOrganizing classes to \
manage complexity of the design is always important, especially when \
- the design is already complex. \n\nTo address this, click on the \
- \"Next>\" button, or manually add the attributes and operations of the \
+ the design is already complex. \n\nTo address this, \
+ add the attributes and operations of the \
highlighted class to the other class, then remove the highlighted \
class from the project.
critics.CrMergeClasses-head = Consider Combining Classes (<ocl>self</ocl>)
@@ -348,24 +352,25 @@
and unambiguous naming is a key element in code generation and serves \
to make the design more understandable and maintainable. \n\nTo \
address this, use the \"Next>\" button, or manually select the \
- \nattribute and use the Properties tab to give it a name.
-critics.CrMissingAttrName-head = Choose a Name
+ attribute and use the Properties tab to give it a name.
+critics.CrMissingAttrName-head = Choose an Attribute Name
critics.CrMissingAttrName-ins = Set the name of this attribute.
critics.CrMissingAttrName-sug = AttributeName
-critics.CrMissingClassName-desc = Every class and interface within a package \
+critics.CrMissingClassName-desc = Every element within a package \
+ (such as class, interface, actor, usecase, etc.) \
must have a name. \n\nClear and unambiguous naming is a key element in \
code generation and serves to make the design more understandable and \
maintainable. \n\nTo address this, use the \"Next>\" button, or \
manually select the class and use the Properties tab to give it a name.
critics.CrMissingClassName-head = Choose a Name
-critics.CrMissingClassName-ins = Set the name of this class.
+critics.CrMissingClassName-ins = Set the name of this element.
critics.CrMissingClassName-sug = ClassName
critics.CrMissingOperName-desc = Every operation must have a name. \n\nClear \
and unambiguous naming is a key element in code generation and serves \
to make the design more understandable and maintainable. \n\nTo \
address this, use the \"Next>\" button, or manually select the \
- \noperation and use the Properties tab to give it a name.
-critics.CrMissingOperName-head = Choose a Name
+ operation and use the Properties tab to give it a name.
+critics.CrMissingOperName-head = Choose a Operation Name
critics.CrMissingOperName-ins = Set the name of this attribute.
critics.CrMissingOperName-sug = AttributeName
critics.CrMissingStateName-desc = Every state within a state machine should \
@@ -374,7 +379,7 @@
maintainable. \n\nTo address this, use the \"Next>\" button, or \
manually select the state and use the Properties tab to give it a \
name, or select the state and type a name.
-critics.CrMissingStateName-head = Choose a Name
+critics.CrMissingStateName-head = Choose a State Name
critics.CrMissingStateName-ins = Set the name of this state.
critics.CrMissingStateName-sug = StateName
critics.CrMultiComposite-desc = An instance may not belong by composition to \
@@ -706,13 +711,15 @@
line of text for an attribute.
critics.CrTooManyAttr-head = Reduce Attributes on <ocl>self</ocl>
critics.CrTooManyClasses-desc = There are too many classes in <ocl>self</ocl>. \
- If one class diagram has too many classes it may become very difficult \
- for humans to understand. \n\nDefining an understandable set of class \
- diagrams is an important part of your design. \n\nTo address this, \
- press the \"Next>\" button, or remove classes manually by clicking on \
- a class in the navigator pane or diagram and pressing the \"Del\" key. \
- Or you can make a new diagram...
-critics.CrTooManyClasses-head = Reduce Classes in Diagram <ocl>self</ocl>
+ If one namespace (i.e. model, package, class, etc.) \
+ has too many classes it may become very difficult \
+ for humans to understand. \n\nDefining an understandable \
+ namespace structure is an important part of your design. \
+ \nMove some classes into another namespace \
+ by click and drag in the explorer. \
+ \n\nTo change the treshold that triggers this critic \
+ press the \"Next>\" button.
+critics.CrTooManyClasses-head = Reduce Classes in Namespace <ocl>self</ocl>
critics.CrTooManyOper-desc = There are too many Operations on class \
<ocl>self</ocl>. Whenever one class becomes too central to the design \
it may become a maintenance bottleneck that must be updated \
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/dialog.properties 2007-07-18 22:27:26-0700
@@ -25,13 +25,17 @@
dialog.add-associated-classifierroles = Add Associated Classifier Roles
dialog.add-associations = Add Associations
dialog.add-predecessors = Add Predecessors
+dialog.browse.button.advanced = Advanced
dialog.browse.button.configure = Configure
dialog.browse.button.edit-network = Edit Network
dialog.browse.button.go = Go
dialog.browse.button.wake = Wake
dialog.browse.column-name.active = Active
dialog.browse.column-name.headline = Headline
+dialog.browse.column-name.knowledge-type = Knowledge Type
+dialog.browse.column-name.priority = Priority
dialog.browse.column-name.snoozed = Snoozed
+dialog.browse.column-name.supported-decision = Supported Decision
dialog.browse.label.critic-class = Critic Class:
dialog.browse.label.critics = Critics
dialog.browse.label.description = Description:
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/menu.properties 2007-07-18 22:27:26-0700
@@ -127,6 +127,9 @@
menu.item.snap-32 = Snap 32
menu.item.snap-32.mnemonic = 3
+menu.toolbars = Toolbars
+menu.toolbars.mnemonic = T
+
menu.item.adjust-pagebreaks.mnemonic = P
menu.item.buttons-on-selection.mnemonic = B
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/i18n/misc.properties 2007-07-18 22:27:26-0700
@@ -189,6 +189,13 @@
misc.tagged-values = Tagged Values
misc.todo-item = ToDo Item
misc.todo-unresolvable = Unable to resolve with poster of type: {0}
+misc.toolbar.constraints = Constraints Toolbar
+misc.toolbar.create-diagram = Create Diagram Toolbar
+misc.toolbar.diagram = Diagram
+misc.toolbar.edit = Edit Toolbar
+misc.toolbar.file = File Toolbar
+misc.toolbar.properties = Properties
+misc.toolbar.view = View Toolbar
misc.tooltip.commentlink = Annotated Element
misc.transition.source-state = Transition->Source State
misc.transition.target-state = Transition->Target State
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/MemberList.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 2004-2006 The Regents of the University of California. All
+// Copyright (c) 2004-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -49,7 +49,8 @@
private static final Logger LOG = Logger.getLogger(MemberList.class);
private AbstractProjectMember model;
- private List diagramMembers = new ArrayList(10);
+ private List<ProjectMemberDiagram> diagramMembers =
+ new ArrayList<ProjectMemberDiagram>(10);
private AbstractProjectMember todoList;
private AbstractProjectMember profileConfiguration;
@@ -77,7 +78,7 @@
return true;
} else if (member instanceof ProjectMemberDiagram) {
// otherwise add the diagram at the start
- return diagramMembers.add(member);
+ return diagramMembers.add((ProjectMemberDiagram) member);
}
return false;
}
Copied: branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/Project.java (from r13095, /trunk/src_new/org/argouml/kernel/Project.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/Project.java?view=diff&rev=13096&p1=/trunk/src_new/org/argouml/kernel/Project.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/Project.java&r1=13095&r2=13096
==============================================================================
--- /trunk/src_new/org/argouml/kernel/Project.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/Project.java 2007-07-18 22:27:26-0700
@@ -33,9 +33,10 @@
import java.util.Map;
import java.util.Vector;
-import org.argouml.uml.Profile;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.generator.GenerationPreferences;
+import org.argouml.uml.profile.Profile;
+import org.argouml.uml.profile.ProfileConfiguration;
import org.tigris.gef.presentation.Fig;
/**
@@ -455,20 +456,23 @@
public boolean isInTrash(Object obj);
/**
+ * @deprecated use a {@link Profile} instead
* @param theDefaultModel a uml model
*/
public void setDefaultModel(Object theDefaultModel);
/**
* Get the default model.
- *
+ *
+ * @deprecated use the {@link ProfileConfiguration#getProfileModels()} instead
* @return A model.
*/
public Object getDefaultModel();
/**
* Find a type by name in the default model.
- *
+ *
+ * @deprecated use {@link #findTypeInProfileModels(String)} instead
* @param name the name.
* @return the type.
*/
@@ -565,7 +569,13 @@
public void setPersistenceVersion(int pv);
/**
- * @return Returns the profile.
+ * Sets the profile configuration
+ */
+ public void setProfileConfiguration(ProfileConfiguration pc);
+
+ /**
+ * @deprecated use {@link #getProfileConfiguration()} instead
+ * @return Returns the default profile.
*/
public Profile getProfile();
@@ -581,5 +591,9 @@
* @return the settings of this project
*/
public ProjectSettings getProjectSettings();
-
+
+ /**
+ * @return Returns the profile configuration.
+ */
+ public ProfileConfiguration getProfileConfiguration();
}
\ No newline at end of file
Copied: branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectImpl.java (from r13095, /trunk/src_new/org/argouml/kernel/ProjectImpl.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13096&p1=/trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectImpl.java&r1=13095&r2=13096
==============================================================================
--- /trunk/src_new/org/argouml/kernel/ProjectImpl.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectImpl.java 2007-07-18 22:27:26-0700
@@ -50,17 +50,16 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.persistence.PersistenceManager;
-import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.explorer.ExplorerEventAdaptor;
import org.argouml.uml.CommentEdge;
-import org.argouml.uml.Profile;
-import org.argouml.uml.ProfileException;
-import org.argouml.uml.ProfileJava;
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.generator.GenerationPreferences;
+import org.argouml.uml.profile.Profile;
+import org.argouml.uml.profile.ProfileConfiguration;
+import org.argouml.uml.profile.ProfileManagerImpl;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.undo.Memento;
import org.tigris.gef.undo.UndoManager;
@@ -133,8 +132,8 @@
private GenerationPreferences cgPrefs;
private transient VetoableChangeSupport vetoSupport;
- private Profile profile;
-
+ private ProfileConfiguration profileConfiguration;
+
/**
* The active diagram, pointer to a diagram in the list with diagrams.
*/
@@ -162,7 +161,13 @@
* Constructor.
*/
public ProjectImpl() {
- profile = new ProfileJava();
+ setProfileConfiguration(new ProfileConfiguration(this));
+ Iterator it = ProfileManagerImpl.getInstance().getDefaultProfiles().iterator();
+
+ while (it.hasNext()) {
+ getProfileConfiguration().addProfile((Profile) it.next());
+ }
+
projectSettings = new ProjectSettings();
Model.getModelManagementFactory().setRootModel(null);
@@ -179,17 +184,6 @@
defaultModelTypeCache = new HashMap<String, Object>();
LOG.info("making empty project with empty model");
- try {
- // Jaap Branderhorst 2002-12-09
- // load the default model
- // this is NOT the way how it should be since this makes argo
- // depend on Java even more.
- setDefaultModel(profile.getProfileModel());
- } catch (ProfileException e) {
- // TODO: how are we going to handle exceptions here?
- // I think we need a ProjectException.
- LOG.error("Exception setting the default profile", e);
- }
addSearchPath("PROJECT_DIR");
}
@@ -526,7 +520,7 @@
public Collection getModels() {
Set ret = new HashSet();
ret.addAll(models);
- ret.add(defaultModel);
+ ret.addAll(profileConfiguration.getProfileModels());
return ret;
}
@@ -576,7 +570,7 @@
return cls;
}
}
- cls = findTypeInDefaultModel(s);
+ cls = findTypeInProfileModels(s);
// hey, now we should move it to the model the user is working in
if (cls != null) {
cls =
@@ -936,18 +930,25 @@
return defaultModel;
}
-
public Object findTypeInDefaultModel(String name) {
+ return findTypeInProfileModels(name);
+ }
+
+ public Object findTypeInProfileModels(String name) {
if (defaultModelTypeCache.containsKey(name)) {
return defaultModelTypeCache.get(name);
}
- Object result = findTypeInModel(name, getDefaultModel());
+ Object result = null;
+ Iterator it = profileConfiguration.getProfileModels().iterator();
+ while (result == null && it.hasNext()) {
+ result = findTypeInModel(name, it.next());
+ }
+
defaultModelTypeCache.put(name, result);
return result;
}
-
public Object getRoot() {
return Model.getModelManagementFactory().getRootModel();
}
@@ -1089,7 +1090,7 @@
public Profile getProfile() {
- return profile;
+ return profileConfiguration.getDefaultProfile();
}
@@ -1108,4 +1109,19 @@
return projectSettings;
}
+ public ProfileConfiguration getProfileConfiguration() {
+ return profileConfiguration;
+ }
+
+ public void setProfileConfiguration(ProfileConfiguration pc) {
+ if (this.profileConfiguration != null) {
+ this.members.remove(this.profileConfiguration);
+ }
+
+ this.profileConfiguration = pc;
+
+ // there's just one ProfileConfiguration in a project
+ // and there's no other way to add another one
+ members.add(pc);
+ }
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/kernel/ProjectManager.java 2007-07-18 22:27:26-0700
@@ -250,7 +250,7 @@
creatingCurrentProject = true;
LOG.info("making empty project");
Project oldProject = currentProject;
- currentProject = new Project();
+ currentProject = new ProjectImpl();
if (addDefaultDiagrams) {
createDefaultDiagrams();
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotation.java 2007-07-18 22:27:26-0700
@@ -39,8 +39,6 @@
public void init() {
NotationProviderFactory2.getInstance();
- InitNotationUml.init();
- InitNotationJava.init();
}
public List<GUISettingsTabInterface> getProjectSettingsTabs() {
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationJava.java?view=auto&rev=13095
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/InitNotationUml.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/NotationProviderFactory2.java 2007-07-18 22:27:26-0700
@@ -32,7 +32,6 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.argouml.notation.providers.NotationProvider;
/**
* The NotationProviderFactory2 is a singleton,
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ActionStateNotation.java 2007-07-18 22:27:26-0700
@@ -29,6 +29,7 @@
import java.util.Iterator;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationEndNameNotation.java 2007-07-18 22:27:26-0700
@@ -32,6 +32,7 @@
import org.argouml.model.AddAssociationEvent;
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationNameNotation.java 2007-07-18 22:27:26-0700
@@ -29,6 +29,7 @@
import java.util.Iterator;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AssociationRoleNotation.java 2007-07-18 22:27:26-0700
@@ -27,6 +27,7 @@
import java.beans.PropertyChangeListener;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/AttributeNotation.java 2007-07-18 22:27:26-0700
@@ -24,6 +24,8 @@
package org.argouml.notation.providers;
+import org.argouml.notation.NotationProvider;
+
/**
* This abstract class forms the basis of all Notation providers
* for the text shown in the attribute compartment of a Class.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/CallStateNotation.java 2007-07-18 22:27:26-0700
@@ -27,6 +27,7 @@
import java.beans.PropertyChangeListener;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ClassifierRoleNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ComponentInstanceNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ExtensionPointNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/MessageNotation.java 2007-07-18 22:27:26-0700
@@ -29,6 +29,7 @@
import java.util.List;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ModelElementNameNotation.java 2007-07-18 22:27:26-0700
@@ -27,6 +27,7 @@
import java.beans.PropertyChangeListener;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NodeInstanceNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/NotationProvider.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateStateNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectFlowStateTypeNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/ObjectNotation.java 2007-07-18 22:27:26-0700
@@ -31,6 +31,7 @@
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/OperationNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/StateBodyNotation.java 2007-07-18 22:27:26-0700
@@ -29,6 +29,7 @@
import java.util.Iterator;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/TransitionNotation.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.notation.providers;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* This abstract class forms the basis of all Notation providers
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java 2007-07-18 22:27:26-0700
@@ -28,7 +28,7 @@
import java.util.Stack;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
/**
* This class is a utility for the Java notation.
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/ui/ActionNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/notation/ui/ActionNotation.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/package.html 2007-07-18 22:27:26-0700
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
-<title>org.argouml.kernel package</title>
+<title>org.argouml package</title>
<!--
- Copyright (c) 1996-99 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -29,6 +29,8 @@
</head>
<body bgcolor="white">
+Provides argo.ini, i.e. the textual configuration file
+that lists the panels in the UI.
<h2>Package Specification</h2>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ModelMemberFilePersister.java 2007-07-18 22:27:26-0700
@@ -57,6 +57,7 @@
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.profile.ProfileConfiguration;
import org.xml.sax.InputSource;
/**
@@ -218,6 +219,8 @@
persister =
PersistenceManager.getInstance()
.getDiagramMemberFilePersister();
+ } else if (pm instanceof ProfileConfiguration) {
+ persister = new ProfileConfigurationFilePersister();
} else if (pm instanceof ProjectMemberTodoList) {
persister = new TodoListMemberFilePersister();
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PGMLStackParser.java 2007-07-18 22:27:26-0700
@@ -35,18 +35,18 @@
import java.util.StringTokenizer;
import org.apache.log4j.Logger;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.PathContainer;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
import org.argouml.uml.diagram.activity.ui.FigPool;
import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
-import org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigEdgePort;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
-import org.argouml.uml.diagram.ui.PathContainer;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigEdgeHandler;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/PrivateHandler.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -27,9 +27,7 @@
import org.apache.log4j.Logger;
import org.argouml.cognitive.ItemUID;
-import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.ui.FigEdgeModelElement;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
+import org.argouml.uml.diagram.IItemUID;
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigEdgeHandler;
import org.tigris.gef.persistence.pgml.FigGroupHandler;
@@ -78,10 +76,10 @@
if (container instanceof PGMLHandler) {
Object o = getPGMLStackParser().getDiagram();
- if (o instanceof ArgoDiagram) {
+ if (o instanceof IItemUID) {
ItemUID uid = getItemUID(contents);
if (uid != null) {
- ((ArgoDiagram) o).setItemUID(uid);
+ ((IItemUID) o).setItemUID(uid);
}
}
// No other uses of string in PGMLHandler
@@ -90,20 +88,20 @@
if (container instanceof FigGroupHandler) {
Object o = ((FigGroupHandler) container).getFigGroup();
- if (o instanceof FigNodeModelElement) {
+ if (o instanceof IItemUID) {
ItemUID uid = getItemUID(contents);
if (uid != null) {
- ((FigNodeModelElement) o).setItemUID(uid);
+ ((IItemUID) o).setItemUID(uid);
}
}
}
if (container instanceof FigEdgeHandler) {
Object o = ((FigEdgeHandler) container).getFigEdge();
- if (o instanceof FigEdgeModelElement) {
+ if (o instanceof IItemUID) {
ItemUID uid = getItemUID(contents);
if (uid != null) {
- ((FigEdgeModelElement) o).setItemUID(uid);
+ ((IItemUID) o).setItemUID(uid);
}
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/UmlFilePersister.java 2007-07-18 22:27:26-0700
@@ -62,6 +62,7 @@
import org.argouml.application.helpers.ApplicationVersion;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectFactory;
import org.argouml.kernel.ProjectMember;
import org.argouml.model.UmlException;
import org.argouml.uml.ProjectMemberModel;
@@ -340,7 +341,7 @@
XmlInputStream inputStream = null;
try {
- Project p = new Project(file.toURI());
+ Project p = ProjectFactory.getInstance().createProject(file.toURI());
// Run through any stylesheet upgrades
int fileVersion = getPersistenceVersionFromFile(file);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/XmiFilePersister.java 2007-07-18 22:27:26-0700
@@ -24,7 +24,6 @@
package org.argouml.persistence;
-import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
@@ -32,16 +31,14 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectFactory;
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectMember;
import org.argouml.model.Model;
@@ -223,7 +220,7 @@
LOG.info("Loading with XMIFilePersister");
try {
- Project p = new Project();
+ Project p = ProjectFactory.getInstance().createProject();
long length = file.length();
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/ZipFilePersister.java 2007-07-18 22:27:26-0700
@@ -39,12 +39,14 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectFactory;
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectMember;
import org.argouml.model.Model;
import org.argouml.uml.ProjectMemberModel;
import org.argouml.uml.cognitive.ProjectMemberTodoList;
import org.argouml.uml.diagram.ProjectMemberDiagram;
+import org.argouml.uml.profile.ProfileConfiguration;
import org.xml.sax.InputSource;
/**
@@ -194,6 +196,8 @@
persister =
PersistenceManager.getInstance()
.getDiagramMemberFilePersister();
+ } else if (pm instanceof ProfileConfiguration) {
+ persister = new ProfileConfigurationFilePersister();
} else if (pm instanceof ProjectMemberTodoList) {
persister = new TodoListMemberFilePersister();
} else if (pm instanceof ProjectMemberModel) {
@@ -211,7 +215,7 @@
LOG.info("Receiving file '" + file.getName() + "'");
try {
- Project p = new Project();
+ Project p = ProjectFactory.getInstance().createProject();
String fileName = file.getName();
String extension =
fileName.substring(
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/persistence/argo.tee 2007-07-18 22:27:26-0700
@@ -7,7 +7,7 @@
<!ATTLIST template class CDATA #REQUIRED
guard CDATA #IMPLIED>
]>
-<!-- This is argo.tee, for Argo/UML to save project -->
+<!-- This is argo.tee, for ArgoUML to save project -->
<!-- files. "tee" = Template with Embedded Expressions. -->
<!-- Original Author: [email protected] -->
@@ -18,7 +18,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<template class="org.argouml.kernel.Project">
+<template class="org.argouml.kernel.ProjectImpl">
<![CDATA[
<argo version="<ocl>self.persistenceVersion</ocl>">
<documentation>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/swingext/package.html 2007-07-18 22:27:26-0700
@@ -3,7 +3,7 @@
<head>
<title>org.argouml.swingext package</title>
<!--
- Copyright (c) 1996-99 The Regents of the University of California. All
+ Copyright (c) 1996-2007 The Regents of the University of California. All
Rights Reserved. Permission to use, copy, modify, and distribute this
software and its documentation without fee, and without a written
agreement is hereby granted, provided that the above copyright notice
@@ -32,6 +32,10 @@
<p>An extension package for swing classes. This package provides ArgoUML
independent swing extensions.</p>
+
+ <p> There shall not be any dependence from this package
+ on any class in the org.argouml namespace.
+ Hence this is a low level package.</p>
</body>
</html>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DetailsPane.java 2007-07-18 22:27:26-0700
@@ -95,7 +95,7 @@
/**
* a list of all the tabs, which are JPanels, in the JTabbedPane tabs.
*/
- private List tabPanelList = new ArrayList();
+ private List<JPanel> tabPanelList = new ArrayList<JPanel>();
/**
* index of the selected tab in the JTabbedPane.
@@ -146,9 +146,8 @@
setFont(new Font("Dialog", Font.PLAIN, 10));
add(topLevelTabbedPane, BorderLayout.CENTER);
- for (int i = 0; i < tabPanelList.size(); i++) {
+ for (JPanel t : tabPanelList) {
String titleKey = "tab";
- JPanel t = (JPanel) tabPanelList.get(i);
if (t instanceof AbstractArgoJPanel) {
titleKey = ((AbstractArgoJPanel) t).getTitle();
}
@@ -203,8 +202,7 @@
*/
public boolean setToDoItem(Object item) {
enableTabs(item);
- for (int i = 0; i < tabPanelList.size(); i++) {
- JPanel t = (JPanel) tabPanelList.get(i);
+ for (JPanel t : tabPanelList) {
if (t instanceof TabToDoTarget) {
((TabToDoTarget) t).setTarget(item);
topLevelTabbedPane.setSelectedComponent(t);
@@ -282,7 +280,7 @@
}
// default tab todo
if (!tabSelected) {
- JPanel tab = (JPanel) tabPanelList.get(0);
+ JPanel tab = tabPanelList.get(0);
if (!(tab instanceof TabToDoTarget)) {
Iterator it = tabPanelList.iterator();
while (it.hasNext()) {
@@ -390,9 +388,9 @@
* @param p the given property panel
*/
public void addToPropTab(Class c, PropPanel p) {
- for (int i = 0; i < tabPanelList.size(); i++) {
- if (tabPanelList.get(i) instanceof TabProps) {
- ((TabProps) tabPanelList.get(i)).addPanel(c, p);
+ for (JPanel panel : tabPanelList) {
+ if (panel instanceof TabProps) {
+ ((TabProps) panel).addPanel(c, p);
}
}
}
@@ -572,13 +570,12 @@
* @see org.tigris.swidgets.Orientable#setOrientation(org.tigris.swidgets.Orientation)
*/
public void setOrientation(Orientation orientation) {
- for (int i = 0; i < tabPanelList.size(); i++) {
- JPanel t = (JPanel) tabPanelList.get(i);
+ for (JPanel t : tabPanelList) {
if (t instanceof Orientable) {
Orientable o = (Orientable) t;
o.setOrientation(orientation);
}
- } /* end for */
+ }
}
/*
@@ -616,7 +613,7 @@
// iterate through the tabbed panels to determine wether they
// should be enabled.
for (int i = 0; i < tabPanelList.size(); i++) {
- JPanel tab = (JPanel) tabPanelList.get(i);
+ JPanel tab = tabPanelList.get(i);
boolean shouldEnable = false;
if (tab instanceof TargetListener) {
if (tab instanceof TabTarget) {
@@ -671,4 +668,4 @@
}
}
-} /* end class DetailsPane */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/DisplayTextTree.java 2007-07-18 22:27:26-0700
@@ -44,8 +44,8 @@
import org.argouml.kernel.ProjectSettings;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.notation.providers.uml.NotationUtilityUml;
import org.argouml.uml.ui.UMLTreeCellRenderer;
import org.tigris.gef.base.Diagram;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/GotoDialog.java 2007-07-18 22:27:26-0700
@@ -63,7 +63,7 @@
Project p = ProjectManager.getManager().getCurrentProject();
- allDiagrams.setResults(p.getDiagrams(), p.getDiagrams());
+ allDiagrams.setResults(p.getDiagramList(), p.getDiagramList());
// TabResults has really large preferred height, so divide in
// half to reduce size of dialog which will be sized based on
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/ProjectBrowser.java 2007-07-18 22:27:26-0700
@@ -30,6 +30,8 @@
import java.awt.Font;
import java.awt.KeyboardFocusManager;
import java.awt.Window;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.beans.PropertyChangeEvent;
@@ -56,6 +58,7 @@
import javax.swing.JMenuBar;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JToolBar;
import javax.swing.SwingUtilities;
import org.apache.log4j.Logger;
@@ -77,6 +80,7 @@
import org.argouml.persistence.UmlVersionException;
import org.argouml.persistence.VersionException;
import org.argouml.persistence.XmiFormatException;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.taskmgmt.ProgressMonitor;
import org.argouml.ui.cmd.GenericArgoMenuBar;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -411,16 +415,77 @@
// Toolbar boundary is the area between the menu and the status
// bar. It contains the workarea at centre and the toolbar
// position north, south, east or west.
- JPanel toolbarBoundary = new JPanel();
+ final JPanel toolbarBoundary = new JPanel();
toolbarBoundary.setLayout(new DockBorderLayout());
// TODO: - should save and restore the last positions of the toolbars
- toolbarBoundary.add(menuBar.getFileToolbar(), BorderLayout.NORTH);
- toolbarBoundary.add(menuBar.getEditToolbar(), BorderLayout.NORTH);
- toolbarBoundary.add(menuBar.getViewToolbar(), BorderLayout.NORTH);
+ final String toolbarPosition = BorderLayout.NORTH;
+ toolbarBoundary.add(menuBar.getFileToolbar(), toolbarPosition);
+ toolbarBoundary.add(menuBar.getEditToolbar(), toolbarPosition);
+ toolbarBoundary.add(menuBar.getViewToolbar(), toolbarPosition);
toolbarBoundary.add(menuBar.getCreateDiagramToolbar(),
- BorderLayout.NORTH);
+ toolbarPosition);
toolbarBoundary.add(workAreaPane, BorderLayout.CENTER);
+
+ /**
+ * Registers all toolbars and enables north panel hidding when all
+ * toolbars are hidden.
+ */
+ ArgoToolbarManager.getInstance().registerToolbar(
+ menuBar.getFileToolbar(), menuBar.getFileToolbar(), 0);
+ ArgoToolbarManager.getInstance().registerToolbar(
+ menuBar.getEditToolbar(), menuBar.getEditToolbar(), 1);
+ ArgoToolbarManager.getInstance().registerToolbar(
+ menuBar.getViewToolbar(), menuBar.getViewToolbar(), 2);
+ ArgoToolbarManager.getInstance().registerToolbar(
+ menuBar.getCreateDiagramToolbar(),
+ menuBar.getCreateDiagramToolbar(), 3);
+
+ final JToolBar[] toolbars = new JToolBar[] {menuBar.getFileToolbar(),
+ menuBar.getEditToolbar(), menuBar.getViewToolbar(),
+ menuBar.getCreateDiagramToolbar() };
+ for (JToolBar toolbar : toolbars) {
+ toolbar.addComponentListener(new ComponentAdapter() {
+ public void componentHidden(ComponentEvent e) {
+ boolean allHidden = true;
+ for (JToolBar bar : toolbars) {
+ if (bar.isVisible()) {
+ allHidden = false;
+ break;
+ }
+ }
+
+ if (allHidden) {
+ for (JToolBar bar : toolbars) {
+ toolbarBoundary.getLayout().removeLayoutComponent(
+ bar);
+ }
+ toolbarBoundary.getLayout().layoutContainer(
+ toolbarBoundary);
+ }
+ }
+
+ public void componentShown(ComponentEvent e) {
+ JToolBar oneVisible = null;
+ for (JToolBar bar : toolbars) {
+ if (bar.isVisible()) {
+ oneVisible = bar;
+ break;
+ }
+ }
+
+ if (oneVisible != null) {
+ toolbarBoundary.add(oneVisible, toolbarPosition);
+ toolbarBoundary.getLayout().layoutContainer(
+ toolbarBoundary);
+ }
+ }
+ });
+ }
+ /**
+ * END registering toolbar
+ */
+
return toolbarBoundary;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/SplashScreen.java 2007-07-18 22:27:26-0700
@@ -39,9 +39,6 @@
/**
* The splash screen.
- *
- * TODO: JWindow? I don't want a frame or close widgets.
- *
*/
public class SplashScreen extends JWindow implements IStatusBar {
@@ -95,15 +92,16 @@
/**
* @return the status bar of this dialog
*/
- public StatusBar getStatusBar() { return statusBar; }
-
- ////////////////////////////////////////////////////////////////
- // IStatusBar
+ public StatusBar getStatusBar() {
+ return statusBar;
+ }
/*
* @see org.tigris.gef.ui.IStatusBar#showStatus(java.lang.String)
*/
- public void showStatus(String s) { statusBar.showStatus(s); }
+ public void showStatus(String s) {
+ statusBar.showStatus(s);
+ }
/*
* Override paint so we can set a flag the first time we're called
@@ -111,6 +109,7 @@
* painted.
* @see java.awt.Component#paint(java.awt.Graphics)
*/
+ @Override
public void paint(Graphics g) {
super.paint(g);
if (!paintCalled) {
@@ -135,4 +134,4 @@
return paintCalled;
}
-} /* end class SplashScreen */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StatusBar.java 2007-07-18 22:27:26-0700
@@ -33,11 +33,13 @@
import javax.swing.JProgressBar;
import javax.swing.border.EtchedBorder;
+import org.tigris.gef.ui.IStatusBar;
+
/**
* The status bar.
*
*/
-public class StatusBar extends JPanel implements Runnable {
+public class StatusBar extends JPanel implements Runnable, IStatusBar {
private JLabel msg = new JLabel();
private JProgressBar progress = new JProgressBar();
@@ -125,4 +127,4 @@
// return false;
// }
-} /* end class StatusBar */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/StylePanelFigNodeModelElement.java 2007-07-18 22:27:26-0700
@@ -35,7 +35,7 @@
import javax.swing.JPanel;
import org.argouml.i18n.Translator;
-import org.argouml.uml.diagram.ui.PathContainer;
+import org.argouml.uml.diagram.PathContainer;
import org.tigris.gef.ui.ColorRenderer;
/**
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabResults.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -25,7 +25,6 @@
package org.argouml.ui;
import java.awt.BorderLayout;
-
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -33,7 +32,9 @@
import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
+import java.util.ArrayList;
import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
import javax.swing.BorderFactory;
@@ -79,15 +80,14 @@
*/
private static final int INSET_PX = 3;
- ////////////////////////////////////////////////////////////////
- // instance variables
private PredicateFind pred;
private ChildGenerator cg;
private Object root;
private JSplitPane mainPane;
- private Vector results = new Vector();
- private Vector related = new Vector();
- private Vector diagrams = new Vector();
+ private List results = new ArrayList();
+ private List related = new ArrayList();
+ // TODO: This should be some non-GEF type such as ArgoDiagram.
+ private List<Diagram> diagrams = new ArrayList<Diagram>();
private boolean relatedShown;
private JLabel resultsLabel = new JLabel();
@@ -160,9 +160,6 @@
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/**
* @param p the predicate for the search
*/
@@ -187,19 +184,29 @@
/**
* @param res the results
* @param dia the diagrams
+ * @deprecated for 0.25.4 by tfmorris. Use {@link #setResults(List, List)}.
*/
+ @Deprecated
public void setResults(Vector res, Vector dia) {
- results = res;
- diagrams = dia;
- Object[] msgArgs = {new Integer(results.size()) };
- resultsLabel.setText(Translator.messageFormat(
+ setResults((List) res, (List) dia);
+ }
+
+ /**
+ * @param res the results
+ * @param dia the diagrams
+ */
+ public void setResults(List res, List dia) {
+ results = res;
+ diagrams = dia;
+ Object[] msgArgs = {new Integer(results.size()) };
+ resultsLabel.setText(Translator.messageFormat(
"dialog.tabresults.results-items", msgArgs));
- resultsModel.setTarget(results, diagrams);
- relatedModel.setTarget(null, null);
- relatedLabel.setText(
+ resultsModel.setTarget(results, diagrams);
+ relatedModel.setTarget((List) null, (List) null);
+ relatedLabel.setText(
Translator.localize("dialog.tabresults.related-items"));
}
-
+
/*
* @see org.argouml.ui.AbstractArgoJPanel#spawn()
*/
@@ -288,15 +295,15 @@
if (row < 0) {
return;
}
- sel = results.elementAt(row);
- d = (Diagram) diagrams.elementAt(row);
+ sel = results.get(row);
+ d = (Diagram) diagrams.get(row);
} else if (src == relatedTable) {
int row = relatedTable.getSelectionModel().getMinSelectionIndex();
if (row < 0) {
return;
}
numJumpToRelated++;
- sel = related.elementAt(row);
+ sel = related.get(row);
}
if (d != null) {
@@ -345,14 +352,14 @@
}
if (relatedShown) {
int row = lse.getFirstIndex();
- Object sel = results.elementAt(row);
+ Object sel = results.get(row);
LOG.debug("selected " + sel);
- related.removeAllElements();
+ related.clear();
Enumeration elems =
ChildGenRelated.getSingleton().gen(sel);
if (elems != null) {
while (elems.hasMoreElements()) {
- related.addElement(elems.nextElement());
+ related.add(elems.nextElement());
}
}
relatedModel.setTarget(related, null);
@@ -362,15 +369,12 @@
}
}
- ////////////////////////////////////////////////////////////////
- // actions
-
/*
* @see java.lang.Runnable#run()
*/
public void run() {
resultsLabel.setText(Translator.localize("dialog.find.searching"));
- results.removeAllElements();
+ results.clear();
depthFirst(root, null);
setResults(results, diagrams);
}
@@ -403,8 +407,8 @@
Object c = elems.nextElement();
if (pred.predicate(c)
&& (lastDiagram != null || pred.matchDiagram(""))) {
- results.addElement(c);
- diagrams.addElement(lastDiagram);
+ results.add(c);
+ diagrams.add(lastDiagram);
}
depthFirst(c, lastDiagram);
}
@@ -414,4 +418,4 @@
* The UID.
*/
private static final long serialVersionUID = 4980167466628873068L;
-} /* end class TabResults */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/TabText.java 2007-07-18 22:27:26-0700
@@ -35,6 +35,8 @@
import javax.swing.event.DocumentListener;
import org.apache.log4j.Logger;
+import org.argouml.i18n.Translator;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.TabModelTarget;
@@ -95,6 +97,7 @@
if (withToolbar) {
toolbar = new ToolBar();
toolbar.setOrientation(SwingConstants.HORIZONTAL);
+ toolbar.setName(getTitle());
add(toolbar, BorderLayout.NORTH);
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ActionGotoDiagram.java 2007-07-18 22:27:26-0700
@@ -34,7 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.ui.GotoDialog;
import org.argouml.ui.targetmanager.TargetManager;
-import org.tigris.gef.base.Diagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.undo.UndoableAction;
////////////////////////////////////////////////////////////////
@@ -73,7 +73,7 @@
*/
public boolean doCommand(String argument) {
Project p = ProjectManager.getManager().getCurrentProject();
- Diagram d = p.getDiagram(argument);
+ ArgoDiagram d = p.getDiagram(argument);
if (d != null) {
TargetManager.getInstance().setTarget(d);
return true;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/GenericArgoMenuBar.java 2007-07-18 22:27:26-0700
@@ -40,12 +40,13 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.UndoEnabler;
-import org.argouml.notation.ui.ActionNotation;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.ActionExportXMI;
import org.argouml.ui.ActionImportXMI;
import org.argouml.ui.ActionProjectSettings;
import org.argouml.ui.ActionSettings;
import org.argouml.ui.ArgoJMenu;
+import org.argouml.ui.ProjectActions;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.ZoomSliderButton;
import org.argouml.ui.explorer.ActionPerspectiveConfig;
@@ -73,6 +74,9 @@
import org.argouml.uml.ui.ActionStateDiagram;
import org.argouml.uml.ui.ActionUseCaseDiagram;
import org.tigris.gef.base.AdjustPageBreaksAction;
+import org.tigris.gef.base.AlignAction;
+import org.tigris.gef.base.DistributeAction;
+import org.tigris.gef.base.ReorderAction;
import org.tigris.gef.base.SelectAllAction;
import org.tigris.gef.base.SelectInvertAction;
import org.tigris.gef.base.ZoomAction;
@@ -290,7 +294,7 @@
JMenu file = new JMenu(menuLocalize("File"));
add(file);
setMnemonic(file, "File");
- fileToolbar = new ToolBar("File Toolbar");
+ fileToolbar = new ToolBar("misc.toolbar.file");
JMenuItem newItem = file.add(new ActionNew());
setMnemonic(newItem, "New");
ShortcutMgr.assignAccelerator(newItem, ShortcutMgr.ACTION_NEW_PROJECT);
@@ -382,13 +386,13 @@
edit = add(new JMenu(menuLocalize("Edit")));
setMnemonic(edit, "Edit");
- JMenuItem undoItem = edit.add(ProjectBrowser.getInstance()
+ JMenuItem undoItem = edit.add(ProjectActions.getInstance()
.getUndoAction());
setMnemonic(undoItem, "Undo");
ShortcutMgr.assignAccelerator(undoItem, ShortcutMgr.ACTION_UNDO);
undoItem.setVisible(UndoEnabler.isEnabled());
- JMenuItem redoItem = edit.add(ProjectBrowser.getInstance()
+ JMenuItem redoItem = edit.add(ProjectActions.getInstance()
.getRedoAction());
setMnemonic(redoItem, "Redo");
ShortcutMgr.assignAccelerator(redoItem, ShortcutMgr.ACTION_REDO);
@@ -438,7 +442,7 @@
//
// edit.addSeparator();
- Action removeFromDiagram = ProjectBrowser.getInstance()
+ Action removeFromDiagram = ProjectActions.getInstance()
.getRemoveFromDiagramAction();
JMenuItem removeItem = edit.add(removeFromDiagram);
@@ -539,6 +543,12 @@
ShortcutMgr.ACTION_ADJUST_PAGE_BREAKS);
view.addSeparator();
+ JMenu menuToolbars = ArgoToolbarManager.getInstance().getMenu();
+ menuToolbars.setText(menuLocalize("toolbars"));
+ setMnemonic(menuToolbars, "toolbars");
+ view.add(menuToolbars);
+ view.addSeparator();
+
JMenuItem showSaved = view.add(new ActionShowXMLDump());
setMnemonic(showSaved, "Show Saved");
ShortcutMgr.assignAccelerator(showSaved,
@@ -556,7 +566,7 @@
private void initMenuCreate() {
createDiagramMenu = add(new JMenu(menuLocalize("Create Diagram")));
setMnemonic(createDiagramMenu, "Create Diagram");
- createDiagramToolbar = new ToolBar("Create Diagram Toolbar");
+ createDiagramToolbar = new ToolBar("misc.toolbar.create-diagram");
JMenuItem usecaseDiagram = createDiagramMenu
.add(new ActionUseCaseDiagram());
setMnemonic(usecaseDiagram, "Usecase Diagram");
@@ -630,9 +640,138 @@
arrange.add(new ActionLayout());
// This used to be deferred, but it's only 30-40 msec of work.
- InitMenusLater.initMenus(align, distribute, reorder);
+ initAlignMenu(align);
+ initDistributeMenu(distribute);
+ initReorderMenu(reorder);
+ }
+
+ /**
+ * Initialize submenus of the Align menu.
+ *
+ * @param align
+ * the Align menu
+ */
+ private static void initAlignMenu(JMenu align) {
+ JMenuItem alignTops = align
+ .add(new AlignAction(AlignAction.ALIGN_TOPS));
+ setMnemonic(alignTops, "align tops");
+ ShortcutMgr.assignAccelerator(alignTops, ShortcutMgr.ACTION_ALIGN_TOPS);
+
+ JMenuItem alignBottoms = align.add(new AlignAction(
+ AlignAction.ALIGN_BOTTOMS));
+ setMnemonic(alignBottoms, "align bottoms");
+ ShortcutMgr.assignAccelerator(alignBottoms,
+ ShortcutMgr.ACTION_ALIGN_BOTTOMS);
+
+ JMenuItem alignRights = align.add(new AlignAction(
+ AlignAction.ALIGN_RIGHTS));
+ setMnemonic(alignRights, "align rights");
+ ShortcutMgr.assignAccelerator(alignRights,
+ ShortcutMgr.ACTION_ALIGN_RIGHTS);
+
+ JMenuItem alignLefts = align.add(new AlignAction(
+ AlignAction.ALIGN_LEFTS));
+ setMnemonic(alignLefts, "align lefts");
+ ShortcutMgr.assignAccelerator(alignLefts,
+ ShortcutMgr.ACTION_ALIGN_LEFTS);
+
+ JMenuItem alignHCenters = align.add(new AlignAction(
+ AlignAction.ALIGN_H_CENTERS));
+ setMnemonic(alignHCenters,
+ "align horizontal centers");
+ ShortcutMgr.assignAccelerator(alignHCenters,
+ ShortcutMgr.ACTION_ALIGN_H_CENTERS);
+
+ JMenuItem alignVCenters = align.add(new AlignAction(
+ AlignAction.ALIGN_V_CENTERS));
+ setMnemonic(alignVCenters, "align vertical centers");
+ ShortcutMgr.assignAccelerator(alignVCenters,
+ ShortcutMgr.ACTION_ALIGN_V_CENTERS);
+
+ JMenuItem alignToGrid = align.add(new AlignAction(
+ AlignAction.ALIGN_TO_GRID));
+ setMnemonic(alignToGrid, "align to grid");
+ ShortcutMgr.assignAccelerator(alignToGrid,
+ ShortcutMgr.ACTION_ALIGN_TO_GRID);
+ }
+
+ /**
+ * Initialize submenus of the Distribute menu.
+ *
+ * @param distribute
+ * the Distribute menu
+ */
+ private static void initDistributeMenu(JMenu distribute) {
+ JMenuItem distributeHSpacing = distribute.add(new DistributeAction(
+ DistributeAction.H_SPACING));
+ setMnemonic(distributeHSpacing,
+ "distribute horizontal spacing");
+ ShortcutMgr.assignAccelerator(distributeHSpacing,
+ ShortcutMgr.ACTION_DISTRIBUTE_H_SPACING);
+
+ JMenuItem distributeHCenters = distribute.add(new DistributeAction(
+ DistributeAction.H_CENTERS));
+ setMnemonic(distributeHCenters,
+ "distribute horizontal centers");
+ ShortcutMgr.assignAccelerator(distributeHCenters,
+ ShortcutMgr.ACTION_DISTRIBUTE_H_CENTERS);
+
+ JMenuItem distributeVSpacing = distribute.add(new DistributeAction(
+ DistributeAction.V_SPACING));
+ setMnemonic(distributeVSpacing,
+ "distribute vertical spacing");
+ ShortcutMgr.assignAccelerator(distributeVSpacing,
+ ShortcutMgr.ACTION_DISTRIBUTE_V_SPACING);
+
+ JMenuItem distributeVCenters = distribute.add(new DistributeAction(
+ DistributeAction.V_CENTERS));
+ setMnemonic(distributeVCenters,
+ "distribute vertical centers");
+ ShortcutMgr.assignAccelerator(distributeVCenters,
+ ShortcutMgr.ACTION_DISTRIBUTE_V_CENTERS);
+ }
+
+ /**
+ * Initialize the submenus for the Reorder menu.
+ *
+ * @param reorder
+ * the main Reorder menu
+ */
+ private static void initReorderMenu(JMenu reorder) {
+ JMenuItem reorderBringForward = reorder.add(new ReorderAction(
+ Translator.localize("action.bring-forward"),
+ ReorderAction.BRING_FORWARD));
+ setMnemonic(reorderBringForward,
+ "reorder bring forward");
+ ShortcutMgr.assignAccelerator(reorderBringForward,
+ ShortcutMgr.ACTION_REORDER_FORWARD);
+
+ JMenuItem reorderSendBackward = reorder.add(new ReorderAction(
+ Translator.localize("action.send-backward"),
+ ReorderAction.SEND_BACKWARD));
+ setMnemonic(reorderSendBackward,
+ "reorder send backward");
+ ShortcutMgr.assignAccelerator(reorderSendBackward,
+ ShortcutMgr.ACTION_REORDER_BACKWARD);
+
+ JMenuItem reorderBringToFront = reorder.add(new ReorderAction(
+ Translator.localize("action.bring-to-front"),
+ ReorderAction.BRING_TO_FRONT));
+ setMnemonic(reorderBringToFront,
+ "reorder bring to front");
+ ShortcutMgr.assignAccelerator(reorderBringToFront,
+ ShortcutMgr.ACTION_REORDER_TO_FRONT);
+
+ JMenuItem reorderSendToBack = reorder.add(new ReorderAction(
+ Translator.localize("action.send-to-back"),
+ ReorderAction.SEND_TO_BACK));
+ setMnemonic(reorderSendToBack,
+ "reorder send to back");
+ ShortcutMgr.assignAccelerator(reorderSendToBack,
+ ShortcutMgr.ACTION_REORDER_TO_BACK);
}
+
/**
* Build the menu "Generation".
*/
@@ -722,6 +861,7 @@
// setHelpMenu(help);
add(help);
}
+
/**
* Get the create diagram toolbar.
@@ -750,12 +890,12 @@
*/
public JToolBar getEditToolbar() {
if (editToolbar == null) {
- editToolbar = new ToolBar("Edit Toolbar");
+ editToolbar = new ToolBar("misc.toolbar.edit");
// editToolbar.add(ActionCut.getInstance());
// editToolbar.add(ActionCopy.getInstance());
// editToolbar.add(ActionPaste.getInstance());
editToolbar.addFocusListener(ActionPaste.getInstance());
- editToolbar.add(ProjectBrowser.getInstance()
+ editToolbar.add(ProjectActions.getInstance()
.getRemoveFromDiagramAction());
editToolbar.add(navigateTargetBackAction);
editToolbar.add(navigateTargetForwardAction);
@@ -780,7 +920,7 @@
*/
public JToolBar getViewToolbar() {
if (viewToolbar == null) {
- viewToolbar = new ToolBar("View Toolbar");
+ viewToolbar = new ToolBar("misc.toolbar.view");
viewToolbar.add(new ActionFind());
viewToolbar.add(new ZoomSliderButton());
}
@@ -812,6 +952,9 @@
*
* @param filename
* of the project
+ *
+ * TODO: This should listen for file save events rather than being called
+ * directly - tfm.
*/
public void addFileSaved(String filename) {
lruList.addEntry(filename);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/cmd/ShortcutMgr.java 2007-07-18 22:27:26-0700
@@ -43,11 +43,11 @@
import org.apache.log4j.Logger;
import org.argouml.configuration.Configuration;
-import org.argouml.notation.ui.ActionNotation;
import org.argouml.ui.ActionExportXMI;
import org.argouml.ui.ActionImportXMI;
import org.argouml.ui.ActionProjectSettings;
import org.argouml.ui.ActionSettings;
+import org.argouml.ui.ProjectActions;
import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.explorer.ActionPerspectiveConfig;
import org.argouml.uml.ui.ActionActivityDiagram;
@@ -64,6 +64,7 @@
import org.argouml.uml.ui.ActionRevertToSaved;
import org.argouml.uml.ui.ActionSaveAllGraphics;
import org.argouml.uml.ui.ActionSaveGraphics;
+import org.argouml.uml.ui.ActionSaveProject;
import org.argouml.uml.ui.ActionSaveProjectAs;
import org.argouml.uml.ui.ActionSequenceDiagram;
import org.argouml.uml.ui.ActionStateDiagram;
@@ -551,8 +552,8 @@
putDefaultShortcut(ACTION_OPEN_PROJECT, KeyStroke.getKeyStroke(
KeyEvent.VK_O, DEFAULT_MASK), new ActionOpenProject());
putDefaultShortcut(ACTION_SAVE_PROJECT, KeyStroke.getKeyStroke(
- KeyEvent.VK_S, DEFAULT_MASK), ProjectBrowser.getInstance()
- .getSaveAction());
+ KeyEvent.VK_S, DEFAULT_MASK),
+ ProjectBrowser.getInstance().getSaveAction());
putDefaultShortcut(ACTION_SAVE_PROJECT_AS, null,
new ActionSaveProjectAs());
putDefaultShortcut(ACTION_REVERT_TO_SAVED, null,
@@ -576,9 +577,9 @@
putDefaultShortcut(ACTION_SELECT_ALL, KeyStroke.getKeyStroke(
KeyEvent.VK_A, DEFAULT_MASK), new SelectAllAction());
putDefaultShortcut(ACTION_REDO, KeyStroke.getKeyStroke(KeyEvent.VK_Y,
- DEFAULT_MASK), ProjectBrowser.getInstance().getRedoAction());
+ DEFAULT_MASK), ProjectActions.getInstance().getRedoAction());
putDefaultShortcut(ACTION_UNDO, KeyStroke.getKeyStroke(KeyEvent.VK_Z,
- DEFAULT_MASK), ProjectBrowser.getInstance().getUndoAction());
+ DEFAULT_MASK), ProjectActions.getInstance().getUndoAction());
putDefaultShortcut(ACTION_NAVIGATE_FORWARD, null,
new NavigateTargetForwardAction());
putDefaultShortcut(ACTION_NAVIGATE_BACK, null,
@@ -589,7 +590,7 @@
new ActionPerspectiveConfig());
putDefaultShortcut(ACTION_SETTINGS, null, new ActionSettings());
putDefaultShortcut(ACTION_REMOVE_FROM_DIAGRAM, KeyStroke.getKeyStroke(
- KeyEvent.VK_DELETE, 0), ProjectBrowser.getInstance()
+ KeyEvent.VK_DELETE, 0), ProjectActions.getInstance()
.getRemoveFromDiagramAction());
putDefaultShortcut(ACTION_DELETE_MODEL_ELEMENTS, KeyStroke
.getKeyStroke(KeyEvent.VK_DELETE, DEFAULT_MASK),
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerPopup.java 2007-07-18 22:27:26-0700
@@ -113,13 +113,13 @@
}
}
- final Diagram activeDiagram = currentProject.getActiveDiagram();
+ final ArgoDiagram activeDiagram = currentProject.getActiveDiagram();
// TODO: I've made some attempt to rationalize the conditions here
// and make them more readable. However I'd suggest that the
// conditions should move to each diagram.
// Break up one complex method into a few simple ones and
- // give the diagrams more knowledge of themselelves
+ // give the diagrams more knowledge of themselves
// (although the diagrams may in fact delegate this in
// turn to the Model component).
// Bob Tarling 31 Jan 2004
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/ExplorerTree.java 2007-07-18 22:27:26-0700
@@ -31,7 +31,6 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import javax.swing.JPopupMenu;
import javax.swing.JTree;
@@ -48,7 +47,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectSettings;
import org.argouml.ui.DisplayTextTree;
-import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.ProjectActions;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
import org.argouml.ui.targetmanager.TargetManager;
@@ -173,9 +172,9 @@
private void myDoubleClick() {
Object target = TargetManager.getInstance().getTarget();
if (target != null) {
- Vector show = new Vector();
+ List show = new ArrayList();
show.add(target);
- ProjectBrowser.getInstance().jumpToDiagramShowing(show);
+ ProjectActions.jumpToDiagramShowing(show);
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoBehavioralFeatureToStateDiagram.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -25,9 +25,8 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
@@ -51,12 +50,9 @@
if (Model.getFacade().isABehavioralFeature(parent)) {
Collection col = Model.getFacade().getBehaviors(parent);
- Vector ret = new Vector();
+ Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
Project p = ProjectManager.getManager().getCurrentProject();
- Vector diagrams = p.getDiagrams();
- Iterator it = diagrams.iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ for (ArgoDiagram diagram : p.getDiagramList()) {
if (diagram instanceof UMLStateDiagram
&& col.contains(((UMLStateDiagram) diagram)
.getStateMachine())) {
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java 2007-07-18 22:27:26-0700
@@ -24,10 +24,8 @@
package org.argouml.ui.explorer.rules;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.HashSet;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -58,12 +56,10 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAClassifier(parent)) {
Collection col = Model.getFacade().getCollaborations(parent);
- List ret = new ArrayList();
+ Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getDiagrams().iterator();
-
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+
+ for (ArgoDiagram diagram : p.getDiagramList()) {
if (diagram instanceof UMLSequenceDiagram
&& col.contains(((SequenceDiagramGraphModel)
((UMLSequenceDiagram) diagram).getGraphModel())
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java 2007-07-18 22:27:26-0700
@@ -25,13 +25,14 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
@@ -59,23 +60,18 @@
if (p == null)
return null;
- Vector res = new Vector();
- Vector diagrams = p.getDiagrams();
- if (diagrams == null)
- return null;
- java.util.Enumeration elems = diagrams.elements();
- while (elems.hasMoreElements()) {
- Object d = elems.nextElement();
+ Set<ArgoDiagram> res = new HashSet<ArgoDiagram>();
+ for (ArgoDiagram d : p.getDiagramList()) {
if (d instanceof UMLCollaborationDiagram
&& ((UMLCollaborationDiagram) d).getNamespace() == parent) {
- res.addElement(d);
+ res.add(d);
}
/* Also show unattached sequence diagrams: */
if ((d instanceof UMLSequenceDiagram)
&& (Model.getFacade().getRepresentedClassifier(parent) == null)
&& (Model.getFacade().getRepresentedOperation(parent) == null)
&& (parent == ((UMLSequenceDiagram) d).getNamespace())) {
- res.addElement(d);
+ res.add(d);
}
}
return res;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelElementToContainedDiagrams.java 2007-07-18 22:27:26-0700
@@ -24,10 +24,8 @@
package org.argouml.ui.explorer.rules;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -59,11 +57,8 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAModelElement(parent)) {
Project p = ProjectManager.getManager().getCurrentProject();
- Collection ret = new ArrayList();
- Collection diagrams = p.getDiagrams();
- Iterator it = diagrams.iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
+ for (ArgoDiagram diagram : p.getDiagramList()) {
if (diagram.getNamespace() == parent) {
ret.add(diagram);
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoModelToDiagrams.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -52,7 +52,7 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAModel(parent)) {
return ProjectManager.getManager()
- .getCurrentProject().getDiagrams();
+ .getCurrentProject().getDiagramList();
}
return null;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java 2007-07-18 22:27:26-0700
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -62,9 +61,7 @@
if (Model.getFacade().isANamespace(namespace)) {
List returnList = new ArrayList();
Project proj = ProjectManager.getManager().getCurrentProject();
- Iterator it = proj.getDiagrams().iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ for (ArgoDiagram diagram : proj.getDiagramList()) {
// Sequence diagrams are not shown as children of the
// collaboration that they show but as children of the
// classifier/operation the collaboration represents.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToCollaborationDiagram.java 2007-07-18 22:27:26-0700
@@ -26,9 +26,8 @@
package org.argouml.ui.explorer.rules;
import java.util.Collection;
-import java.util.Iterator;
+import java.util.HashSet;
import java.util.Set;
-import java.util.Vector;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
@@ -50,14 +49,11 @@
*/
public Collection getChildren(Object parent) {
if (Model.getFacade().isAOperation(parent)) {
- Object operation = parent; //MOperation
+ Object operation = parent;
Collection col = Model.getFacade().getCollaborations(operation);
- Vector ret = new Vector();
+ Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
Project p = ProjectManager.getManager().getCurrentProject();
- Vector diagrams = p.getDiagrams();
- Iterator it = diagrams.iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ for (ArgoDiagram diagram : p.getDiagramList()) {
if (diagram instanceof UMLCollaborationDiagram
&& col.contains(((UMLCollaborationDiagram) diagram)
.getNamespace())) {
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java 2007-07-18 22:27:26-0700
@@ -24,10 +24,8 @@
package org.argouml.ui.explorer.rules;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.HashSet;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -58,11 +56,9 @@
public Collection getChildren(Object parent) {
if (Model.getFacade().isAOperation(parent)) {
Collection col = Model.getFacade().getCollaborations(parent);
- List ret = new ArrayList();
+ Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getDiagrams().iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ for (ArgoDiagram diagram : p.getDiagramList()) {
if (diagram instanceof UMLSequenceDiagram
&& col.contains(
(
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToCollaboration.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -52,14 +51,13 @@
*/
public Collection getChildren(Object parent) {
Collection col = new ArrayList();
- if (parent instanceof Project) {
- Iterator it = ((Project) parent).getUserDefinedModels().iterator();
- while (it.hasNext()) {
- col.addAll(Model.getModelManagementHelper()
- .getAllModelElementsOfKind(it.next(),
- Model.getMetaTypes().getCollaboration()));
- }
- }
+ if (parent instanceof Project) {
+ for (Object model : ((Project) parent).getUserDefinedModelList()) {
+ col.addAll(Model.getModelManagementHelper()
+ .getAllModelElementsOfKind(model,
+ Model.getMetaTypes().getCollaboration()));
+ }
+ }
return col;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToDiagram.java 2007-07-18 22:27:26-0700
@@ -48,7 +48,7 @@
*/
public Collection getChildren(Object parent) {
if (parent instanceof Project) {
- return ((Project) parent).getDiagrams();
+ return ((Project) parent).getDiagramList();
}
return null;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToModel.java 2007-07-18 22:27:26-0700
@@ -48,7 +48,7 @@
*/
public Collection getChildren(Object parent) {
if (parent instanceof Project) {
- return ((Project) parent).getUserDefinedModels();
+ return ((Project) parent).getUserDefinedModelList();
}
return null;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoProjectToStateMachine.java 2007-07-18 22:27:26-0700
@@ -26,7 +26,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Set;
import org.argouml.i18n.Translator;
@@ -52,10 +51,9 @@
public Collection getChildren(Object parent) {
Collection col = new ArrayList();
if (parent instanceof Project) {
- Iterator it = ((Project) parent).getUserDefinedModels().iterator();
- while (it.hasNext()) {
+ for (Object model : ((Project) parent).getUserDefinedModelList()) {
col.addAll(Model.getModelManagementHelper()
- .getAllModelElementsOfKind(it.next(),
+ .getAllModelElementsOfKind(model,
Model.getMetaTypes().getStateMachine()));
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/ui/explorer/rules/GoStatemachineToDiagram.java 2007-07-18 22:27:26-0700
@@ -24,16 +24,15 @@
package org.argouml.ui.explorer.rules;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
+import java.util.HashSet;
import java.util.Set;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
@@ -51,11 +50,9 @@
*/
public Collection getChildren(Object parent) {
if (Model.getFacade().isAStateMachine(parent)) {
- List returnList = new ArrayList();
+ Set<ArgoDiagram> returnList = new HashSet<ArgoDiagram>();
Project proj = ProjectManager.getManager().getCurrentProject();
- Iterator it = proj.getDiagrams().iterator();
- while (it.hasNext()) {
- Object diagram = it.next();
+ for (ArgoDiagram diagram : proj.getDiagramList()) {
if (diagram instanceof UMLActivityDiagram) {
UMLActivityDiagram activityDiagram =
(UMLActivityDiagram) diagram;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/PredicateNotInTrash.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
*/
package org.argouml.uml;
-import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.tigris.gef.util.Predicate;
@@ -37,16 +36,11 @@
* which are already in the trash bin.
**/
public class PredicateNotInTrash implements Predicate {
- private Project p;
-
/*
* @see org.tigris.gef.util.Predicate#predicate(java.lang.Object)
*/
public boolean predicate(Object obj) {
- p = ProjectManager.getManager().getCurrentProject();
- if (p == null) return true;
- if (p.isInTrash(obj)) return false;
- return true;
+ return !ProjectManager.getManager().getCurrentProject().isInTrash(obj);
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/TMResults.java 2007-07-18 22:27:26-0700
@@ -24,6 +24,7 @@
package org.argouml.uml;
+import java.util.List;
import java.util.Vector;
import javax.swing.table.AbstractTableModel;
@@ -41,8 +42,8 @@
*/
public class TMResults extends AbstractTableModel {
- private Vector rowObjects;
- private Vector diagrams;
+ private List rowObjects;
+ private List<UMLDiagram> diagrams;
private boolean showInDiagramColumn;
/**
@@ -63,19 +64,25 @@
showInDiagramColumn = showTheInDiagramColumn;
}
- ////////////////
- // accessors
-
/**
* @param results the row objects
* @param theDiagrams the diagrams
+ * @deprecated for 0.25.4 by tfmorris. Use {@link #setTarget(List, List)}.
*/
public void setTarget(Vector results, Vector theDiagrams) {
+ setTarget((List) results, (List) theDiagrams);
+ }
+
+ /**
+ * @param results the row objects
+ * @param theDiagrams the diagrams
+ */
+ public void setTarget(List results, List theDiagrams) {
rowObjects = results;
diagrams = theDiagrams;
fireTableStructureChanged();
}
-
+
////////////////
// TableModel implementation
@@ -141,7 +148,7 @@
if (col < 0 || col >= (showInDiagramColumn ? 4 : 3)) {
return "bad col!";
}
- Object rowObj = rowObjects.elementAt(row);
+ Object rowObj = rowObjects.get(row);
if (rowObj instanceof Diagram) {
Diagram d = (Diagram) rowObj;
switch (col) {
@@ -164,7 +171,7 @@
if (Model.getFacade().isAModelElement(rowObj)) {
Diagram d = null;
if (diagrams != null) {
- d = (Diagram) diagrams.elementAt(row);
+ d = (Diagram) diagrams.get(row);
}
switch (col) {
case 0 : // the name of this type of ModelElement
@@ -215,6 +222,7 @@
/*
* @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int)
*/
+ @Override
public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
}
@@ -222,4 +230,4 @@
* The UID.
*/
private static final long serialVersionUID = -1444599676429024575L;
-} /* end class TMResults */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/ChildGenFind.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -58,8 +58,8 @@
if (o instanceof Project) {
Project p = (Project) o;
Vector res = new Vector();
- res.addAll(p.getUserDefinedModels());
- res.addAll(p.getDiagrams());
+ res.addAll(p.getUserDefinedModelList());
+ res.addAll(p.getDiagramList());
return res.elements();
}
@@ -86,4 +86,4 @@
public static ChildGenFind getSingleton() {
return SINGLETON;
}
-} /* end class ChildGenFind */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/UMLToDoItem.java 2007-07-18 22:27:26-0700
@@ -41,7 +41,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
-import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.ProjectActions;
/**
@@ -119,13 +119,13 @@
* Action jumps to the diagram containing all or most of the
* offenders and calls {@link #deselect()}, {@link #select()}
* around the call to
- * {@link ProjectBrowser#jumpToDiagramShowing(java.util.Vector)}.
+ * {@link ProjectDiagramActions#jumpToDiagramShowing(java.util.List)}.
*/
@Override
public void action() {
deselect();
// this also sets the target as a convenient side effect
- ProjectBrowser.getInstance().jumpToDiagramShowing(getOffenders());
+ ProjectActions.jumpToDiagramShowing(getOffenders());
select();
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ChildGenUML.java 2007-07-18 22:27:26-0700
@@ -24,18 +24,19 @@
package org.argouml.uml.cognitive.critics;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Enumeration;
-import java.util.Vector;
+import java.util.Iterator;
+import java.util.List;
import org.apache.log4j.Logger;
import org.argouml.kernel.Project;
import org.argouml.model.Model;
+import org.argouml.util.IteratorEnumeration;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.util.ChildGenerator;
-import org.tigris.gef.util.EnumerationComposite;
-import org.tigris.gef.util.EnumerationEmpty;
-import org.tigris.gef.util.EnumerationSingle;
/**
* This class gives critics access to parts of the UML model of the
@@ -59,12 +60,23 @@
/**
* Reply a java.util.Enumeration of the children of the given Object
- * TODO: GEF has moved away from vectors to collections
- * returning an iterator would now seem better.
- *
+ *
* @see org.tigris.gef.util.ChildGenerator#gen(java.lang.Object)
+ * @deprecated for 0.25.4 by tfmorris. Only for use with legacy GEF
+ * interfaces. Use {@link #gen2(Object)} for new applications.
*/
+ @Deprecated
public Enumeration gen(Object o) {
+ return new IteratorEnumeration(gen2(o));
+ }
+
+ /**
+ * Return an Iterator of the children of the given Object
+ *
+ * @param o object to return the children of
+ * @see org.tigris.gef.util.ChildGenerator#gen(java.lang.Object)
+ */
+ public Iterator gen2(Object o) {
if (o == null) {
LOG.debug("Object is null");
@@ -74,92 +86,95 @@
if (o instanceof Project) {
Project p = (Project) o;
- return new EnumerationComposite(p.getUserDefinedModels().elements(),
- p.getDiagrams().elements());
+ Collection result = new ArrayList();
+ result.addAll(p.getUserDefinedModelList());
+ result.addAll(p.getDiagramList());
+ return result.iterator();
}
if (o instanceof Diagram) {
Collection figs = ((Diagram) o).getLayer().getContents();
if (figs != null) {
- return new Vector(figs).elements();
+ return figs.iterator();
}
}
if (Model.getFacade().isAPackage(o)) {
- Vector ownedElements =
- new Vector(Model.getFacade().getOwnedElements(o));
+ Collection ownedElements =
+ Model.getFacade().getOwnedElements(o);
if (ownedElements != null) {
- return ownedElements.elements();
+ return ownedElements.iterator();
}
}
if (Model.getFacade().isAElementImport(o)) {
- Object me = Model.getFacade().getModelElement(o);
- return new EnumerationSingle(me); //wasteful!
+ Collection result = new ArrayList();
+ result.add(Model.getFacade().getModelElement(o));
+ return result.iterator(); //wasteful!
}
// TODO: associationclasses fit both of the next 2 cases
if (Model.getFacade().isAClassifier(o)) {
- EnumerationComposite res = new EnumerationComposite();
- res.addSub(new Vector(Model.getFacade().getFeatures(o)));
+ Collection result = new ArrayList();
+ result.addAll(Model.getFacade().getFeatures(o));
- Vector sms = new Vector(Model.getFacade().getBehaviors(o));
+ Collection sms = Model.getFacade().getBehaviors(o);
//Object sm = null;
//if (sms != null && sms.size() > 0)
//sm = sms.elementAt(0);
//if (sm != null) res.addSub(new EnumerationSingle(sm));
if (sms != null) {
- res.addSub(sms.elements());
+ result.addAll(sms);
}
- return res;
+ return result.iterator();
}
if (Model.getFacade().isAAssociation(o)) {
- Vector assocEnds = new Vector(Model.getFacade().getConnections(o));
+ List assocEnds = (List) Model.getFacade().getConnections(o);
if (assocEnds != null) {
- return assocEnds.elements();
+ return assocEnds.iterator();
}
- //TODO: MAssociationRole
+ //TODO: AssociationRole
}
// // needed?
if (Model.getFacade().isAStateMachine(o)) {
- EnumerationComposite res = new EnumerationComposite();
+ Collection result = new ArrayList();
Object top = Model.getStateMachinesHelper().getTop(o);
if (top != null) {
- res.addSub(new EnumerationSingle(top));
+ result.add(top);
}
- res.addSub(new Vector(Model.getFacade().getTransitions(o)));
- return res;
+ result.addAll(Model.getFacade().getTransitions(o));
+ return result.iterator();
}
// needed?
if (Model.getFacade().isACompositeState(o)) {
- Vector substates = new Vector(Model.getFacade().getSubvertices(o));
+ Collection substates = Model.getFacade().getSubvertices(o);
if (substates != null) {
- return substates.elements();
+ return substates.iterator();
}
}
if (Model.getFacade().isAOperation(o)) {
- Vector params = new Vector(Model.getFacade().getParameters(o));
+ Collection params = Model.getFacade().getParameters(o);
if (params != null) {
- return params.elements();
+ return params.iterator();
}
}
if (Model.getFacade().isAModelElement(o)) {
- Vector behavior = new Vector(Model.getFacade().getBehaviors(o));
+ Collection behavior = Model.getFacade().getBehaviors(o);
if (behavior != null) {
- return behavior.elements();
+ return behavior.iterator();
}
}
// tons more cases
LOG.debug("No children found for: " + o.getClass());
- return EnumerationEmpty.theInstance();
+ return Collections.EMPTY_SET.iterator();
}
-} /* end class ChildGenUML */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java 2007-07-18 22:27:26-0700
@@ -32,7 +32,7 @@
import org.apache.log4j.Logger;
import org.argouml.cognitive.ToDoItem;
import org.argouml.ui.Clarifier;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.tigris.gef.presentation.Fig;
/**
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/ClOperationCompartment.java 2007-07-18 22:27:26-0700
@@ -31,7 +31,7 @@
import org.argouml.cognitive.ToDoItem;
import org.argouml.ui.Clarifier;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidHistory.java 2007-07-18 22:27:26-0700
@@ -31,7 +31,8 @@
import org.argouml.uml.cognitive.UMLDecision;
/**
- * UML 1.5 Well-formedness rule [2] for Pseudostates.
+ * UML 1.5 Well-formedness rule [2] for Pseudostates: <p>
+ * History vertices can have at most one outgoing transition.
*
* @author [email protected]
*/
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrInvalidInitial.java 2007-07-18 22:27:26-0700
@@ -33,8 +33,10 @@
/**
* A critic to detect when an initial state has more than one
- * outgoing transitions. Implements a constraint from the UML
- * 1.1 standard: page 10, Pseudostate [1].
+ * outgoing transitions.
+ * Implements the first part of a well-formedness rule from the UML
+ * 1.4.2 standard: Pseudostate [1]:<p>
+ * An initial vertex can have at most one outgoing transition (...).
*
* @author jrobbins
*/
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrMissingClassName.java 2007-07-18 22:27:26-0700
@@ -34,8 +34,7 @@
import org.argouml.uml.cognitive.UMLDecision;
/**
- * Well-formedness rule [1] for Namespace. See page 33 of UML 1.1
- * Semantics. OMG document ad/97-08-04.
+ * This critics tests if a ModelElement has a name.
*/
public class CrMissingClassName extends CrUML {
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/CrTooManyClasses.java 2007-07-18 22:27:26-0700
@@ -24,15 +24,15 @@
package org.argouml.uml.cognitive.critics;
+import java.util.ArrayList;
+import java.util.Collection;
+
import org.argouml.cognitive.Designer;
+import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
/**
- * A critic to detect when a classdiagram has too many classes. <p>
- *
- * TODO: currently it checks for nodes (classes, interfaces, comments).
- * This critic should be rewritten to work with namespaces.
+ * A critic to detect when a namespace has too many classes.
*/
public class CrTooManyClasses extends AbstractCrTooMany {
@@ -45,10 +45,10 @@
* The constructor.
*/
public CrTooManyClasses() {
- // TODO: <ocl>self.name</ocl> is not expanded for diagram objects
- setupHeadAndDesc();
+ setupHeadAndDesc();
addSupportedDecision(UMLDecision.CLASS_SELECTION);
setThreshold(CLASS_THRESHOLD);
+ addTrigger("ownedElement");
}
/*
@@ -56,12 +56,18 @@
* java.lang.Object, org.argouml.cognitive.Designer)
*/
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLClassDiagram)) {
+ if (!(Model.getFacade().isANamespace(dm))) {
return NO_PROBLEM;
}
- UMLClassDiagram d = (UMLClassDiagram) dm;
- if (d.getGraphModel().getNodes().size() <= getThreshold()) {
+ Collection subs = Model.getFacade().getOwnedElements(dm);
+ Collection<Object> classes = new ArrayList<Object>();
+ for (Object me : subs) {
+ if (Model.getFacade().isAClass(me)) {
+ classes.add(me);
+ }
+ }
+ if (classes.size() <= getThreshold()) {
return NO_PROBLEM;
}
return PROBLEM_FOUND;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/cognitive/critics/InitCognitiveCritics.java 2007-07-18 22:27:26-0700
@@ -34,7 +34,6 @@
import org.argouml.cognitive.Critic;
import org.argouml.model.Model;
import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.UMLDiagram;
@@ -292,6 +291,7 @@
Object synchStateCls = Model.getMetaTypes().getSynchState();
// Class stateDiagramCls = UMLStateDiagram.class;
// Class useCaseDiagramCls = UMLUseCaseDiagram.class;
+ // Class classDiagramCls = UMLClassDiagram.class;
// TODO: Agency should allow registration by interface
// useful for MAssociation.
@@ -317,6 +317,7 @@
Agency.register(crNavFromInterface, assocCls);
Agency.register(crNameConflictAC, assocClassCls);
Agency.register(clsNaming, classCls);
+ Agency.register(clsNaming, interfaceCls);
Agency.register(clsNaming, actorCls);
Agency.register(clsNaming, useCaseCls);
@@ -359,8 +360,7 @@
Agency.register(crTooManyOper, classCls);
Agency.register(crTooManyTransitions, stateVertexCls);
Agency.register(crTooManyStates, compositieStateCls);
- Class classDiagramCls = UMLClassDiagram.class;
- Agency.register(crTooManyClasses, classDiagramCls);
+ Agency.register(crTooManyClasses, namespaceCls);
Object pseudostateCls = Model.getMetaTypes().getPseudostate();
Object transitionCls = Model.getMetaTypes().getTransition();
Agency.register(noTrans1, stateVertexCls);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/DiagramFactory.java 2007-07-18 22:27:26-0700
@@ -24,10 +24,11 @@
package org.argouml.uml.diagram;
+import java.util.ArrayList;
+import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import org.argouml.model.ActivityDiagram;
import org.argouml.model.ClassDiagram;
@@ -47,18 +48,50 @@
import org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.graph.GraphNodeRenderer;
-import org.tigris.gef.presentation.Fig;
/**
* Provide a factory method to create different UML diagrams.
* @author Bob Tarling
*/
public final class DiagramFactory {
+
+ /**
+ * Map from our public enum to our internal implementation classes.
+ * This allows use to hide the implementation classes from users of
+ * the factory.
+ * NOTE: This needs to be initialized before the constructor is called
+ * to initialize the singleton.
+ */
+ private static Map<DiagramType, Class> diagramClasses =
+ new EnumMap<DiagramType, Class>(DiagramType.class);
+
+ /**
+ * The singleton instance.
+ */
private static DiagramFactory diagramFactory = new DiagramFactory();
- private List diagrams = new Vector();
+ /**
+ * Enumeration containing all the different types of UML diagrams.
+ */
+ public enum DiagramType {
+ Class, UseCase, State, Deployment, Collaboration, Activity, Sequence
+ }
+
+
+
+
+ private List<ArgoDiagram> diagrams = new ArrayList<ArgoDiagram>();
private DiagramFactory() {
+ super();
+ diagramClasses.put(DiagramType.Class, UMLClassDiagram.class);
+ diagramClasses.put(DiagramType.UseCase, UMLUseCaseDiagram.class);
+ diagramClasses.put(DiagramType.State, UMLStateDiagram.class);
+ diagramClasses.put(DiagramType.Deployment, UMLDeploymentDiagram.class);
+ diagramClasses.put(DiagramType.Collaboration,
+ UMLCollaborationDiagram.class);
+ diagramClasses.put(DiagramType.Activity, UMLActivityDiagram.class);
+ diagramClasses.put(DiagramType.Sequence, UMLSequenceDiagram.class);
}
/**
@@ -71,16 +104,35 @@
/**
* @return the list of diagrams
*/
- public List getDiagram() {
+ public List<ArgoDiagram> getDiagram() {
return diagrams;
}
-
-// public ArgoDiagram createDiagram(Class type, Object namespace,
-// Object machine) {
-//
-// }
+ /**
+ * Factory method to create a new default instance of an ArgoDiagram.
+ * @param namespace The namespace that (in)directly
+ * owns the elements on the diagram
+ * @return the newly instantiated class diagram
+ */
+ public ArgoDiagram createDefaultDiagram(Object namespace) {
+ return createDiagram(DiagramType.Class, namespace, null);
+ }
+
+ /**
+ * Factory method to create a new instance of an ArgoDiagram.
+ *
+ * @param type The class of rendering diagram to create
+ * @param namespace The namespace that (in)directly
+ * owns the elements on the diagram
+ * @param machine The StateMachine for the diagram
+ * (only: statemachine - activitygraph)
+ * @return the newly instantiated class diagram
+ */
+ public ArgoDiagram createDiagram(DiagramType type, Object namespace,
+ Object machine) {
+ return createDiagram(diagramClasses.get(type), namespace, machine);
+ }
/**
* Factory method to create a new instance of an ArgoDiagram.
@@ -91,7 +143,10 @@
* @param machine The StateMachine for the diagram
* (only: statemachine - activitygraph)
* @return the newly instantiated class diagram
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #createDiagram(DiagramType, Object, Object)}.
*/
+ @Deprecated
public ArgoDiagram createDiagram(Class type, Object namespace,
Object machine) {
@@ -159,22 +214,24 @@
return diagram;
}
- public DiDiagram getDiDiagram(Object graphModel) {
- if (graphModel instanceof UMLMutableGraphSupport) {
- return ((UMLMutableGraphSupport) graphModel).getDiDiagram();
- }
- throw new IllegalArgumentException("graphModel: " + graphModel);
- }
+ // Unused - tfm - 20070706
+// public DiDiagram getDiDiagram(Object graphModel) {
+// if (graphModel instanceof UMLMutableGraphSupport) {
+// return ((UMLMutableGraphSupport) graphModel).getDiDiagram();
+// }
+// throw new IllegalArgumentException("graphModel: " + graphModel);
+// }
- public void addElement(Object diagram, Object element) {
- if (!(diagram instanceof ArgoDiagram)) {
- throw new IllegalArgumentException("diagram: " + diagram);
- }
- if (!(element instanceof Fig)) {
- throw new IllegalArgumentException("fig: " + element);
- }
- ((ArgoDiagram) diagram).add((Fig) element);
- }
+ // Unused - tfm 20070706
+// public void addElement(Object diagram, Object element) {
+// if (!(diagram instanceof ArgoDiagram)) {
+// throw new IllegalArgumentException("diagram: " + diagram);
+// }
+// if (!(element instanceof Fig)) {
+// throw new IllegalArgumentException("fig: " + element);
+// }
+// ((ArgoDiagram) diagram).add((Fig) element);
+// }
private final Map noStyleProperties = new HashMap();
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java 2007-07-18 22:27:26-0700
@@ -37,14 +37,8 @@
private static final String MEMBER_TYPE = "pgml";
private static final String FILE_EXT = ".pgml";
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private ArgoDiagram diagram;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*
@@ -58,9 +52,6 @@
setDiagram(d);
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/**
* @return the diagram
*/
@@ -78,6 +69,7 @@
/*
* @see org.argouml.kernel.AbstractProjectMember#getZipFileExtension()
*/
+ @Override
public String getZipFileExtension() {
return FILE_EXT;
}
@@ -96,4 +88,4 @@
return diagram.repair();
}
-} /* end class ProjectMemberDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java 2007-07-18 22:27:26-0700
@@ -34,7 +34,6 @@
import org.apache.log4j.Logger;
import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.DiDiagram;
import org.argouml.model.Model;
import org.argouml.model.UmlException;
@@ -238,8 +237,7 @@
Dictionary args = mode.getArgs();
Object style = args.get("aggregation"); //MAggregationKind
Boolean unidirectional = (Boolean) args.get("unidirectional");
- Object model =
- ProjectManager.getManager().getCurrentProject().getModel();
+ Object model = getProject().getModel();
// Create the UML connection of the given type between the
// given model elements.
@@ -534,7 +532,7 @@
* @param dd
*/
void setDiDiagram(DiDiagram dd) {
- this.diDiagram = dd;
+ diDiagram = dd;
}
/**
@@ -562,7 +560,7 @@
* @param p the project
*/
public void setProject(Project p) {
- this.project = p;
+ project = p;
}
/**
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/UmlDiagramRenderer.java 2007-07-18 22:27:26-0700
@@ -70,23 +70,23 @@
import org.argouml.uml.diagram.static_structure.ui.FigPackage;
import org.argouml.uml.diagram.static_structure.ui.FigStereotypeDeclaration;
import org.argouml.uml.diagram.static_structure.ui.FigSubsystem;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ui.FigAssociation;
import org.argouml.uml.diagram.ui.FigAssociationClass;
import org.argouml.uml.diagram.ui.FigAssociationEnd;
import org.argouml.uml.diagram.ui.FigClassAssociationClass;
import org.argouml.uml.diagram.ui.FigDependency;
+import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigGeneralization;
import org.argouml.uml.diagram.ui.FigMessage;
import org.argouml.uml.diagram.ui.FigNodeAssociation;
import org.argouml.uml.diagram.ui.FigPermission;
import org.argouml.uml.diagram.ui.FigRealization;
import org.argouml.uml.diagram.ui.FigUsage;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
import org.argouml.uml.diagram.use_case.ui.FigActor;
import org.argouml.uml.diagram.use_case.ui.FigExtend;
import org.argouml.uml.diagram.use_case.ui.FigInclude;
import org.argouml.uml.diagram.use_case.ui.FigUseCase;
+import org.tigris.gef.base.Layer;
import org.tigris.gef.graph.GraphEdgeRenderer;
import org.tigris.gef.graph.GraphNodeRenderer;
import org.tigris.gef.presentation.Fig;
@@ -301,4 +301,87 @@
return newEdge;
}
+
+ /**
+ * Find the Figs in the given layer that should be the source and
+ * destination and attach these to either end of the FigEdge
+ * @param layer the layer to look for the FigNodes
+ * @param newEdge The edge to attach
+ */
+ protected final void setPorts(Layer layer, FigEdge newEdge) {
+ Object modelElement = newEdge.getOwner();
+ if (newEdge.getSourcePortFig() == null) {
+ Object source;
+ if (modelElement instanceof CommentEdge) {
+ source = ((CommentEdge) modelElement).getSource();
+ } else {
+ source = Model.getUmlHelper().getSource(modelElement);
+ }
+ FigNode sourceNode = getNodePresentationFor(layer, source);
+ assert (sourceNode != null) : "No FigNode found for " + source;
+ setSourcePort(newEdge, sourceNode);
+ }
+
+ if (newEdge.getDestPortFig() == null) {
+ Object dest;
+ if (modelElement instanceof CommentEdge) {
+ dest = ((CommentEdge) modelElement).getDestination();
+ } else {
+ dest = Model.getUmlHelper().getDestination(newEdge.getOwner());
+ }
+ setDestPort(newEdge, getNodePresentationFor(layer, dest));
+ }
+
+ if (newEdge.getSourcePortFig() == null
+ || newEdge.getDestPortFig() == null) {
+ throw new IllegalStateException("Edge of type "
+ + newEdge.getClass().getName()
+ + " created with no source or destination port");
+ }
+ }
+
+ private void setSourcePort(FigEdge edge, FigNode source) {
+ edge.setSourcePortFig(source);
+ edge.setSourceFigNode(source);
+ }
+
+ private void setDestPort(FigEdge edge, FigNode dest) {
+ edge.setDestPortFig(dest);
+ edge.setDestFigNode(dest);
+ }
+
+ /**
+ * Get the FigNode from the given layer that represents the given
+ * model element.
+ * The FigNode portion of an association class is returned in preference
+ * to the FigEdge portion.
+ * If no FigNode is found then a FIgEdge is searched for and the FigNode
+ * that acts as its edge port is returned.
+ * @param lay the layer containing the Fig
+ * @param modelElement the model element to find presentation for
+ * @return the FigNode presentation of the model element
+ */
+ private FigNode getNodePresentationFor(Layer lay, Object modelElement) {
+ assert modelElement != null : "A modelElement must be supplied";
+ for (Iterator it = lay.getContentsNoEdges().iterator();
+ it.hasNext(); ) {
+ Object fig = it.next();
+ if (fig instanceof FigNode
+ && ((FigNode) fig).getOwner().equals(modelElement)) {
+ return ((FigNode) fig);
+ }
+ }
+ for (Iterator it = lay.getContentsEdgesOnly().iterator();
+ it.hasNext(); ) {
+ Object fig = it.next();
+ if (fig instanceof FigEdgeModelElement
+ && modelElement.equals(((FigEdgeModelElement) fig)
+ .getOwner())) {
+ return ((FigEdgeModelElement) fig).getEdgePort();
+ }
+ }
+ return null;
+ }
+
+
} /* end class CollabDiagramRenderer */
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java 2007-07-18 22:27:26-0700
@@ -34,8 +34,8 @@
import org.argouml.model.AddAssociationEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.state.ui.FigStateVertex;
import org.argouml.uml.diagram.ui.FigMultiLineText;
import org.tigris.gef.graph.GraphModel;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java 2007-07-18 22:27:26-0700
@@ -36,8 +36,8 @@
import org.argouml.application.events.ArgoEvent;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigSingleLineText;
import org.tigris.gef.base.LayerPerspective;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java 2007-07-18 22:27:26-0700
@@ -35,7 +35,6 @@
import javax.swing.Action;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.ActivityGraphsHelper;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
@@ -248,7 +247,7 @@
&& "remove".equals(evt.getPropertyName())) {
Model.getPump().removeModelEventListener(this,
theActivityGraph, new String[] {"remove", "namespace"});
- ProjectManager.getManager().getCurrentProject().moveToTrash(this);
+ getProject().moveToTrash(this);
}
if (evt.getSource() == getStateMachine()) {
Object newNamespace =
@@ -278,6 +277,10 @@
/**
* @return the statemachine
+ *
+ * TODO: If this method is called by any of the Figs, it will introduce
+ * a dependency cycle. It would be much better if they could just
+ * use {@link ArgoDiagram#getOwner()} which does the same thing.
*/
public Object getStateMachine() {
GraphModel gm = getGraphModel();
@@ -359,20 +362,6 @@
return actions;
}
- /**
- * Creates a new diagram name.<p>
- *
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -743,4 +732,4 @@
return Model.getFacade().getContents(partition).contains(state);
}
-} /* end class UMLActivityDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/CollabDiagramRenderer.java 2007-07-18 22:27:26-0700
@@ -126,33 +126,8 @@
"Don't know how to create FigEdge for model type "
+ edge.getClass().getName());
}
-
- if (newEdge.getSourcePortFig() == null) {
- Object source;
- if (edge instanceof CommentEdge) {
- source = ((CommentEdge) edge).getSource();
- } else {
- source = Model.getUmlHelper().getSource(edge);
- }
- setSourcePort(newEdge, (FigNode) lay.presentationFor(source));
- }
-
- if (newEdge.getDestPortFig() == null) {
- Object dest;
- if (edge instanceof CommentEdge) {
- dest = ((CommentEdge) edge).getDestination();
- } else {
- dest = Model.getUmlHelper().getDestination(edge);
- }
- setDestPort(newEdge, (FigNode) lay.presentationFor(dest));
- }
-
- if (newEdge.getSourcePortFig() == null
- || newEdge.getDestPortFig() == null) {
- throw new IllegalStateException("Edge of type "
- + newEdge.getClass().getName()
- + " created with no source or destination port");
- }
+
+ setPorts(lay, newEdge);
assert newEdge != null : "There has been no FigEdge created";
assert (newEdge.getDestFigNode() != null)
@@ -167,14 +142,4 @@
lay.add(newEdge);
return newEdge;
}
-
- private void setSourcePort(FigEdge edge, FigNode source) {
- edge.setSourcePortFig(source);
- edge.setSourceFigNode(source);
- }
-
- private void setDestPort(FigEdge edge, FigNode dest) {
- edge.setDestPortFig(dest);
- edge.setDestFigNode(dest);
- }
} /* end class CollabDiagramRenderer */
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigAssociationRole.java 2007-07-18 22:27:26-0700
@@ -29,12 +29,12 @@
import java.util.List;
import org.argouml.notation.NotationProviderFactory2;
+import org.argouml.uml.diagram.ui.ArgoFigGroup;
import org.argouml.uml.diagram.ui.FigAssociation;
import org.argouml.uml.diagram.ui.FigMessage;
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.PathConvPercent;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
/**
@@ -93,7 +93,7 @@
*
* TODO: Should this be in its own source file?
*/
-class FigMessageGroup extends FigGroup {
+class FigMessageGroup extends ArgoFigGroup {
/**
* Constructor for FigMessageGroup.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java 2007-07-18 22:27:26-0700
@@ -35,8 +35,8 @@
import org.argouml.model.AddAssociationEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
import org.tigris.gef.base.Layer;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2007-07-18 22:27:26-0700
@@ -32,7 +32,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.collaboration.CollabDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionAddAssociationRole;
@@ -236,19 +235,6 @@
}
}
- /**
- * Creates a new diagramname.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/DeploymentDiagramRenderer.java 2007-07-18 22:27:26-0700
@@ -178,33 +178,8 @@
"Don't know how to create FigEdge for model type "
+ edge.getClass().getName());
}
-
- if (newEdge.getSourcePortFig() == null) {
- Object source;
- if (edge instanceof CommentEdge) {
- source = ((CommentEdge) edge).getSource();
- } else {
- source = Model.getUmlHelper().getSource(edge);
- }
- setSourcePort(newEdge, (FigNode) lay.presentationFor(source));
- }
-
- if (newEdge.getDestPortFig() == null) {
- Object dest;
- if (edge instanceof CommentEdge) {
- dest = ((CommentEdge) edge).getDestination();
- } else {
- dest = Model.getUmlHelper().getDestination(edge);
- }
- setDestPort(newEdge, (FigNode) lay.presentationFor(dest));
- }
-
- if (newEdge.getSourcePortFig() == null
- || newEdge.getDestPortFig() == null) {
- throw new IllegalStateException("Edge of type "
- + newEdge.getClass().getName()
- + " created with no source or destination port");
- }
+
+ setPorts(lay, newEdge);
assert newEdge != null : "There has been no FigEdge created";
assert (newEdge.getDestFigNode() != null)
@@ -219,15 +194,4 @@
lay.add(newEdge);
return newEdge;
}
-
-
- private void setSourcePort(FigEdge edge, FigNode source) {
- edge.setSourcePortFig(source);
- edge.setSourceFigNode(source);
- }
-
- private void setDestPort(FigEdge edge, FigNode dest) {
- edge.setDestPortFig(dest);
- edge.setDestFigNode(dest);
- }
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java 2007-07-18 22:27:26-0700
@@ -38,8 +38,8 @@
import org.argouml.model.AssociationChangeEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Editor;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java 2007-07-18 22:27:26-0700
@@ -38,8 +38,8 @@
import org.argouml.model.AssociationChangeEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Geometry;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java 2007-07-18 22:27:26-0700
@@ -32,7 +32,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Facade;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
@@ -85,10 +84,7 @@
private Action actionMGeneralization;
private Action actionMAbstraction;
-
- ////////////////////////////////////////////////////////////////
- // contructors
-
+
/**
* Constructor.
*/
@@ -190,19 +186,6 @@
*/
static final long serialVersionUID = -375918274062198744L;
- /**
- * Creates a new diagramname.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -473,11 +456,11 @@
* @see org.argouml.uml.diagram.ui.UMLDiagram#isRelocationAllowed(java.lang.Object)
*/
public boolean isRelocationAllowed(Object base) {
- return false;
- /* TODO: We may return the following when the
- * relocate() has been implemented.
- */
-// base == ProjectManager.getManager().getCurrentProject().getModel();
+ return false;
+ /* TODO: We may return the following when the
+ * relocate() has been implemented.
+ */
+// base == ProjectManager.getManager().getCurrentProject().getModel();
}
/*
@@ -532,4 +515,4 @@
}
}
-} /* end class UMLDeploymentDiagram */
+}
\ No newline at end of file
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/SequenceDiagramGraphModel.java 2007-07-18 22:27:26-0700
@@ -34,7 +34,6 @@
import java.util.Vector;
import org.apache.log4j.Logger;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.uml.CommentEdge;
@@ -428,8 +427,7 @@
if (collaboration == null) {
collaboration =
Model.getCollaborationsFactory().buildCollaboration(
- ProjectManager.getManager().getCurrentProject()
- .getRoot());
+ getProject().getRoot());
}
return collaboration;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigHead.java 2007-07-18 22:27:26-0700
@@ -29,13 +29,13 @@
import java.util.Iterator;
import java.util.List;
+import org.argouml.uml.diagram.ui.ArgoFigGroup;
import org.tigris.gef.base.Layer;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
import org.tigris.gef.presentation.FigRect;
import org.tigris.gef.presentation.FigText;
-class FigHead extends FigGroup {
+class FigHead extends ArgoFigGroup {
private final FigText nameFig;
private final Fig stereotypeFig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigLifeLine.java 2007-07-18 22:27:26-0700
@@ -36,6 +36,7 @@
import org.apache.log4j.Logger;
import org.argouml.uml.diagram.sequence.MessageNode;
import org.argouml.uml.diagram.sequence.ui.FigClassifierRole.TempFig;
+import org.argouml.uml.diagram.ui.ArgoFigGroup;
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigGroupHandler;
import org.tigris.gef.persistence.pgml.HandlerFactory;
@@ -43,14 +44,13 @@
import org.tigris.gef.persistence.pgml.PGMLStackParser;
import org.tigris.gef.persistence.pgml.UnknownHandler;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
import org.tigris.gef.presentation.FigLine;
import org.tigris.gef.presentation.FigRect;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-class FigLifeLine extends FigGroup implements HandlerFactory {
+class FigLifeLine extends ArgoFigGroup implements HandlerFactory {
/**
* The UID.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/FigMessagePort.java 2007-07-18 22:27:26-0700
@@ -25,14 +25,12 @@
package org.argouml.uml.diagram.sequence.ui;
import java.awt.Point;
-
import java.util.ArrayList;
import java.util.List;
import org.argouml.uml.diagram.sequence.MessageNode;
-
+import org.argouml.uml.diagram.ui.ArgoFigGroup;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
import org.tigris.gef.presentation.FigLine;
/**
@@ -40,7 +38,7 @@
*
* @author jaap.branderhorst
*/
-public class FigMessagePort extends FigGroup {
+public class FigMessagePort extends ArgoFigGroup {
private static final long serialVersionUID = -7805833566723101923L;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/sequence/ui/UMLSequenceDiagram.java 2007-07-18 22:27:26-0700
@@ -28,7 +28,6 @@
import java.util.Hashtable;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionSetAddMessageMode;
@@ -95,21 +94,6 @@
return getNamespace();
}
- /**
- * Creates a new diagramname.
- *
- * @return a new unique name.
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!(ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name))) {
- name = getNewDiagramName();
- }
- return name;
- }
-
-
@Override
public String getLabelName() {
return Translator.localize("label.sequence-diagram");
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEffect.java 2007-07-18 22:27:26-0700
@@ -30,7 +30,6 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.tigris.gef.undo.UndoableAction;
@@ -53,11 +52,12 @@
}
public void actionPerformed(ActionEvent e) {
- if (!isEnabled()) return;
+ if (!isEnabled()) {
+ return;
+ }
super.actionPerformed(e);
Object target = TargetManager.getInstance().getModelTarget();
- Object model =
- ProjectManager.getManager().getCurrentProject().getModel();
+ Object model = Model.getFacade().getModel(target);
Object ns = Model.getStateMachinesHelper()
.findNamespaceForEvent(target, model);
Object event = createEvent(ns);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/ButtonActionNewEvent.java 2007-07-18 22:27:26-0700
@@ -28,7 +28,6 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetListener;
@@ -57,8 +56,7 @@
if (!isEnabled()) return;
super.actionPerformed(e);
Object target = TargetManager.getInstance().getModelTarget();
- Object model =
- ProjectManager.getManager().getCurrentProject().getModel();
+ Object model = Model.getFacade().getModel(target);
Object ns = Model.getStateMachinesHelper()
.findNamespaceForEvent(target, model);
Object event = createEvent(ns);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java 2007-07-18 22:27:26-0700
@@ -39,7 +39,7 @@
import javax.swing.SwingUtilities;
import org.argouml.model.Model;
-import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.ProjectActions;
import org.argouml.uml.diagram.ui.ActionAddConcurrentRegion;
import org.argouml.uml.diagram.ui.ActionDeleteConcurrentRegion;
import org.tigris.gef.base.Globals;
@@ -60,18 +60,11 @@
MouseListener,
MouseMotionListener {
- ////////////////////////////////////////////////////////////////
- // instance variables
-
- // /** The main label on this icon. */
- //FigText _name;
private FigRect cover;
private FigLine dividerline;
private static Handle curHandle = new Handle(-1);
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* The constructor.
@@ -146,16 +139,13 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/*
* @see org.tigris.gef.ui.PopupGenerator#getPopUpActions(java.awt.event.MouseEvent)
*/
public Vector getPopUpActions(MouseEvent me) {
Vector popUpActions = super.getPopUpActions(me);
popUpActions.remove(
- ProjectBrowser.getInstance().getRemoveFromDiagramAction());
+ ProjectActions.getInstance().getRemoveFromDiagramAction());
popUpActions.add(new JSeparator());
popUpActions.addElement(
new ActionAddConcurrentRegion());
@@ -566,4 +556,4 @@
* The UID.
*/
private static final long serialVersionUID = -7228935179004210975L;
-} /* end class FigConcurrentRegion */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/FigState.java 2007-07-18 22:27:26-0700
@@ -31,8 +31,8 @@
import org.argouml.model.AssociationChangeEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.FigRRect;
import org.tigris.gef.presentation.FigText;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2007-07-18 22:27:26-0700
@@ -31,7 +31,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
@@ -109,9 +108,6 @@
private Action actionTransition;
private Action actionJunctionPseudoState;
- ////////////////////////////////////////////////////////////////
- // contructors
-
/**
* This constructor is used to build a dummy statechart diagram so
* that a project will load properly.
@@ -182,7 +178,9 @@
}
Object namespace = Model.getFacade().getNamespace(machine);
- if (namespace != null) return namespace;
+ if (namespace != null) {
+ return namespace;
+ }
Object context = Model.getFacade().getContext(machine);
if (Model.getFacade().isAClassifier(context)) {
@@ -192,8 +190,7 @@
Model.getFacade().getOwner(context));
}
if (namespace == null) {
- namespace =
- ProjectManager.getManager().getCurrentProject().getRoot();
+ namespace = getProject().getRoot();
}
if (namespace == null || !Model.getFacade().isANamespace(namespace)) {
throw new IllegalStateException(
@@ -304,7 +301,7 @@
&& "remove".equals(evt.getPropertyName())) {
Model.getPump().removeModelEventListener(this,
theStateMachine, new String[] {"remove", "namespace"});
- ProjectManager.getManager().getCurrentProject().moveToTrash(this);
+ getProject().moveToTrash(this);
}
if (evt.getSource() == theStateMachine
&& "namespace".equals(evt.getPropertyName())) {
@@ -396,20 +393,6 @@
return actions;
}
- /**
- * Creates a name for the diagram.
- *
- * @return the new diagram name
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -706,7 +689,7 @@
*/
@Override
public Object getDependentElement() {
- return getStateMachine(); /* The StateMachine. */
+ return getStateMachine();
}
/*
@@ -732,4 +715,4 @@
// Do nothing.
}
-} /* end class UMLStateDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/ClassDiagramRenderer.java 2007-07-18 22:27:26-0700
@@ -265,36 +265,10 @@
"Don't know how to create FigEdge for model type "
+ edge.getClass().getName());
}
+
+ setPorts(lay, newEdge);
- if (newEdge.getSourcePortFig() == null) {
- Object source;
- if (edge instanceof CommentEdge) {
- source = ((CommentEdge) edge).getSource();
- } else {
- source = Model.getUmlHelper().getSource(edge);
- }
- FigNode sourceNode = getNodePresentationFor(lay, source);
- assert (sourceNode != null) : "No FigNode found for " + source;
- setSourcePort(newEdge, sourceNode);
- }
-
- if (newEdge.getDestPortFig() == null) {
- Object dest;
- if (edge instanceof CommentEdge) {
- dest = ((CommentEdge) edge).getDestination();
- } else {
- dest = Model.getUmlHelper().getDestination(edge);
- }
- LOG.info("The dest model element is " + dest);
- setDestPort(newEdge, getNodePresentationFor(lay, dest));
- }
-
- if (newEdge.getSourcePortFig() == null
- || newEdge.getDestPortFig() == null) {
- throw new IllegalStateException("Edge of type "
- + newEdge.getClass().getName()
- + " created with no source or destination port");
- }
+ assert newEdge != null : "There has been no FigEdge created";
newEdge.setDiElement(
GraphChangeAdapter.getInstance().createElement(gm, edge));
@@ -313,46 +287,4 @@
return newEdge;
}
- private void setSourcePort(FigEdge edge, FigNode source) {
- edge.setSourcePortFig(source);
- edge.setSourceFigNode(source);
- }
-
- private void setDestPort(FigEdge edge, FigNode dest) {
- edge.setDestPortFig(dest);
- edge.setDestFigNode(dest);
- }
-
- /**
- * Get the FigNode from the given layer that represents the given
- * model element.
- * The FigNode portion of an association class is returned in preference
- * to the FigEdge portion.
- * If no FigNode is found then a FIgEdge is searched for and the FigNode
- * that acts as its edge port is returned.
- * @param lay the layer containing the Fig
- * @param modelElement the model element to find presentation for
- * @return the FigNode presentation of the model element
- */
- private FigNode getNodePresentationFor(Layer lay, Object modelElement) {
- assert modelElement != null : "A modelElement must be supplied";
- for (Iterator it = lay.getContentsNoEdges().iterator();
- it.hasNext(); ) {
- Object fig = it.next();
- if (fig instanceof FigNode
- && ((FigNode) fig).getOwner().equals(modelElement)) {
- return ((FigNode) fig);
- }
- }
- for (Iterator it = lay.getContentsEdgesOnly().iterator();
- it.hasNext(); ) {
- Object fig = it.next();
- if (fig instanceof FigEdgeModelElement
- && modelElement.equals(((FigEdgeModelElement) fig)
- .getOwner())) {
- return ((FigEdgeModelElement) fig).getEdgePort();
- }
- }
- return null;
- }
} /* end class ClassDiagramRenderer */
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigAttribute.java 2007-07-18 22:27:26-0700
@@ -24,7 +24,7 @@
package org.argouml.uml.diagram.static_structure.ui;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.tigris.gef.presentation.Fig;
/**
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java 2007-07-18 22:27:26-0700
@@ -43,7 +43,7 @@
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.ui.ArgoJMenu;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.argouml.uml.diagram.ui.FigAttributesCompartment;
import org.argouml.uml.ui.foundation.core.ActionAddAttribute;
@@ -204,7 +204,7 @@
* Returns the status of the attribute field.
* @return true if the attributes are visible, false otherwise
*
- * @see org.argouml.uml.diagram.ui.AttributesCompartmentContainer#isAttributesVisible()
+ * @see org.argouml.uml.diagram.AttributesCompartmentContainer#isAttributesVisible()
*/
public boolean isAttributesVisible() {
return getAttributesFig().isVisible();
@@ -213,7 +213,7 @@
/**
* @param isVisible true if the attribute compartment is visible
*
- * @see org.argouml.uml.diagram.ui.AttributesCompartmentContainer#setAttributesVisible(boolean)
+ * @see org.argouml.uml.diagram.AttributesCompartmentContainer#setAttributesVisible(boolean)
*/
public void setAttributesVisible(boolean isVisible) {
Rectangle rect = getBounds();
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2007-07-18 22:27:26-0700
@@ -40,6 +40,7 @@
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.ui.ArgoJMenu;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.argouml.uml.diagram.ui.ActionAddNote;
import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
import org.argouml.uml.diagram.ui.ActionEdgesDisplay;
@@ -47,7 +48,6 @@
import org.argouml.uml.diagram.ui.FigCompartmentBox;
import org.argouml.uml.diagram.ui.FigEmptyRect;
import org.argouml.uml.diagram.ui.FigOperationsCompartment;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
import org.argouml.uml.ui.foundation.core.ActionAddOperation;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumerationLiteral.java 2007-07-18 22:27:26-0700
@@ -24,7 +24,7 @@
package org.argouml.uml.diagram.static_structure.ui;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java 2007-07-18 22:27:26-0700
@@ -28,7 +28,7 @@
import java.beans.PropertyChangeEvent;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.tigris.gef.base.Selection;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigOperation.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,7 @@
import java.beans.PropertyChangeEvent;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-07-18 22:27:26-0700
@@ -50,10 +50,10 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Geometry;
import org.tigris.gef.base.Globals;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigClass.java 2007-07-18 22:27:26-0700
@@ -31,8 +31,8 @@
import org.argouml.i18n.Translator;
import org.argouml.ui.StylePanelFigNodeModelElement;
-import org.argouml.uml.diagram.ui.AttributesCompartmentContainer;
-import org.argouml.uml.diagram.ui.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
/**
* Stylepanel which adds an attributes and operations checkbox and depends on
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/StylePanelFigPackage.java 2007-07-18 22:27:26-0700
@@ -29,8 +29,8 @@
import javax.swing.JCheckBox;
import org.argouml.ui.StylePanelFigNodeModelElement;
-import org.argouml.uml.diagram.ui.StereotypeContainer;
-import org.argouml.uml.diagram.ui.VisibilityContainer;
+import org.argouml.uml.diagram.StereotypeContainer;
+import org.argouml.uml.diagram.VisibilityContainer;
/**
* Stylepanel which adds a checkbox to show or hide the stereotype.<p>
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java 2007-07-18 22:27:26-0700
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.ui.ModeCreateDependency;
@@ -266,19 +265,6 @@
return actions;
}
- /**
- * Create a new diagram name.
- * @return String
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name)) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java 2007-07-18 22:27:26-0700
@@ -59,7 +59,7 @@
////////////////////////////////////////////////////////////////
// static variables
- /** logger */
+ /** logger */
private static final Logger LOG =
Logger.getLogger(ActionAddConcurrentRegion.class);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java 2007-07-18 22:27:26-0700
@@ -62,9 +62,11 @@
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
// we have an edge (the UML modelelement!)
- if (edge == null) return;
+ if (edge == null) {
+ return;
+ }
// let's test which situation we have. 3 Possibilities:
- // 1. The nodes are allready on the diagram, we can use
+ // 1. The nodes are already on the diagram, we can use
// canAddEdge for this.
// 2. One of the nodes is already on the diagram. The other
// has to be added.
@@ -90,7 +92,9 @@
Object target = TargetManager.getInstance().getModelTarget();
ArgoDiagram dia = ProjectManager.getManager().getCurrentProject().
getActiveDiagram();
- if (dia == null) return false;
+ if (dia == null) {
+ return false;
+ }
MutableGraphModel gm = (MutableGraphModel) dia.getGraphModel();
return gm.canAddEdge(target);
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java 2007-07-18 22:27:26-0700
@@ -64,7 +64,9 @@
Object target = TargetManager.getInstance().getTarget();
ArgoDiagram dia = ProjectManager.getManager().
getCurrentProject().getActiveDiagram();
- if (dia == null) return false;
+ if (dia == null) {
+ return false;
+ }
MutableGraphModel gm = (MutableGraphModel) dia.getGraphModel();
return gm.canAddNode(target);
}
@@ -77,4 +79,4 @@
AddExistingNodeCommand cmd = new AddExistingNodeCommand(object);
cmd.execute();
}
-} /* end class ActionAddExistingNode */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNodes.java 2007-07-18 22:27:26-0700
@@ -63,14 +63,15 @@
/*
* @see javax.swing.Action#isEnabled()
*/
+ @Override
public boolean isEnabled() {
- ArgoDiagram dia = ProjectManager.getManager().
- getCurrentProject().getActiveDiagram();
- if (dia == null) return false;
+ ArgoDiagram dia = ProjectManager.getManager().getCurrentProject()
+ .getActiveDiagram();
+ if (dia == null) {
+ return false;
+ }
MutableGraphModel gm = (MutableGraphModel) dia.getGraphModel();
- Iterator iter = objects.iterator();
- while (iter.hasNext()) {
- Object o = iter.next();
+ for (Object o : objects) {
if (gm.canAddNode(o)) {
return true;
}
@@ -81,19 +82,18 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
if (!objects.isEmpty()) {
// Use DiagramInterface to add classes to diagram
- ArgoDiagram dia = ProjectManager.getManager().
- getCurrentProject().getActiveDiagram();
+ ArgoDiagram dia = ProjectManager.getManager().getCurrentProject()
+ .getActiveDiagram();
if (dia != null) {
DiagramInterface diagram =
new DiagramInterface(Globals.curEditor());
diagram.setCurrentDiagram(dia);
- Iterator iter = objects.iterator();
- while (iter.hasNext()) {
- Object o = iter.next();
+ for (Object o : objects) {
if (Model.getFacade().isAClass(o)) {
diagram.addClass(o, false);
} else if (Model.getFacade().isAInterface(o)) {
@@ -103,4 +103,4 @@
}
}
}
-} /* end class ActionAddExistingNodes */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionAddNote.java 2007-07-18 22:27:26-0700
@@ -40,7 +40,6 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.tigris.gef.base.Diagram;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigEdge;
@@ -157,7 +156,7 @@
* @return The position where it should be placed.
*/
private Point calculateLocation(
- Diagram diagram, Object firstTarget, Fig noteFig) {
+ ArgoDiagram diagram, Object firstTarget, Fig noteFig) {
Point point = new Point(DEFAULT_POS, DEFAULT_POS);
if (firstTarget == null) {
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java 2007-07-18 22:27:26-0700
@@ -31,6 +31,9 @@
import java.util.Vector;
import org.argouml.i18n.Translator;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
import org.argouml.uml.diagram.use_case.ui.FigUseCase;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java 2007-07-18 22:27:26-0700
@@ -51,9 +51,6 @@
*/
public class ActionEdgesDisplay extends UndoableAction {
- ////////////////////////////////////////////////////////////////
- // static variables
-
// compartments
private static UndoableAction showEdges = new ActionEdgesDisplay(true,
Translator.localize("menu.popup.add.all-relations"));
@@ -62,9 +59,6 @@
private boolean show;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*
@@ -78,16 +72,13 @@
show = showEdge;
}
-
- // //////////////////////////////////////////////////////////////
- // main methods
-
/*
* TODO: Support commentEdges.
* TODO: Support associations to self.
*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
ArgoDiagram d = ProjectManager.getManager()
@@ -138,6 +129,7 @@
* @return true if the action is enabled
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return true;
}
@@ -158,7 +150,7 @@
return hideEdges;
}
-} /* end class ActionEdgesDisplay */
+}
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionProperties.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ActionProperties.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java 2007-07-18 22:27:26-0700
@@ -48,9 +48,6 @@
*/
public class AddExistingNodeCommand implements Command, GraphFactory {
- ////////////////////////////////////////////////////////////////
- // instance variables
-
/**
* The UML object to be added to the diagram.
*/
@@ -92,9 +89,6 @@
count = cnt;
}
- ////////////////////////////////////////////////////////////////
- // constructor
-
/*
* @see org.tigris.gef.base.Command#execute()
*/
@@ -192,4 +186,4 @@
return object;
}
-} /* end class ActionAddExistingNode */
+}
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/AttributesCompartmentContainer.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,7 @@
import java.awt.Color;
import org.apache.log4j.Logger;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigText;
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/ExtensionsCompartmentContainer.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociation.java 2007-07-18 22:27:26-0700
@@ -45,8 +45,8 @@
import org.argouml.model.AddAssociationEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.notation.providers.uml.NotationUtilityUml;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.targetmanager.TargetManager;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAssociationClass.java 2007-07-18 22:27:26-0700
@@ -29,6 +29,9 @@
import java.util.Iterator;
import java.util.List;
+import org.argouml.uml.diagram.AttributesCompartmentContainer;
+import org.argouml.uml.diagram.OperationsCompartmentContainer;
+import org.argouml.uml.diagram.PathContainer;
import org.tigris.gef.base.Layer;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigNode;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigAttributesCompartment.java 2007-07-18 22:27:26-0700
@@ -29,8 +29,8 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.static_structure.ui.FigAttribute;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigCompartment.java 2007-07-18 22:27:26-0700
@@ -35,7 +35,7 @@
/**
* @author Bob Tarling
*/
-public abstract class FigCompartment extends FigGroup {
+public abstract class FigCompartment extends ArgoFigGroup {
private Fig bigPort;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2007-07-18 22:27:26-0700
@@ -73,15 +73,17 @@
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
-import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.ProjectActions;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.IItemUID;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.ui.ActionDeleteModelElements;
+import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.LayerPerspective;
@@ -108,7 +110,9 @@
KeyListener,
PropertyChangeListener,
ArgoNotationEventListener,
- Highlightable {
+ Highlightable,
+ IItemUID,
+ ArgoFig {
private static final Logger LOG =
Logger.getLogger(FigEdgeModelElement.class);
@@ -250,6 +254,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getTipString(java.awt.event.MouseEvent)
*/
+ @Override
public String getTipString(MouseEvent me) {
ToDoItem item = hitClarifier(me.getX(), me.getY());
String tip = "";
@@ -286,7 +291,7 @@
popupAddOffset = 1;
if (removeFromDiagram) {
popUpActions.addElement(
- ProjectBrowser.getInstance().getRemoveFromDiagramAction());
+ ProjectActions.getInstance().getRemoveFromDiagramAction());
popupAddOffset++;
}
popUpActions.addElement(new ActionDeleteModelElements());
@@ -960,7 +965,7 @@
public void deleteFromModel() {
Object own = getOwner();
if (own != null) {
- ProjectManager.getManager().getCurrentProject().moveToTrash(own);
+ getProject().moveToTrash(own);
}
/* TODO: MVW: Why is this not done in GEF? */
@@ -1072,10 +1077,7 @@
// GEF does not take into account the multiple diagrams we have
// therefore we loop through our diagrams and delete each and every
// occurence on our own
- it = ProjectManager.getManager().getCurrentProject().getDiagrams()
- .iterator();
- while (it.hasNext()) {
- ArgoDiagram diagram = (ArgoDiagram) it.next();
+ for (ArgoDiagram diagram : getProject().getDiagramList()) {
diagram.damage();
}
@@ -1368,15 +1370,37 @@
listeners.clear();
}
+
/**
- * Get the Project that the Fig belongs to
- * @return the project
+ * This optional method is not implemented. It will throw an
+ * {@link UnsupportedOperationException} if used. Figs are
+ * added to a GraphModel which is, in turn, owned by a project.
*/
- protected Project getProject() {
- LayerPerspective layer = (LayerPerspective) getLayer();
- UMLMutableGraphSupport gm =
- (UMLMutableGraphSupport) layer.getGraphModel();
- return gm.getProject();
+ public void setProject(Project project) {
+ throw new UnsupportedOperationException();
}
-
-} /* end class FigEdgeModelElement */
+
+ public Project getProject() {
+ LayerPerspective layer = (LayerPerspective) getLayer();
+ if (layer == null) {
+ /* TODO: Without this, we fail to draw e.g. a Class.
+ * But is this a good solution?
+ * Why is the Layer not set in the constructor? */
+ Editor editor = Globals.curEditor();
+ if (editor == null) {
+ // TODO: The above doesn't work reliably in a constructor. We
+ // need a better way of getting default fig settings for the owning
+ // project rather than using the project manager singleton. - tfm
+ return ProjectManager.getManager().getCurrentProject();
+ }
+ Layer lay = editor.getLayerManager().getActiveLayer();
+ if (lay instanceof LayerPerspective) {
+ layer = (LayerPerspective) lay;
+ }
+ }
+ UMLMutableGraphSupport gm =
+ (UMLMutableGraphSupport) layer.getGraphModel();
+ return gm.getProject();
+ }
+
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEditableCompartment.java 2007-07-18 22:27:26-0700
@@ -33,8 +33,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.InvalidElementException;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigLine;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java 2007-07-18 22:27:26-0700
@@ -27,8 +27,8 @@
import java.util.Collection;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.static_structure.ui.FigEnumerationLiteral;
import org.tigris.gef.presentation.Fig;
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigMultiLineText.java 2007-07-18 22:27:26-0700
@@ -26,6 +26,7 @@
import java.awt.Color;
+import org.argouml.gefext.ArgoFigText;
import org.tigris.gef.presentation.FigText;
/**
@@ -41,7 +42,7 @@
*
* @author Bob Tarling
*/
-public class FigMultiLineText extends FigText {
+public class FigMultiLineText extends ArgoFigText {
/*
* @see org.tigris.gef.presentation.FigText#FigText(
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-07-18 22:27:26-0700
@@ -75,13 +75,15 @@
import org.argouml.model.DiElement;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.Clarifier;
-import org.argouml.ui.ProjectBrowser;
+import org.argouml.ui.ProjectActions;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.IItemUID;
+import org.argouml.uml.diagram.PathContainer;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.ui.ActionDeleteModelElements;
import org.tigris.gef.base.Diagram;
@@ -115,7 +117,10 @@
PropertyChangeListener,
PathContainer,
ArgoNotationEventListener,
- Highlightable {
+ Highlightable,
+ IItemUID,
+ Clarifiable,
+ ArgoFig {
/**
* Logger.
@@ -134,7 +139,7 @@
private static final Font BOLD_ITALIC_LABEL_FONT;
private NotationProvider notationProviderName;
- private HashMap npArguments = new HashMap();
+ private HashMap<String, Object> npArguments = new HashMap<String, Object>();
/**
* True if an instance is allowed to be
@@ -324,7 +329,9 @@
*/
private boolean editable = true;
- private Collection listeners = new ArrayList();
+ // TODO: A more strongly typed data structure could be used here.
+ private Collection<Object[]> listeners = new ArrayList<Object[]>();
+
/**
* The main constructor.
*
@@ -347,8 +354,9 @@
readyToEdit = false;
ArgoEventPump.addListener(ArgoEventTypes.ANY_NOTATION_EVENT, this);
- Project p = ProjectManager.getManager().getCurrentProject();
- ProjectSettings ps = p.getProjectSettings();
+
+ Project project = getProject();
+ ProjectSettings ps = project.getProjectSettings();
showBoldName = ps.getShowBoldNamesValue();
if ((nameFig.getFont().getStyle() & Font.ITALIC) != 0) {
@@ -519,7 +527,7 @@
popupAddOffset = 1;
if (removeFromDiagram) {
popUpActions.addElement(
- ProjectBrowser.getInstance().getRemoveFromDiagramAction());
+ ProjectActions.getInstance().getRemoveFromDiagramAction());
popupAddOffset++;
}
popUpActions.addElement(new ActionDeleteModelElements());
@@ -999,13 +1007,13 @@
}
/**
- * Utility function to localize the given string with help text,
- * and show it in the status bar of the ArgoUML window.
- * This function is used in favour of the inline call
- * to enable later improvements; e.g. it would be possible to
- * show a help-balloon. TODO: Work this out.
- * One matter to possibly improve: show multiple lines.
- *
+ * Utility function to localize the given string with help text, and show it
+ * in the status bar of the ArgoUML window. This function is used in favour
+ * of the inline call to enable later improvements; e.g. it would be
+ * possible to show a help-balloon.
+ * <p>
+ * TODO: Work this out. One matter to possibly improve: show multiple lines.
+ *
* @param s the given string to be localized and shown
*/
protected void showHelp(String s) {
@@ -1235,10 +1243,11 @@
/*
* @see org.tigris.gef.presentation.Fig#deleteFromModel()
*/
+ @Override
public void deleteFromModel() {
Object own = getOwner();
if (own != null) {
- ProjectManager.getManager().getCurrentProject().moveToTrash(own);
+ getProject().moveToTrash(own);
}
Iterator it = getFigs().iterator();
while (it.hasNext()) {
@@ -1255,6 +1264,7 @@
* by use of the empty constructor.
* The assigned model element (owner) must not change during the lifetime
* of the Fig.
+ * <p>
* TODO: It is planned to refactor so that there is only one Fig
* constructor. When this is achieved this method can refactored out.
*
@@ -1339,7 +1349,7 @@
if (notationProviderName != null) {
nameFig.setText(notationProviderName.toString(
getOwner(), npArguments));
- Project p = ProjectManager.getManager().getCurrentProject();
+ Project p = getProject();
ProjectSettings ps = p.getProjectSettings();
showBoldName = ps.getShowBoldNamesValue();
if ((nameFig.getFont().getStyle() & Font.ITALIC) != 0) {
@@ -1689,6 +1699,7 @@
/**
* Get the Fig containing the stereotype.
+ * <p>
* TODO: Should return FigStereotypesCompartment or at the very least
* a FigGroup
*
@@ -1938,16 +1949,33 @@
npArguments.put(key, value);
}
}
+
+ /**
+ * This optional method is not implemented. It will throw an
+ * {@link UnsupportedOperationException} if used. Figs are
+ * added to a GraphModel which is, in turn, owned by a project.
+ */
+ public void setProject(Project project) {
+ throw new UnsupportedOperationException();
+ }
- protected Project getProject() {
+ public Project getProject() {
LayerPerspective layer = (LayerPerspective) getLayer();
if (layer == null) {
/* TODO: Without this, we fail to draw e.g. a Class.
* But is this a good solution?
* Why is the Layer not set in the constructor? */
Editor editor = Globals.curEditor();
+ if (editor == null) {
+ // TODO: The above doesn't work reliably in a constructor. We
+ // need a better way of getting default fig settings for the owning
+ // project rather than using the project manager singleton. - tfm
+ return ProjectManager.getManager().getCurrentProject();
+ }
Layer lay = editor.getLayerManager().getActiveLayer();
- if (lay instanceof LayerPerspective) layer = (LayerPerspective) lay;
+ if (lay instanceof LayerPerspective) {
+ layer = (LayerPerspective) lay;
+ }
}
UMLMutableGraphSupport gm =
(UMLMutableGraphSupport) layer.getGraphModel();
@@ -2000,7 +2028,11 @@
*/
public void setStereotypeView(int s) {
this.stereotypeView = s;
- renderingChanged();
+ try {
+ renderingChanged();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
/**
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigOperationsCompartment.java 2007-07-18 22:27:26-0700
@@ -30,8 +30,8 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.static_structure.ui.FigOperation;
import org.tigris.gef.presentation.Fig;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigSingleLineText.java 2007-07-18 22:27:26-0700
@@ -31,9 +31,10 @@
import java.beans.PropertyChangeEvent;
import java.util.Arrays;
+import org.argouml.gefext.ArgoFigText;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
import org.tigris.gef.presentation.FigText;
/**
@@ -48,7 +49,7 @@
*
* @author Bob Tarling
*/
-public class FigSingleLineText extends FigText {
+public class FigSingleLineText extends ArgoFigText {
/**
* The UID.
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java 2007-07-18 22:27:26-0700
@@ -30,7 +30,6 @@
import java.util.Iterator;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
/**
* Custom class to group FigTexts in such a way that they don't
@@ -39,7 +38,7 @@
*
* @author [email protected]
*/
-public class FigTextGroup extends FigGroup implements MouseListener {
+public class FigTextGroup extends ArgoFigGroup implements MouseListener {
private boolean supressCalcBounds = false;
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/OperationsCompartmentContainer.java?view=auto&rev=13095
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/PathContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/PathContainer.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionMoveClarifiers.java 2007-07-18 22:27:26-0700
@@ -37,9 +37,6 @@
*/
public class SelectionMoveClarifiers extends SelectionMove {
- ////////////////////////////////////////////////////////////////
- // constructors
-
/** Construct a new SelectionMoveClarifiers for the given Fig
*
* @param f the given Fig
@@ -55,9 +52,9 @@
* @see org.tigris.gef.base.Selection#paint(java.awt.Graphics)
*/
public void paint(Graphics g) {
- ((FigNodeModelElement) getContent()).paintClarifiers(g);
+ ((Clarifiable) getContent()).paintClarifiers(g);
super.paint(g);
}
-} /* end class SelectionMoveClarifiers */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/SelectionNodeClarifiers2.java 2007-07-18 22:27:26-0700
@@ -92,8 +92,9 @@
/*
* @see org.tigris.gef.base.SelectionButtons#paint(java.awt.Graphics)
*/
+ @Override
public void paint(Graphics g) {
- ((FigNodeModelElement) getContent()).paintClarifiers(g);
+ ((Clarifiable) getContent()).paintClarifiers(g);
super.paint(g);
}
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/StereotypeContainer.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/TabDiagram.java 2007-07-18 22:27:26-0700
@@ -48,7 +48,6 @@
import org.argouml.configuration.Configuration;
import org.argouml.kernel.ProjectManager;
import org.argouml.ui.AbstractArgoJPanel;
-import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetEvent;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
@@ -88,9 +87,6 @@
*/
private static final Logger LOG = Logger.getLogger(TabDiagram.class);
- ////////////////////////////////////////////////////////////////
- // instance variables
-
/**
* The diagram object.
*/
@@ -112,9 +108,6 @@
*/
private JToolBar toolBar;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Default constructor.
*/
@@ -134,7 +127,8 @@
graph.setDrawingSize((612 - 30) * 2, (792 - 55 - 20) * 2);
// TODO: should update to size of diagram contents
- Globals.setStatusBar(ProjectBrowser.getInstance());
+ Globals.setStatusBar(new StatusBarAdapter());
+
JPanel p = new JPanel();
p.setLayout(new BorderLayout());
p.setBorder(new EtchedBorder(EtchedBorder.LOWERED));
@@ -152,6 +146,7 @@
* Toolbar.
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
// next statement gives us a clone JGraph but not a cloned Toolbar
TabDiagram newPanel = new TabDiagram();
@@ -227,8 +222,6 @@
return newTarget instanceof ArgoDiagram;
}
- ////////////////////////////////////////////////////////////////
- // accessors
/**
* Getter for the {@link JGraph}.
@@ -405,7 +398,7 @@
public void propertyChange(PropertyChangeEvent arg0) {
if ("remove".equals(arg0.getPropertyName())) {
- Diagram diagram = ProjectManager.getManager()
+ ArgoDiagram diagram = ProjectManager.getManager()
.getCurrentProject().getActiveDiagram();
TargetManager.getInstance().setTarget(diagram);
}
@@ -443,6 +436,7 @@
/*
* @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseEntered(MouseEvent me) {
if (getActiveTextEditor() != null) {
getActiveTextEditor().requestFocus();
@@ -457,6 +451,7 @@
/*
* @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseMoved(MouseEvent me) {
//- RedrawManager.lock();
translateMouseEvent(me);
@@ -489,6 +484,7 @@
*
* @see org.tigris.gef.base.Editor#paint(java.awt.Graphics)
*/
+ @Override
public synchronized void paint(Graphics g) {
if (!shouldPaint()) {
return;
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/UMLDiagram.java 2007-07-18 22:27:26-0700
@@ -42,10 +42,12 @@
import org.argouml.gefext.ArgoModeCreateFigText;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
+import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.CmdCreateNode;
import org.argouml.uml.UUIDHelper;
-import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagramImpl;
import org.argouml.uml.diagram.Relocatable;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.util.ToolBarUtility;
@@ -86,7 +88,7 @@
* panel as the "home model". <p>
*/
public abstract class UMLDiagram
- extends ArgoDiagram
+ extends ArgoDiagramImpl
implements Relocatable {
/**
@@ -225,6 +227,7 @@
public JToolBar getJToolBar() {
if (toolBar == null) {
initToolBar();
+ toolBar.setName("misc.toolbar.diagram");
}
return toolBar;
}
@@ -544,7 +547,23 @@
}
/**
+ * Create a new diagram name.
+ * @return String
+ */
+ protected String getNewDiagramName() {
+ String name = getLabelName() + " " + getNextDiagramSerial();
+ // Project project = getProject();
+ // TODO: If this gets called from the constructor the project
+ // won't be set yet. Figure out another way to handle it
+ Project project = ProjectManager.getManager().getCurrentProject();
+ if (!project.isValidDiagramName(name)) {
+ name = getNewDiagramName();
+ }
+ return name;
+ }
+
+ /**
* The UID.
*/
static final long serialVersionUID = -401219134410459387L;
-} /* end class UMLDiagram */
+}
Removed: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/ui/VisibilityContainer.java?view=auto&rev=13095
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigInclude.java 2007-07-18 22:27:26-0700
@@ -155,6 +155,5 @@
endArrow.setLineColor(getLineColor());
super.paint(g);
}
-
} /* end class FigInclude */
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java 2007-07-18 22:27:26-0700
@@ -44,15 +44,15 @@
import org.argouml.model.AssociationChangeEvent;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
import org.argouml.notation.NotationProviderFactory2;
-import org.argouml.notation.providers.NotationProvider;
import org.argouml.ui.ArgoJMenu;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
import org.argouml.uml.diagram.ui.ActionAddNote;
import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
import org.argouml.uml.diagram.ui.CompartmentFigText;
-import org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
@@ -432,7 +432,7 @@
* @return <code>true</code> if the extensionpoints are visible,
* <code>false</code> otherwise.
*
- * @see org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer#isExtensionPointVisible()
+ * @see org.argouml.uml.diagram.ExtensionsCompartmentContainer#isExtensionPointVisible()
*/
public boolean isExtensionPointVisible() {
return epVec.isVisible();
@@ -452,7 +452,7 @@
* @param isVisible <code>true</code> if the compartment should be shown,
* <code>false</code> otherwise.
*
- * @see org.argouml.uml.diagram.ui.ExtensionsCompartmentContainer#setExtensionPointVisible(boolean)
+ * @see org.argouml.uml.diagram.ExtensionsCompartmentContainer#setExtensionPointVisible(boolean)
*/
public void setExtensionPointVisible(boolean isVisible) {
if (epVec.isVisible() && (!isVisible)) {
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java 2007-07-18 22:27:26-0700
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
@@ -105,8 +104,6 @@
private Action actionExtensionPoint;
- // constructors
-
/**
* Construct a new use case diagram with no defined namespace.<p>
*
@@ -123,7 +120,7 @@
try {
setName(getNewDiagramName());
} catch (PropertyVetoException pve) { }
- // TODO: All super constrcutors should take a GraphModel
+ // TODO: All super constrctors should take a GraphModel
setGraphModel(createGraphModel());
}
@@ -254,18 +251,6 @@
return actions;
}
- /**
- * @return a new unique name for the diagram
- */
- protected String getNewDiagramName() {
- String name = getLabelName() + " " + getNextDiagramSerial();
- if (!(ProjectManager.getManager().getCurrentProject()
- .isValidDiagramName(name))) {
- name = getNewDiagramName();
- }
- return name;
- }
-
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getLabelName()
*/
@@ -459,4 +444,5 @@
FigNode oldEncloser, FigNode newEncloser) {
// Do nothing.
}
-} /* end class UMLUseCaseDiagram */
+
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/diagram/use_case/ui/UseCaseDiagramRenderer.java 2007-07-18 22:27:26-0700
@@ -69,6 +69,9 @@
* @author abonner
*/
public class UseCaseDiagramRenderer extends UmlDiagramRenderer {
+
+ static final long serialVersionUID = 2217410137377934879L;
+
/**
* Logger.
*/
@@ -251,30 +254,7 @@
"Don't know how to create FigEdge for model type "
+ edge.getClass().getName());
} else {
- if (newEdge.getSourcePortFig() == null) {
- Object source;
- if (edge instanceof CommentEdge) {
- source = ((CommentEdge) edge).getSource();
- } else {
- source = Model.getUmlHelper().getSource(edge);
- }
- setSourcePort(newEdge, (FigNode) lay.presentationFor(source));
- }
- if (newEdge.getDestPortFig() == null) {
- Object dest;
- if (edge instanceof CommentEdge) {
- dest = ((CommentEdge) edge).getDestination();
- } else {
- dest = Model.getUmlHelper().getDestination(edge);
- }
- setDestPort(newEdge, (FigNode) lay.presentationFor(dest));
- }
- if (newEdge.getSourcePortFig() == null
- || newEdge.getDestPortFig() == null) {
- throw new IllegalStateException("Edge of type "
- + newEdge.getClass().getName()
- + " created with no source or destination port");
- }
+ setPorts(lay, newEdge);
}
lay.add(newEdge);
@@ -284,16 +264,4 @@
return newEdge;
}
- private void setSourcePort(FigEdge edge, FigNode source) {
- edge.setSourcePortFig(source);
- edge.setSourceFigNode(source);
- }
-
- private void setDestPort(FigEdge edge, FigNode dest) {
- edge.setDestPortFig(dest);
- edge.setDestFigNode(dest);
- }
-
- static final long serialVersionUID = 2217410137377934879L;
-
} /* end class UseCaseDiagramRenderer */
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/generator/GenerationPreferences.java 2007-07-18 22:27:26-0700
@@ -34,6 +34,9 @@
* TODO: The header comment is curently not used - this function
* is not completely implemented yet. How do we store this in the project?
* Where should the user enter his header comment?
+ *
+ * TODO: This should be included in
+ * {@link org.argouml.kernel.ProjectSettings}. - tfm 20070706
*/
public class GenerationPreferences implements java.io.Serializable {
////////////////////////////////////////////////////////////////
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/profile/ProfileConfiguration.java 2007-07-18 22:27:26-0700
@@ -31,6 +31,7 @@
import org.argouml.kernel.AbstractProjectMember;
import org.argouml.kernel.Project;
+import org.argouml.ui.explorer.ExplorerEventAdaptor;
/**
* This class captures represents the unique access point for the
* configurability allowed by the use of profiles.
@@ -121,6 +122,8 @@
if (fns != null) {
figNodeStrategies.add(fns);
}
+
+ ExplorerEventAdaptor.getInstance().structureChanged();
}
}
@@ -131,6 +134,7 @@
*/
public void setDefaultProfile(Profile profile) {
this.defaultProfile = profile;
+ ExplorerEventAdaptor.getInstance().structureChanged();
}
/**
@@ -156,6 +160,7 @@
figNodeStrategies.remove(fns);
}
+ ExplorerEventAdaptor.getInstance().structureChanged();
}
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/DiagramInterface.java 2007-07-18 22:27:26-0700
@@ -25,6 +25,7 @@
package org.argouml.uml.reveng;
import java.beans.PropertyVetoException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
@@ -34,15 +35,14 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectMember;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ProjectMemberDiagram;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.FigClassifierBox;
import org.argouml.uml.diagram.static_structure.ui.FigInterface;
import org.argouml.uml.diagram.static_structure.ui.FigPackage;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.presentation.Fig;
@@ -77,7 +77,8 @@
* To know what diagrams we have to layout after the import,
* we store them in this Vector.
*/
- private Vector modifiedDiagrams = new Vector();
+ private List<ArgoDiagram> modifiedDiagrams =
+ new ArrayList<ArgoDiagram>();
/**
* The current GraphModel of the current classdiagram.
@@ -120,10 +121,22 @@
*
* @param diagram The diagram to mark as modified.
*/
- void markDiagramAsModified(Object diagram) {
- if (!modifiedDiagrams.contains(diagram)) {
- modifiedDiagrams.add(diagram);
- }
+ void markDiagramAsModified(ArgoDiagram diagram) {
+ if (!modifiedDiagrams.contains(diagram)) {
+ modifiedDiagrams.add(diagram);
+ }
+ }
+
+ /**
+ * Get the list of modified diagrams.
+ *
+ * @return The list of modified diagrams.
+ * @deprecated for 0.25.4 by tfmorris. Use
+ * {@link #getModifiedDiagramList()}.
+ */
+ @Deprecated
+ public Vector<ArgoDiagram> getModifiedDiagrams() {
+ return new Vector<ArgoDiagram>(modifiedDiagrams);
}
/**
@@ -131,15 +144,15 @@
*
* @return The list of modified diagrams.
*/
- public Vector getModifiedDiagrams() {
- return modifiedDiagrams;
+ public List<ArgoDiagram> getModifiedDiagramList() {
+ return modifiedDiagrams;
}
-
+
/**
* Reset the list of modified diagrams.
*/
void resetModifiedDiagrams() {
- modifiedDiagrams = new Vector();
+ modifiedDiagrams = new ArrayList<ArgoDiagram>();
}
/**
@@ -249,12 +262,12 @@
*/
public void addClassDiagram(Object ns, String name) {
Project p = ProjectManager.getManager().getCurrentProject();
+// Object root = p.getRoot();
+ Object root = Model.getModelManagementFactory().getRootModel();
- ArgoDiagram d =
- DiagramFactory.getInstance().createDiagram(
- UMLClassDiagram.class,
- ns == null ? p.getRoot() : ns,
- null);
+ ArgoDiagram d = DiagramFactory.getInstance().createDiagram(
+ DiagramFactory.DiagramType.Class,
+ ns == null ? root : ns, null);
try {
d.setName(getDiagramName(name));
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java 2007-07-18 22:27:26-0700
@@ -36,7 +36,6 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -180,15 +179,15 @@
portCnt =
SequenceDiagramLayer.getNodeIndex(
figMessage.getDestMessageNode().getFigMessagePort().getY());
- Enumeration enu = diagram.elements();
- while (enu.hasMoreElements()) {
- Object f = enu.nextElement();
+ Iterator<Fig> it = diagram.getFigIterator();
+ while (it.hasNext()) {
+ Fig f = it.next();
if (f instanceof FigClassifierRole) {
- int x = ((Fig) f).getX();
+ int x = f.getX();
if (maxXPos < x) {
maxXPos = x;
}
- if (Model.getFacade().getName(((Fig) f).getOwner())
+ if (Model.getFacade().getName(f.getOwner())
.startsWith("anon")) {
anonCnt++;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionActivityDiagram.java 2007-07-18 22:27:26-0700
@@ -28,9 +28,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to trigger creation of a new activity diagram.<p>
@@ -57,10 +56,11 @@
* @return the newly created and initialized diagram
*/
protected ArgoDiagram createDiagram() {
- Project p = ProjectManager.getManager().getCurrentProject();
Object target = TargetManager.getInstance().getModelTarget();
Object graph = null;
- Object namespace = p.getRoot(); // the root model
+// Project p = ProjectManager.getManager().getCurrentProject();
+// Object namespace = p.getRoot(); // the root model
+ Object namespace = Model.getModelManagementFactory().getRootModel();
if (Model.getActivityGraphsHelper().isAddingActivityGraphAllowed(
target)) {
/* The target is a valid context */
@@ -76,7 +76,7 @@
}
return DiagramFactory.getInstance().createDiagram(
- UMLActivityDiagram.class,
+ DiagramFactory.DiagramType.Activity,
Model.getFacade().getNamespace(graph),
graph);
}
@@ -86,4 +86,4 @@
*/
private static final long serialVersionUID = -28844322376391273L;
-} /* end class ActionActivityDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionAddTopLevelPackage.java 2007-07-18 22:27:26-0700
@@ -41,9 +41,6 @@
*/
public class ActionAddTopLevelPackage extends UndoableAction {
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*/
@@ -55,16 +52,13 @@
}
- ////////////////////////////////////////////////////////////////
- // main methods
-
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
Project p = ProjectManager.getManager().getCurrentProject();
- int numPacks = p.getUserDefinedModels().size();
+ int numPacks = p.getUserDefinedModelList().size();
String nameStr = "package_" + (numPacks + 1);
Object model = Model.getModelManagementFactory().createModel();
Model.getCoreHelper().setName(model, nameStr);
@@ -74,4 +68,4 @@
}
-} /* end class ActionAddTopLevelPackage */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionClassDiagram.java 2007-07-18 22:27:26-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -26,27 +26,20 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to trigger creation of new class diagram.
*/
public class ActionClassDiagram extends ActionAddDiagram {
- ////////////////////////////////////////////////////////////////
- // static variables
-
/**
* Logger.
*/
private static final Logger LOG =
Logger.getLogger(ActionClassDiagram.class);
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Constructor.
*/
@@ -60,7 +53,7 @@
public ArgoDiagram createDiagram(Object ns) {
if (Model.getFacade().isANamespace(ns)) {
return DiagramFactory.getInstance().createDiagram(
- UMLClassDiagram.class,
+ DiagramFactory.DiagramType.Class,
ns,
null);
}
@@ -87,4 +80,4 @@
* The UID.
*/
private static final long serialVersionUID = 2415943949021223859L;
-} /* end class ActionClassDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java 2007-07-18 22:27:26-0700
@@ -24,9 +24,8 @@
package org.argouml.uml.ui;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to trigger creation of new collaboration diagram.
@@ -45,7 +44,7 @@
*/
public ArgoDiagram createDiagram() {
return DiagramFactory.getInstance().createDiagram(
- UMLCollaborationDiagram.class,
+ DiagramFactory.DiagramType.Collaboration,
createCollaboration(),
null);
}
@@ -55,4 +54,4 @@
*/
private static final long serialVersionUID = -1089352213298998155L;
-} /* end class ActionCollaborationDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeleteModelElements.java 2007-07-18 22:27:26-0700
@@ -48,8 +48,8 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.CommentEdge;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.ui.ActionDeleteConcurrentRegion;
-import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
import org.tigris.gef.presentation.Fig;
@@ -284,9 +284,9 @@
return true;
}
Object target = TargetManager.getInstance().getTarget();
- if (target instanceof Diagram) { // we cannot delete the last diagram
+ if (target instanceof ArgoDiagram) { // we cannot delete the last diagram
return (ProjectManager.getManager().getCurrentProject()
- .getDiagrams().size() > 1);
+ .getDiagramList().size() > 1);
}
if (Model.getFacade().isAModel(target)
// we cannot delete the model itself
@@ -305,4 +305,4 @@
}
return target != null;
}
-} /* end class ActionRemoveFromModel */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionDeploymentDiagram.java 2007-07-18 22:27:26-0700
@@ -25,29 +25,22 @@
package org.argouml.uml.ui;
import org.apache.log4j.Logger;
-import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to trigger creation of a deployment diagram.
*/
public class ActionDeploymentDiagram extends ActionAddDiagram {
- ////////////////////////////////////////////////////////////////
- // static variables
/**
* Logger.
*/
private static final Logger LOG =
Logger.getLogger(ActionDeploymentDiagram.class);
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Constructor.
*/
@@ -55,17 +48,15 @@
super("action.deployment-diagram");
}
- ////////////////////////////////////////////////////////////////
- // main methods
-
/*
* @see org.argouml.uml.ui.ActionAddDiagram#createDiagram(Object)
*/
public ArgoDiagram createDiagram(Object notUsedHandle) {
// a deployment diagram shows something about the whole model
// according to the uml spec
- Project p = ProjectManager.getManager().getCurrentProject();
- Object handle = p.getRoot();
+ Object handle = Model.getModelManagementFactory().getRootModel();
+// Project p = ProjectManager.getManager().getCurrentProject();
+// Object handle = p.getRoot();
if (!Model.getFacade().isANamespace(handle)) {
LOG.error("No namespace as argument");
LOG.error(handle);
@@ -74,7 +65,7 @@
+ "is not a namespace.");
}
return DiagramFactory.getInstance().createDiagram(
- UMLDeploymentDiagram.class,
+ DiagramFactory.DiagramType.Deployment,
handle,
null);
}
@@ -109,4 +100,4 @@
* The UID.
*/
private static final long serialVersionUID = 9027235104963895167L;
-} /* end class ActionDeploymentDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSaveAllGraphics.java 2007-07-18 22:27:26-0700
@@ -30,24 +30,24 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.Vector;
import javax.swing.Action;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import org.apache.log4j.Logger;
+import org.argouml.application.events.ArgoEventPump;
+import org.argouml.application.events.ArgoEventTypes;
+import org.argouml.application.events.ArgoStatusEvent;
import org.argouml.configuration.Configuration;
import org.argouml.i18n.Translator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.ui.ArgoFrame;
-import org.argouml.ui.ProjectBrowser;
import org.argouml.ui.targetmanager.TargetManager;
-import org.tigris.gef.base.SaveGraphicsAction;
import org.argouml.uml.diagram.ArgoDiagram;
import org.tigris.gef.base.Diagram;
+import org.tigris.gef.base.SaveGraphicsAction;
import org.tigris.gef.undo.UndoableAction;
import org.tigris.gef.util.Util;
@@ -102,8 +102,6 @@
public boolean trySave(boolean overwrite, File directory) {
Project p = ProjectManager.getManager().getCurrentProject();
TargetManager tm = TargetManager.getInstance();
- Vector targets = p.getDiagrams();
- Iterator it = targets.iterator();
File saveDir = (directory != null) ? directory : getSaveDir(p);
if (saveDir == null) {
/* The user cancelled! */
@@ -111,10 +109,12 @@
}
boolean okSoFar = true;
ArgoDiagram activeDiagram = p.getActiveDiagram();
- while (it.hasNext() && okSoFar) {
- ArgoDiagram d = (ArgoDiagram) it.next();
+ for (ArgoDiagram d : p.getDiagramList()) {
tm.setTarget(d);
okSoFar = trySaveDiagram(overwrite, d, saveDir);
+ if (!okSoFar) {
+ break;
+ }
}
tm.setTarget(activeDiagram);
return okSoFar;
@@ -128,7 +128,6 @@
*/
protected boolean trySaveDiagram(boolean overwrite, Object target,
File saveDir) {
- ProjectBrowser pb = ProjectBrowser.getInstance();
if ( target instanceof Diagram ) {
String defaultName = ((Diagram) target).getName();
defaultName = Util.stripJunk(defaultName);
@@ -144,13 +143,14 @@
.getSaveActionBySuffix(
SaveGraphicsManager.getInstance().getDefaultSuffix());
if (cmd == null) {
- pb.showStatus("Unknown graphics file type with extension "
- + SaveGraphicsManager.getInstance().getDefaultSuffix());
+ showStatus("Unknown graphics file type with extension "
+ + SaveGraphicsManager.getInstance()
+ .getDefaultSuffix());
return false;
}
- pb.showStatus( "Writing " + path + name + "..." );
+ showStatus( "Writing " + path + name + "..." );
saveGraphicsToFile(theFile, cmd, overwrite);
- pb.showStatus( "Wrote " + path + name );
+ showStatus( "Wrote " + path + name );
return true;
}
catch ( FileNotFoundException ignore ) {
@@ -238,4 +238,8 @@
return chooser;
}
+ private void showStatus(String text) {
+ ArgoEventPump.fireEvent(new ArgoStatusEvent(
+ ArgoEventTypes.STATUS_TEXT, this, text));
+ }
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java 2007-07-18 22:27:26-0700
@@ -24,9 +24,8 @@
package org.argouml.uml.ui;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to add a new sequence diagram.
@@ -45,7 +44,7 @@
*/
public ArgoDiagram createDiagram() {
return DiagramFactory.getInstance().createDiagram(
- UMLSequenceDiagram.class,
+ DiagramFactory.DiagramType.Sequence,
createCollaboration(),
null);
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionStateDiagram.java 2007-07-18 22:27:26-0700
@@ -24,15 +24,12 @@
package org.argouml.uml.ui;
-import java.util.Collection;
-import java.util.Iterator;
-
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
/**
@@ -51,10 +48,11 @@
* @see org.argouml.uml.ui.ActionNewDiagram#createDiagram()
*/
protected ArgoDiagram createDiagram() {
- Project p = ProjectManager.getManager().getCurrentProject();
Object target = TargetManager.getInstance().getModelTarget();
Object machine = null;
- Object namespace = p.getRoot(); // the root model
+ Object namespace = Model.getModelManagementFactory().getRootModel();
+// Project p = ProjectManager.getManager().getCurrentProject();
+// Object namespace = p.getRoot(); // the root model
if (Model.getStateMachinesHelper().isAddingStatemachineAllowed(
target)) {
/* The target is a valid context. */
@@ -78,17 +76,14 @@
}
return DiagramFactory.getInstance().createDiagram(
- UMLStateDiagram.class,
+ DiagramFactory.DiagramType.State,
Model.getFacade().getNamespace(machine),
machine);
}
private boolean hasNoDiagramYet(Object machine) {
Project p = ProjectManager.getManager().getCurrentProject();
- Collection c = p.getDiagrams();
- Iterator i = c.iterator();
- while (i.hasNext()) {
- ArgoDiagram d = (ArgoDiagram) i.next();
+ for (ArgoDiagram d : p.getDiagramList()) {
if (d instanceof UMLStateDiagram) {
if (((UMLStateDiagram) d).getStateMachine() == machine) {
return false;
@@ -103,4 +98,4 @@
*/
private static final long serialVersionUID = -5197718695001757808L;
-} /* end class ActionStateDiagram */
+}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java 2007-07-18 22:27:26-0700
@@ -26,9 +26,8 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.use_case.ui.UMLUseCaseDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
/**
* Action to create a new use case diagram.
@@ -56,7 +55,7 @@
"The argument " + namespace + "is not a namespace.");
}
return DiagramFactory.getInstance().createDiagram(
- UMLUseCaseDiagram.class,
+ DiagramFactory.DiagramType.UseCase,
namespace,
null);
}
@@ -67,7 +66,7 @@
public boolean isValidNamespace(Object handle) {
boolean validNamespace = false;
if (Model.getFacade().isAPackage(handle)
- || Model.getFacade().isAClassifier(handle))
+ || Model.getFacade().isAClassifier(handle))
validNamespace = true;
return validNamespace;
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/PropPanel.java 2007-07-18 22:27:26-0700
@@ -56,6 +56,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.LookAndFeelMgr;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -204,6 +205,7 @@
factory.setRollover(true);
factory.setFloatable(false);
JToolBar toolBar = factory.createToolBar();
+ toolBar.setName("misc.toolbar.properties");
buttonPanel.removeAll();
buttonPanel.add(BorderLayout.WEST, toolBar);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabConstraints.java 2007-07-18 22:27:26-0700
@@ -40,6 +40,7 @@
import org.argouml.model.Model;
import org.argouml.ocl.ArgoFacade;
import org.argouml.ocl.OCLUtil;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.targetmanager.TargetEvent;
import org.tigris.gef.presentation.Fig;
@@ -95,6 +96,7 @@
mOcleEditor.setDoAutoSplit(false);
setToolbarRollover(true);
setToolbarFloatable(false);
+ getOclToolbar().setName("misc.toolbar.constraints");
add(mOcleEditor);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/TabTaggedValues.java 2007-07-18 22:27:26-0700
@@ -50,6 +50,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
+import org.argouml.swingext.ArgoToolbarManager;
import org.argouml.ui.AbstractArgoJPanel;
import org.argouml.ui.LookAndFeelMgr;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -89,6 +90,7 @@
public TabTaggedValues() {
super("tab.tagged-values");
buttonPanel = new ToolBar();
+ buttonPanel.setName(getTitle());
buttonPanel.setFloatable(false);
JButton b = new JButton();
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -55,11 +54,7 @@
protected void buildModelList() {
Collection elements = new ArrayList();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getUserDefinedModels().iterator();
-
- while (it.hasNext()) {
- Object model = it.next();
-
+ for (Object model : p.getUserDefinedModelList()) {
elements.addAll(Model
.getModelManagementHelper().getAllModelElementsOfKind(
model, Model.getMetaTypes().getClassifier()));
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -56,18 +55,16 @@
protected void buildModelList() {
Collection classifiers = new ArrayList();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getUserDefinedModels().iterator();
- while (it.hasNext()) {
- Object model = it.next();
+ for (Object model : p.getUserDefinedModelList()) {
Collection c = Model.getModelManagementHelper()
.getAllModelElementsOfKind(model,
Model.getMetaTypes().getClassifier());
- Iterator ci = c.iterator();
- while (ci.hasNext()) {
- Object cls = ci.next();
+ for (Object cls : c) {
Collection s = Model.getModelManagementHelper()
.getAllSurroundingNamespaces(cls);
- if (!s.contains(getTarget())) classifiers.add(cls);
+ if (!s.contains(getTarget())) {
+ classifiers.add(cls);
+ }
}
}
setElements(classifiers);
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -56,15 +55,11 @@
protected void buildModelList() {
Collection operations = new ArrayList();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getUserDefinedModels().iterator();
- while (it.hasNext()) {
- Object model = it.next();
+ for (Object model : p.getUserDefinedModelList()) {
Collection c = Model.getModelManagementHelper()
.getAllModelElementsOfKind(model,
Model.getMetaTypes().getOperation());
- Iterator ci = c.iterator();
- while (ci.hasNext()) {
- Object oper = ci.next();
+ for (Object oper : c) {
Object ns = Model.getFacade().getOwner(oper);
Collection s = Model.getModelManagementHelper()
.getAllSurroundingNamespaces(ns);
@@ -90,6 +85,7 @@
/*
* @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
/* Do nothing by design. */
}
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -27,7 +27,6 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
@@ -56,11 +55,7 @@
protected void buildModelList() {
Collection elements = new ArrayList();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getUserDefinedModels().iterator();
-
- while (it.hasNext()) {
- Object model = it.next();
-
+ for (Object model : p.getUserDefinedModelList()) {
elements.addAll(Model
.getModelManagementHelper().getAllModelElementsOfKind(
model, Model.getMetaTypes().getClassifier()));
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationPowertypeComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -66,15 +66,13 @@
protected void buildModelList() {
Set elements = new HashSet();
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator it = p.getUserDefinedModels().iterator();
- while (it.hasNext()) {
- Object model = it.next();
+ for (Object model : p.getUserDefinedModelList()) {
elements.addAll(Model.getModelManagementHelper()
.getAllModelElementsOfKind(model,
Model.getMetaTypes().getClassifier()));
}
- it = p.getProfileConfiguration().getProfileModels().iterator();
+ Iterator it = p.getProfileConfiguration().getProfileModels().iterator();
while (it.hasNext()) {
Object model = it.next();
elements.addAll(Model.getModelManagementHelper()
Modified: branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=13096&p1=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&p2=branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&r1=13095&r2=13096
==============================================================================
--- branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java (original)
+++ branches/gsoc2007/maurelio1234/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java 2007-07-18 22:27:26-0700
@@ -25,7 +25,6 @@
package org.argouml.uml.ui.foundation.core;
import java.beans.PropertyChangeEvent;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -84,11 +83,8 @@
if (p == null) {
return;
}
- Iterator it = (new ArrayList(p.getUserDefinedModels())).iterator();
-
- while (it.hasNext()) {
- Object model = it.next();
-
+
+ for (Object model : p.getUserDefinedModelList()) {
elements.addAll(Model.getModelManagementHelper()
.getAllModelElementsOfKind(
model, Model.getMetaTypes().getUMLClass()));
@@ -100,7 +96,7 @@
model, Model.getMetaTypes().getDataType()));
}
- it = p.getProfileConfiguration().getProfileModels().iterator();
+ Iterator it = p.getProfileConfiguration().getProfileModels().iterator();
while (it.hasNext()) {
Object model = it.next();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.