• R/O
  • SSH
  • HTTPS

propedit: 提交


Commit MetaInfo

修订版195 (tree)
时间2009-05-24 00:03:53
作者chomakichi

Log Message

Eclipse3.2で利用できない不具合を修正

更改概述

差异

--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/wizard/BasicNewPropertiesFileWizard.java (revision 194)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/wizard/BasicNewPropertiesFileWizard.java (revision 195)
@@ -6,7 +6,6 @@
66 import jp.gr.java_conf.ussiy.app.propedit.eclipse.plugin.resources.Messages;
77
88 import org.eclipse.jface.wizard.IWizardPage;
9-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
109 import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
1110
1211 /**
@@ -20,7 +19,6 @@
2019 public void addPage(IWizardPage page) {
2120 page.setTitle(Messages.getString("eclipse.propertieseditor.BasicNewPropertiesFileWizard.0")); //$NON-NLS-1$
2221 page.setDescription(Messages.getString("eclipse.propertieseditor.BasicNewPropertiesFileWizard.1")); //$NON-NLS-1$
23- ((WizardNewFileCreationPage)page).setFileExtension("properties"); //$NON-NLS-1$
2422 super.addPage(page);
2523 }
2624
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/jdt/hover/PropertiesHover.java (revision 194)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/jdt/hover/PropertiesHover.java (revision 195)
@@ -29,7 +29,6 @@
2929 import org.eclipse.ui.IEditorInput;
3030 import org.eclipse.ui.IEditorPart;
3131 import org.eclipse.ui.IFileEditorInput;
32-import org.eclipse.ui.editors.text.EditorsUI;
3332
3433 /**
3534 *
@@ -146,17 +145,12 @@
146145
147146 Iterator ite = propertyMap.keySet().iterator();
148147 StringBuffer buf = new StringBuffer();
149- buf.append("<code>").append(Messages.getString("eclipse.propertieseditor.hover.key")).append(":").append(targetKey).append("</code><br/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
150148 while (ite.hasNext()) {
151149 IFile file = (IFile)ite.next();
152150 String path = (String)file.getFullPath().toPortableString();
153151 String value = (String)((Properties)propertyMap.get(file)).getProperty(targetKey);
154- value = value.replaceAll("\r\n", "<br/>"); //$NON-NLS-1$ //$NON-NLS-2$
155- value = value.replaceAll("\n", "<br/>"); //$NON-NLS-1$ //$NON-NLS-2$
156- value = value.replaceAll("\r", "<br/>"); //$NON-NLS-1$ //$NON-NLS-2$
157- buf.append("&lt;").append(Messages.getString("eclipse.propertieseditor.hover.file")).append(":").append(path).append("&gt;<br/>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
158- buf.append("<b><code>").append(value).append("</code></b>"); //$NON-NLS-1$ //$NON-NLS-2$
159- buf.append("<br/>"); //$NON-NLS-1$
152+ buf.append("< ").append(Messages.getString("eclipse.propertieseditor.hover.file")).append(path).append(" >\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
153+ buf.append(value).append("\n"); //$NON-NLS-1$
160154 }
161155 return buf.toString();
162156 } else {
@@ -177,7 +171,7 @@
177171 public IInformationControlCreator getHoverControlCreator() {
178172 return new IInformationControlCreator() {
179173 public IInformationControl createInformationControl(Shell parent) {
180- return new DefaultInformationControl(parent, EditorsUI.getTooltipAffordanceString());
174+ return new DefaultInformationControl(parent);
181175 }
182176 };
183177 }
--- trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/util/ProjectProperties.java (revision 194)
+++ trunk/PropertiesEditor/src/jp/gr/java_conf/ussiy/app/propedit/eclipse/plugin/util/ProjectProperties.java (revision 195)
@@ -119,7 +119,7 @@
119119 }
120120
121121 private void log(String msg) {
122- IStatus status = new Status(IStatus.INFO, PropertiesEditorPlugin.PLUGIN_ID, msg);
122+ IStatus status = new Status(IStatus.INFO, PropertiesEditorPlugin.PLUGIN_ID, IStatus.OK, msg, null);
123123 ILog log = PropertiesEditorPlugin.getDefault().getLog();
124124 log.log(status);
125125 }
Show on old repository browser