Revision 42161 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/java/org/gvsig/andami/actioninfo/impl/DefaultActionInfo.java

View differences:

DefaultActionInfo.java
195 195
        }
196 196
        return this.identityManager;
197 197
    }
198
    
198

  
199 199
    private SimpleIdentity getCurrentUser() {
200 200
        return this.getIdentityManager().getCurrentIdentity();
201 201
    }
202
    
202

  
203 203
    public boolean isVisible() {
204 204
        if( !this.getCurrentUser().isAuthorized(this.getName()) ) {
205 205
            return false;
......
395 395
            return this.iconName;
396 396
        }
397 397
        if (Action.SHORT_DESCRIPTION.equalsIgnoreCase(key)) {
398
            return this.text;
398
            return this.getLabel();
399 399
        }
400 400
        if (ActionInfo.TOOLTIP.equalsIgnoreCase(key)) {
401
            return this.text;
401
            return this.getTooltip();
402 402
        }
403 403
        if (ActionInfo.POSITION.equalsIgnoreCase(key)) {
404 404
            return this.position;
......
435 435

  
436 436
    public void putValue(String key, Object newValue) {
437 437
        super.putValue(key, newValue);
438
        // This class is immutable, only "active" can be changed 
438
        // This class is immutable, only "active" can be changed
439 439
        if (ActionInfo.ACTIVE.equalsIgnoreCase(key)) {
440 440
            this.setActive(this.active);
441 441
        }

Also available in: Unified diff