Author: bobtarling
Date: 2008-07-03 11:28:35-0700
New Revision: 15154
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java
trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
Log:
Some improvement to the expand space tool.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java?view=diff&rev=15154&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java&r1=15153&r2=15154
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeChangeHeight.java 2008-07-03 11:28:35-0700
@@ -87,34 +87,34 @@
return;
}
- SequenceDiagramLayer layout =
+ SequenceDiagramLayer layer =
(SequenceDiagramLayer) Globals.curEditor().getLayerManager()
.getActiveLayer();
int endY = me.getY();
if (isContract()) {
- int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ int startOffset = layer.getNodeIndex(startY);
int endOffset;
if (startY > endY) {
endOffset = startOffset;
- startOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ startOffset = layer.getNodeIndex(endY);
} else {
- endOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ endOffset = layer.getNodeIndex(endY);
}
int diff = endOffset - startOffset;
if (diff > 0) {
- layout.contractDiagram(startOffset, diff);
+ layer.contractDiagram(startOffset, diff);
}
} else {
- int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ int startOffset = layer.getNodeIndex(startY);
if (startOffset > 0 && endY < startY) {
startOffset--;
}
- int diff = SequenceDiagramLayer.getNodeIndex(endY) - startOffset;
+ int diff = layer.getNodeIndex(endY) - startOffset;
if (diff < 0) {
diff = -diff;
}
if (diff > 0) {
- layout.expandDiagram(startOffset, diff);
+ layer.expandDiagram(startOffset, diff);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java?view=diff&rev=15154&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java&r1=15153&r2=15154
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeContract.java 2008-07-03 11:28:35-0700
@@ -85,21 +85,21 @@
return;
}
- SequenceDiagramLayer layout =
+ SequenceDiagramLayer layer =
(SequenceDiagramLayer) Globals.curEditor().getLayerManager()
.getActiveLayer();
int endY = me.getY();
- int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ int startOffset = layer.getNodeIndex(startY);
int endOffset;
if (startY > endY) {
endOffset = startOffset;
- startOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ startOffset = layer.getNodeIndex(endY);
} else {
- endOffset = SequenceDiagramLayer.getNodeIndex(endY);
+ endOffset = layer.getNodeIndex(endY);
}
int diff = endOffset - startOffset;
if (diff > 0) {
- layout.contractDiagram(startOffset, diff);
+ layer.contractDiagram(startOffset, diff);
}
me.consume();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java?view=diff&rev=15154&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java&r1=15153&r2=15154
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/ModeExpand.java 2008-07-03 11:28:35-0700
@@ -85,20 +85,20 @@
return;
}
- SequenceDiagramLayer layout =
+ SequenceDiagramLayer layer =
(SequenceDiagramLayer) Globals.curEditor().getLayerManager()
.getActiveLayer();
int endY = me.getY();
- int startOffset = SequenceDiagramLayer.getNodeIndex(startY);
+ int startOffset = layer.getNodeIndex(startY);
if (startOffset > 0 && endY < startY) {
startOffset--;
}
- int diff = SequenceDiagramLayer.getNodeIndex(endY) - startOffset;
+ int diff = layer.getNodeIndex(endY) - startOffset;
if (diff < 0) {
diff = -diff;
}
if (diff > 0) {
- layout.expandDiagram(startOffset, diff);
+ layer.expandDiagram(startOffset, diff);
}
me.consume();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java?view=diff&rev=15154&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java&r1=15153&r2=15154
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/SequenceDiagramLayer.java 2008-07-03 11:28:35-0700
@@ -176,8 +176,19 @@
* @param y The point.
* @return The node index.
*/
- public static int getNodeIndex(int y) {
- y -= DIAGRAM_TOP_MARGIN + FigClassifierRole.MIN_HEAD_HEIGHT;
+ public int getNodeIndex(int y) {
+ FigClassifierRole figClassifierRole = null;
+ for (Object fig : getContentsNoEdges()) {
+ if (fig instanceof FigClassifierRole) {
+ figClassifierRole = (FigClassifierRole) fig;
+ }
+ }
+ if (figClassifierRole == null) {
+ return 0;
+ }
+ y -= figClassifierRole.getY()
+ + figClassifierRole.getHeadFig().getHeight();
+ y += LINK_DISTANCE / 2;
if (y < 0) {
y = 0;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=diff&rev=15154&p1=trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&p2=trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&r1=15153&r2=15154
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java 2008-07-03 11:28:35-0700
@@ -184,6 +184,8 @@
setResizable(false);
this.project = project;
+ SequenceDiagramLayer layer = (SequenceDiagramLayer) diagram.getLayer();
+
operation = oper;
model = project.getModel();
try {
@@ -206,7 +208,7 @@
// TODO: There is only a single port on new implementation of SD
// so how do we resolve this?
portCnt =
- SequenceDiagramLayer.getNodeIndex(
+ layer.getNodeIndex(
figMessage.getDestMessageNode().getFigMessagePort().getY());
Iterator<Fig> it = diagram.getFigIterator();
while (it.hasNext()) {
@@ -224,7 +226,7 @@
}
} else if (Model.getFacade().isAMessage(modelElement)) {
int port =
- SequenceDiagramLayer.getNodeIndex(
+ layer.getNodeIndex(
((FigMessage) f).getDestMessageNode()
.getFigMessagePort().getY());
if (maxPort < port) {
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.