[Exmmt-commit] SF.net SVN: exmmt: [8] net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java

[<lgr...@us...>]

Revision: 8
Author:   lgrammel
Date:     2006-05-16 15:16:39 -0700 (Tue, 16 May 2006)
ViewCVS:  http://svn.sourceforge.net/exmmt/?rev=8&view=rev

Log Message:
-----------
#1489785 refactor model editor

Modified Paths:
--------------
    net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java
Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java
===================================================================
--- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java	2006-05-16 21:29:10 UTC (rev 7)
+++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java	2006-05-16 22:16:39 UTC (rev 8)
@@ -187,52 +187,42 @@
 			}
 			selectedLiteral = getNavigationElements().get(index);
 			control.redraw();
-		} else if (event.keyCode == SWT.ARROW_RIGHT
-				&& selectedLiteral instanceof VariableLiteral) {
-
+		} else if (selectedLiteral instanceof VariableLiteral) {
 			VariableLiteral literal = (VariableLiteral) selectedLiteral;
-
-			literal.setCaretPosition(literal.getCaretPosition() + 1);
-			control.redraw();
-		} else if (event.keyCode == SWT.ARROW_LEFT
-				&& selectedLiteral instanceof VariableLiteral) {
-			VariableLiteral literal = (VariableLiteral) selectedLiteral;
-			literal.setCaretPosition(literal.getCaretPosition() - 1);
-			control.redraw();
-		} else if (event.keyCode == SWT.CR
-				&& selectedLiteral instanceof AdditionPoint) {
-			AdditionPoint literal = (AdditionPoint) selectedLiteral;
-			literal.execute();
-			control.redraw();
-		} else if (event.keyCode == SWT.DEL
-				&& selectedLiteral instanceof VariableLiteral) {
-			VariableLiteral literal = (VariableLiteral) selectedLiteral;
-			if (literal.getCaretPosition() < literal.getValue().length()) {
+			if (event.keyCode == SWT.ARROW_RIGHT) {
+				literal.setCaretPosition(literal.getCaretPosition() + 1);
+				control.redraw();
+			} else if (event.keyCode == SWT.ARROW_LEFT) {
+				literal.setCaretPosition(literal.getCaretPosition() - 1);
+				control.redraw();
+			} else if (event.keyCode == SWT.DEL
+					&& (literal.getCaretPosition() < literal.getValue()
+							.length())) {
 				StringBuffer value = new StringBuffer(literal.getValue());
 				value.deleteCharAt(literal.getCaretPosition());
 				literal.setValue(value.toString());
 				changed();
 				control.redraw();
-			}
-		} else if (event.keyCode == SWT.BS
-				&& selectedLiteral instanceof VariableLiteral) {
-			VariableLiteral literal = (VariableLiteral) selectedLiteral;
-			if (literal.getCaretPosition() > 0) {
+			} else if (event.keyCode == SWT.BS
+					&& (literal.getCaretPosition() > 0)) {
 				StringBuffer value = new StringBuffer(literal.getValue());
 				value.deleteCharAt(literal.getCaretPosition() - 1);
 				literal.setValue(value.toString());
 				literal.setCaretPosition(literal.getCaretPosition() - 1);
 				changed();
 				control.redraw();
+			} else if (isValidCharacter(event.stateMask, event.character)) {
+				StringBuffer value = new StringBuffer(literal.getValue());
+				value.insert(literal.getCaretPosition(), event.character);
+				literal.setValue(value.toString());
+				literal.setCaretPosition(literal.getCaretPosition() + 1);
+				changed();
+				control.redraw();
 			}
-		} else if (isValidCharacter(event.stateMask, event.character)
-				&& selectedLiteral instanceof VariableLiteral) {
-			VariableLiteral literal = (VariableLiteral) selectedLiteral;
-			StringBuffer value = new StringBuffer(literal.getValue());
-			value.insert(literal.getCaretPosition(), event.character);
-			literal.setValue(value.toString());
-			literal.setCaretPosition(literal.getCaretPosition() + 1);
-			changed();
+		} else if (event.keyCode == SWT.CR
+				&& selectedLiteral instanceof AdditionPoint) {
+			AdditionPoint literal = (AdditionPoint) selectedLiteral;
+			literal.execute();
 			control.redraw();
 		}
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.