# HG changeset patch
# User Fiore Martin <fiore@eecs.qmul.ac.uk>
# Date 1355856560 0
# Node ID 075ae9eb2a40a809d95e710488af493a907afa5f
# Parent  1c5af356bb992cb9faa0bf5a1575cb8afb980e63
changed splash screen to .gif
corrected line style bug
set Tablet/Mouse as first option on haptic device dialog

diff -r 1c5af356bb99 -r 075ae9eb2a40 java/src/splash.gif
Binary file java/src/splash.gif has changed
diff -r 1c5af356bb99 -r 075ae9eb2a40 java/src/splash.jpeg
Binary file java/src/splash.jpeg has changed
diff -r 1c5af356bb99 -r 075ae9eb2a40 java/src/uk/ac/qmul/eecs/ccmi/gui/LineStyle.java
--- a/java/src/uk/ac/qmul/eecs/ccmi/gui/LineStyle.java	Mon Dec 17 18:39:40 2012 +0000
+++ b/java/src/uk/ac/qmul/eecs/ccmi/gui/LineStyle.java	Tue Dec 18 18:49:20 2012 +0000
@@ -33,13 +33,13 @@
 			BasicStroke.JOIN_ROUND, 
 			0.0f, 
 			new float[]{1.0f,3.0f}, 
-			0.0f),0xF0F0),
+			0.0f),0xAAAA),
 	Dashed(new BasicStroke(1.0f, 
 			BasicStroke.CAP_ROUND, 
 			BasicStroke.JOIN_ROUND, 
 			0.0f, 
 			new float[]{5.0f,5.0f}, 
-			0.0f),0xAAAA);
+			0.0f),0xF0F0);
 	
 	private LineStyle(BasicStroke stroke, int stipplePattern){
 		this.stroke = stroke;
diff -r 1c5af356bb99 -r 075ae9eb2a40 java/src/uk/ac/qmul/eecs/ccmi/main/DiagramEditorApp.java
--- a/java/src/uk/ac/qmul/eecs/ccmi/main/DiagramEditorApp.java	Mon Dec 17 18:39:40 2012 +0000
+++ b/java/src/uk/ac/qmul/eecs/ccmi/main/DiagramEditorApp.java	Tue Dec 18 18:49:20 2012 +0000
@@ -148,7 +148,7 @@
 						String selection = (String)SpeechOptionPane.showSelectionDialog(null, 
 								ResourceBundle.getBundle(DiagramEditorApp.class.getName()).getString("haptics_init.welcome"), 
 								hapticDevices, 
-								hapticDevices[0]);
+								hapticDevices[2]);
 						if(selection == null)
 							System.exit(0);
 						preferences.put("haptic_device", selection);
diff -r 1c5af356bb99 -r 075ae9eb2a40 java/src/uk/ac/qmul/eecs/ccmi/speech/SpeechUtilities.java
--- a/java/src/uk/ac/qmul/eecs/ccmi/speech/SpeechUtilities.java	Mon Dec 17 18:39:40 2012 +0000
+++ b/java/src/uk/ac/qmul/eecs/ccmi/speech/SpeechUtilities.java	Tue Dec 18 18:49:20 2012 +0000
@@ -104,6 +104,8 @@
 			public void actionPerformed(ActionEvent evt) {
 				FocusTraversalPolicy policy = KeyboardFocusManager.getCurrentKeyboardFocusManager().getDefaultFocusTraversalPolicy();
 				Component next = policy.getComponentAfter(container, KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner());
+				if(next == null)
+					return;
 				next.requestFocusInWindow();
 				NarratorFactory.getInstance().speak(SpeechUtilities.getComponentSpeech(next));
 				InteractionLog.log("TABBED PANE","change focus ",next.getAccessibleContext().getAccessibleName());
@@ -118,6 +120,8 @@
 			public void actionPerformed(ActionEvent evt) {
 				FocusTraversalPolicy policy = KeyboardFocusManager.getCurrentKeyboardFocusManager().getDefaultFocusTraversalPolicy();
 				Component previous = policy.getComponentBefore(container, KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner());
+				if(previous == null)
+					return;
 				previous.requestFocusInWindow();
 				NarratorFactory.getInstance().speak(SpeechUtilities.getComponentSpeech(previous));
 				InteractionLog.log("TABBED PANE","change focus ",previous.getAccessibleContext().getAccessibleName());