| |
@@ -3,7 +3,6 @@ |
| 3 |
3 |
|
|
| 4 |
4 |
|
import java.util.*; |
| 5 |
5 |
|
|
| 6 |
|
- |
import org.litesoft.core.simpletypes.boxers.*; |
| 7 |
6 |
|
import org.litesoft.util.*; |
| 8 |
7 |
|
import org.litesoft.ui_1_5.*; |
| 9 |
8 |
|
|
| |
@@ -177,32 +176,32 @@ |
| 177 |
176 |
|
mEntries.putAll( pEntries.mEntries ); |
| 178 |
177 |
|
} |
| 179 |
178 |
|
|
| 180 |
|
- |
private Map<String, BoxedString> mEntries = new HashMap<String, BoxedString>(); |
| |
179 |
+ |
private Map<String, String> mEntries = new HashMap<String, String>(); |
| 181 |
180 |
|
|
| 182 |
181 |
|
private void LLadd( String pKey, String pResolved ) |
| 183 |
182 |
|
{ |
| 184 |
|
- |
mEntries.put( pKey, new BoxedString( Entry.normalizeResolved( pResolved ) ) ); |
| |
183 |
+ |
mEntries.put( pKey, Entry.normalizeResolved( pResolved ) ); |
| 185 |
184 |
|
} |
| 186 |
185 |
|
|
| 187 |
|
- |
public synchronized BoxedString getEntry( String pKey ) |
| |
186 |
+ |
public synchronized String getEntry( String pKey ) |
| 188 |
187 |
|
{ |
| 189 |
188 |
|
return mEntries.get( Utils.deNull( pKey ).trim() ); |
| 190 |
189 |
|
} |
| 191 |
190 |
|
|
| 192 |
|
- |
public BoxedString getTooltip( String pKey ) |
| |
191 |
+ |
public String getTooltip( String pKey ) |
| 193 |
192 |
|
{ |
| 194 |
193 |
|
return getEntry( Utils.deNull( pKey ).trim() + TOOLTIP ); |
| 195 |
194 |
|
} |
| 196 |
195 |
|
|
| 197 |
|
- |
public BoxedString getEntry( String pKey, Handler pCommon ) |
| |
196 |
+ |
public String getEntry( String pKey, Handler pCommon ) |
| 198 |
197 |
|
{ |
| 199 |
|
- |
BoxedString rv = getEntry( pKey ); |
| |
198 |
+ |
String rv = getEntry( pKey ); |
| 200 |
199 |
|
return (rv != null) ? rv : pCommon.getEntry( pKey ); |
| 201 |
200 |
|
} |
| 202 |
201 |
|
|
| 203 |
|
- |
public BoxedString getTooltip( String pKey, Handler pCommon ) |
| |
202 |
+ |
public String getTooltip( String pKey, Handler pCommon ) |
| 204 |
203 |
|
{ |
| 205 |
|
- |
BoxedString rv = getTooltip( pKey ); |
| |
204 |
+ |
String rv = getTooltip( pKey ); |
| 206 |
205 |
|
return (rv != null) ? rv : pCommon.getTooltip( pKey ); |
| 207 |
206 |
|
} |
| 208 |
207 |
|
|
| |
@@ -276,31 +275,31 @@ |
| 276 |
275 |
|
|
| 277 |
276 |
|
public String resolveLabel( String pLabelID ) |
| 278 |
277 |
|
{ |
| 279 |
|
- |
BoxedString entry = mLabelAndInputs.getEntry( pLabelID, mCommons ); |
| 280 |
|
- |
return (entry != null) ? entry.toString() : mProxied.resolveLabel( pLabelID ); |
| |
278 |
+ |
String entry = mLabelAndInputs.getEntry( pLabelID, mCommons ); |
| |
279 |
+ |
return (entry != null) ? entry : mProxied.resolveLabel( pLabelID ); |
| 281 |
280 |
|
} |
| 282 |
281 |
|
|
| 283 |
282 |
|
public String resolveAction( String pActionID ) |
| 284 |
283 |
|
{ |
| 285 |
|
- |
BoxedString entry = mActions.getEntry( pActionID, mCommons ); |
| 286 |
|
- |
return (entry != null) ? entry.toString() : mProxied.resolveAction( pActionID ); |
| |
284 |
+ |
String entry = mActions.getEntry( pActionID, mCommons ); |
| |
285 |
+ |
return (entry != null) ? entry : mProxied.resolveAction( pActionID ); |
| 287 |
286 |
|
} |
| 288 |
287 |
|
|
| 289 |
288 |
|
public String resolveActionTooltip( String pActionID ) |
| 290 |
289 |
|
{ |
| 291 |
|
- |
BoxedString entry = mActions.getTooltip( pActionID, mCommons ); |
| 292 |
|
- |
return (entry != null) ? entry.toString() : mProxied.resolveActionTooltip( pActionID ); |
| |
290 |
+ |
String entry = mActions.getTooltip( pActionID, mCommons ); |
| |
291 |
+ |
return (entry != null) ? entry : mProxied.resolveActionTooltip( pActionID ); |
| 293 |
292 |
|
} |
| 294 |
293 |
|
|
| 295 |
294 |
|
public String resolveInputTooltip( String pInputID ) |
| 296 |
295 |
|
{ |
| 297 |
|
- |
BoxedString entry = mLabelAndInputs.getTooltip( pInputID, mCommons ); |
| 298 |
|
- |
return (entry != null) ? entry.toString() : mProxied.resolveInputTooltip( pInputID ); |
| |
296 |
+ |
String entry = mLabelAndInputs.getTooltip( pInputID, mCommons ); |
| |
297 |
+ |
return (entry != null) ? entry : mProxied.resolveInputTooltip( pInputID ); |
| 299 |
298 |
|
} |
| 300 |
299 |
|
|
| 301 |
300 |
|
public String resolveError( String pErrorID ) |
| 302 |
301 |
|
{ |
| 303 |
|
- |
BoxedString entry = mErrors.getEntry( pErrorID, mCommons ); |
| 304 |
|
- |
return (entry != null) ? entry.toString() : mProxied.resolveError( pErrorID ); |
| |
302 |
+ |
String entry = mErrors.getEntry( pErrorID, mCommons ); |
| |
303 |
+ |
return (entry != null) ? entry : mProxied.resolveError( pErrorID ); |
| 305 |
304 |
|
} |
| 306 |
305 |
|
} |
View this file contents
View the full history
Commits for