Merge branch 'master' of https://koljastrohm-games.com:3000/GraphDrawer/NodePlacementAnimation

src/view/MainView.java

@@ -172,7 +172,7 @@ public class MainView {
 	    stepForward = new NiceButton( "stepForward" );
 	    stepForward.setLocation( 10, 10 );
 	    stepForward.setMnemonic( KeyEvent.VK_DOWN );
-	    stepForward.setToolTipText( "Forward step over (alt+down arrow key)" );
+	    stepForward.setToolTipText( "Forward step over (alt + down arrow key)" );
 	    stepForward.addActionListener( new ActionListener() {
 
             @Override
@@ -185,7 +185,7 @@ public class MainView {
 	    stepForwardInto = new NiceButton( "stepForwardInto" );
 	    stepForwardInto.setLocation( 60, 10 );
 	    stepForwardInto.setMnemonic( KeyEvent.VK_RIGHT );
-	    stepForwardInto.setToolTipText( "Forward step Into (alt+right arrow key)" );
+	    stepForwardInto.setToolTipText( "Forward step into (alt + right arrow key)" );
 	    stepForwardInto.addActionListener( new ActionListener() {
 
             @Override
@@ -198,7 +198,7 @@ public class MainView {
         stepForwardOut = new NiceButton( "stepForwardOut" );
         stepForwardOut.setLocation( 110, 10 );
         stepForwardOut.setMnemonic( KeyEvent.VK_PAGE_DOWN );
-        stepForwardOut.setToolTipText( "Forward step out (alt+page down key)" );
+        stepForwardOut.setToolTipText( "Forward step out (alt + page down key)" );
         stepForwardOut.addActionListener( new ActionListener() {
 
             @Override
@@ -211,7 +211,7 @@ public class MainView {
         runForward = new NiceButton( "runForward" );
         runForward.setLocation( 160, 10 );
         runForward.setMnemonic( KeyEvent.VK_P );
-        runForward.setToolTipText( "Run forward annimation (alt+p)" );
+        runForward.setToolTipText( "Run forwards (alt + p)" );
         runForward.addActionListener( new ActionListener() {
 
             @Override
@@ -224,7 +224,7 @@ public class MainView {
         runBackward = new NiceButton( "runBackward" );
         runBackward.setLocation( 160, 60 );
         runBackward.setMnemonic( KeyEvent.VK_R );
-        runBackward.setToolTipText( "Run backward annimation (alt+r)" );
+        runBackward.setToolTipText( "Run backwards (alt + r)" );
         runBackward.addActionListener( new ActionListener() {
 
             @Override
@@ -237,7 +237,7 @@ public class MainView {
         stepBackward = new NiceButton( "stepBackward" );
         stepBackward.setLocation( 10, 60 );
         stepBackward.setMnemonic( KeyEvent.VK_UP );
-        stepBackward.setToolTipText( "Backward step over (alt+up arrow key)" );
+        stepBackward.setToolTipText( "Backward step over (alt + up arrow key)" );
         stepBackward.addActionListener( new ActionListener() {
 
             @Override
@@ -250,7 +250,7 @@ public class MainView {
         stepBackwardInto = new NiceButton( "stepBackwardInto" );
         stepBackwardInto.setLocation( 60, 60 );
         stepBackwardInto.setMnemonic( KeyEvent.VK_LEFT );
-        stepBackwardInto.setToolTipText( "Backward step into (alt+left arrow key)" );
+        stepBackwardInto.setToolTipText( "Backward step into (alt + left arrow key)" );
         stepBackwardInto.addActionListener( new ActionListener() {
 
             @Override
@@ -263,7 +263,7 @@ public class MainView {
         stepBackwardOut = new NiceButton( "stepBackwardOut" );
         stepBackwardOut.setLocation( 110, 60 );
         stepBackwardOut.setMnemonic( KeyEvent.VK_PAGE_UP );
-        stepBackwardOut.setToolTipText( "Backward step out (alt+page up key)" );
+        stepBackwardOut.setToolTipText( "Backward step out (alt + page up)" );
         stepBackwardOut.addActionListener( new ActionListener() {
 
             @Override
@@ -276,7 +276,7 @@ public class MainView {
         pause = new NiceButton( "pause" );
         pause.setLocation( 210, 10 );
         pause.setMnemonic( KeyEvent.VK_PAUSE );
-        pause.setToolTipText( "Animation stop (alt+pause key)" );
+        pause.setToolTipText( "Pause (alt + pause)" );
         pause.addActionListener( new ActionListener() {
 
             @Override
@@ -288,7 +288,7 @@ public class MainView {
         debug = new NiceButton( "debug" );
         debug.setLocation( 350, 10 );
         debug.setMnemonic( KeyEvent.VK_D );
-        debug.setToolTipText( "Show debug info (alt+d)" );
+        debug.setToolTipText( "Show debug info (alt + d)" );
         debug.addActionListener( new ActionListener() {
 
             @Override
@@ -300,7 +300,7 @@ public class MainView {
         randomGraph = new NiceButton( "random" );
         randomGraph.setLocation( 350, 60 );
         randomGraph.setMnemonic( KeyEvent.VK_G );
-        randomGraph.setToolTipText( "Generate random graph (alt+g)" );
+        randomGraph.setToolTipText( "Generate random graph (alt + g)" );
         randomGraph.addActionListener( new ActionListener() {
 
             @Override
@@ -310,7 +310,7 @@ public class MainView {
                 GridBagConstraints c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 0;
-                diag.add( new JLabel( "P(Subgraph exists)="), c );
+                diag.add( new JLabel( "P(subgraph exists)"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 0;
@@ -338,7 +338,7 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 1;
-                diag.add( new JLabel( "P(Edge exists)="), c );
+                diag.add( new JLabel( "P(edge exists)"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 1;
@@ -366,7 +366,7 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 2;
-                diag.add( new JLabel( "Minimal Layers="), c );
+                diag.add( new JLabel( "min. num. layers"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 2;
@@ -398,7 +398,7 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 3;
-                diag.add( new JLabel( "Maximal Layers="), c );
+                diag.add( new JLabel( "max. num. layers"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 3;
@@ -428,14 +428,14 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 4;
-                diag.add( new JLabel( "Minimal Nodes="), c );
+                diag.add( new JLabel( "min. num. nodes"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 4;
                 JTextField minNodes = new JTextField( "5" );
                 JTextField maxNodes = new JTextField( "5" );
                 minNodes.setPreferredSize( new Dimension( 100, 20 ) );
-                minNodes.setToolTipText( "Zwischen 1 und 'Maximal Nodes'" );
+                minNodes.setToolTipText( "between 1 and 'min. num. nodes'" );
                 minNodes.addFocusListener( new FocusListener() {
                     @Override
                     public void focusGained(FocusEvent e) {
@@ -461,12 +461,12 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 5;
-                diag.add( new JLabel( "Maximal Nodes="), c );
+                diag.add( new JLabel( "max. num. nodes"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 5;
                 maxNodes.setPreferredSize( new Dimension( 100, 20 ) );
-                maxNodes.setToolTipText( "Zwischen 'Minimal Nodes' und unendlich" );
+                maxNodes.setToolTipText( "between 'min. num. nodes' and +Inf" );
                 maxNodes.addFocusListener( new FocusListener() {
                     @Override
                     public void focusGained(FocusEvent e) {
@@ -492,13 +492,13 @@ public class MainView {
                 c = new GridBagConstraints();
                 c.gridx = 0;
                 c.gridy = 6;
-                diag.add( new JLabel( "Maximal depth="), c );
+                diag.add( new JLabel( "max. hier. depth"), c );
                 c = new GridBagConstraints();
                 c.gridx = 1;
                 c.gridy = 6;
                 JTextField maxDepth = new JTextField( "1" );
                 maxDepth.setPreferredSize( new Dimension( 100, 20 ) );
-                maxDepth.setToolTipText( "Zwischen 1 und unendlich" );
+                maxDepth.setToolTipText( "between 1 and +Inf" );
                 maxDepth.addFocusListener( new FocusListener() {
                     @Override
                     public void focusGained(FocusEvent e) {
@@ -636,7 +636,7 @@ public class MainView {
         load = new NiceButton( "load" );
         load.setLocation( 230, 60 );
         load.setMnemonic( KeyEvent.VK_L );
-        load.setToolTipText( "Load a graph (alt+l)" );
+        load.setToolTipText( "Load a graph (alt + l)" );
         load.addActionListener( new ActionListener() {
 
             @Override
@@ -658,7 +658,7 @@ public class MainView {
         save = new NiceButton( "save" );
         save.setLocation( 285, 60 );
         save.setMnemonic( KeyEvent.VK_S );
-        save.setToolTipText( "Save graph (alt+s)" );
+        save.setToolTipText( "Save graph (alt + s)" );
         save.addActionListener( new ActionListener() {
 
             @Override