Revision 977

View differences:

trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/JMenuItem.java
80 80
	/**
81 81
	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
82 82
	 */
83
	public void setToolTipText(String text) {
83
	public void setToolTip(String text) {
84 84
		toolTip = text;
85
		super.setToolTipText(text);
86 85
	}
87 86
}
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/JPopUpMenu.java
35 35
	/**
36 36
	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
37 37
	 */
38
	public void setToolTipText(String text) {
38
	public void setToolTip(String text) {
39 39
		toolTip = text;
40
		super.setToolTipText(text);
41 40
	}
42 41
	/**
43 42
	 * 
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/MDIFrame.java
199 199
        btn.addActionListener(this);
200 200
        btn.setFocusable(false);
201 201
        btn.setActionCommand(selectableTool.getActionCommand());
202
        btn.setToolTipText(ps.getText(selectableTool.getTooltip()));
202
        btn.setToolTipText(selectableTool.getTooltip());
203 203
        
204 204
        if (selectableTool.getIsDefault()) {
205 205
            btn.setSelected(true);
......
225 225
        }
226 226

  
227 227
        if (selectableTool.getEnableText() != null) {
228
            btn.setEnableText(selectableTool.getEnableText());
228
            btn.setEnableText(ps.getText(selectableTool.getEnableText()));
229 229
        }
230 230

  
231 231
        if (selectableTool.getLast() == true) {
......
266 266
        btn.addActionListener(this);
267 267
        btn.setFocusable(false);
268 268
        btn.setActionCommand(actionTool.getActionCommand());
269
        btn.setToolTipText(ps.getText(actionTool.getTooltip()));
270 269

  
271 270
        String name = getName(toolBar.getName(), loader);
272 271

  
......
284 283
        controlClass.put(btn, loader.loadClass(ext.getClassName()));
285 284

  
286 285
        if (actionTool.getTooltip() != null) {
287
            btn.setToolTipText(ps.getText(actionTool.getTooltip()));
288
            // TODO: QUITAR LA SIGUIENTE LINEA, ES PARA DEPURAR
289
            // btn.setText(actionTool.getTooltip());
286
            btn.setToolTip(ps.getText(actionTool.getTooltip()));
290 287
        }
291 288

  
292 289
        if (actionTool.getEnableText() != null) {
293
            btn.setEnableText(actionTool.getEnableText());
290
            btn.setEnableText(ps.getText(actionTool.getEnableText()));
294 291
        }
295 292

  
296 293
        if (actionTool.getLast() == true) {
......
578 575
        nuevoMenu.setActionCommand(menu.getActionCommand());
579 576

  
580 577
        if (menu.getTooltip() != null) {
581
            nuevoMenu.setToolTipText(ps.getText(menu.getTooltip()));
578
            nuevoMenu.setToolTip(ps.getText(menu.getTooltip()));
582 579
        }
583 580

  
584 581
        if (menu.getEnableText() != null) {
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/JButton.java
63 63
	 */
64 64
	public void setEnabled(boolean aFlag) {
65 65
		super.setEnabled(aFlag);
66
		// TODO: Habilitar cuando funcione lo de los tooltips
67
		/* if (aFlag){
66
		if (aFlag){
68 67
			setToolTipText(toolTip);
69 68
		}else{
70 69
			setToolTipText(enableText);
71
		}  */
70
		}
72 71
	}
73 72
	/**
74 73
	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
75 74
	 */
76
	public void setToolTipText(String text) {
75
	public void setToolTip(String text) {
77 76
		toolTip = text;
78
		/* System.out.println("fijanto tooltip=" + text + " a componente " + this.getText());
79
		if (text == null)
80
		{
81
			Exception e = new Exception();
82
			e.printStackTrace();
83
		} */
84
		super.setToolTipText(text);
85 77
	}
86 78
}
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/JToggleButton.java
97 97
	/**
98 98
	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
99 99
	 */
100
	public void setToolTipText(String text) {
100
	public void setToolTip(String text) {
101 101
		toolTip = text;
102
		super.setToolTipText(text);
103 102
	}
104 103
}
trunk/frameworks/_fwAndami/src/com/iver/andami/ui/mdiFrame/EnableTextSupport.java
31 31
	/**
32 32
	 * @see javax.swing.JComponent#setToolTipText(java.lang.String)
33 33
	 */
34
	public abstract void setToolTipText(String text);
34
	public abstract void setToolTip(String text);
35 35
}

Also available in: Unified diff