|
@@ -16,8 +16,7 @@ |
16 |
16 |
|
CurrentUserView, |
17 |
17 |
|
CurrentOptionView, |
18 |
18 |
|
AlternateOptionPickerWidgetPanel, |
19 |
|
- |
PageRefreshableProxy |
20 |
|
- |
{ |
|
19 |
+ |
PageRefreshableProxy { |
21 |
20 |
|
private SizeableLabel mMessage = new Message().style( "Message" ); |
22 |
21 |
|
private Picker mPicker = new Picker().style( "Picker" ); |
23 |
22 |
|
private SimpleLabel mCurrentOption = new SimpleLabel( "---" ).style( "CurrentOption" ); |
|
@@ -35,31 +34,24 @@ |
35 |
34 |
|
private Widget mContent; |
36 |
35 |
|
private PageRefreshable mProxiedPageRefreshable = null; |
37 |
36 |
|
|
38 |
|
- |
public AppPanel( int pAddBottomPaddingPixels ) |
39 |
|
- |
{ |
|
37 |
+ |
public AppPanel( int pAddBottomPaddingPixels ) { |
40 |
38 |
|
stretchable(); |
41 |
39 |
|
|
42 |
40 |
|
add( mContent = mDefaultContent ); |
43 |
41 |
|
add( mStatusBar ); |
44 |
42 |
|
|
45 |
|
- |
if ( pAddBottomPaddingPixels > 0 ) |
46 |
|
- |
{ |
|
43 |
+ |
if ( pAddBottomPaddingPixels > 0 ) { |
47 |
44 |
|
add( new Spacer( pAddBottomPaddingPixels ) ); |
48 |
45 |
|
} |
49 |
46 |
|
|
50 |
47 |
|
setInfoMessage( "" ); |
51 |
48 |
|
|
52 |
|
- |
mStatusBar.setRefreshButtonClickHandler( new ClickHandler() |
53 |
|
- |
{ |
|
49 |
+ |
mStatusBar.setRefreshButtonClickHandler( new ClickHandler() { |
54 |
50 |
|
@Override |
55 |
|
- |
public void onClick( ClickEvent event ) |
56 |
|
- |
{ |
57 |
|
- |
if ( UtilsGwt.wasAltKeyDownOnCurrentEvent() ) |
58 |
|
- |
{ |
|
51 |
+ |
public void onClick( ClickEvent event ) { |
|
52 |
+ |
if ( UtilsGwt.wasAltKeyDownOnCurrentEvent() ) { |
59 |
53 |
|
BrowserAsLogSyncFactory.open(); |
60 |
|
- |
} |
61 |
|
- |
else |
62 |
|
- |
{ |
|
54 |
+ |
} else { |
63 |
55 |
|
refreshPage(); |
64 |
56 |
|
} |
65 |
57 |
|
} |
|
@@ -67,134 +59,107 @@ |
67 |
59 |
|
} |
68 |
60 |
|
|
69 |
61 |
|
@Override |
70 |
|
- |
public void setPicker( final Widget pPicker ) |
71 |
|
- |
{ |
72 |
|
- |
mStatusBar.change( new Command() |
73 |
|
- |
{ |
|
62 |
+ |
public void setPicker( final Widget pPicker ) { |
|
63 |
+ |
mStatusBar.change( new Command() { |
74 |
64 |
|
@Override |
75 |
|
- |
public void execute() |
76 |
|
- |
{ |
|
65 |
+ |
public void execute() { |
77 |
66 |
|
mPicker.setWidget( (pPicker != null) ? pPicker : new Spacer() ); |
78 |
67 |
|
} |
79 |
68 |
|
} ); |
80 |
69 |
|
} |
81 |
70 |
|
|
82 |
71 |
|
@Override |
83 |
|
- |
public void setCurrentOption( final String pCurrentOption ) |
84 |
|
- |
{ |
85 |
|
- |
mStatusBar.change( new Command() |
86 |
|
- |
{ |
|
72 |
+ |
public void setCurrentOption( final String pCurrentOption ) { |
|
73 |
+ |
mStatusBar.change( new Command() { |
87 |
74 |
|
@Override |
88 |
|
- |
public void execute() |
89 |
|
- |
{ |
|
75 |
+ |
public void execute() { |
90 |
76 |
|
mCurrentOption.setText( pCurrentOption ); |
91 |
77 |
|
} |
92 |
78 |
|
} ); |
93 |
79 |
|
} |
94 |
80 |
|
|
95 |
81 |
|
@Override |
96 |
|
- |
public void setProxyTo( PageRefreshable pPageRefreshable ) |
97 |
|
- |
{ |
|
82 |
+ |
public void setProxyTo( PageRefreshable pPageRefreshable ) { |
98 |
83 |
|
mProxiedPageRefreshable = pPageRefreshable; |
99 |
84 |
|
} |
100 |
85 |
|
|
101 |
86 |
|
@Override |
102 |
|
- |
public void refreshPage() |
103 |
|
- |
{ |
104 |
|
- |
if ( mProxiedPageRefreshable != null ) |
105 |
|
- |
{ |
|
87 |
+ |
public void refreshPage() { |
|
88 |
+ |
if ( mProxiedPageRefreshable != null ) { |
106 |
89 |
|
mProxiedPageRefreshable.refreshPage(); |
107 |
90 |
|
} |
108 |
91 |
|
} |
109 |
92 |
|
|
110 |
93 |
|
@Override |
111 |
|
- |
public void setUser( final String pUser ) |
112 |
|
- |
{ |
113 |
|
- |
mStatusBar.change( new Command() |
114 |
|
- |
{ |
|
94 |
+ |
public void setUser( final String pUser ) { |
|
95 |
+ |
mStatusBar.change( new Command() { |
115 |
96 |
|
@Override |
116 |
|
- |
public void execute() |
117 |
|
- |
{ |
|
97 |
+ |
public void execute() { |
118 |
98 |
|
mUser.setText( pUser ); |
119 |
99 |
|
} |
120 |
100 |
|
} ); |
121 |
101 |
|
} |
122 |
102 |
|
|
123 |
103 |
|
@Override |
124 |
|
- |
public void clearMessage() |
125 |
|
- |
{ |
|
104 |
+ |
public void clearMessage() { |
126 |
105 |
|
setInfoMessage( null ); |
127 |
106 |
|
} |
128 |
107 |
|
|
129 |
108 |
|
@Override |
130 |
|
- |
public void clearMessage( String pMessage ) |
131 |
|
- |
{ |
132 |
|
- |
if ( mLastMessage.equals( pMessage ) ) |
133 |
|
- |
{ |
|
109 |
+ |
public void clearMessage( String pMessage ) { |
|
110 |
+ |
if ( mLastMessage.equals( pMessage ) ) { |
134 |
111 |
|
clearMessage(); |
135 |
112 |
|
} |
136 |
113 |
|
} |
137 |
114 |
|
|
138 |
115 |
|
@Override |
139 |
|
- |
public void setInfoMessage( String pMessage ) |
140 |
|
- |
{ |
|
116 |
+ |
public void setInfoMessage( String pMessage ) { |
141 |
117 |
|
setMessage( STYLE_INFO, pMessage ); |
142 |
118 |
|
} |
143 |
119 |
|
|
144 |
120 |
|
@Override |
145 |
|
- |
public void setWarningMessage( String pMessage ) |
146 |
|
- |
{ |
|
121 |
+ |
public void setWarningMessage( String pMessage ) { |
147 |
122 |
|
setMessage( STYLE_WARNING, pMessage ); |
148 |
123 |
|
} |
149 |
124 |
|
|
150 |
125 |
|
@Override |
151 |
|
- |
public void setErrorMessage( String pMessage ) |
152 |
|
- |
{ |
|
126 |
+ |
public void setErrorMessage( String pMessage ) { |
153 |
127 |
|
setMessage( STYLE_ERROR, pMessage ); |
154 |
128 |
|
} |
155 |
129 |
|
|
156 |
130 |
|
private String mLastMessage = " "; |
157 |
131 |
|
|
158 |
|
- |
private void setMessage( String pStyle, String pMessage ) |
159 |
|
- |
{ |
|
132 |
+ |
private void setMessage( String pStyle, String pMessage ) { |
160 |
133 |
|
final String zMessage = Strings.noEmpty( pMessage ); |
161 |
|
- |
if ( zMessage == null ) |
162 |
|
- |
{ |
|
134 |
+ |
if ( zMessage == null ) { |
163 |
135 |
|
pStyle = STYLE_INFO; |
164 |
136 |
|
} |
165 |
137 |
|
mStatusBar.removeStyleName( STYLE_INFO ); |
166 |
138 |
|
mStatusBar.removeStyleName( STYLE_WARNING ); |
167 |
139 |
|
mStatusBar.removeStyleName( STYLE_ERROR ); |
168 |
140 |
|
mStatusBar.addStyleName( pStyle ); |
169 |
|
- |
mStatusBar.change( new Command() |
170 |
|
- |
{ |
|
141 |
+ |
mStatusBar.change( new Command() { |
171 |
142 |
|
@Override |
172 |
|
- |
public void execute() |
173 |
|
- |
{ |
|
143 |
+ |
public void execute() { |
174 |
144 |
|
mMessage.setText( mLastMessage = (zMessage != null) ? zMessage : " " ); |
175 |
145 |
|
} |
176 |
146 |
|
} ); |
177 |
147 |
|
} |
178 |
148 |
|
|
179 |
149 |
|
@Override |
180 |
|
- |
public void setWidget( Widget pWidget ) |
181 |
|
- |
{ |
|
150 |
+ |
public void setWidget( Widget pWidget ) { |
182 |
151 |
|
mNewContent = (pWidget != null) ? pWidget : mDefaultContent; |
183 |
152 |
|
resetSizing(); |
184 |
153 |
|
} |
185 |
154 |
|
|
186 |
155 |
|
private Widget mNewContent = null; |
187 |
156 |
|
|
188 |
|
- |
private void resetSizing() |
189 |
|
- |
{ |
|
157 |
+ |
private void resetSizing() { |
190 |
158 |
|
boolean zHasSized = WindowSizingPanel.HasSized; |
191 |
|
- |
if ( !zHasSized ) |
192 |
|
- |
{ |
193 |
|
- |
Scheduler.get().scheduleDeferred( new Command() |
194 |
|
- |
{ |
|
159 |
+ |
if ( !zHasSized ) { |
|
160 |
+ |
Scheduler.get().scheduleDeferred( new Command() { |
195 |
161 |
|
@Override |
196 |
|
- |
public void execute() |
197 |
|
- |
{ |
|
162 |
+ |
public void execute() { |
198 |
163 |
|
resetSizing(); |
199 |
164 |
|
} |
200 |
165 |
|
} ); |
|
@@ -208,18 +173,15 @@ |
208 |
173 |
|
mContent.setHeight( "" + zHeight ); |
209 |
174 |
|
} |
210 |
175 |
|
|
211 |
|
- |
private void setWidgetAt( int pIndex, Widget pWidget ) |
212 |
|
- |
{ |
|
176 |
+ |
private void setWidgetAt( int pIndex, Widget pWidget ) { |
213 |
177 |
|
remove( pIndex ); |
214 |
178 |
|
insert( pWidget, pIndex ); |
215 |
179 |
|
} |
216 |
180 |
|
|
217 |
|
- |
private static class StatusBar extends SizeableHorizontalPanel |
218 |
|
- |
{ |
|
181 |
+ |
private static class StatusBar extends SizeableHorizontalPanel { |
219 |
182 |
|
private RefreshButton mRefreshButton; |
220 |
183 |
|
|
221 |
|
- |
private StatusBar( Widget pW1, Widget pW2, Widget pW3 ) |
222 |
|
- |
{ |
|
184 |
+ |
private StatusBar( Widget pW1, Widget pW2, Widget pW3 ) { |
223 |
185 |
|
stretchableHorizontally(); |
224 |
186 |
|
|
225 |
187 |
|
add( pW1 ); |
|
@@ -232,58 +194,47 @@ |
232 |
194 |
|
add( mRefreshButton ); |
233 |
195 |
|
} |
234 |
196 |
|
|
235 |
|
- |
public StatusBar setStyle( String pStyle ) |
236 |
|
- |
{ |
|
197 |
+ |
public StatusBar setStyle( String pStyle ) { |
237 |
198 |
|
style( pStyle ); |
238 |
199 |
|
return this; |
239 |
200 |
|
} |
240 |
201 |
|
|
241 |
|
- |
public void setRefreshButtonClickHandler( ClickHandler pClickHandler ) |
242 |
|
- |
{ |
|
202 |
+ |
public void setRefreshButtonClickHandler( ClickHandler pClickHandler ) { |
243 |
203 |
|
mRefreshButton.addClickHandler( pClickHandler ); |
244 |
204 |
|
} |
245 |
205 |
|
|
246 |
|
- |
public void change( Command pCommand ) |
247 |
|
- |
{ |
|
206 |
+ |
public void change( Command pCommand ) { |
248 |
207 |
|
pCommand.execute(); |
249 |
208 |
|
getWidthHelper().contentChangedResizeToParent(); |
250 |
209 |
|
} |
251 |
210 |
|
} |
252 |
211 |
|
|
253 |
|
- |
private static class Message extends SizeableLabel |
254 |
|
- |
{ |
255 |
|
- |
private Message() |
256 |
|
- |
{ |
|
212 |
+ |
private static class Message extends SizeableLabel { |
|
213 |
+ |
private Message() { |
257 |
214 |
|
super( " ", false ); |
258 |
215 |
|
stretchableHorizontally(); |
259 |
216 |
|
} |
260 |
217 |
|
} |
261 |
218 |
|
|
262 |
|
- |
private static class PCO extends HorizontalPanel |
263 |
|
- |
{ |
264 |
|
- |
private PCO( Widget pW1, Widget pW2 ) |
265 |
|
- |
{ |
|
219 |
+ |
private static class PCO extends HorizontalPanel { |
|
220 |
+ |
private PCO( Widget pW1, Widget pW2 ) { |
266 |
221 |
|
setVerticalAlignment( ALIGN_MIDDLE ); |
267 |
222 |
|
add( pW1 ); |
268 |
223 |
|
add( pW2 ); |
269 |
224 |
|
} |
270 |
225 |
|
|
271 |
|
- |
public PCO style( String pName ) |
272 |
|
- |
{ |
|
226 |
+ |
public PCO style( String pName ) { |
273 |
227 |
|
addStyleName( pName ); |
274 |
228 |
|
return this; |
275 |
229 |
|
} |
276 |
230 |
|
} |
277 |
231 |
|
|
278 |
|
- |
private static class Picker extends SimplePanel |
279 |
|
- |
{ |
280 |
|
- |
public Picker() |
281 |
|
- |
{ |
|
232 |
+ |
private static class Picker extends SimplePanel { |
|
233 |
+ |
public Picker() { |
282 |
234 |
|
setWidget( new Spacer() ); |
283 |
235 |
|
} |
284 |
236 |
|
|
285 |
|
- |
public Picker style( String pName ) |
286 |
|
- |
{ |
|
237 |
+ |
public Picker style( String pName ) { |
287 |
238 |
|
setStyleName( pName ); |
288 |
239 |
|
return this; |
289 |
240 |
|
} |