1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
diff -ur src.orig/alice/tuprologx/ide/AWTFrameLauncher.java src/alice/tuprologx/ide/AWTFrameLauncher.java
--- src.orig/alice/tuprologx/ide/AWTFrameLauncher.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/tuprologx/ide/AWTFrameLauncher.java 2007-01-31 19:39:21.000000000 +1300
@@ -88,7 +88,7 @@
height = Math.min(height, screenSize.height);
setBounds((screenSize.width - width) / 2, (screenSize.height - height) / 2, width, height);
}
- show();
+ setVisible(true);
}
public void update(Graphics g) {
diff -ur src.orig/alice/tuprologx/ide/Applet.java src/alice/tuprologx/ide/Applet.java
--- src.orig/alice/tuprologx/ide/Applet.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/tuprologx/ide/Applet.java 2007-01-31 19:39:21.000000000 +1300
@@ -41,7 +41,7 @@
ide.removeWindowListener(listeners[i]);
ide.pack();
- ide.show();
+ ide.setVisible(true);
}
} // end Applet class
\ No newline at end of file
diff -ur src.orig/alice/tuprologx/ide/DotNetIOManager.java src/alice/tuprologx/ide/DotNetIOManager.java
--- src.orig/alice/tuprologx/ide/DotNetIOManager.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/tuprologx/ide/DotNetIOManager.java 2007-01-31 19:39:21.000000000 +1300
@@ -46,7 +46,7 @@
FileDialog dialog = new FileDialog(parent, "Load Theory", FileDialog.LOAD);
dialog.setDirectory(currentLoadDirectory);
dialog.setFile("*.pro");
- dialog.show();
+ dialog.setVisible(true);
String directory = dialog.getDirectory();
currentLoadDirectory = directory;
String fileName = dialog.getFile();
@@ -61,7 +61,7 @@
public String saveTheoryAs(String theory) throws Exception {
FileDialog dialog = new FileDialog(parent, "Save Theory As...", FileDialog.SAVE);
dialog.setDirectory(currentSaveDirectory);
- dialog.show();
+ dialog.setVisible(true);
String directory = dialog.getDirectory();
currentSaveDirectory = directory;
String fileName = dialog.getFile();
diff -ur src.orig/alice/tuprologx/ide/GUILauncher.java src/alice/tuprologx/ide/GUILauncher.java
--- src.orig/alice/tuprologx/ide/GUILauncher.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/tuprologx/ide/GUILauncher.java 2007-01-31 19:39:21.000000000 +1300
@@ -74,7 +74,7 @@
private void launchDotNetGUI() {
DotNetIDE ide = new DotNetIDE();
ide.pack();
- ide.show();
+ ide.setVisible(true);
}
/**
diff -ur src.orig/alice/util/jedit/JEditTextArea.java src/alice/util/jedit/JEditTextArea.java
--- src.orig/alice/util/jedit/JEditTextArea.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/util/jedit/JEditTextArea.java 2007-01-31 19:39:21.000000000 +1300
@@ -115,10 +115,10 @@
* Returns if this component can be traversed by pressing
* the Tab key. This returns false.
*/
- public final boolean isManagingFocus()
+ /*public final boolean isManagingFocus()
{
return true;
- }
+ }*/
/**
* Returns the object responsible for painting this text area.
@@ -507,7 +507,7 @@
if(id == Token.NULL)
fm = painter.getFontMetrics();
else
- fm = styles[id].getFontMetrics(defaultFont);
+ fm = styles[id].getFontMetrics(painter, defaultFont);
int length = tokens.length;
@@ -604,7 +604,7 @@
if(id == Token.NULL)
fm = painter.getFontMetrics();
else
- fm = styles[id].getFontMetrics(defaultFont);
+ fm = styles[id].getFontMetrics(painter, defaultFont);
int length = tokens.length;
diff -ur src.orig/alice/util/jedit/SyntaxStyle.java src/alice/util/jedit/SyntaxStyle.java
--- src.orig/alice/util/jedit/SyntaxStyle.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/util/jedit/SyntaxStyle.java 2007-01-31 19:39:21.000000000 +1300
@@ -9,6 +9,7 @@
package alice.util.jedit;
import java.awt.*;
+import javax.swing.*;
import java.util.StringTokenizer;
/**
@@ -86,7 +87,7 @@
/**
* Returns the font metrics for the styled font.
*/
- public FontMetrics getFontMetrics(Font font)
+ public FontMetrics getFontMetrics(JComponent component, Font font)
{
if(font == null)
throw new NullPointerException("font param must not"
@@ -98,7 +99,7 @@
(bold ? Font.BOLD : 0)
| (italic ? Font.ITALIC : 0),
font.getSize());
- fontMetrics = Toolkit.getDefaultToolkit().getFontMetrics(
+ fontMetrics = component.getFontMetrics(
lastStyledFont);
return fontMetrics;
}
diff -ur src.orig/alice/util/jedit/TextAreaPainter.java src/alice/util/jedit/TextAreaPainter.java
--- src.orig/alice/util/jedit/TextAreaPainter.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/util/jedit/TextAreaPainter.java 2007-01-31 19:39:21.000000000 +1300
@@ -67,10 +67,10 @@
* Returns if this component can be traversed by pressing the
* Tab key. This returns false.
*/
- public final boolean isManagingFocus()
+ /*public final boolean isManagingFocus()
{
return false;
- }
+ }*/
/**
* Returns the syntax styles used to paint colorized text. Entry <i>n</i>
@@ -350,7 +350,7 @@
public void setFont(Font font)
{
super.setFont(font);
- fm = Toolkit.getDefaultToolkit().getFontMetrics(font);
+ fm = getFontMetrics(font);
textArea.recalculateVisibleLines();
}
diff -ur src.orig/alice/util/thinlet/Thinlet.java src/alice/util/thinlet/Thinlet.java
--- src.orig/alice/util/thinlet/Thinlet.java 2007-01-30 15:12:42.000000000 +1300
+++ src/alice/util/thinlet/Thinlet.java 2007-01-31 19:39:21.000000000 +1300
@@ -1,4 +1,4 @@
-/* ��������
+/* ����
Thinlet GUI toolkit - www.thinlet.com
Copyright (C) 2002 Robert Bajzat (robert.bajzat@thinlet.com)
@@ -2157,7 +2157,7 @@
*
* @return true as focus-transverable component, overwrites the default false value
*/
- public boolean isFocusTraversable() {
+ public boolean isFocusable() {
return true;
}
|
GitWeb