Revision 7244

View differences:

branches/v10/libraries/libUI/src-test/org/gvsig/gui/beans/comboBoxItemsSeeker/TestJComboBoxItemsSeekerConfigurable.java
7 7

  
8 8
import org.gvsig.gui.beans.Messages;
9 9

  
10
import com.iver.andami.PluginServices;
11 10

  
12

  
13

  
14 11
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
15 12
 *
16 13
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
branches/v10/libraries/libUI/src/org/gvsig/gui/beans/ProgressDialog.java
43 43
 *
44 44
 * $Id$
45 45
 * $Log$
46
 * Revision 1.4  2006-08-29 07:56:08  cesar
46
 * Revision 1.4.2.1  2006-09-13 13:13:19  cesar
47
 * Replace PluginServices.getText by the new Messages bridge class from libUI
48
 *
49
 * Revision 1.4  2006/08/29 07:56:08  cesar
47 50
 * Rename the *View* family of classes to *Window* (ie: SingletonView to SingletonWindow, ViewInfo to WindowInfo, etc)
48 51
 *
49 52
 * Revision 1.3  2006/06/15 15:47:25  jaume
......
64 67
import javax.swing.JLabel;
65 68
import javax.swing.JProgressBar;
66 69

  
67
import com.iver.andami.PluginServices;
68 70
import com.iver.andami.messages.NotificationManager;
69 71
import com.iver.andami.ui.mdiManager.SingletonWindow;
70 72
/**
......
141 143
						cc.cancel();
142 144
				}
143 145
			});
144
			btnCancel.setText(PluginServices.getText(this, "cancel"));
146
			btnCancel.setText(Messages.getText("cancel"));
145 147
		}
146 148
		return btnCancel;
147 149
	}
branches/v10/libraries/libUI/src/org/gvsig/gui/beans/optionsEditionByMousePopupMenu/JOptionsEditionByMousePopupMenu.java
7 7
import java.io.Serializable;
8 8
import java.util.HashMap;
9 9

  
10
import com.iver.andami.PluginServices;
11 10

  
12 11
import javax.swing.ImageIcon;
13 12
import javax.swing.JMenuItem;
14 13
import javax.swing.JPopupMenu;
15 14
import javax.swing.border.BevelBorder;
16 15

  
16
import org.gvsig.gui.beans.Messages;
17

  
17 18
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
18 19
*
19 20
* Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
......
135 136
	 */
136 137
	private JMenuItem getJMenuItemUndo() {
137 138
		if (jMenuItemUndo == null) {
138
			ImageIcon undoIcon = new ImageIcon("images/edit-undo.png", PluginServices.getText(null, "edit_undo"));
139
			jMenuItemUndo = new JMenuItem(PluginServices.getText(null, "edit_undo"), undoIcon);
139
			ImageIcon undoIcon = new ImageIcon("images/edit-undo.png", Messages.getText("edit_undo"));
140
			jMenuItemUndo = new JMenuItem(Messages.getText("edit_undo"), undoIcon);
140 141
			jMenuItemUndo.setHorizontalTextPosition(JMenuItem.RIGHT);
141 142
			jMenuItemUndo.addActionListener(this.getMenuListener());
142
			map.put(PluginServices.getText(null, "edit_undo"), new Integer(JOptionsEditionByMousePopupMenu.UNDO));
143
			map.put(Messages.getText("edit_undo"), new Integer(JOptionsEditionByMousePopupMenu.UNDO));
143 144
		}
144 145
		return jMenuItemUndo;
145 146
	}
......
151 152
	 */
152 153
	private JMenuItem getJMenuItemRedo() {
153 154
		if (jMenuItemRedo == null) {
154
			ImageIcon redoIcon = new ImageIcon("images/edit-redo.png", PluginServices.getText(null, "edit_redo"));
155
			jMenuItemRedo = new JMenuItem(PluginServices.getText(null, "edit_redo"), redoIcon);
155
			ImageIcon redoIcon = new ImageIcon("images/edit-redo.png", Messages.getText("edit_redo"));
156
			jMenuItemRedo = new JMenuItem(Messages.getText("edit_redo"), redoIcon);
156 157
			jMenuItemRedo.setHorizontalTextPosition(JMenuItem.RIGHT);
157 158
			jMenuItemRedo.addActionListener(this.getMenuListener());
158
			map.put(PluginServices.getText(null, "edit_redo"), new Integer(JOptionsEditionByMousePopupMenu.REDO));
159
			map.put(Messages.getText("edit_redo"), new Integer(JOptionsEditionByMousePopupMenu.REDO));
159 160
		}
160 161
		return jMenuItemRedo;
161 162
	}
......
167 168
	 */
168 169
	private JMenuItem getJMenuItemCut() {
169 170
		if (jMenuItemCut == null) {
170
			ImageIcon cutIcon = new ImageIcon("images/edit-cut.png", PluginServices.getText(null, "edit_cut"));
171
			jMenuItemCut = new JMenuItem(PluginServices.getText(null, "edit_cut"), cutIcon);
171
			ImageIcon cutIcon = new ImageIcon("images/edit-cut.png", Messages.getText("edit_cut"));
172
			jMenuItemCut = new JMenuItem(Messages.getText("edit_cut"), cutIcon);
172 173
			jMenuItemCut.setHorizontalTextPosition(JMenuItem.RIGHT);
173 174
			jMenuItemCut.addActionListener(this.getMenuListener());
174
			map.put(PluginServices.getText(null, "edit_cut"), new Integer(JOptionsEditionByMousePopupMenu.CUT));
175
			map.put(Messages.getText("edit_cut"), new Integer(JOptionsEditionByMousePopupMenu.CUT));
175 176
		}
176 177
		return jMenuItemCut;
177 178
	}
......
183 184
	 */
184 185
	private JMenuItem getJMenuItemCopy() {
185 186
		if (jMenuItemCopy == null) {
186
			ImageIcon copyIcon = new ImageIcon("images/edit-copy.png", PluginServices.getText(null, "edit_copy"));
187
			jMenuItemCopy = new JMenuItem(PluginServices.getText(null, "edit_copy"), copyIcon);
187
			ImageIcon copyIcon = new ImageIcon("images/edit-copy.png", Messages.getText("edit_copy"));
188
			jMenuItemCopy = new JMenuItem(Messages.getText("edit_copy"), copyIcon);
188 189
			jMenuItemCopy.setHorizontalTextPosition(JMenuItem.RIGHT);
189 190
			jMenuItemCopy.addActionListener(this.getMenuListener());
190
			map.put(PluginServices.getText(null, "edit_copy"), new Integer(JOptionsEditionByMousePopupMenu.COPY));
191
			map.put(Messages.getText("edit_copy"), new Integer(JOptionsEditionByMousePopupMenu.COPY));
191 192
		}
192 193
		return jMenuItemCopy;
193 194
	}
......
199 200
	 */
200 201
	private JMenuItem getJMenuItemPaste() {
201 202
		if (jMenuItemPaste == null) {
202
			ImageIcon pasteIcon = new ImageIcon("images/edit-paste.png", PluginServices.getText(null, "edit_paste"));
203
			jMenuItemPaste = new JMenuItem(PluginServices.getText(null, "edit_paste"), pasteIcon);
203
			ImageIcon pasteIcon = new ImageIcon("images/edit-paste.png", Messages.getText("edit_paste"));
204
			jMenuItemPaste = new JMenuItem(Messages.getText("edit_paste"), pasteIcon);
204 205
			jMenuItemPaste.setHorizontalTextPosition(JMenuItem.RIGHT);
205 206
			jMenuItemPaste.addActionListener(this.getMenuListener());
206
			map.put(PluginServices.getText(null, "edit_paste"), new Integer(JOptionsEditionByMousePopupMenu.PASTE));
207
			map.put(Messages.getText("edit_paste"), new Integer(JOptionsEditionByMousePopupMenu.PASTE));
207 208
		}
208 209
		return jMenuItemPaste;
209 210
	}
......
215 216
	 */
216 217
	private JMenuItem getJMenuItemDelete() {
217 218
		if (jMenuItemDelete == null) {
218
			ImageIcon deleteIcon = new ImageIcon("images/edit-delete.png", PluginServices.getText(null, "edit_delete"));
219
			jMenuItemDelete = new JMenuItem(PluginServices.getText(null, "edit_delete"), deleteIcon);
219
			ImageIcon deleteIcon = new ImageIcon("images/edit-delete.png", Messages.getText("edit_delete"));
220
			jMenuItemDelete = new JMenuItem(Messages.getText("edit_delete"), deleteIcon);
220 221
			jMenuItemDelete.setHorizontalTextPosition(JMenuItem.RIGHT);
221 222
			jMenuItemDelete.addActionListener(this.getMenuListener());
222
			map.put(PluginServices.getText(null, "edit_delete"), new Integer(JOptionsEditionByMousePopupMenu.DELETE));
223
			map.put(Messages.getText("edit_delete"), new Integer(JOptionsEditionByMousePopupMenu.DELETE));
223 224
		}
224 225
		return jMenuItemDelete;
225 226
	}	
......
231 232
	 */
232 233
	private JMenuItem getJMenuItemSelectAll() {
233 234
		if (jMenuItemSelectAll == null) {
234
			ImageIcon selectAllIcon = new ImageIcon("images/edit-select-all.png", PluginServices.getText(null, "edit_select_all"));
235
			jMenuItemSelectAll = new JMenuItem(PluginServices.getText(null, "edit_select_all"), selectAllIcon);
235
			ImageIcon selectAllIcon = new ImageIcon("images/edit-select-all.png", Messages.getText("edit_select_all"));
236
			jMenuItemSelectAll = new JMenuItem(Messages.getText("edit_select_all"), selectAllIcon);
236 237
			jMenuItemSelectAll.setHorizontalTextPosition(JMenuItem.RIGHT);
237 238
			jMenuItemSelectAll.addActionListener(this.getMenuListener());
238
			map.put(PluginServices.getText(null, "edit_select_all"), new Integer(JOptionsEditionByMousePopupMenu.SELECT_ALL));
239
			map.put(Messages.getText("edit_select_all"), new Integer(JOptionsEditionByMousePopupMenu.SELECT_ALL));
239 240
		}
240 241
		return jMenuItemSelectAll;
241 242
	}
branches/v10/libraries/libUI/src/org/gvsig/gui/beans/AcceptCancelPanel.java
43 43
*
44 44
* $Id$
45 45
* $Log$
46
* Revision 1.3  2006-07-20 11:12:25  jaume
46
* Revision 1.3.2.1  2006-09-13 13:13:19  cesar
47
* Replace PluginServices.getText by the new Messages bridge class from libUI
48
*
49
* Revision 1.3  2006/07/20 11:12:25  jaume
47 50
* *** empty log message ***
48 51
*
49 52
* Revision 1.2  2006/07/20 10:42:37  jaume
......
63 66

  
64 67
import org.gvsig.gui.beans.swing.JButton;
65 68

  
66
import com.iver.andami.PluginServices;
67

  
68 69
/**
69 70
 * A JPanel representing a normative sized and aligned Ok and Cancel buttons according
70 71
 * on the gvSIG's style sheet. The buttons size is automatically handled as far as the
......
118 119
	private JButton getBtnOk(ActionListener okAction) {
119 120
		if (btnOk == null) {
120 121
			btnOk = new JButton();
121
			btnOk.setText(PluginServices.getText( this, "ok" ));
122
			btnOk.setText(Messages.getText("ok" ));
122 123
			if (okAction != null)
123 124
				btnOk.addActionListener(okAction);
124 125
		}
......
133 134
	private JButton getCancelButton(ActionListener cancelAction) {
134 135
		if (btnCancel == null) {
135 136
			btnCancel = new JButton();
136
			btnCancel.setText(PluginServices.getText( this, "cancel" ));
137
			btnCancel.setText(Messages.getText("cancel" ));
137 138
			if (cancelAction != null)
138 139
				btnCancel.addActionListener(cancelAction);
139 140
		}
branches/v10/libraries/libUI/src/org/gvsig/gui/beans/comboBoxItemsSeeker/JComboBoxItemsSeekerConfigurable.java
50 50
import javax.swing.undo.UndoableEdit;
51 51

  
52 52
import org.apache.log4j.Logger;
53
import org.gvsig.gui.beans.Messages;
53 54
import org.gvsig.gui.beans.optionsEditionByMousePopupMenu.JOptionsEditionByMousePopupMenu;
54 55

  
55 56

  
56
import com.iver.andami.PluginServices;
57

  
58 57
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
59 58
 *
60 59
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
......
287 286
		this.beepEnabled = true;
288 287
		
289 288
		if (!testFlagsConfigurationOK())
290
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
289
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
291 290
		else
292 291
			this.configure();
293 292
	}
......
327 326
		this.allowedRepeatedItems = allowed_Repeated_Items;
328 327
		
329 328
		if (!testFlagsConfigurationOK())
330
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
329
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
331 330
		else
332 331
			this.configure();
333 332
	}
......
1947 1946
		this.model.setStartBehavior(start_Behavior);
1948 1947
		
1949 1948
		if (!this.model.testFlagsConfigurationOK())
1950
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1949
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1951 1950
		else
1952 1951
			updateLastSelectionItem();
1953 1952
	}
......
1960 1959
		this.model.setSearchBehavior(search_Behavior);
1961 1960
		
1962 1961
		if (!this.model.testFlagsConfigurationOK())
1963
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1962
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1964 1963
		else
1965 1964
			updateLastSelectionItem();
1966 1965
	}
......
1986 1985
		this.model.setCaseSensitive(case_Sensitive);
1987 1986
		
1988 1987
		if (!this.model.testFlagsConfigurationOK())
1989
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1988
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
1990 1989
	}
1991 1990

  
1992 1991
	/**
......
2011 2010
		this.onlyOneColor = only_One_Color;
2012 2011
		
2013 2012
		if (!this.model.testFlagsConfigurationOK())
2014
			JOptionPane.showMessageDialog(this, PluginServices.getText(this, "errorMessageJComboBoxItemsSeekerConfigurable"), PluginServices.getText(this, "exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
2013
			JOptionPane.showMessageDialog(this, Messages.getText("errorMessageJComboBoxItemsSeekerConfigurable"), Messages.getText("exportJOP2Title"), JOptionPane.ERROR_MESSAGE);
2015 2014
	}
2016 2015
	
2017 2016

  

Also available in: Unified diff