• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision189 (tree)
Time2016-01-01 20:57:54
Authort_nakayama1971

Log Message

correct import

Change Summary

Incremental Difference

--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatManagerAppPreferencePage.java (revision 188)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatManagerAppPreferencePage.java (revision 189)
@@ -10,6 +10,9 @@
1010 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_MANAGER_PASSWORD;
1111 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_MANAGER_URL;
1212 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_MANAGER_USER;
13+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_MANAGER_PASSWORD;
14+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_MANAGER_URL;
15+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_MANAGER_USER;
1316
1417 import java.io.File;
1518 import java.io.IOException;
@@ -70,7 +73,7 @@
7073 lbl.setParent(getFieldEditorParent());
7174
7275 this.urlEditor = new StringFieldEditor(
73- TomcatPluginResources.TOMCAT_PREF_MANAGER_URL,
76+ TOMCAT_PREF_MANAGER_URL,
7477 PREF_PAGE_MANAGER_URL,
7578 getFieldEditorParent());
7679 addField(this.urlEditor);
@@ -81,13 +84,13 @@
8184 lbl.setParent(getFieldEditorParent());
8285
8386 this.userEditor = new StringFieldEditor(
84- TomcatPluginResources.TOMCAT_PREF_MANAGER_USER,
87+ TOMCAT_PREF_MANAGER_USER,
8588 PREF_PAGE_MANAGER_USER,
8689 getFieldEditorParent());
8790 addField(this.userEditor);
8891
8992 this.pwdEditor = new StringFieldEditor(
90- TomcatPluginResources.TOMCAT_PREF_MANAGER_PASSWORD,
93+ TOMCAT_PREF_MANAGER_PASSWORD,
9194 PREF_PAGE_MANAGER_PASSWORD,
9295 getFieldEditorParent());
9396 addField(this.pwdEditor);
@@ -105,8 +108,8 @@
105108 */
106109 @Override
107110 public void init(final IWorkbench workbench) {
108- if (!(getPreferenceStore().contains(TomcatPluginResources.TOMCAT_PREF_MANAGER_URL))) {
109- getPreferenceStore().setValue(TomcatPluginResources.TOMCAT_PREF_MANAGER_URL,
111+ if (!(getPreferenceStore().contains(TOMCAT_PREF_MANAGER_URL))) {
112+ getPreferenceStore().setValue(TOMCAT_PREF_MANAGER_URL,
110113 DEFAULT_MANAGER_URL);
111114 }
112115 }
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatSourcePathPreferencePage.java (revision 188)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatSourcePathPreferencePage.java (revision 189)
@@ -7,6 +7,7 @@
77
88 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_COMPUTESOURCEPATH_LABEL;
99 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_PROJECTINSOURCEPATH_LABEL;
10+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_COMPUTESOURCEPATH_KEY;
1011
1112 import org.eclipse.jface.preference.BooleanFieldEditor;
1213 import org.eclipse.jface.preference.FieldEditor;
@@ -51,10 +52,8 @@
5152 Composite composite = new Composite(parent, SWT.NULL);
5253 composite.setLayout(new GridLayout());
5354
54- this.automaticEditor = new BooleanFieldEditor(
55- TomcatPluginResources.TOMCAT_PREF_COMPUTESOURCEPATH_KEY,
56- PREF_PAGE_COMPUTESOURCEPATH_LABEL,
57- composite);
55+ this.automaticEditor = new BooleanFieldEditor(TOMCAT_PREF_COMPUTESOURCEPATH_KEY,
56+ PREF_PAGE_COMPUTESOURCEPATH_LABEL, composite);
5857 this.initField(this.automaticEditor);
5958
6059 final Group projectListGroup = new Group(composite, SWT.NULL);
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/AdvancedPreferencePage.java (revision 188)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/AdvancedPreferencePage.java (revision 189)
@@ -5,9 +5,13 @@
55
66 package com.sysdeo.eclipse.tomcat;
77
8+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.NATURE_ID;
9+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PLUGIN_ID;
810 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_BASE_LABEL;
911 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_PROJECTINCP_LABEL;
1012 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_SECURITYMANAGER_LABEL;
13+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_BASE_KEY;
14+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_SECURITYMANAGER;
1115
1216 import org.eclipse.core.runtime.preferences.InstanceScope;
1317 import org.eclipse.jface.preference.BooleanFieldEditor;
@@ -57,20 +61,18 @@
5761 composite.setLayout(new GridLayout(1, false));
5862
5963 Group homeGroup = new Group(composite, SWT.NONE);
60- this.base = new DirectoryFieldEditor(
61- TomcatPluginResources.TOMCAT_PREF_BASE_KEY,
64+ this.base = new DirectoryFieldEditor(TOMCAT_PREF_BASE_KEY,
6265 PREF_PAGE_BASE_LABEL, homeGroup);
6366 initLayoutAndData(homeGroup, 3);
6467
6568 Group securityGroup = new Group(composite, SWT.NONE);
66- this.securityEditor = new BooleanFieldEditor(
67- TomcatPluginResources.TOMCAT_PREF_SECURITYMANAGER,
69+ this.securityEditor = new BooleanFieldEditor(TOMCAT_PREF_SECURITYMANAGER,
6870 PREF_PAGE_SECURITYMANAGER_LABEL, securityGroup);
6971 initField(this.securityEditor);
7072 initLayoutAndData(securityGroup, 1);
7173
7274 Group projectListGroup = new Group(composite, SWT.NONE);
73- String[] excludedProjectsNature = {TomcatPluginResources.NATURE_ID};
75+ String[] excludedProjectsNature = {NATURE_ID};
7476 this.projectListEditor = new ProjectListEditor(excludedProjectsNature);
7577 this.projectListEditor.setLabel(PREF_PAGE_PROJECTINCP_LABEL);
7678 Control projectList = this.projectListEditor.getControl(projectListGroup);
@@ -105,7 +107,7 @@
105107 this.securityEditor.store();
106108 TomcatLauncherPlugin.setProjectsInCP(this.projectListEditor.getCheckedElements());
107109 try {
108- InstanceScope.INSTANCE.getNode(TomcatPluginResources.PLUGIN_ID).flush();
110+ InstanceScope.INSTANCE.getNode(PLUGIN_ID).flush();
109111 } catch (final BackingStoreException e) {
110112 TomcatLauncherPlugin.log(e);
111113 return false;
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatProjectChangeListener.java (revision 188)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatProjectChangeListener.java (revision 189)
@@ -5,6 +5,7 @@
55
66 package com.sysdeo.eclipse.tomcat;
77
8+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.NATURE_ID;
89 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.WIZARD_PROJECT_REMOVE_DESCRIPTION;
910 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.WIZARD_PROJECT_REMOVE_TITLE;
1011
@@ -70,8 +71,7 @@
7071 IJavaProject javaProject = JavaCore.create(project);
7172 if (javaProject != null) {
7273 try {
73- ITomcatProject result = (ITomcatProject)javaProject.getProject().getNature(
74- TomcatPluginResources.NATURE_ID);
74+ ITomcatProject result = (ITomcatProject)javaProject.getProject().getNature(NATURE_ID);
7575 if (result != null) {
7676 result.setJavaProject(javaProject);
7777 }
--- trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatJVMPreferencePage.java (revision 188)
+++ trunk/plugin/com.sysdeo.eclipse.tomcat/src/com/sysdeo/eclipse/tomcat/TomcatJVMPreferencePage.java (revision 189)
@@ -5,6 +5,7 @@
55
66 package com.sysdeo.eclipse.tomcat;
77
8+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PLUGIN_ID;
89 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_BOOTCLASSPATH_LABEL;
910 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_CLASSPATH_LABEL;
1011 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_CREATE_LAUNCH_LABEL;
@@ -12,6 +13,11 @@
1213 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_DUMP_CONFIG_LABEL;
1314 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_JRE_LABEL;
1415 import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_PARAMETERS_LABEL;
16+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_DEBUGMODE_KEY;
17+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_JRE_KEY;
18+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_JVM_BOOTCLASSPATH_KEY;
19+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_JVM_CLASSPATH_KEY;
20+import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_JVM_PARAMETERS_KEY;
1521
1622 import java.util.ArrayList;
1723 import java.util.Arrays;
@@ -83,10 +89,10 @@
8389
8490 String[][] namesAndValues = collectAllJres();
8591 this.jvmChoice = new ComboFieldEditor(
86- TomcatPluginResources.TOMCAT_PREF_JRE_KEY, PREF_PAGE_JRE_LABEL, namesAndValues, composite);
92+ TOMCAT_PREF_JRE_KEY, PREF_PAGE_JRE_LABEL, namesAndValues, composite);
8793
8894 this.debugModeEditor = new BooleanFieldEditor(
89- TomcatPluginResources.TOMCAT_PREF_DEBUGMODE_KEY, PREF_PAGE_DEBUGMODE_LABEL, composite);
95+ TOMCAT_PREF_DEBUGMODE_KEY, PREF_PAGE_DEBUGMODE_LABEL, composite);
9096 initField(this.debugModeEditor);
9197
9298 Label lbl = new Label(composite, SWT.NULL);
@@ -107,11 +113,11 @@
107113 this.btLog.addSelectionListener(this);
108114
109115 this.jvmParamaters = new ListFieldEditor(
110- TomcatPluginResources.TOMCAT_PREF_JVM_PARAMETERS_KEY, PREF_PAGE_PARAMETERS_LABEL, composite);
116+ TOMCAT_PREF_JVM_PARAMETERS_KEY, PREF_PAGE_PARAMETERS_LABEL, composite);
111117 this.jvmClasspath = new ClasspathFieldEditor(
112- TomcatPluginResources.TOMCAT_PREF_JVM_CLASSPATH_KEY, PREF_PAGE_CLASSPATH_LABEL, composite);
118+ TOMCAT_PREF_JVM_CLASSPATH_KEY, PREF_PAGE_CLASSPATH_LABEL, composite);
113119 this.jvmBootClasspath = new ClasspathFieldEditor(
114- TomcatPluginResources.TOMCAT_PREF_JVM_BOOTCLASSPATH_KEY, PREF_PAGE_BOOTCLASSPATH_LABEL, composite);
120+ TOMCAT_PREF_JVM_BOOTCLASSPATH_KEY, PREF_PAGE_BOOTCLASSPATH_LABEL, composite);
115121
116122 initField(this.jvmChoice);
117123 initField(this.jvmParamaters);
@@ -189,7 +195,7 @@
189195 this.debugModeEditor.store();
190196
191197 try {
192- InstanceScope.INSTANCE.getNode(TomcatPluginResources.PLUGIN_ID).flush();
198+ InstanceScope.INSTANCE.getNode(PLUGIN_ID).flush();
193199 } catch (final BackingStoreException e) {
194200 TomcatLauncherPlugin.log(e);
195201 return false;