Author: thn Date: 2008-09-29 14:58:37-0700 New Revision: 15830 Removed: trunk/src/argouml-app/src/org/argouml/language/java/generator/ trunk/src/argouml-app/src/org/argouml/language/java/package.html trunk/src/argouml-app/src/org/argouml/uml/reveng/java/ trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRESequenceDiagram.java trunk/src/argouml-app/tests/org/argouml/language/ trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportClass.java trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportInterface.java trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java
Log: remove Java import and generator support (now in Java module) Removed: trunk/src/argouml-app/src/org/argouml/language/java/package.html Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/language/java/package.html?view=auto&rev=15829 Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=15830&p1=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&r1=15829&r2=15830 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java (original) +++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java 2008-09-29 14:58:37-0700 @@ -67,7 +67,6 @@ import org.argouml.uml.ui.ActionCollaborationDiagram; import org.argouml.uml.ui.ActionDeleteModelElements; import org.argouml.uml.ui.ActionDeploymentDiagram; -import org.argouml.uml.ui.ActionRESequenceDiagram; import org.argouml.uml.ui.ActionSequenceDiagram; import org.argouml.uml.ui.ActionSetSourcePath; import org.argouml.uml.ui.ActionStateDiagram; @@ -295,10 +294,6 @@ || packageSelected) { this.add(new ActionSetSourcePath()); } - - if (Model.getFacade().isAOperation(selectedItem)) { - this.add(new ActionRESequenceDiagram()); - } } if (modelElementsOnly && selectedItem != projectModel) { Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java?view=diff&rev=15830&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java&r1=15829&r2=15830 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigMessage.java 2008-09-29 14:58:37-0700 @@ -25,14 +25,11 @@ package org.argouml.uml.diagram.sequence.ui; import java.awt.Point; -import java.awt.event.MouseEvent; -import java.util.Vector; import org.argouml.model.Model; import org.argouml.uml.diagram.sequence.MessageNode; import org.argouml.uml.diagram.ui.FigEdgeModelElement; import org.argouml.uml.diagram.ui.FigTextGroup; -import org.argouml.uml.ui.ActionRESequenceDiagram; import org.tigris.gef.base.Editor; import org.tigris.gef.base.Globals; import org.tigris.gef.base.PathConvPercent; @@ -73,30 +70,6 @@ } /** - * Build a collection of menu items relevant for a right-click - * popup menu on a message. - * - * @param me a mouse event - * @return a collection of menu items - * - * @see org.tigris.gef.presentation.Fig#getPopUpActions(java.awt.event.MouseEvent) - */ - @Override - public Vector getPopUpActions(MouseEvent me) { - Vector popUpActions = super.getPopUpActions(me); - - // the menu item for RE a sequence into the diagram is offered always, - // because a check (e.g. does a operation with a body exist) would be - // too expensive - // TODO: There is a cyclic dependency between ActionRESequenceDiagram - // and FigMessage - popUpActions.add(popUpActions.size() - getPopupAddOffset(), - new ActionRESequenceDiagram(this)); - - return popUpActions; - } - - /** * Returns the action attached to this link if any.<p> * * @return the action attached to this link or null if there isn't any. Removed: trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=auto&rev=15829 Removed: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRESequenceDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionRESequenceDiagram.java?view=auto&rev=15829 Removed: trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportClass.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportClass.java?view=auto&rev=15829 Removed: trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportEnumeration.java?view=auto&rev=15829 Removed: trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportInterface.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportInterface.java?view=auto&rev=15829 Removed: trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/reveng/TestJavaImportUnicode.java?view=auto&rev=15829 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
