| Revision | 189 (tree) |
|---|---|
| Time | 2016-01-01 20:57:54 |
| Author | t_nakayama1971 |
correct import
| @@ -10,6 +10,9 @@ | ||
| 10 | 10 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_MANAGER_PASSWORD; |
| 11 | 11 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_MANAGER_URL; |
| 12 | 12 | 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; | |
| 13 | 16 | |
| 14 | 17 | import java.io.File; |
| 15 | 18 | import java.io.IOException; |
| @@ -70,7 +73,7 @@ | ||
| 70 | 73 | lbl.setParent(getFieldEditorParent()); |
| 71 | 74 | |
| 72 | 75 | this.urlEditor = new StringFieldEditor( |
| 73 | - TomcatPluginResources.TOMCAT_PREF_MANAGER_URL, | |
| 76 | + TOMCAT_PREF_MANAGER_URL, | |
| 74 | 77 | PREF_PAGE_MANAGER_URL, |
| 75 | 78 | getFieldEditorParent()); |
| 76 | 79 | addField(this.urlEditor); |
| @@ -81,13 +84,13 @@ | ||
| 81 | 84 | lbl.setParent(getFieldEditorParent()); |
| 82 | 85 | |
| 83 | 86 | this.userEditor = new StringFieldEditor( |
| 84 | - TomcatPluginResources.TOMCAT_PREF_MANAGER_USER, | |
| 87 | + TOMCAT_PREF_MANAGER_USER, | |
| 85 | 88 | PREF_PAGE_MANAGER_USER, |
| 86 | 89 | getFieldEditorParent()); |
| 87 | 90 | addField(this.userEditor); |
| 88 | 91 | |
| 89 | 92 | this.pwdEditor = new StringFieldEditor( |
| 90 | - TomcatPluginResources.TOMCAT_PREF_MANAGER_PASSWORD, | |
| 93 | + TOMCAT_PREF_MANAGER_PASSWORD, | |
| 91 | 94 | PREF_PAGE_MANAGER_PASSWORD, |
| 92 | 95 | getFieldEditorParent()); |
| 93 | 96 | addField(this.pwdEditor); |
| @@ -105,8 +108,8 @@ | ||
| 105 | 108 | */ |
| 106 | 109 | @Override |
| 107 | 110 | 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, | |
| 110 | 113 | DEFAULT_MANAGER_URL); |
| 111 | 114 | } |
| 112 | 115 | } |
| @@ -7,6 +7,7 @@ | ||
| 7 | 7 | |
| 8 | 8 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_COMPUTESOURCEPATH_LABEL; |
| 9 | 9 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_PROJECTINSOURCEPATH_LABEL; |
| 10 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.TOMCAT_PREF_COMPUTESOURCEPATH_KEY; | |
| 10 | 11 | |
| 11 | 12 | import org.eclipse.jface.preference.BooleanFieldEditor; |
| 12 | 13 | import org.eclipse.jface.preference.FieldEditor; |
| @@ -51,10 +52,8 @@ | ||
| 51 | 52 | Composite composite = new Composite(parent, SWT.NULL); |
| 52 | 53 | composite.setLayout(new GridLayout()); |
| 53 | 54 | |
| 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); | |
| 58 | 57 | this.initField(this.automaticEditor); |
| 59 | 58 | |
| 60 | 59 | final Group projectListGroup = new Group(composite, SWT.NULL); |
| @@ -5,9 +5,13 @@ | ||
| 5 | 5 | |
| 6 | 6 | package com.sysdeo.eclipse.tomcat; |
| 7 | 7 | |
| 8 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.NATURE_ID; | |
| 9 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PLUGIN_ID; | |
| 8 | 10 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_BASE_LABEL; |
| 9 | 11 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_PROJECTINCP_LABEL; |
| 10 | 12 | 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; | |
| 11 | 15 | |
| 12 | 16 | import org.eclipse.core.runtime.preferences.InstanceScope; |
| 13 | 17 | import org.eclipse.jface.preference.BooleanFieldEditor; |
| @@ -57,20 +61,18 @@ | ||
| 57 | 61 | composite.setLayout(new GridLayout(1, false)); |
| 58 | 62 | |
| 59 | 63 | 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, | |
| 62 | 65 | PREF_PAGE_BASE_LABEL, homeGroup); |
| 63 | 66 | initLayoutAndData(homeGroup, 3); |
| 64 | 67 | |
| 65 | 68 | 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, | |
| 68 | 70 | PREF_PAGE_SECURITYMANAGER_LABEL, securityGroup); |
| 69 | 71 | initField(this.securityEditor); |
| 70 | 72 | initLayoutAndData(securityGroup, 1); |
| 71 | 73 | |
| 72 | 74 | Group projectListGroup = new Group(composite, SWT.NONE); |
| 73 | - String[] excludedProjectsNature = {TomcatPluginResources.NATURE_ID}; | |
| 75 | + String[] excludedProjectsNature = {NATURE_ID}; | |
| 74 | 76 | this.projectListEditor = new ProjectListEditor(excludedProjectsNature); |
| 75 | 77 | this.projectListEditor.setLabel(PREF_PAGE_PROJECTINCP_LABEL); |
| 76 | 78 | Control projectList = this.projectListEditor.getControl(projectListGroup); |
| @@ -105,7 +107,7 @@ | ||
| 105 | 107 | this.securityEditor.store(); |
| 106 | 108 | TomcatLauncherPlugin.setProjectsInCP(this.projectListEditor.getCheckedElements()); |
| 107 | 109 | try { |
| 108 | - InstanceScope.INSTANCE.getNode(TomcatPluginResources.PLUGIN_ID).flush(); | |
| 110 | + InstanceScope.INSTANCE.getNode(PLUGIN_ID).flush(); | |
| 109 | 111 | } catch (final BackingStoreException e) { |
| 110 | 112 | TomcatLauncherPlugin.log(e); |
| 111 | 113 | return false; |
| @@ -5,6 +5,7 @@ | ||
| 5 | 5 | |
| 6 | 6 | package com.sysdeo.eclipse.tomcat; |
| 7 | 7 | |
| 8 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.NATURE_ID; | |
| 8 | 9 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.WIZARD_PROJECT_REMOVE_DESCRIPTION; |
| 9 | 10 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.WIZARD_PROJECT_REMOVE_TITLE; |
| 10 | 11 |
| @@ -70,8 +71,7 @@ | ||
| 70 | 71 | IJavaProject javaProject = JavaCore.create(project); |
| 71 | 72 | if (javaProject != null) { |
| 72 | 73 | try { |
| 73 | - ITomcatProject result = (ITomcatProject)javaProject.getProject().getNature( | |
| 74 | - TomcatPluginResources.NATURE_ID); | |
| 74 | + ITomcatProject result = (ITomcatProject)javaProject.getProject().getNature(NATURE_ID); | |
| 75 | 75 | if (result != null) { |
| 76 | 76 | result.setJavaProject(javaProject); |
| 77 | 77 | } |
| @@ -5,6 +5,7 @@ | ||
| 5 | 5 | |
| 6 | 6 | package com.sysdeo.eclipse.tomcat; |
| 7 | 7 | |
| 8 | +import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PLUGIN_ID; | |
| 8 | 9 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_BOOTCLASSPATH_LABEL; |
| 9 | 10 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_CLASSPATH_LABEL; |
| 10 | 11 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_CREATE_LAUNCH_LABEL; |
| @@ -12,6 +13,11 @@ | ||
| 12 | 13 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_DUMP_CONFIG_LABEL; |
| 13 | 14 | import static com.sysdeo.eclipse.tomcat.TomcatPluginResources.PREF_PAGE_JRE_LABEL; |
| 14 | 15 | 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; | |
| 15 | 21 | |
| 16 | 22 | import java.util.ArrayList; |
| 17 | 23 | import java.util.Arrays; |
| @@ -83,10 +89,10 @@ | ||
| 83 | 89 | |
| 84 | 90 | String[][] namesAndValues = collectAllJres(); |
| 85 | 91 | 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); | |
| 87 | 93 | |
| 88 | 94 | 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); | |
| 90 | 96 | initField(this.debugModeEditor); |
| 91 | 97 | |
| 92 | 98 | Label lbl = new Label(composite, SWT.NULL); |
| @@ -107,11 +113,11 @@ | ||
| 107 | 113 | this.btLog.addSelectionListener(this); |
| 108 | 114 | |
| 109 | 115 | 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); | |
| 111 | 117 | 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); | |
| 113 | 119 | 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); | |
| 115 | 121 | |
| 116 | 122 | initField(this.jvmChoice); |
| 117 | 123 | initField(this.jvmParamaters); |
| @@ -189,7 +195,7 @@ | ||
| 189 | 195 | this.debugModeEditor.store(); |
| 190 | 196 | |
| 191 | 197 | try { |
| 192 | - InstanceScope.INSTANCE.getNode(TomcatPluginResources.PLUGIN_ID).flush(); | |
| 198 | + InstanceScope.INSTANCE.getNode(PLUGIN_ID).flush(); | |
| 193 | 199 | } catch (final BackingStoreException e) { |
| 194 | 200 | TomcatLauncherPlugin.log(e); |
| 195 | 201 | return false; |