• R/O
  • SSH
  • HTTPS

propedit: コミット


コミットメタ情報

リビジョン78 (tree)
日時2009-05-02 21:13:32
作者chomakichi

ログメッセージ

プロジェクト毎に設定を保持できるように修正
国際化対応のpropertiesファイルを整理

変更サマリ

差分

--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/ReplaceTextDialog.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/ReplaceTextDialog.java (revision 78)
@@ -8,7 +8,6 @@
88 import java.awt.GridBagLayout;
99 import java.awt.Insets;
1010 import java.awt.event.ActionEvent;
11-import java.util.ResourceBundle;
1211
1312 import javax.swing.JButton;
1413 import javax.swing.JLabel;
@@ -17,8 +16,6 @@
1716
1817 public class ReplaceTextDialog extends BaseDialog {
1918
20- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
21-
2219 private String sourceText;
2320
2421 private String exchangeText;
@@ -49,7 +46,7 @@
4946
5047 public ReplaceTextDialog(Frame frame, boolean modal) {
5148
52- this(frame, res.getString("replaceMenuItem_Text"), modal); //$NON-NLS-1$
49+ this(frame, PropertiesEditor.getI18nProperty("replaceMenuItem_Text"), modal); //$NON-NLS-1$
5350 }
5451
5552 private ReplaceTextDialog(Frame frame, String title, boolean modal) {
@@ -72,7 +69,7 @@
7269
7370 panel1.setLayout(borderLayout1);
7471 replaceButton.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
75- replaceButton.setText(res.getString("replaceMenuItem_Text")); //$NON-NLS-1$
72+ replaceButton.setText(PropertiesEditor.getI18nProperty("replaceMenuItem_Text")); //$NON-NLS-1$
7673 replaceButton.addActionListener(new java.awt.event.ActionListener() {
7774
7875 public void actionPerformed(ActionEvent e) {
@@ -81,7 +78,7 @@
8178 }
8279 });
8380 cancelButton.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
84- cancelButton.setText(res.getString("KEY17")); //$NON-NLS-1$
81+ cancelButton.setText(PropertiesEditor.getI18nProperty("KEY17")); //$NON-NLS-1$
8582 cancelButton.addActionListener(new java.awt.event.ActionListener() {
8683
8784 public void actionPerformed(ActionEvent e) {
@@ -93,12 +90,12 @@
9390 flowLayout1.setAlignment(FlowLayout.RIGHT);
9491 jPanel2.setLayout(gridBagLayout1);
9592 jLabel1.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
96- jLabel1.setText(res.getString("jLabel1_Text1")); //$NON-NLS-1$
93+ jLabel1.setText(PropertiesEditor.getI18nProperty("jLabel1_Text1")); //$NON-NLS-1$
9794 sourceTextField.setFont(new java.awt.Font("Dialog", 0, 14)); //$NON-NLS-1$
9895 sourceTextField.setPreferredSize(new Dimension(200, 30));
9996 sourceTextField.setText(""); //$NON-NLS-1$
10097 jLabel2.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
101- jLabel2.setText(res.getString("jLabel2_Text")); //$NON-NLS-1$
98+ jLabel2.setText(PropertiesEditor.getI18nProperty("jLabel2_Text")); //$NON-NLS-1$
10299 exchangeTextField.setFont(new java.awt.Font("Dialog", 0, 14)); //$NON-NLS-1$
103100 exchangeTextField.setPreferredSize(new Dimension(200, 30));
104101 exchangeTextField.setText(""); //$NON-NLS-1$
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditorFrame_AboutBox.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditorFrame_AboutBox.java (revision 78)
@@ -12,7 +12,6 @@
1212 import java.awt.event.ActionEvent;
1313 import java.awt.event.ActionListener;
1414 import java.awt.event.WindowEvent;
15-import java.util.ResourceBundle;
1615
1716 import javax.swing.BorderFactory;
1817 import javax.swing.ImageIcon;
@@ -31,10 +30,6 @@
3130 */
3231 public class PropertiesEditorFrame_AboutBox extends JDialog implements ActionListener {
3332
34- /**
35- */
36- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
37-
3833 private JPanel panel1 = new JPanel();
3934
4035 /**
@@ -118,13 +113,13 @@
118113 image1 = new ImageIcon(jp.gr.java_conf.ussiy.app.propedit.PropertiesEditorFrame.class.getResource("resource/editor.gif")); //$NON-NLS-1$
119114 imageLabel.setBorder(null);
120115 imageLabel.setIcon(image1);
121- this.setTitle(res.getString("versionMenuItem_Text")); //$NON-NLS-1$
116+ this.setTitle(PropertiesEditor.getI18nProperty("versionMenuItem_Text")); //$NON-NLS-1$
122117 panel1.setLayout(borderLayout1);
123118 panel2.setLayout(borderLayout2);
124119 insetsPanel2.setLayout(borderLayout3);
125120 insetsPanel2.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
126121 label2.setFont(new java.awt.Font("Dialog", 1, 16)); //$NON-NLS-1$
127- label2.setText(res.getString("label2_Text") + PropertiesEditor.VERSION); //$NON-NLS-1$
122+ label2.setText(PropertiesEditor.getI18nProperty("label2_Text") + PropertiesEditor.VERSION); //$NON-NLS-1$
128123 label3.setFont(new java.awt.Font("Dialog", 1, 15)); //$NON-NLS-1$
129124 label3.setText(PropertiesEditor.COPYRIGHT);
130125 label3.setVerticalAlignment(SwingConstants.CENTER);
@@ -134,10 +129,10 @@
134129 button1.addActionListener(this);
135130 jTextField1.setBorder(null);
136131 jTextField1.setEditable(false);
137- jTextField1.setText(res.getString("jTextField1_Text")); //$NON-NLS-1$
132+ jTextField1.setText(PropertiesEditor.getI18nProperty("jTextField1_Text")); //$NON-NLS-1$
138133 jPanel1.setLayout(borderLayout5);
139134 jLabel1.setFont(new java.awt.Font("Dialog", 0, 14)); //$NON-NLS-1$
140- jLabel1.setText(res.getString("license_Text")); //$NON-NLS-1$
135+ jLabel1.setText(PropertiesEditor.getI18nProperty("license_Text")); //$NON-NLS-1$
141136 insetsPanel2.add(imageLabel, BorderLayout.CENTER);
142137 panel2.add(insetsPanel2, BorderLayout.WEST);
143138 this.getContentPane().add(panel1, null);
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditor.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditor.java (revision 78)
@@ -22,7 +22,7 @@
2222
2323 /**
2424 */
25- public static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
25+ private static ResourceBundle res = ResourceBundle.getBundle("jp.gr.java_conf.ussiy.app.propedit.lang"); //$NON-NLS-1$
2626
2727 public static String VERSION = res.getString("version"); //$NON-NLS-1$
2828
@@ -80,4 +80,8 @@
8080 System.out.println(PropertiesEditor.COPYRIGHT);
8181 System.out.println("*****************************************/"); //$NON-NLS-1$
8282 }
83+
84+ public static String getI18nProperty(String key) {
85+ return res.getString(key);
86+ }
8387 }
\ No newline at end of file
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/PropertiesEditorPlugin.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/PropertiesEditorPlugin.java (revision 78)
@@ -13,6 +13,8 @@
1313 */
1414 public class PropertiesEditorPlugin extends AbstractUIPlugin {
1515
16+ public static String PLUGIN_ID = "jp.gr.java_conf.ussiy.app.propedit"; //$NON-NLS-1$
17+
1618 //The shared instance.
1719 private static PropertiesEditorPlugin plugin;
1820
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/checker/CheckAndMarkDuplicateKey.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/checker/CheckAndMarkDuplicateKey.java (revision 78)
@@ -10,6 +10,7 @@
1010
1111 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
1212 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesEditorDuplicationCheckerPreference;
13+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
1314
1415 import org.eclipse.core.resources.IMarker;
1516 import org.eclipse.core.resources.IResource;
@@ -57,7 +58,7 @@
5758 String line = null;
5859 int cntLine = 0;
5960 Map map = new HashMap();
60- String warn = jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor.res.getString("eclipse_editor_key_duplicate"); //$NON-NLS-1$
61+ String warn = Messages.getString("eclipse_editor_key_duplicate"); //$NON-NLS-1$
6162 boolean multipleValueFlg = false;
6263 List duplicateKeyList = new ArrayList();
6364
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/property/PropertiesProperty.java (nonexistent)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/property/PropertiesProperty.java (revision 78)
@@ -0,0 +1,240 @@
1+package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property;
2+
3+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
4+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
5+
6+import org.eclipse.core.resources.IProject;
7+import org.eclipse.core.resources.ResourcesPlugin;
8+import org.eclipse.core.runtime.CoreException;
9+import org.eclipse.core.runtime.ILog;
10+import org.eclipse.core.runtime.IStatus;
11+import org.eclipse.core.runtime.QualifiedName;
12+import org.eclipse.core.runtime.Status;
13+import org.eclipse.jface.dialogs.ErrorDialog;
14+import org.eclipse.swt.SWT;
15+import org.eclipse.swt.events.SelectionAdapter;
16+import org.eclipse.swt.events.SelectionEvent;
17+import org.eclipse.swt.layout.GridData;
18+import org.eclipse.swt.layout.GridLayout;
19+import org.eclipse.swt.widgets.Button;
20+import org.eclipse.swt.widgets.Combo;
21+import org.eclipse.swt.widgets.Composite;
22+import org.eclipse.swt.widgets.Control;
23+import org.eclipse.swt.widgets.Group;
24+import org.eclipse.swt.widgets.Label;
25+import org.eclipse.swt.widgets.Text;
26+import org.eclipse.ui.dialogs.PropertyPage;
27+
28+public class PropertiesProperty extends PropertyPage {
29+
30+ public static final String P_ENCODE = "readEncode"; //$NON-NLS-1$
31+
32+ public static final String P_NOT_CONVERT_COMMENT = "notConvertComment"; //$NON-NLS-1$
33+
34+ public static final String P_NOT_ALL_CONVERT = "notConvert"; //$NON-NLS-1$
35+
36+ public static final String P_COMMENT_CHARACTER = "commentCharacter"; //$NON-NLS-1$
37+
38+ public static final String P_ORIGINAL_SETTINGS = "originalSettings"; //$NON-NLS-1$
39+
40+ private String[] items = new String[] { System.getProperty("file.encoding"), "US-ASCII", "UTF-8", "UTF-16" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
41+
42+ private Button orgCheckBox = null;
43+
44+ private Combo encodeCombo = null;
45+
46+ private Text commentText = null;
47+
48+ private Button notAllConvertCheckBox = null;
49+
50+ private Button notConvertCommentCheckBox = null;
51+
52+ protected Control createContents(Composite parent) {
53+
54+ Composite composite = new Composite(parent, SWT.NONE);
55+ GridLayout layout = new GridLayout();
56+ layout.numColumns = 2;
57+ composite.setLayout(layout);
58+ composite.setLayoutData(new GridData(GridData.FILL_BOTH));
59+
60+ orgCheckBox = new Button(composite, SWT.CHECK);
61+ orgCheckBox.setText(Messages.getString("eclipse.propertieseditor.property.project_org_settings")); //$NON-NLS-1$
62+ GridData gd = new GridData();
63+ gd.horizontalSpan = 2;
64+ orgCheckBox.setLayoutData(gd);
65+ orgCheckBox.addSelectionListener(new SelectionAdapter() {
66+ public void widgetSelected(SelectionEvent e) {
67+ if (orgCheckBox.getSelection()) {
68+ encodeCombo.setEnabled(true);
69+ commentText.setEnabled(true);
70+ notAllConvertCheckBox.setEnabled(true);
71+ if (notAllConvertCheckBox.getSelection()) {
72+ notConvertCommentCheckBox.setEnabled(false);
73+ } else {
74+ notConvertCommentCheckBox.setEnabled(true);
75+ }
76+ } else {
77+ encodeCombo.setEnabled(false);
78+ commentText.setEnabled(false);
79+ notAllConvertCheckBox.setEnabled(false);
80+ notConvertCommentCheckBox.setEnabled(false);
81+ }
82+ }
83+ });
84+
85+ Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
86+ gd = new GridData(GridData.FILL_HORIZONTAL);
87+ gd.horizontalSpan = 2;
88+ separator.setLayoutData(gd);
89+
90+ Label label= new Label(composite, SWT.NONE);
91+ label.setText(Messages.getString("eclipse.propertieseditor.preference.read.encode")); //$NON-NLS-1$
92+
93+ encodeCombo = new Combo(composite, SWT.DROP_DOWN);
94+ encodeCombo.setItems(items);
95+
96+ label = new Label(composite, SWT.NONE);
97+ label.setText(Messages.getString("eclipse.propertieseditor.preference.comment.character")); //$NON-NLS-1$
98+
99+ commentText = new Text(composite, SWT.BORDER);
100+ commentText.setTextLimit(1);
101+
102+ Group group = new Group(composite, SWT.NONE);
103+ group.setLayout(new GridLayout());
104+ gd = new GridData(GridData.FILL_HORIZONTAL);
105+ gd.horizontalSpan = 2;
106+ group.setLayoutData(gd);
107+ group.setText(Messages.getString("eclipse.propertieseditor.preference.convert.option.group")); //$NON=NLS-1$ //$NON-NLS-1$
108+
109+ notAllConvertCheckBox = new Button(group, SWT.CHECK);
110+ notAllConvertCheckBox.setText(Messages.getString("eclipse.propertieseditor.preference.convert")); //$NON-NLS-1$
111+ notAllConvertCheckBox.addSelectionListener(new SelectionAdapter() {
112+ public void widgetSelected(SelectionEvent e) {
113+ if (notAllConvertCheckBox.getSelection()) {
114+ notConvertCommentCheckBox.setEnabled(false);
115+ } else {
116+ notConvertCommentCheckBox.setEnabled(true);
117+ }
118+ }
119+ });
120+
121+ notConvertCommentCheckBox = new Button(group, SWT.CHECK);
122+ notConvertCommentCheckBox.setText(Messages.getString("eclipse.propertieseditor.preference.convert.comment")); //$NON-NLS-1$
123+
124+ initialize();
125+
126+ return composite;
127+ }
128+
129+ private void initialize() {
130+ String org = null;
131+ String encode = null;
132+ String commentChar = null;
133+ String notAllConvert = null;
134+ String notConvertComment = null;
135+ try {
136+ IProject project = (IProject)getElement();
137+ org = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_ORIGINAL_SETTINGS));
138+ encode = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_ENCODE));
139+ commentChar = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_COMMENT_CHARACTER));
140+ notAllConvert = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_NOT_ALL_CONVERT));
141+ notConvertComment = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_NOT_CONVERT_COMMENT));
142+ } catch (CoreException e) {
143+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
144+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
145+ log.log(status);
146+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.get.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
147+ }
148+
149+ if (encode != null) {
150+ encodeCombo.setText(encode);
151+ } else {
152+ encodeCombo.setText(ResourcesPlugin.getEncoding());
153+ }
154+ if (commentChar != null) {
155+ commentText.setText(commentChar);
156+ } else {
157+ commentText.setText("#"); //$NON-NLS-1$
158+ }
159+ if (notAllConvert != null) {
160+ notAllConvertCheckBox.setSelection(Boolean.valueOf(notAllConvert).booleanValue());
161+ if (notAllConvertCheckBox.getSelection()) {
162+ notConvertCommentCheckBox.setEnabled(false);
163+ } else {
164+ notConvertCommentCheckBox.setEnabled(true);
165+ }
166+ } else {
167+ notAllConvertCheckBox.setSelection(false);
168+ notConvertCommentCheckBox.setEnabled(false);
169+ }
170+ if (notConvertComment != null) {
171+ notConvertCommentCheckBox.setSelection(Boolean.valueOf(notConvertComment).booleanValue());
172+ } else {
173+ notConvertCommentCheckBox.setSelection(false);
174+ }
175+
176+ if (org != null) {
177+ orgCheckBox.setSelection(Boolean.valueOf(org).booleanValue());
178+ if (orgCheckBox.getSelection()) {
179+ encodeCombo.setEnabled(true);
180+ commentText.setEnabled(true);
181+ notAllConvertCheckBox.setEnabled(true);
182+ if (notAllConvertCheckBox.getSelection()) {
183+ notConvertCommentCheckBox.setEnabled(false);
184+ } else {
185+ notConvertCommentCheckBox.setEnabled(true);
186+ }
187+ } else {
188+ encodeCombo.setEnabled(false);
189+ commentText.setEnabled(false);
190+ notAllConvertCheckBox.setEnabled(false);
191+ notConvertCommentCheckBox.setEnabled(false);
192+ }
193+ } else {
194+ orgCheckBox.setSelection(false);
195+ encodeCombo.setEnabled(false);
196+ commentText.setEnabled(false);
197+ notAllConvertCheckBox.setEnabled(false);
198+ notConvertCommentCheckBox.setEnabled(false);
199+ }
200+
201+ }
202+
203+ /**
204+ * @see org.eclipse.jface.preference.PreferencePage#performApply()
205+ */
206+ protected void performApply() {
207+ try {
208+ IProject project = (IProject)getElement();
209+ project.setPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_ORIGINAL_SETTINGS), Boolean.toString(orgCheckBox.getSelection()));
210+ project.setPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_ENCODE), encodeCombo.getText());
211+ project.setPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_COMMENT_CHARACTER), commentText.getText());
212+ project.setPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_NOT_ALL_CONVERT), Boolean.toString(notAllConvertCheckBox.getSelection()));
213+ project.setPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, P_NOT_CONVERT_COMMENT), Boolean.toString(notConvertCommentCheckBox.getSelection()));
214+ } catch (CoreException e) {
215+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
216+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
217+ log.log(status);
218+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.save.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
219+ }
220+ }
221+
222+ protected void performDefaults() {
223+ encodeCombo.setText(ResourcesPlugin.getEncoding());
224+ commentText.setText("#"); //$NON-NLS-1$
225+ notAllConvertCheckBox.setSelection(false);
226+ notConvertCommentCheckBox.setEnabled(false);
227+ notConvertCommentCheckBox.setSelection(false);
228+ orgCheckBox.setSelection(false);
229+ encodeCombo.setEnabled(false);
230+ commentText.setEnabled(false);
231+ notAllConvertCheckBox.setEnabled(false);
232+ notConvertCommentCheckBox.setEnabled(false);
233+ }
234+
235+ public boolean performOk() {
236+ performApply();
237+ return true;
238+ }
239+
240+}
\ No newline at end of file
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/property/PropertyUtil.java (nonexistent)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/property/PropertyUtil.java (revision 78)
@@ -0,0 +1,118 @@
1+package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property;
2+
3+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
4+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
5+
6+import org.eclipse.core.resources.IProject;
7+import org.eclipse.core.runtime.CoreException;
8+import org.eclipse.core.runtime.ILog;
9+import org.eclipse.core.runtime.IStatus;
10+import org.eclipse.core.runtime.QualifiedName;
11+import org.eclipse.core.runtime.Status;
12+import org.eclipse.jface.dialogs.ErrorDialog;
13+
14+public class PropertyUtil {
15+
16+ public static String getEncode(IProject project, String preference) {
17+ String org = null;
18+ String encode = null;
19+ try {
20+ org = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_ORIGINAL_SETTINGS));
21+ encode = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_ENCODE));
22+ } catch (CoreException e) {
23+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
24+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
25+ log.log(status);
26+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.get.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
27+ }
28+ if (org != null) {
29+ if (Boolean.valueOf(org).booleanValue()) {
30+ if (encode == null || encode.equals("")) { //$NON-NLS-1$
31+ return preference;
32+ } else {
33+ return encode;
34+ }
35+ }
36+ }
37+ return preference;
38+ }
39+
40+ public static String getCommentChar(IProject project, String preference) {
41+ String org = null;
42+ String commentChar = null;
43+ try {
44+ org = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_ORIGINAL_SETTINGS));
45+ commentChar = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_COMMENT_CHARACTER));
46+ } catch (CoreException e) {
47+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
48+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
49+ log.log(status);
50+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.get.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
51+ }
52+ if (org != null) {
53+ if (Boolean.valueOf(org).booleanValue()) {
54+ if (commentChar == null || commentChar.equals("")) { //$NON-NLS-1$
55+ return preference;
56+ } else {
57+ return commentChar;
58+ }
59+ }
60+ }
61+ return preference;
62+ }
63+
64+ public static boolean getNotAllConvert(IProject project, boolean preference) {
65+ String org = null;
66+ String notAllConvert = null;
67+ try {
68+ org = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_ORIGINAL_SETTINGS));
69+ notAllConvert = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_NOT_ALL_CONVERT));
70+ } catch (CoreException e) {
71+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
72+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
73+ log.log(status);
74+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.get.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
75+ }
76+ if (org != null) {
77+ if (Boolean.valueOf(org).booleanValue()) {
78+ if (notAllConvert == null || notAllConvert.equals("")) { //$NON-NLS-1$
79+ return preference;
80+ } else {
81+ return Boolean.valueOf(notAllConvert).booleanValue();
82+ }
83+ }
84+ }
85+ return preference;
86+ }
87+
88+ public static boolean getNotConvertComment(IProject project, boolean preference) {
89+ String org = null;
90+ String notAllConvert = null;
91+ String notConvertComment = null;
92+ try {
93+ org = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_ORIGINAL_SETTINGS));
94+ notAllConvert = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_NOT_ALL_CONVERT));
95+ notConvertComment = project.getPersistentProperty(new QualifiedName(PropertiesEditorPlugin.PLUGIN_ID, PropertiesProperty.P_NOT_CONVERT_COMMENT));
96+ } catch (CoreException e) {
97+ IStatus status = new Status(IStatus.ERROR, PropertiesEditorPlugin.PLUGIN_ID, 0, e.getMessage(), e);
98+ ILog log = PropertiesEditorPlugin.getDefault().getLog();
99+ log.log(status);
100+ ErrorDialog.openError(null, Messages.getString("eclipse.propertieseditor.property.error_title"), Messages.getString("eclipse.propertieseditor.property.get.settings.error"), status); //$NON-NLS-1$ //$NON-NLS-2$
101+ }
102+ if (org != null) {
103+ if (Boolean.valueOf(org).booleanValue()) {
104+ if (notAllConvert != null) {
105+ if (Boolean.valueOf(notAllConvert).booleanValue()) {
106+ return true;
107+ }
108+ }
109+ if (notConvertComment == null || notConvertComment.equals("")) { //$NON-NLS-1$
110+ return preference;
111+ } else {
112+ return Boolean.valueOf(notConvertComment).booleanValue();
113+ }
114+ }
115+ }
116+ return preference;
117+ }
118+}
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesDoubleClickStrategy.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesDoubleClickStrategy.java (revision 78)
@@ -35,6 +35,8 @@
3535 IDocument doc = fText.getDocument();
3636
3737 try {
38+ int len = doc.getLength();
39+ if (len == pos) return false;
3840 ITypedRegion[] partitionType = doc.computePartitioning(pos, 1);
3941 if (partitionType.length > 0) {
4042 if (partitionType[0].getType().equals(IDocument.DEFAULT_CONTENT_TYPE)) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesContentOutlinePage.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesContentOutlinePage.java (revision 78)
@@ -3,8 +3,8 @@
33 import java.net.MalformedURLException;
44 import java.net.URL;
55
6-import jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor;
76 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
7+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
88
99 import org.eclipse.jface.action.Action;
1010 import org.eclipse.jface.action.IToolBarManager;
@@ -84,7 +84,7 @@
8484 // create toolbar action
8585 PropertiesEditorPlugin.getDefault().getPluginPreferences().setDefault(ALPHA_SORT_BTN_CHECK_KEY, false);
8686 IToolBarManager toolbar = getSite().getActionBars().getToolBarManager();
87- String label = PropertiesEditor.res.getString("eclipse.contentoutline.sort.label"); //$NON-NLS-1$
87+ String label = Messages.getString("eclipse.contentoutline.sort.label"); //$NON-NLS-1$
8888 Action action = new Action(label, Action.AS_CHECK_BOX) {
8989 public void run() {
9090 PropertiesEditorPlugin.getDefault().getPluginPreferences().setValue(ALPHA_SORT_BTN_CHECK_KEY, isChecked());
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesDocumentProvider.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/PropertiesDocumentProvider.java (revision 78)
@@ -9,9 +9,11 @@
99 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
1010 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.listener.IPropertiesDocumentListener;
1111 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesPreference;
12+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property.PropertyUtil;
1213 import jp.gr.java_conf.ussiy.app.propedit.util.EncodeChanger;
1314
1415 import org.eclipse.core.resources.IFile;
16+import org.eclipse.core.resources.IProject;
1517 import org.eclipse.core.runtime.CoreException;
1618 import org.eclipse.core.runtime.IConfigurationElement;
1719 import org.eclipse.core.runtime.IExtension;
@@ -64,6 +66,8 @@
6466 IDocument document = null;
6567 if (element instanceof IEditorInput) {
6668 document = createEmptyDocument();
69+ IProject project = ((IFileEditorInput)element).getFile().getProject();
70+ readEncode = PropertyUtil.getEncode(project, readEncode);
6771 if (!setDocumentContent(document, (IEditorInput) element, readEncode)) {
6872 document = null;
6973 }
@@ -105,8 +109,8 @@
105109 IFileEditorInput input = (IFileEditorInput) element;
106110
107111 try {
108-
109- String encoding = PropertiesEditorPlugin.getDefault().getPreferenceStore().getString(PropertiesPreference.P_ENCODE);
112+ IProject project = input.getFile().getProject();
113+ String encoding = PropertyUtil.getEncode(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getString(PropertiesPreference.P_ENCODE));
110114 if (encoding == null || encoding.equals("")) { //$NON-NLS-1$
111115 encoding = getDefaultEncoding();
112116 }
@@ -122,9 +126,9 @@
122126 }
123127
124128 String uniEscStr = null;
125- if (PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_ALL_CONVERT)) {
129+ if (PropertyUtil.getNotAllConvert(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_ALL_CONVERT))) {
126130 uniEscStr = document.get();
127- } else if (PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT)) {
131+ } else if (PropertyUtil.getNotConvertComment(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT))) {
128132 uniEscStr = EncodeChanger.unicode2UnicodeEscWithoutComment(document.get());
129133 } else {
130134 uniEscStr = EncodeChanger.unicode2UnicodeEsc(document.get());
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/MultiPagePropertiesEditor.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/editors/MultiPagePropertiesEditor.java (revision 78)
@@ -7,9 +7,12 @@
77 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
88 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesEditorPreference;
99 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesPreference;
10+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property.PropertyUtil;
11+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
1012 import jp.gr.java_conf.ussiy.app.propedit.util.EncodeChanger;
1113
1214 import org.eclipse.core.resources.IMarker;
15+import org.eclipse.core.resources.IProject;
1316 import org.eclipse.core.runtime.IProgressMonitor;
1417 import org.eclipse.jface.dialogs.ErrorDialog;
1518 import org.eclipse.jface.preference.IPreferenceStore;
@@ -29,6 +32,7 @@
2932 import org.eclipse.ui.IEditorInput;
3033 import org.eclipse.ui.IEditorPart;
3134 import org.eclipse.ui.IEditorSite;
35+import org.eclipse.ui.IFileEditorInput;
3236 import org.eclipse.ui.IWorkbenchPreferenceConstants;
3337 import org.eclipse.ui.PartInitException;
3438 import org.eclipse.ui.ide.IDE;
@@ -69,7 +73,7 @@
6973 try {
7074 editor = new PropertiesEditor();
7175 int index = addPage(editor, getEditorInput());
72- setPageText(index, jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor.res.getString("eclipse.tabname.edit")); //$NON-NLS-1$
76+ setPageText(index, Messages.getString("eclipse.tabname.edit")); //$NON-NLS-1$
7377 setPartName(editor.getTitle());
7478 setPageImage(index, image);
7579 IPreferenceStore pStore = PropertiesEditorPlugin.getDefault().getPreferenceStore();
@@ -106,7 +110,7 @@
106110 text.setBackground(color);
107111
108112 int index = addPage(composite);
109- setPageText(index, jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor.res.getString("eclipse.tabname.preview")); //$NON-NLS-1$
113+ setPageText(index, Messages.getString("eclipse.tabname.preview")); //$NON-NLS-1$
110114 setPageImage(index, image);
111115 }
112116
@@ -203,7 +207,8 @@
203207
204208 super.pageChange(newPageIndex);
205209 String editorText = editor.getDocumentProvider().getDocument(editor.getEditorInput()).get();
206- if (PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT)) {
210+ IProject project = ((IFileEditorInput)editor.getEditorInput()).getFile().getProject();
211+ if (PropertyUtil.getNotConvertComment(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT))) {
207212 try {
208213 text.setText(EncodeChanger.unicode2UnicodeEscWithoutComment(editorText));
209214 } catch (IOException e) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/resources/Messages.java (nonexistent)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/resources/Messages.java (revision 78)
@@ -0,0 +1,22 @@
1+package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources;
2+
3+import java.util.MissingResourceException;
4+import java.util.ResourceBundle;
5+
6+public class Messages {
7+ private static final String BUNDLE_NAME = "jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.messages"; //$NON-NLS-1$
8+
9+ private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
10+ .getBundle(BUNDLE_NAME);
11+
12+ private Messages() {
13+ }
14+
15+ public static String getString(String key) {
16+ try {
17+ return RESOURCE_BUNDLE.getString(key);
18+ } catch (MissingResourceException e) {
19+ return '!' + key + '!';
20+ }
21+ }
22+}
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/action/ShowUnicodeEscAction.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/action/ShowUnicodeEscAction.java (revision 78)
@@ -7,8 +7,10 @@
77 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
88 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.PropertiesEditor;
99 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesPreference;
10+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property.PropertyUtil;
1011 import jp.gr.java_conf.ussiy.app.propedit.util.EncodeChanger;
1112
13+import org.eclipse.core.resources.IProject;
1214 import org.eclipse.jface.action.IAction;
1315 import org.eclipse.jface.resource.ImageDescriptor;
1416 import org.eclipse.jface.viewers.ISelection;
@@ -23,6 +25,7 @@
2325 import org.eclipse.swt.widgets.Shell;
2426 import org.eclipse.ui.IEditorActionDelegate;
2527 import org.eclipse.ui.IEditorPart;
28+import org.eclipse.ui.IFileEditorInput;
2629
2730 public class ShowUnicodeEscAction implements IEditorActionDelegate {
2831 private PropertiesEditor textEditor;
@@ -68,10 +71,13 @@
6871
6972 // set title
7073 shell.setText(textEditor.getTitle());
71-
7274 // set unicode text
7375 String editorText = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()).get();
74- if (PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT)) {
76+
77+ IProject project = ((IFileEditorInput)textEditor.getEditorInput()).getFile().getProject();
78+ if (PropertyUtil.getNotAllConvert(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_ALL_CONVERT))) {
79+ text.setText(editorText);
80+ } else if (PropertyUtil.getNotConvertComment(project, PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_CONVERT_COMMENT))) {
7581 try {
7682 text.setText(EncodeChanger.unicode2UnicodeEscWithoutComment(editorText));
7783 } catch (IOException e) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/action/ToggleCommentAction.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/action/ToggleCommentAction.java (revision 78)
@@ -4,7 +4,9 @@
44 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.MultiPagePropertiesEditor;
55 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.PropertiesEditor;
66 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesPreference;
7+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property.PropertyUtil;
78
9+import org.eclipse.core.resources.IProject;
810 import org.eclipse.jface.action.IAction;
911 import org.eclipse.jface.preference.IPreferenceStore;
1012 import org.eclipse.jface.text.BadLocationException;
@@ -15,6 +17,7 @@
1517 import org.eclipse.jface.viewers.ISelectionProvider;
1618 import org.eclipse.ui.IEditorActionDelegate;
1719 import org.eclipse.ui.IEditorPart;
20+import org.eclipse.ui.IFileEditorInput;
1821
1922 public class ToggleCommentAction implements IEditorActionDelegate {
2023 private PropertiesEditor textEditor;
@@ -45,7 +48,8 @@
4548
4649 IPreferenceStore pStore = PropertiesEditorPlugin.getDefault().getPreferenceStore();
4750
48- String commentString = pStore.getString(PropertiesPreference.P_COMMENT_CHARACTER);
51+ IProject project = ((IFileEditorInput)textEditor.getEditorInput()).getFile().getProject();
52+ String commentString = PropertyUtil.getCommentChar(project, pStore.getString(PropertiesPreference.P_COMMENT_CHARACTER));
4953
5054 ISelectionProvider selection = textEditor.getSelectionProvider();
5155 if (selection == null) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesEditorPreference.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesEditorPreference.java (revision 78)
@@ -1,9 +1,9 @@
11 package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference;
22
3-import jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor;
43 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
54 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.ColorManager;
65 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.MultiPagePropertiesEditor;
6+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
77
88 import org.eclipse.jface.preference.BooleanFieldEditor;
99 import org.eclipse.jface.preference.ColorFieldEditor;
@@ -58,7 +58,7 @@
5858
5959 super(GRID);
6060 setPreferenceStore(PropertiesEditorPlugin.getDefault().getPreferenceStore());
61- setDescription(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
61+ setDescription(Messages.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
6262 }
6363
6464 public void createFieldEditors() {
@@ -70,8 +70,8 @@
7070 collapseGd.horizontalSpan = 2;
7171 collapseGroup.setLayoutData(collapseGd);
7272 collapseGroup.setLayout(new GridLayout(1, true));
73- collapseGroup.setText(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.collapse.group")); //$NON-NLS-1$
74- collapseCheckFieldEditor = new BooleanFieldEditor(P_COLLAPSE, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.collapse"), collapseGroup) { //$NON-NLS-1$
73+ collapseGroup.setText(Messages.getString("eclipse.propertieseditor.preference.collapse.group")); //$NON-NLS-1$
74+ collapseCheckFieldEditor = new BooleanFieldEditor(P_COLLAPSE, Messages.getString("eclipse.propertieseditor.preference.collapse"), collapseGroup) { //$NON-NLS-1$
7575
7676 /**
7777 * @see org.eclipse.jface.preference.BooleanFieldEditor#valueChanged(boolean, boolean)
@@ -82,7 +82,7 @@
8282 super.valueChanged(oldValue, newValue);
8383 }
8484 };
85- initialCollapseCheckFieldEditor = new BooleanFieldEditor(P_INIT_COLLAPSE, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.initcollapse"), collapseGroup); //$NON-NLS-1$
85+ initialCollapseCheckFieldEditor = new BooleanFieldEditor(P_INIT_COLLAPSE, Messages.getString("eclipse.propertieseditor.preference.initcollapse"), collapseGroup); //$NON-NLS-1$
8686 initialCollapseCheckFieldEditor.setEnabled(PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesEditorPreference.P_COLLAPSE), collapseGroup);
8787
8888 final Group colorGroup = new Group(parent, SWT.NONE);
@@ -90,12 +90,12 @@
9090 colorGd.horizontalSpan = 2;
9191 colorGroup.setLayoutData(colorGd);
9292 colorGroup.setLayout(new GridLayout(1, true));
93- colorGroup.setText(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.option.group")); //$NON-NLS-1$
94- commentColorFieldEditor = new ColorFieldEditor(P_COMMENT_COLOR, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.comment"), colorGroup); //$NON-NLS-1$
95- separatorColorFieldEditor = new ColorFieldEditor(P_SEPARATOR_COLOR, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.separator"), colorGroup); //$NON-NLS-1$
96- keyColorFieldEditor = new ColorFieldEditor(P_KEY_COLOR, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.key"), colorGroup); //$NON-NLS-1$
97- valueColorFieldEditor = new ColorFieldEditor(P_VALUE_COLOR, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.value"), colorGroup); //$NON-NLS-1$
98- backgroundColorFieldEditor = new ColorFieldEditor(P_BACKGROUND_COLOR, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.color.background"), colorGroup); //$NON-NLS-1$
93+ colorGroup.setText(Messages.getString("eclipse.propertieseditor.preference.color.option.group")); //$NON-NLS-1$
94+ commentColorFieldEditor = new ColorFieldEditor(P_COMMENT_COLOR, Messages.getString("eclipse.propertieseditor.preference.color.comment"), colorGroup); //$NON-NLS-1$
95+ separatorColorFieldEditor = new ColorFieldEditor(P_SEPARATOR_COLOR, Messages.getString("eclipse.propertieseditor.preference.color.separator"), colorGroup); //$NON-NLS-1$
96+ keyColorFieldEditor = new ColorFieldEditor(P_KEY_COLOR, Messages.getString("eclipse.propertieseditor.preference.color.key"), colorGroup); //$NON-NLS-1$
97+ valueColorFieldEditor = new ColorFieldEditor(P_VALUE_COLOR, Messages.getString("eclipse.propertieseditor.preference.color.value"), colorGroup); //$NON-NLS-1$
98+ backgroundColorFieldEditor = new ColorFieldEditor(P_BACKGROUND_COLOR, Messages.getString("eclipse.propertieseditor.preference.color.background"), colorGroup); //$NON-NLS-1$
9999
100100 addField(collapseCheckFieldEditor);
101101 addField(initialCollapseCheckFieldEditor);
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesEditorDuplicationCheckerPreference.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesEditorDuplicationCheckerPreference.java (revision 78)
@@ -1,7 +1,7 @@
11 package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference;
22
3-import jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor;
43 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
4+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
55
66 import org.eclipse.jface.preference.BooleanFieldEditor;
77 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -19,7 +19,7 @@
1919
2020 super(GRID);
2121 setPreferenceStore(PropertiesEditorPlugin.getDefault().getPreferenceStore());
22- setDescription(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
22+ setDescription(Messages.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
2323 }
2424
2525 public void createFieldEditors() {
@@ -26,7 +26,7 @@
2626
2727 Composite parent = getFieldEditorParent();
2828
29- duplicateCheckFieldEditor = new BooleanFieldEditor(P_CHECK_KEY, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.checkduplication"), parent); //$NON-NLS-1$
29+ duplicateCheckFieldEditor = new BooleanFieldEditor(P_CHECK_KEY, Messages.getString("eclipse.propertieseditor.preference.checkduplication"), parent); //$NON-NLS-1$
3030
3131 addField(duplicateCheckFieldEditor);
3232 }
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesPreference.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/preference/PropertiesPreference.java (revision 78)
@@ -1,8 +1,8 @@
11 package jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference;
22
3-import jp.gr.java_conf.ussiy.app.propedit.PropertiesEditor;
43 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.PropertiesEditorPlugin;
54 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.editors.ComboFieldEditor;
5+import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
66
77 import org.eclipse.jface.preference.BooleanFieldEditor;
88 import org.eclipse.jface.preference.FieldEditorPreferencePage;
@@ -39,7 +39,7 @@
3939
4040 super(GRID);
4141 setPreferenceStore(PropertiesEditorPlugin.getDefault().getPreferenceStore());
42- setDescription(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
42+ setDescription(Messages.getString("eclipse.propertieseditor.preference.page.title")); //$NON-NLS-1$
4343 }
4444
4545 public void createFieldEditors() {
@@ -46,8 +46,8 @@
4646
4747 Composite parent = getFieldEditorParent();
4848
49- encodeComboFieldEditor = new ComboFieldEditor(P_ENCODE, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.read.encode"), items, parent); //$NON-NLS-1$
50- commentCharacterField = new StringFieldEditor(P_COMMENT_CHARACTER, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.comment.character"), 1, parent); //$NON-NLS-1$
49+ encodeComboFieldEditor = new ComboFieldEditor(P_ENCODE, Messages.getString("eclipse.propertieseditor.preference.read.encode"), items, parent); //$NON-NLS-1$
50+ commentCharacterField = new StringFieldEditor(P_COMMENT_CHARACTER, Messages.getString("eclipse.propertieseditor.preference.comment.character"), 1, parent); //$NON-NLS-1$
5151 commentCharacterField.setTextLimit(1);
5252
5353 final Group convGroup = new Group(parent, SWT.NONE);
@@ -55,8 +55,8 @@
5555 convGd.horizontalSpan = 2;
5656 convGroup.setLayoutData(convGd);
5757 convGroup.setLayout(new GridLayout(1, true));
58- convGroup.setText(PropertiesEditor.res.getString("eclipse.propertieseditor.preference.convert.option.group")); //$NON-NLS-1$
59- notAllConvertEditor = new BooleanFieldEditor(P_NOT_ALL_CONVERT, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.convert"), convGroup) { //$NON-NLS-1$
58+ convGroup.setText(Messages.getString("eclipse.propertieseditor.preference.convert.option.group")); //$NON-NLS-1$
59+ notAllConvertEditor = new BooleanFieldEditor(P_NOT_ALL_CONVERT, Messages.getString("eclipse.propertieseditor.preference.convert"), convGroup) { //$NON-NLS-1$
6060
6161 /**
6262 * @see org.eclipse.jface.preference.BooleanFieldEditor#valueChanged(boolean, boolean)
@@ -67,7 +67,7 @@
6767 super.valueChanged(oldValue, newValue);
6868 }
6969 };
70- notConvertCommentField = new BooleanFieldEditor(P_NOT_CONVERT_COMMENT, PropertiesEditor.res.getString("eclipse.propertieseditor.preference.convert.comment"), convGroup); //$NON-NLS-1$
70+ notConvertCommentField = new BooleanFieldEditor(P_NOT_CONVERT_COMMENT, Messages.getString("eclipse.propertieseditor.preference.convert.comment"), convGroup); //$NON-NLS-1$
7171 notConvertCommentField.setEnabled(!PropertiesEditorPlugin.getDefault().getPreferenceStore().getBoolean(PropertiesPreference.P_NOT_ALL_CONVERT), convGroup);
7272
7373 addField(commentCharacterField);
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/UnicodeDialog.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/UnicodeDialog.java (revision 78)
@@ -10,7 +10,6 @@
1010 import java.awt.Color;
1111 import java.awt.Frame;
1212 import java.awt.event.ActionEvent;
13-import java.util.ResourceBundle;
1413
1514 import javax.swing.JMenu;
1615 import javax.swing.JMenuBar;
@@ -27,10 +26,6 @@
2726 */
2827 public class UnicodeDialog extends BaseDialog {
2928
30- /**
31- */
32- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
33-
3429 private JPanel panel1 = new JPanel();
3530
3631 /**
@@ -85,8 +80,8 @@
8580 jTextArea1.setBackground(new Color(230, 230, 255));
8681 jTextArea1.setEnabled(true);
8782 jTextArea1.setEditable(false);
88- jMenu1.setText(res.getString("fileMenu_Text")); //$NON-NLS-1$
89- jMenuItem1.setText(res.getString("closeMenuItem_Text")); //$NON-NLS-1$
83+ jMenu1.setText(PropertiesEditor.getI18nProperty("fileMenu_Text")); //$NON-NLS-1$
84+ jMenuItem1.setText(PropertiesEditor.getI18nProperty("closeMenuItem_Text")); //$NON-NLS-1$
9085 jMenuItem1.setAccelerator(javax.swing.KeyStroke.getKeyStroke('U', java.awt.event.KeyEvent.CTRL_MASK, false));
9186 jMenuItem1.addActionListener(new java.awt.event.ActionListener() {
9287
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/BaseDialog.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/BaseDialog.java (revision 78)
@@ -27,14 +27,6 @@
2727 this.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2);
2828 }
2929
30- public void show() {
31-
32- // Setup the display position of a dialog
33- setInitScreen();
34- // Show
35- super.setVisible(true);
36- }
37-
3830 public void setVisible(boolean b) {
3931
4032 // Setup the display position of a dialog
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/SearchTextDialog.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/SearchTextDialog.java (revision 78)
@@ -6,7 +6,6 @@
66 import java.awt.Frame;
77 import java.awt.event.ActionEvent;
88 import java.awt.event.KeyEvent;
9-import java.util.ResourceBundle;
109
1110 import javax.swing.JButton;
1211 import javax.swing.JLabel;
@@ -15,8 +14,6 @@
1514
1615 public class SearchTextDialog extends BaseDialog {
1716
18- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
19-
2017 private String inputString;
2118
2219 private JPanel panel1 = new JPanel();
@@ -41,7 +38,7 @@
4138
4239 public SearchTextDialog(Frame frame, boolean modal) {
4340
44- this(frame, res.getString("findMenuItem_Text"), modal); //$NON-NLS-1$
41+ this(frame, PropertiesEditor.getI18nProperty("findMenuItem_Text"), modal); //$NON-NLS-1$
4542 }
4643
4744 private SearchTextDialog(Frame frame, String title, boolean modal) {
@@ -67,7 +64,7 @@
6764 flowLayout1.setAlignment(FlowLayout.RIGHT);
6865 jPanel2.setLayout(flowLayout2);
6966 jLabel1.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
70- jLabel1.setText(res.getString("jLabel1_Text2")); //$NON-NLS-1$
67+ jLabel1.setText(PropertiesEditor.getI18nProperty("jLabel1_Text2")); //$NON-NLS-1$
7168 inputTextField.setFont(new java.awt.Font("Dialog", 0, 14)); //$NON-NLS-1$
7269 inputTextField.setPreferredSize(new Dimension(200, 30));
7370 inputTextField.setText(""); //$NON-NLS-1$
@@ -79,7 +76,7 @@
7976 }
8077 });
8178 cancelButton.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
82- cancelButton.setText(res.getString("KEY17")); //$NON-NLS-1$
79+ cancelButton.setText(PropertiesEditor.getI18nProperty("KEY17")); //$NON-NLS-1$
8380 cancelButton.addActionListener(new java.awt.event.ActionListener() {
8481
8582 public void actionPerformed(ActionEvent e) {
@@ -88,7 +85,7 @@
8885 }
8986 });
9087 searchButton.setFont(new java.awt.Font("Dialog", 1, 13)); //$NON-NLS-1$
91- searchButton.setText(res.getString("findMenuItem_Text")); //$NON-NLS-1$
88+ searchButton.setText(PropertiesEditor.getI18nProperty("findMenuItem_Text")); //$NON-NLS-1$
9289 searchButton.addActionListener(new java.awt.event.ActionListener() {
9390
9491 public void actionPerformed(ActionEvent e) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/EncodeSelectPanel.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/EncodeSelectPanel.java (revision 78)
@@ -3,7 +3,6 @@
33 import java.awt.GridLayout;
44 import java.util.ArrayList;
55 import java.util.Enumeration;
6-import java.util.ResourceBundle;
76 import java.util.Vector;
87
98 import javax.swing.AbstractButton;
@@ -18,8 +17,6 @@
1817
1918 class EncodeSelectPanel extends JPanel {
2019
21- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
22-
2320 private GridLayout gridLayout1 = new GridLayout();
2421
2522 private JLabel jLabel1 = new JLabel();
@@ -49,7 +46,7 @@
4946
5047 void jbInit() throws Exception {
5148
52- jLabel1.setText(res.getString("jLabel1_Text")); //$NON-NLS-1$
49+ jLabel1.setText(PropertiesEditor.getI18nProperty("jLabel1_Text")); //$NON-NLS-1$
5350 this.setLayout(gridLayout1);
5451 this.setBorder(BorderFactory.createEtchedBorder());
5552 if (!store) {
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditorFrame.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/PropertiesEditorFrame.java (revision 78)
@@ -34,7 +34,6 @@
3434 import java.awt.print.PrinterJob;
3535 import java.io.File;
3636 import java.io.IOException;
37-import java.util.ResourceBundle;
3837
3938 import javax.swing.AbstractAction;
4039 import javax.swing.Action;
@@ -78,10 +77,6 @@
7877 */
7978 public class PropertiesEditorFrame extends JFrame implements ActionListener {
8079
81- /**
82- */
83- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
84-
8580 private UndoAction undoAction = new UndoAction();
8681
8782 /**
@@ -427,7 +422,7 @@
427422 contentPane = (JPanel) this.getContentPane();
428423 contentPane.setLayout(borderLayout1);
429424 this.setSize(new Dimension(640, 480));
430- this.setTitle(res.getString("Title")); //$NON-NLS-1$
425+ this.setTitle(PropertiesEditor.getI18nProperty("Title")); //$NON-NLS-1$
431426 UIManager.LookAndFeelInfo[] lfInfo = UIManager.getInstalledLookAndFeels();
432427 lfRadioMenuItem = new JRadioButtonMenuItem[lfInfo.length];
433428 for (int cnt = 0; cnt < lfInfo.length; cnt++) {
@@ -441,9 +436,9 @@
441436 lineNumberTextArea.setEditable(false);
442437 // lineNumberTextArea.setDoubleBuffered(true);
443438 // lineNumberTextArea.setPreferredSize(new Dimension(0, 19));
444- fileMenu.setText(res.getString("fileMenu_Text")); //$NON-NLS-1$
439+ fileMenu.setText(PropertiesEditor.getI18nProperty("fileMenu_Text")); //$NON-NLS-1$
445440 closeMenuItem.setIcon(closeImage16);
446- closeMenuItem.setText(res.getString("closeMenuItem_Text")); //$NON-NLS-1$
441+ closeMenuItem.setText(PropertiesEditor.getI18nProperty("closeMenuItem_Text")); //$NON-NLS-1$
447442 closeMenuItem.addActionListener(new ActionListener() {
448443
449444 public void actionPerformed(ActionEvent e) {
@@ -451,9 +446,9 @@
451446 close_actionPerformed(e);
452447 }
453448 });
454- helpMenu.setText(res.getString("helpMenu_Text")); //$NON-NLS-1$
449+ helpMenu.setText(PropertiesEditor.getI18nProperty("helpMenu_Text")); //$NON-NLS-1$
455450 versionMenuItem.setIcon(infoImage16);
456- versionMenuItem.setText(res.getString("versionMenuItem_Text")); //$NON-NLS-1$
451+ versionMenuItem.setText(PropertiesEditor.getI18nProperty("versionMenuItem_Text")); //$NON-NLS-1$
457452 versionMenuItem.addActionListener(new ActionListener() {
458453
459454 public void actionPerformed(ActionEvent e) {
@@ -462,7 +457,7 @@
462457 }
463458 });
464459 newMenuItem.setIcon(newImage16);
465- newMenuItem.setText(res.getString("newMenuItem_Text")); //$NON-NLS-1$
460+ newMenuItem.setText(PropertiesEditor.getI18nProperty("newMenuItem_Text")); //$NON-NLS-1$
466461 newMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('N', java.awt.event.KeyEvent.CTRL_MASK, false));
467462 newMenuItem.addActionListener(new java.awt.event.ActionListener() {
468463
@@ -472,7 +467,7 @@
472467 }
473468 });
474469 openMenuItem.setIcon(openImage16);
475- openMenuItem.setText(res.getString("openMenuItem_Text")); //$NON-NLS-1$
470+ openMenuItem.setText(PropertiesEditor.getI18nProperty("openMenuItem_Text")); //$NON-NLS-1$
476471 openMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('O', java.awt.event.KeyEvent.CTRL_MASK, false));
477472 openMenuItem.addActionListener(new java.awt.event.ActionListener() {
478473
@@ -482,7 +477,7 @@
482477 }
483478 });
484479 unicodeSaveMenuItem.setIcon(saveImage16);
485- unicodeSaveMenuItem.setText(res.getString("unicodeSaveMenuItem_Text")); //$NON-NLS-1$
480+ unicodeSaveMenuItem.setText(PropertiesEditor.getI18nProperty("unicodeSaveMenuItem_Text")); //$NON-NLS-1$
486481 unicodeSaveMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('S', java.awt.event.KeyEvent.CTRL_MASK, false));
487482 unicodeSaveMenuItem.addActionListener(new java.awt.event.ActionListener() {
488483
@@ -491,10 +486,10 @@
491486 saveUnicode_actionPerformed(e);
492487 }
493488 });
494- editMenu.setText(res.getString("editMenu_Text")); //$NON-NLS-1$
495- dispMenu.setText(res.getString("dispMenu_Text")); //$NON-NLS-1$
489+ editMenu.setText(PropertiesEditor.getI18nProperty("editMenu_Text")); //$NON-NLS-1$
490+ dispMenu.setText(PropertiesEditor.getI18nProperty("dispMenu_Text")); //$NON-NLS-1$
496491 undoMenuItem.setIcon(undoImage16);
497- undoMenuItem.setText(res.getString("undoMenuItem_Text")); //$NON-NLS-1$
492+ undoMenuItem.setText(PropertiesEditor.getI18nProperty("undoMenuItem_Text")); //$NON-NLS-1$
498493 undoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('Z', java.awt.event.KeyEvent.CTRL_MASK, false));
499494 undoMenuItem.addActionListener(new java.awt.event.ActionListener() {
500495
@@ -503,7 +498,7 @@
503498 undo_actionPerformed(e);
504499 }
505500 });
506- redoMenuItem.setText(res.getString("redoMenuItem_Text")); //$NON-NLS-1$
501+ redoMenuItem.setText(PropertiesEditor.getI18nProperty("redoMenuItem_Text")); //$NON-NLS-1$
507502 redoMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('Y', java.awt.event.KeyEvent.CTRL_MASK, false));
508503 redoMenuItem.addActionListener(new java.awt.event.ActionListener() {
509504
@@ -513,7 +508,7 @@
513508 }
514509 });
515510 cutMenuItem.setIcon(cutImage16);
516- cutMenuItem.setText(res.getString("cutMenuItem_Text")); //$NON-NLS-1$
511+ cutMenuItem.setText(PropertiesEditor.getI18nProperty("cutMenuItem_Text")); //$NON-NLS-1$
517512 cutMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('X', java.awt.event.KeyEvent.CTRL_MASK, false));
518513 cutMenuItem.addActionListener(new java.awt.event.ActionListener() {
519514
@@ -523,7 +518,7 @@
523518 }
524519 });
525520 copyMenuItem.setIcon(copyImage16);
526- copyMenuItem.setText(res.getString("copyMenuItem_Text")); //$NON-NLS-1$
521+ copyMenuItem.setText(PropertiesEditor.getI18nProperty("copyMenuItem_Text")); //$NON-NLS-1$
527522 copyMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('C', java.awt.event.KeyEvent.CTRL_MASK, false));
528523 copyMenuItem.addActionListener(new java.awt.event.ActionListener() {
529524
@@ -533,7 +528,7 @@
533528 }
534529 });
535530 pasteMenuItem.setIcon(pasteImage16);
536- pasteMenuItem.setText(res.getString("pasteMenuItem_Text")); //$NON-NLS-1$
531+ pasteMenuItem.setText(PropertiesEditor.getI18nProperty("pasteMenuItem_Text")); //$NON-NLS-1$
537532 pasteMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('V', java.awt.event.KeyEvent.CTRL_MASK, false));
538533 pasteMenuItem.addActionListener(new java.awt.event.ActionListener() {
539534
@@ -543,7 +538,7 @@
543538 }
544539 });
545540 deleteMenuItem.setIcon(deleteImage16);
546- deleteMenuItem.setText(res.getString("deleteMenuItem_Text")); //$NON-NLS-1$
541+ deleteMenuItem.setText(PropertiesEditor.getI18nProperty("deleteMenuItem_Text")); //$NON-NLS-1$
547542 deleteMenuItem.addActionListener(new java.awt.event.ActionListener() {
548543
549544 public void actionPerformed(ActionEvent e) {
@@ -552,7 +547,7 @@
552547 }
553548 });
554549 findMenuItem.setIcon(searchImage16);
555- findMenuItem.setText(res.getString("findMenuItem_Text")); //$NON-NLS-1$
550+ findMenuItem.setText(PropertiesEditor.getI18nProperty("findMenuItem_Text")); //$NON-NLS-1$
556551 findMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('F', java.awt.event.KeyEvent.CTRL_MASK, false));
557552 findMenuItem.addActionListener(new java.awt.event.ActionListener() {
558553
@@ -562,7 +557,7 @@
562557 }
563558 });
564559 nextFindMenuItem.setIcon(searchNextImage16);
565- nextFindMenuItem.setText(res.getString("nextFindMenuItem_Text")); //$NON-NLS-1$
560+ nextFindMenuItem.setText(PropertiesEditor.getI18nProperty("nextFindMenuItem_Text")); //$NON-NLS-1$
566561 nextFindMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0, false));
567562 nextFindMenuItem.addActionListener(new java.awt.event.ActionListener() {
568563
@@ -572,7 +567,7 @@
572567 }
573568 });
574569 replaceMenuItem.setIcon(replaceImage16);
575- replaceMenuItem.setText(res.getString("replaceMenuItem_Text")); //$NON-NLS-1$
570+ replaceMenuItem.setText(PropertiesEditor.getI18nProperty("replaceMenuItem_Text")); //$NON-NLS-1$
576571 replaceMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('R', java.awt.event.KeyEvent.CTRL_MASK, false));
577572 replaceMenuItem.addActionListener(new java.awt.event.ActionListener() {
578573
@@ -581,7 +576,7 @@
581576 replace_actionPerformed(e);
582577 }
583578 });
584- selectAllMenuItem.setText(res.getString("selectAllMenuItem_Text")); //$NON-NLS-1$
579+ selectAllMenuItem.setText(PropertiesEditor.getI18nProperty("selectAllMenuItem_Text")); //$NON-NLS-1$
585580 selectAllMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('A', java.awt.event.KeyEvent.CTRL_MASK, false));
586581 selectAllMenuItem.addActionListener(new java.awt.event.ActionListener() {
587582
@@ -592,9 +587,9 @@
592587 });
593588 toolBar.setFloatable(false);
594589 wordWrapCheckBoxMenuItem.setEnabled(false);
595- wordWrapCheckBoxMenuItem.setText(res.getString("wordWrapCheckBoxMenuItem_Text")); //$NON-NLS-1$
590+ wordWrapCheckBoxMenuItem.setText(PropertiesEditor.getI18nProperty("wordWrapCheckBoxMenuItem_Text")); //$NON-NLS-1$
596591 lineNumberCheckBoxMenuItem.setIcon(lineNumImage16);
597- lineNumberCheckBoxMenuItem.setText(res.getString("lineNumberCheckBoxMenuItem_Text")); //$NON-NLS-1$
592+ lineNumberCheckBoxMenuItem.setText(PropertiesEditor.getI18nProperty("lineNumberCheckBoxMenuItem_Text")); //$NON-NLS-1$
598593 lineNumberCheckBoxMenuItem.addActionListener(new java.awt.event.ActionListener() {
599594
600595 public void actionPerformed(ActionEvent e) {
@@ -602,7 +597,7 @@
602597 lineNumberCheckBoxMenuItem_actionPerformed(e);
603598 }
604599 });
605- toolbarCheckBoxMenuItem.setText(res.getString("toolbarCheckBoxMenuItem_Text")); //$NON-NLS-1$
600+ toolbarCheckBoxMenuItem.setText(PropertiesEditor.getI18nProperty("toolbarCheckBoxMenuItem_Text")); //$NON-NLS-1$
606601 toolbarCheckBoxMenuItem.addActionListener(new java.awt.event.ActionListener() {
607602
608603 public void actionPerformed(ActionEvent e) {
@@ -610,7 +605,7 @@
610605 toolbarCheckBoxMenuItem_actionPerformed(e);
611606 }
612607 });
613- newButton.setToolTipText(res.getString("newMenuItem_Text")); //$NON-NLS-1$
608+ newButton.setToolTipText(PropertiesEditor.getI18nProperty("newMenuItem_Text")); //$NON-NLS-1$
614609 newButton.setFocusPainted(true);
615610 newButton.setIcon(newImage16);
616611 newButton.addActionListener(new java.awt.event.ActionListener() {
@@ -620,7 +615,7 @@
620615 new_actionPerformed(e);
621616 }
622617 });
623- openButton.setToolTipText(res.getString("openMenuItem_Text")); //$NON-NLS-1$
618+ openButton.setToolTipText(PropertiesEditor.getI18nProperty("openMenuItem_Text")); //$NON-NLS-1$
624619 openButton.setIcon(openImage16);
625620 openButton.addActionListener(new java.awt.event.ActionListener() {
626621
@@ -629,7 +624,7 @@
629624 open_actionPerformed(e);
630625 }
631626 });
632- closeButton.setToolTipText(res.getString("closeMenuItem_Text")); //$NON-NLS-1$
627+ closeButton.setToolTipText(PropertiesEditor.getI18nProperty("closeMenuItem_Text")); //$NON-NLS-1$
633628 closeButton.setIcon(closeImage16);
634629 closeButton.addActionListener(new java.awt.event.ActionListener() {
635630
@@ -638,7 +633,7 @@
638633 close_actionPerformed(e);
639634 }
640635 });
641- cutButton.setToolTipText(res.getString("cutMenuItem_Text")); //$NON-NLS-1$
636+ cutButton.setToolTipText(PropertiesEditor.getI18nProperty("cutMenuItem_Text")); //$NON-NLS-1$
642637 cutButton.setIcon(cutImage16);
643638 cutButton.setText(""); //$NON-NLS-1$
644639 cutButton.addActionListener(new java.awt.event.ActionListener() {
@@ -648,7 +643,7 @@
648643 cut_actionPerformed(e);
649644 }
650645 });
651- pasteButton.setToolTipText(res.getString("pasteMenuItem_Text")); //$NON-NLS-1$
646+ pasteButton.setToolTipText(PropertiesEditor.getI18nProperty("pasteMenuItem_Text")); //$NON-NLS-1$
652647 pasteButton.setIcon(pasteImage16);
653648 pasteButton.setText(""); //$NON-NLS-1$
654649 pasteButton.addActionListener(new java.awt.event.ActionListener() {
@@ -658,7 +653,7 @@
658653 paste_actionPerformed(e);
659654 }
660655 });
661- copyButton.setToolTipText(res.getString("copyMenuItem_Text")); //$NON-NLS-1$
656+ copyButton.setToolTipText(PropertiesEditor.getI18nProperty("copyMenuItem_Text")); //$NON-NLS-1$
662657 copyButton.setIcon(copyImage16);
663658 copyButton.setText(""); //$NON-NLS-1$
664659 copyButton.addActionListener(new java.awt.event.ActionListener() {
@@ -668,7 +663,7 @@
668663 copy_actionPerformed(e);
669664 }
670665 });
671- findButton.setToolTipText(res.getString("findButton_ToolTipText")); //$NON-NLS-1$
666+ findButton.setToolTipText(PropertiesEditor.getI18nProperty("findButton_ToolTipText")); //$NON-NLS-1$
672667 findButton.setIcon(searchImage16);
673668 findButton.setText(""); //$NON-NLS-1$
674669 findButton.addActionListener(new java.awt.event.ActionListener() {
@@ -678,7 +673,7 @@
678673 find_actionPerformed(e);
679674 }
680675 });
681- undoButton.setToolTipText(res.getString("undoMenuItem_Text")); //$NON-NLS-1$
676+ undoButton.setToolTipText(PropertiesEditor.getI18nProperty("undoMenuItem_Text")); //$NON-NLS-1$
682677 undoButton.setIcon(undoImage16);
683678 undoButton.setText(""); //$NON-NLS-1$
684679 undoButton.addActionListener(new java.awt.event.ActionListener() {
@@ -688,7 +683,7 @@
688683 undo_actionPerformed(e);
689684 }
690685 });
691- nextFindButton.setToolTipText(res.getString("nextFindMenuItem_Text")); //$NON-NLS-1$
686+ nextFindButton.setToolTipText(PropertiesEditor.getI18nProperty("nextFindMenuItem_Text")); //$NON-NLS-1$
692687 nextFindButton.setIcon(searchNextImage16);
693688 nextFindButton.setText(""); //$NON-NLS-1$
694689 nextFindButton.addActionListener(new java.awt.event.ActionListener() {
@@ -698,7 +693,7 @@
698693 nextFind_actionPerformed(e);
699694 }
700695 });
701- replaceButton.setToolTipText(res.getString("replaceMenuItem_Text")); //$NON-NLS-1$
696+ replaceButton.setToolTipText(PropertiesEditor.getI18nProperty("replaceMenuItem_Text")); //$NON-NLS-1$
702697 replaceButton.setIcon(replaceImage16);
703698 replaceButton.setText(""); //$NON-NLS-1$
704699 replaceButton.addActionListener(new java.awt.event.ActionListener() {
@@ -708,7 +703,7 @@
708703 replace_actionPerformed(e);
709704 }
710705 });
711- infomationButton.setToolTipText(res.getString("versionMenuItem_Text")); //$NON-NLS-1$
706+ infomationButton.setToolTipText(PropertiesEditor.getI18nProperty("versionMenuItem_Text")); //$NON-NLS-1$
712707 infomationButton.setIcon(infoImage16);
713708 infomationButton.addActionListener(new java.awt.event.ActionListener() {
714709
@@ -717,7 +712,7 @@
717712 version_actionPerformed(e);
718713 }
719714 });
720- showLineNumberButton.setToolTipText(res.getString("showLineNumberButton_ToolTipText")); //$NON-NLS-1$
715+ showLineNumberButton.setToolTipText(PropertiesEditor.getI18nProperty("showLineNumberButton_ToolTipText")); //$NON-NLS-1$
721716 showLineNumberButton.setIcon(lineNumImage16);
722717 showLineNumberButton.setText(""); //$NON-NLS-1$
723718 showLineNumberButton.addActionListener(new java.awt.event.ActionListener() {
@@ -736,7 +731,7 @@
736731 editTextArea_keyReleased(e);
737732 }
738733 });
739- saveUnicodeButton.setToolTipText(res.getString("saveUnicodeButton_ToolTipText")); //$NON-NLS-1$
734+ saveUnicodeButton.setToolTipText(PropertiesEditor.getI18nProperty("saveUnicodeButton_ToolTipText")); //$NON-NLS-1$
740735 saveUnicodeButton.setIcon(saveImage16);
741736 saveUnicodeButton.setText(""); //$NON-NLS-1$
742737 saveUnicodeButton.addActionListener(new java.awt.event.ActionListener() {
@@ -746,7 +741,7 @@
746741 saveUnicode_actionPerformed(e);
747742 }
748743 });
749- showUnicodeMenuItem.setText(res.getString("showUnicodeMenuItem_Text")); //$NON-NLS-1$
744+ showUnicodeMenuItem.setText(PropertiesEditor.getI18nProperty("showUnicodeMenuItem_Text")); //$NON-NLS-1$
750745 showUnicodeMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke('U', java.awt.event.KeyEvent.CTRL_MASK, false));
751746 showUnicodeMenuItem.addActionListener(new java.awt.event.ActionListener() {
752747
@@ -762,9 +757,9 @@
762757 fontSelectMenuItem_actionPerformed(e);
763758 }
764759 });
765- fontSelectMenuItem.setText(res.getString("fontSelectMenuItem_Text")); //$NON-NLS-1$
760+ fontSelectMenuItem.setText(PropertiesEditor.getI18nProperty("fontSelectMenuItem_Text")); //$NON-NLS-1$
766761 printMenuItem.setRequestFocusEnabled(true);
767- printMenuItem.setText(res.getString("printMenuItem_Text")); //$NON-NLS-1$
762+ printMenuItem.setText(PropertiesEditor.getI18nProperty("printMenuItem_Text")); //$NON-NLS-1$
768763 printMenuItem.addActionListener(new java.awt.event.ActionListener() {
769764
770765 public void actionPerformed(ActionEvent e) {
@@ -772,7 +767,7 @@
772767 printMenuItem_actionPerformed(e);
773768 }
774769 });
775- printLayoutMenuItem.setText(res.getString("printLayoutMenuItem_Text")); //$NON-NLS-1$
770+ printLayoutMenuItem.setText(PropertiesEditor.getI18nProperty("printLayoutMenuItem_Text")); //$NON-NLS-1$
776771 printLayoutMenuItem.addActionListener(new java.awt.event.ActionListener() {
777772
778773 public void actionPerformed(ActionEvent e) {
@@ -780,9 +775,9 @@
780775 printLayoutMenuItem_actionPerformed(e);
781776 }
782777 });
783- jMenu1.setText(res.getString("jMenu1_Text")); //$NON-NLS-1$
778+ jMenu1.setText(PropertiesEditor.getI18nProperty("jMenu1_Text")); //$NON-NLS-1$
784779 unicodeSaveWithNameMenuItem.setIcon(saveImage16);
785- unicodeSaveWithNameMenuItem.setText(res.getString("unicodeSaveWithNameMenuItem_Text")); //$NON-NLS-1$
780+ unicodeSaveWithNameMenuItem.setText(PropertiesEditor.getI18nProperty("unicodeSaveWithNameMenuItem_Text")); //$NON-NLS-1$
786781 unicodeSaveWithNameMenuItem.addActionListener(new java.awt.event.ActionListener() {
787782
788783 public void actionPerformed(ActionEvent e) {
@@ -962,7 +957,7 @@
962957 // Preservation processing of a setup
963958 setting.saveSetting();
964959 } catch (Exception ex) {
965- JOptionPane.showMessageDialog(this, res.getString("KEY2")); //$NON-NLS-1$
960+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("KEY2")); //$NON-NLS-1$
966961 }
967962 this.dispose();
968963 // System.exit(0);
@@ -1053,12 +1048,12 @@
10531048 resetUndoHistory();
10541049
10551050 } catch (IOException e) {
1056- JOptionPane.showMessageDialog(this, res.getString("KEY3"), res.getString("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1051+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("KEY3"), PropertiesEditor.getI18nProperty("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
10571052 e.printStackTrace();
10581053 opFp = opFpBuk;
10591054 return;
10601055 }
1061- setTitle(res.getString("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
1056+ setTitle(PropertiesEditor.getI18nProperty("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
10621057 AppSetting.getInstance().setOpenFileHistory(file);
10631058 return;
10641059 }
@@ -1073,7 +1068,7 @@
10731068 if (undo.canUndo()) {
10741069 // In the case of under edit
10751070 // The dialog display which asks whether to save
1076- int ret = JOptionPane.showConfirmDialog(this, res.getString("KEY6"), res.getString("KEY7"), JOptionPane.YES_NO_CANCEL_OPTION); //$NON-NLS-1$ //$NON-NLS-2$
1071+ int ret = JOptionPane.showConfirmDialog(this, PropertiesEditor.getI18nProperty("KEY6"), PropertiesEditor.getI18nProperty("KEY7"), JOptionPane.YES_NO_CANCEL_OPTION); //$NON-NLS-1$ //$NON-NLS-2$
10771072 if (ret == JOptionPane.YES_OPTION) {
10781073 // When saving
10791074 // It changes and saves to the Unicode reference character.
@@ -1399,7 +1394,7 @@
13991394 // Character sequence reference processing
14001395 // The dialog which asks a reference character sequence is displayed.
14011396 SearchTextDialog dlg = new SearchTextDialog(this, true);
1402- dlg.show();
1397+ dlg.setVisible(true);
14031398
14041399 // Nothing is carried out, when null the reference character sequence or
14051400 // it is not inputted.
@@ -1455,10 +1450,10 @@
14551450 int targetIndex = text.indexOf(key, searchStartPossition);
14561451 if (targetIndex == -1) {
14571452 if (searchStartPossition == 0) {
1458- JOptionPane.showConfirmDialog(this, res.getString("KEY8"), "", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1453+ JOptionPane.showConfirmDialog(this, PropertiesEditor.getI18nProperty("KEY8"), "", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
14591454 return;
14601455 } else {
1461- int ret = JOptionPane.showConfirmDialog(this, res.getString("KEY8"), "", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1456+ int ret = JOptionPane.showConfirmDialog(this, PropertiesEditor.getI18nProperty("KEY8"), "", JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
14621457 if (ret == JOptionPane.OK_OPTION) {
14631458 this.nextTextSearch(true);
14641459 }
@@ -1508,7 +1503,7 @@
15081503 // and
15091504 // the character sequence after substitution is displayed.
15101505 ReplaceTextDialog dlg = new ReplaceTextDialog(this, true);
1511- dlg.show();
1506+ dlg.setVisible(true);
15121507
15131508 // Nothing is carried out when the character sequence before
15141509 // substitution is
@@ -1541,7 +1536,7 @@
15411536 editTextArea.setText(editTextArea.getText().replaceAll(source, exchange));
15421537
15431538 // A substitution result is displayed on a status bar.
1544- JOptionPane.showMessageDialog(this, cnt + res.getString("KEY9"), res.getString("KEY10"), JOptionPane.INFORMATION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1539+ JOptionPane.showMessageDialog(this, cnt + PropertiesEditor.getI18nProperty("KEY9"), PropertiesEditor.getI18nProperty("KEY10"), JOptionPane.INFORMATION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
15451540 }
15461541
15471542 /**
@@ -1703,7 +1698,7 @@
17031698 }
17041699 File file = new FileOpener(filepath);
17051700 if (file.exists() && file.isFile()) {
1706- ret = JOptionPane.showConfirmDialog(this, res.getString("KEY11"), res.getString("KEY12"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1701+ ret = JOptionPane.showConfirmDialog(this, PropertiesEditor.getI18nProperty("KEY11"), PropertiesEditor.getI18nProperty("KEY12"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
17071702 if (ret != 0) {
17081703 return false;
17091704 }
@@ -1731,11 +1726,11 @@
17311726 opFp.write(EncodeManager.ASCII);
17321727 return true;
17331728 } catch (AlreadyFileLockException e) {
1734- JOptionPane.showMessageDialog(this, res.getString("KEY13"), res.getString("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1729+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("KEY13"), PropertiesEditor.getI18nProperty("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
17351730 return false;
17361731 } catch (Exception e) {
17371732 e.printStackTrace();
1738- JOptionPane.showMessageDialog(this, res.getString("KEY14"), res.getString("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1733+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("KEY14"), PropertiesEditor.getI18nProperty("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
17391734 return false;
17401735 }
17411736 }
@@ -1755,7 +1750,7 @@
17551750 }
17561751 if (result) {
17571752 resetUndoHistory();
1758- setTitle(res.getString("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
1753+ setTitle(PropertiesEditor.getI18nProperty("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
17591754 }
17601755 }
17611756
@@ -1768,7 +1763,7 @@
17681763 boolean ret = writeFile();
17691764 if (ret) {
17701765 resetUndoHistory();
1771- setTitle(res.getString("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
1766+ setTitle(PropertiesEditor.getI18nProperty("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
17721767 }
17731768 return ret;
17741769 }
@@ -1781,10 +1776,10 @@
17811776 void showUnicodeMenuItem_actionPerformed(ActionEvent e) {
17821777
17831778 String unicodeText = EncodeChanger.unicode2UnicodeEsc(editTextArea.getText());
1784- UnicodeDialog dlg = new UnicodeDialog(this, res.getString("Unicode_"), false); //$NON-NLS-1$
1779+ UnicodeDialog dlg = new UnicodeDialog(this, PropertiesEditor.getI18nProperty("Unicode_"), false); //$NON-NLS-1$
17851780 dlg.setMessage(unicodeText);
17861781 dlg.setSize(new Dimension(680, 550));
1787- dlg.show();
1782+ dlg.setVisible(true);
17881783 }
17891784
17901785 void fontSelectMenuItem_actionPerformed(ActionEvent e) {
@@ -1793,7 +1788,7 @@
17931788 Color back = editTextArea.getBackground();
17941789 Color fore = editTextArea.getForeground();
17951790 JFontChooserDialog fontChooser = new JFontChooserDialog(this, font, fore, back, true);
1796- fontChooser.show();
1791+ fontChooser.setVisible(true);
17971792 if (fontChooser.getReturnValue() != JFontChooserDialog.APPROVE_OPTION) {
17981793 return;
17991794 }
@@ -1826,9 +1821,9 @@
18261821
18271822 printable = p;
18281823 printerJob = PrinterJob.getPrinterJob();
1829- String[] options = { res.getString("KEY17") }; //$NON-NLS-1$
1824+ String[] options = { PropertiesEditor.getI18nProperty("KEY17") }; //$NON-NLS-1$
18301825 optionPane = new JOptionPane("", JOptionPane.INFORMATION_MESSAGE, JOptionPane.CANCEL_OPTION, null, options); //$NON-NLS-1$
1831- statusDialog = optionPane.createDialog(null, res.getString("KEY18")); //$NON-NLS-1$
1826+ statusDialog = optionPane.createDialog(null, PropertiesEditor.getI18nProperty("KEY18")); //$NON-NLS-1$
18321827 }
18331828
18341829 public void performPrint() throws PrinterException {
@@ -1836,7 +1831,7 @@
18361831 pageFormat = printerJob.validatePage(pageFormat);
18371832 printerJob.setPrintable(this, pageFormat);
18381833
1839- optionPane.setMessage(res.getString("optionPane_Message")); //$NON-NLS-1$
1834+ optionPane.setMessage(PropertiesEditor.getI18nProperty("optionPane_Message")); //$NON-NLS-1$
18401835 Thread t = new Thread(new Runnable() {
18411836
18421837 public void run() {
@@ -1899,7 +1894,7 @@
18991894 try {
19001895 pm.performPrint();
19011896 } catch (PrinterException pe) {
1902- JOptionPane.showMessageDialog(PropertiesEditorFrame.this, res.getString("KEY16") + pe.getMessage()); //$NON-NLS-1$
1897+ JOptionPane.showMessageDialog(PropertiesEditorFrame.this, PropertiesEditor.getI18nProperty("KEY16") + pe.getMessage()); //$NON-NLS-1$
19031898 }
19041899 }
19051900 });
@@ -1921,10 +1916,10 @@
19211916 SwingUtilities.updateComponentTreeUI(this);
19221917 AppSetting.getInstance().setLookAndFeelClass(lfInfo[i].getClassName());
19231918 } catch (UnsupportedLookAndFeelException ex) {
1924- JOptionPane.showMessageDialog(this, res.getString("_LookAndFeel_"), res.getString("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1919+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("_LookAndFeel_"), PropertiesEditor.getI18nProperty("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
19251920 ex.printStackTrace();
19261921 } catch (Exception ex) {
1927- JOptionPane.showMessageDialog(this, res.getString("LookAndFeel_"), res.getString("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
1922+ JOptionPane.showMessageDialog(this, PropertiesEditor.getI18nProperty("LookAndFeel_"), PropertiesEditor.getI18nProperty("KEY4"), JOptionPane.ERROR_MESSAGE); //$NON-NLS-1$ //$NON-NLS-2$
19281923 ex.printStackTrace();
19291924 }
19301925 }
@@ -1935,7 +1930,7 @@
19351930
19361931 if (writeFile()) {
19371932 resetUndoHistory();
1938- setTitle(res.getString("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
1933+ setTitle(PropertiesEditor.getI18nProperty("KEY5") + opFp.getAbsolutePath()); //$NON-NLS-1$
19391934 }
19401935 }
19411936 }
\ No newline at end of file
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/swing/filechooser/PropertiesFileFilter.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/swing/filechooser/PropertiesFileFilter.java (revision 78)
@@ -4,7 +4,7 @@
44
55 public class PropertiesFileFilter extends AbstractFileFilter {
66
7- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
7+ static ResourceBundle res = ResourceBundle.getBundle("jp.gr.java_conf.ussiy.swing.lang"); //$NON-NLS-1$
88
99 public PropertiesFileFilter() {
1010
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/swing/JFontChooserDialog.java (revision 77)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/swing/JFontChooserDialog.java (revision 78)
@@ -28,7 +28,7 @@
2828
2929 public class JFontChooserDialog extends BaseDialog {
3030
31- static ResourceBundle res = ResourceBundle.getBundle("lang"); //$NON-NLS-1$
31+ static ResourceBundle res = ResourceBundle.getBundle("jp.gr.java_conf.ussiy.swing.lang"); //$NON-NLS-1$
3232
3333 public static final int CANCEL_OPTION = 1;
3434
--- trunk/PropertiesEditor/about.ini (nonexistent)
+++ trunk/PropertiesEditor/about.ini (revision 78)
@@ -0,0 +1,2 @@
1+aboutText=PropertiesEditor Plugin
2+featureImage=icons/pe_32.gif
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- trunk/PropertiesEditor/plugin.xml (revision 77)
+++ trunk/PropertiesEditor/plugin.xml (revision 78)
@@ -23,7 +23,8 @@
2323 <page
2424 name="%propertiesEditorPreferencePageName"
2525 class="jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesPreference"
26- id="jp.gr.java_conf.ussiy.app.propedit.preference.PropertiesPreference"/>
26+ id="jp.gr.java_conf.ussiy.app.propedit.preference.PropertiesPreference"
27+ objectClass="org.eclipse.core.resources.IProject"/>
2728 <page
2829 class="jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PropertiesEditorPreference"
2930 category="jp.gr.java_conf.ussiy.app.propedit.preference.PropertiesPreference"
@@ -38,6 +39,18 @@
3839 <extension point="org.eclipse.core.runtime.preferences">
3940 <initializer class="jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.preference.PreferenceInitializer"/>
4041 </extension>
42+
43+ <!-- property page -->
44+ <extension point="org.eclipse.ui.propertyPages">
45+ <page
46+ name="%propertiesEditorPreferencePageName"
47+ class="jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.property.PropertiesProperty"
48+ id="jp.gr.java_conf.ussiy.app.propedit.property.PropertiesProperty">
49+ <enabledWhen>
50+ <instanceof value="org.eclipse.core.resources.IProject"/>
51+ </enabledWhen>
52+ </page>
53+ </extension>
4154
4255 <!-- popup menu & action -->
4356 <extension point="org.eclipse.ui.popupMenus">
旧リポジトリブラウザで表示