Thread: [Exmmt-commit] SF.net SVN: exmmt: [60] net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/n
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
exmmt-commit
|
From: <lgr...@us...> - 2006-06-05 23:44:43
|
Revision: 60 Author: lgrammel Date: 2006-06-05 02:51:50 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=60&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:48:47 UTC (rev 59) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:51:50 UTC (rev 60) @@ -51,9 +51,22 @@ int currentIndex = siblings.indexOf(focusedElement); - assert currentIndex != -1; + assert currentIndex >= 0; + assert currentIndex <= siblings.size() - 1; - focusedElement = siblings.get(currentIndex + 1); + int newIndex = currentIndex + 1; + + assert newIndex >= 1; + assert newIndex <= siblings.size(); + + if (newIndex == siblings.size()) { + newIndex = 0; + } + + assert newIndex >= 0; + assert newIndex <= siblings.size() - 1; + + focusedElement = siblings.get(newIndex); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:45:13
|
Revision: 48 Author: lgrammel Date: 2006-06-05 02:29:45 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=48&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:25:36 UTC (rev 47) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:29:45 UTC (rev 48) @@ -41,7 +41,14 @@ } public void moveToParent() { - focusedElement = focusedElement.getParent(); + Composite parent = focusedElement.getParent(); + + // TODO extract isRoot() method + if (parent == null) { + return; + } + + focusedElement = parent; } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:45:14
|
Revision: 42 Author: lgrammel Date: 2006-06-05 02:21:16 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=42&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:06:08 UTC (rev 41) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:21:16 UTC (rev 42) @@ -28,4 +28,8 @@ return focusedElement; } + public void moveToChild() { + focusedElement = focusedElement.getChildren().get(0); + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-05 23:51:58
|
Revision: 63 Author: lgrammel Date: 2006-06-05 02:55:47 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=63&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:53:13 UTC (rev 62) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:55:47 UTC (rev 63) @@ -17,12 +17,12 @@ import net.sourceforge.exmmt.builder.Composite; public class Focus { - + private Composite focusedElement; public Focus(Composite root) { assert root != null; - + this.focusedElement = root; } @@ -46,16 +46,16 @@ if (focusedElement.isRoot()) { return; } - + List<Composite> siblings = focusedElement.getParent().getChildren(); - + int currentIndex = siblings.indexOf(focusedElement); - + assert currentIndex >= 0; assert currentIndex <= siblings.size() - 1; - + int newIndex = currentIndex + 1; - + assert newIndex >= 1; assert newIndex <= siblings.size(); @@ -65,8 +65,35 @@ assert newIndex >= 0; assert newIndex <= siblings.size() - 1; - + focusedElement = siblings.get(newIndex); } + public void moveToPreviousSibling() { + if (focusedElement.isRoot()) { + return; + } + + List<Composite> siblings = focusedElement.getParent().getChildren(); + + int currentIndex = siblings.indexOf(focusedElement); + + assert currentIndex >= 0; + assert currentIndex <= siblings.size() - 1; + + int newIndex = currentIndex - 1; + + assert newIndex >= -1; + assert newIndex <= siblings.size() - 2; + + if (newIndex == -1) { + newIndex = siblings.size() - 1; + } + + assert newIndex >= 0; + assert newIndex <= siblings.size() - 1; + + focusedElement = siblings.get(newIndex); + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:52:40
|
Revision: 58 Author: lgrammel Date: 2006-06-05 02:48:40 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=58&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:45:18 UTC (rev 57) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:48:40 UTC (rev 58) @@ -12,6 +12,8 @@ */ package net.sourceforge.exmmt.navigation; +import java.util.List; + import net.sourceforge.exmmt.builder.Composite; public class Focus { @@ -41,6 +43,17 @@ } public void moveToNextSibling() { + if (focusedElement.isRoot()) { + return; + } + + List<Composite> siblings = focusedElement.getParent().getChildren(); + + int currentIndex = siblings.indexOf(focusedElement); + + assert currentIndex != -1; + + focusedElement = siblings.get(currentIndex + 1); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:23
|
Revision: 46 Author: lgrammel Date: 2006-06-05 02:25:28 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=46&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:24:04 UTC (rev 45) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:25:28 UTC (rev 46) @@ -40,4 +40,8 @@ focusedElement = children.get(0); } + public void moveToParent() { + focusedElement = focusedElement.getParent(); + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 00:55:29
|
Revision: 56 Author: lgrammel Date: 2006-06-05 02:45:10 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=56&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:39:37 UTC (rev 55) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:45:10 UTC (rev 56) @@ -40,4 +40,7 @@ } } + public void moveToNextSibling() { + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <lgr...@us...> - 2006-06-06 02:30:35
|
Revision: 44 Author: lgrammel Date: 2006-06-05 02:23:56 -0700 (Mon, 05 Jun 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=44&view=rev Log Message: ----------- #1500774 scenario "shopping list" Modified Paths: -------------- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java Modified: net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java =================================================================== --- net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:21:24 UTC (rev 43) +++ net.sourceforge.exmmt/trunk/src/java/net/sourceforge/exmmt/navigation/Focus.java 2006-06-05 09:23:56 UTC (rev 44) @@ -12,6 +12,8 @@ */ package net.sourceforge.exmmt.navigation; +import java.util.List; + import net.sourceforge.exmmt.builder.Composite; public class Focus { @@ -29,7 +31,13 @@ } public void moveToChild() { - focusedElement = focusedElement.getChildren().get(0); + List<Composite> children = focusedElement.getChildren(); + + if (children.isEmpty()) { + return; + } + + focusedElement = children.get(0); } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X