summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMajouane BENJELLOUL <majouane.benjelloul@inria.fr>2007-07-16 15:52:36 +0000
committerMajouane BENJELLOUL <majouane.benjelloul@inria.fr>2007-07-16 15:52:36 +0000
commit326caf8e11f455b3550f090ba1f9b820928e60c4 (patch)
tree13e1de1b5e001ca8f9981a2754f40a7d3be39b78 /tests
parent0cb8d75dd7d39bd66d98ec481775870b466a7fee (diff)
downloadscilab-326caf8e11f455b3550f090ba1f9b820928e60c4.zip
scilab-326caf8e11f455b3550f090ba1f9b820928e60c4.tar.gz
Package renaming
Diffstat (limited to 'tests')
-rw-r--r--tests/GUI/window/WindowTest1.java (renamed from tests/GUI/marouane/WindowTest1.java)25
1 files changed, 17 insertions, 8 deletions
diff --git a/tests/GUI/marouane/WindowTest1.java b/tests/GUI/window/WindowTest1.java
index cfe0c17..bfc3618 100644
--- a/tests/GUI/marouane/WindowTest1.java
+++ b/tests/GUI/window/WindowTest1.java
@@ -1,13 +1,12 @@
1/* Copyright INRIA 2007 */ 1/* Copyright INRIA 2007 */
2 2
3package marouane; 3package window;
4 4
5import java.awt.BorderLayout; 5import java.awt.BorderLayout;
6import java.awt.Color; 6import java.awt.Color;
7import java.awt.EventQueue; 7import java.awt.EventQueue;
8import java.awt.event.*; 8import java.awt.event.*;
9 9
10import javax.swing.JPanel;
11import javax.swing.UIManager; 10import javax.swing.UIManager;
12import javax.swing.border.LineBorder; 11import javax.swing.border.LineBorder;
13 12
@@ -28,6 +27,8 @@ import org.scilab.modules.gui.pushbutton.PushButton;
28import org.scilab.modules.gui.pushbutton.ScilabPushButton; 27import org.scilab.modules.gui.pushbutton.ScilabPushButton;
29import org.scilab.modules.gui.tab.ScilabTab; 28import org.scilab.modules.gui.tab.ScilabTab;
30import org.scilab.modules.gui.tab.Tab; 29import org.scilab.modules.gui.tab.Tab;
30import org.scilab.modules.gui.textbox.ScilabTextBox;
31import org.scilab.modules.gui.textbox.TextBox;
31import org.scilab.modules.gui.toolbar.ScilabToolBar; 32import org.scilab.modules.gui.toolbar.ScilabToolBar;
32import org.scilab.modules.gui.toolbar.ToolBar; 33import org.scilab.modules.gui.toolbar.ToolBar;
33import org.scilab.modules.gui.utils.Size; 34import org.scilab.modules.gui.utils.Size;
@@ -100,9 +101,9 @@ public class WindowTest1 {
100 menu.add(menuItem); 101 menu.add(menuItem);
101 menuBar.add(menu); 102 menuBar.add(menu);
102 103
103 System.out.println("mainView.menuBar is null : result = " + mainView.getMenuBar()); 104 //System.out.println("mainView.menuBar is null : result = " + mainView.getMenuBar());
104 mainView.setMenuBar(menuBar); 105 mainView.addMenuBar(menuBar);
105 System.out.println("mainView.menuBar Added : result = " + mainView.getMenuBar()); 106 //System.out.println("mainView.menuBar Added : result = " + mainView.getMenuBar());
106 107
107 // toolBar 108 // toolBar
108 ToolBar toolBar = ScilabToolBar.createToolBar(); 109 ToolBar toolBar = ScilabToolBar.createToolBar();
@@ -113,12 +114,20 @@ public class WindowTest1 {
113 pushButton.setText("PB Two"); 114 pushButton.setText("PB Two");
114 toolBar.add(pushButton); 115 toolBar.add(pushButton);
115 116
116 System.out.println("mainView.toolBar is null : result = " + mainView.getToolBar()); 117 //System.out.println("mainView.toolBar is null : result = " + mainView.getToolBar());
117 mainView.setToolBar(toolBar); 118 mainView.addToolBar(toolBar);
118 System.out.println("mainView.toolBar is null : result = " + mainView.getToolBar()); 119 //System.out.println("mainView.toolBar Added : result = " + mainView.getToolBar());
120
121// infoBar
122 TextBox infoBar = ScilabTextBox.createTextBox();
123
124 System.out.println("mainView.infoBar is null : result = " + mainView.getInfoBar());
125 mainView.addInfoBar(infoBar);
126 System.out.println("mainView.infoBar Added : result = " + mainView.getInfoBar());
119 127
120 mainView.draw(); 128 mainView.draw();
121 129
130 mainView.getInfoBar().setText("Loaded WindowTest1");
122 System.out.println("-*- Last Line Program WindowTest1 -*-"); 131 System.out.println("-*- Last Line Program WindowTest1 -*-");
123 } 132 }
124 133