| Revision | 127 (tree) |
|---|---|
| Time | 2015-10-08 21:57:37 |
| Author | t_nakayama1971 |
clear warning
| @@ -549,11 +549,12 @@ | ||
| 549 | 549 | * @return IFolder |
| 550 | 550 | */ |
| 551 | 551 | public IFolder getWorkFolder() { |
| 552 | -// if (getRootDirFolder() == null) { | |
| 553 | -// return project.getFolder("work"); | |
| 554 | -// } else { | |
| 555 | -// return getRootDirFolder().getFolder("work"); | |
| 556 | -// } | |
| 552 | + // TODO: | |
| 553 | + // if (getRootDirFolder() == null) { | |
| 554 | + // return project.getFolder("work"); | |
| 555 | + // } else { | |
| 556 | + // return getRootDirFolder().getFolder("work"); | |
| 557 | + // } | |
| 557 | 558 | |
| 558 | 559 | return this.project.getFolder("work"); |
| 559 | 560 | } |
| @@ -122,7 +122,7 @@ | ||
| 122 | 122 | * @param uEditor StringFieldEditor |
| 123 | 123 | * @param pEditor StringFieldEditor |
| 124 | 124 | */ |
| 125 | - public Adapter(final StringFieldEditor uEditor, final StringFieldEditor pEditor) { | |
| 125 | + Adapter(final StringFieldEditor uEditor, final StringFieldEditor pEditor) { | |
| 126 | 126 | this.userEditor = uEditor; |
| 127 | 127 | this.pwdEditor = pEditor; |
| 128 | 128 | } |
| @@ -263,7 +263,7 @@ | ||
| 263 | 263 | * @param list CheckedListDialogField |
| 264 | 264 | * @param button Button |
| 265 | 265 | */ |
| 266 | - public Adapter(final CheckedListDialogField<String> list, final Button button) { | |
| 266 | + Adapter(final CheckedListDialogField<String> list, final Button button) { | |
| 267 | 267 | this.cpList = list; |
| 268 | 268 | this.webClassPathCheck = button; |
| 269 | 269 | } |
| @@ -116,7 +116,7 @@ | ||
| 116 | 116 | * @param pEditor ProjectListEditor |
| 117 | 117 | * @param bEditor BooleanFieldEditor |
| 118 | 118 | */ |
| 119 | - public Listener(final ProjectListEditor pEditor, final BooleanFieldEditor bEditor) { | |
| 119 | + Listener(final ProjectListEditor pEditor, final BooleanFieldEditor bEditor) { | |
| 120 | 120 | this.projectListEditor = pEditor; |
| 121 | 121 | this.automaticEditor = bEditor; |
| 122 | 122 | } |
| @@ -157,7 +157,7 @@ | ||
| 157 | 157 | * @param sh Shell |
| 158 | 158 | * @param txt Text |
| 159 | 159 | */ |
| 160 | - public Adapter(final Shell sh, final Text txt) { | |
| 160 | + Adapter(final Shell sh, final Text txt) { | |
| 161 | 161 | this.shell = sh; |
| 162 | 162 | this.text = txt; |
| 163 | 163 | } |
| @@ -25,10 +25,10 @@ | ||
| 25 | 25 | ArrayList<String> vmArgs = new ArrayList<>(); |
| 26 | 26 | vmArgs.add("-Dcatalina.home=\"" + getTomcatDir() + "\""); |
| 27 | 27 | |
| 28 | -// This is not needed in Tomcat 4.1.24, does it come from a previous version | |
| 29 | -// Does not work with Tomcat 4.1.29 | |
| 30 | -// String binDir = getTomcatDir() + File.separator + "bin"; | |
| 31 | -// vmArgs.add("-Djava.endorsed.dirs=\"" + binDir + File.pathSeparator + commonEndorsedDir + "\""); | |
| 28 | + // This is not needed in Tomcat 4.1.24, does it come from a previous version | |
| 29 | + // Does not work with Tomcat 4.1.29 | |
| 30 | + // String binDir = getTomcatDir() + File.separator + "bin"; | |
| 31 | + // vmArgs.add("-Djava.endorsed.dirs=\"" + binDir + File.pathSeparator + commonEndorsedDir + "\""); | |
| 32 | 32 | |
| 33 | 33 | String commonEndorsedDir = getTomcatDir() + File.separator + "common" + File.separator + "endorsed"; |
| 34 | 34 | vmArgs.add("-Djava.endorsed.dirs=\"" + commonEndorsedDir + "\""); |
| @@ -193,7 +193,7 @@ | ||
| 193 | 193 | TomcatLauncherPlugin.log(e); |
| 194 | 194 | return false; |
| 195 | 195 | } |
| 196 | -// TomcatLauncherPlugin.getDefault().savePluginPreferences(); | |
| 196 | + // TomcatLauncherPlugin.getDefault().savePluginPreferences(); | |
| 197 | 197 | return true; |
| 198 | 198 | } |
| 199 | 199 |
| @@ -55,20 +55,20 @@ | ||
| 55 | 55 | TomcatLauncherPlugin.getResourceString("pref.page.chooseversion.label"); |
| 56 | 56 | |
| 57 | 57 | |
| 58 | -// public static final String PREF_PAGE_VERSION3_LABEL = | |
| 59 | -// TomcatLauncherPlugin.getResourceString("pref.page.version3.label"); | |
| 60 | -// | |
| 61 | -// public static final String PREF_PAGE_VERSION4_LABEL = | |
| 62 | -// TomcatLauncherPlugin.getResourceString("pref.page.version4.label"); | |
| 63 | -// | |
| 64 | -// public static final String PREF_PAGE_VERSION4_1_LABEL = | |
| 65 | -// TomcatLauncherPlugin.getResourceString("pref.page.version41.label"); | |
| 66 | -// | |
| 67 | -// public static final String PREF_PAGE_VERSION5_LABEL = | |
| 68 | -// TomcatLauncherPlugin.getResourceString("pref.page.version5.label"); | |
| 69 | -// | |
| 70 | -// public static final String PREF_PAGE_VERSION6_LABEL = | |
| 71 | -// TomcatLauncherPlugin.getResourceString("pref.page.version6.label"); | |
| 58 | + // public static final String PREF_PAGE_VERSION3_LABEL = | |
| 59 | + // TomcatLauncherPlugin.getResourceString("pref.page.version3.label"); | |
| 60 | + // | |
| 61 | + // public static final String PREF_PAGE_VERSION4_LABEL = | |
| 62 | + // TomcatLauncherPlugin.getResourceString("pref.page.version4.label"); | |
| 63 | + // | |
| 64 | + // public static final String PREF_PAGE_VERSION4_1_LABEL = | |
| 65 | + // TomcatLauncherPlugin.getResourceString("pref.page.version41.label"); | |
| 66 | + // | |
| 67 | + // public static final String PREF_PAGE_VERSION5_LABEL = | |
| 68 | + // TomcatLauncherPlugin.getResourceString("pref.page.version5.label"); | |
| 69 | + // | |
| 70 | + // public static final String PREF_PAGE_VERSION6_LABEL = | |
| 71 | + // TomcatLauncherPlugin.getResourceString("pref.page.version6.label"); | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | /** PREF_PAGE_VERSION7_LABEL */ |
| @@ -57,7 +57,7 @@ | ||
| 57 | 57 | composite.setLayoutData(new GridData(GridData.FILL_BOTH)); |
| 58 | 58 | |
| 59 | 59 | createWebpathGroup(composite); |
| 60 | -// new Label(composite, SWT.NULL); | |
| 60 | + // new Label(composite, SWT.NULL); | |
| 61 | 61 | createUpdateXmlGroup(composite); |
| 62 | 62 | |
| 63 | 63 | new Label(composite, SWT.NULL); |
| @@ -84,11 +84,11 @@ | ||
| 84 | 84 | TomcatLauncherPlugin.TOMCAT_PREF_VERSION_KEY, |
| 85 | 85 | PREF_PAGE_CHOOSEVERSION_LABEL, 1, |
| 86 | 86 | new String[][] { |
| 87 | -// {PREF_PAGE_VERSION3_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION3}, | |
| 88 | -// {PREF_PAGE_VERSION4_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION4}, | |
| 89 | -// {PREF_PAGE_VERSION4_1_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION41}, | |
| 90 | -// {PREF_PAGE_VERSION5_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION5}, | |
| 91 | -// {PREF_PAGE_VERSION6_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION6}, | |
| 87 | + // {PREF_PAGE_VERSION3_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION3}, | |
| 88 | + // {PREF_PAGE_VERSION4_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION4}, | |
| 89 | + // {PREF_PAGE_VERSION4_1_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION41}, | |
| 90 | + // {PREF_PAGE_VERSION5_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION5}, | |
| 91 | + // {PREF_PAGE_VERSION6_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION6}, | |
| 92 | 92 | |
| 93 | 93 | {PREF_PAGE_VERSION7_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION7}, |
| 94 | 94 | {PREF_PAGE_VERSION8_LABEL, TomcatLauncherPlugin.TOMCAT_VERSION8} |
| @@ -209,7 +209,7 @@ | ||
| 209 | 209 | TomcatLauncherPlugin.log(e); |
| 210 | 210 | return false; |
| 211 | 211 | } |
| 212 | -// TomcatLauncherPlugin.getDefault().savePluginPreferences(); | |
| 212 | + // TomcatLauncherPlugin.getDefault().savePluginPreferences(); | |
| 213 | 213 | |
| 214 | 214 | if (!this.oldVersion.equals(TomcatLauncherPlugin.getTomcatVersion())) { |
| 215 | 215 | this.updateTomcatProjectsBuildPath(); |
| @@ -96,7 +96,7 @@ | ||
| 96 | 96 | * @param saveConfig boolean |
| 97 | 97 | * @throws CoreException CoreException |
| 98 | 98 | */ |
| 99 | - public static void runVM(final String label, final String classToLaunch, final String[] classpath, | |
| 99 | + static void runVM(final String label, final String classToLaunch, final String[] classpath, | |
| 100 | 100 | final String[] bootClasspath, final String vmArgs, final String prgArgs, |
| 101 | 101 | final boolean debug, final boolean saveConfig) throws CoreException { |
| 102 | 102 |
| @@ -336,21 +336,21 @@ | ||
| 336 | 336 | public static TomcatBootstrap getTomcatBootstrap() { |
| 337 | 337 | TomcatBootstrap tomcatBootsrap = null; |
| 338 | 338 | |
| 339 | -// if (getTomcatVersion().equals(TOMCAT_VERSION3)) { | |
| 340 | -// tomcatBootsrap = new Tomcat3Bootstrap(); | |
| 341 | -// } | |
| 342 | -// if (getTomcatVersion().equals(TOMCAT_VERSION4)) { | |
| 343 | -// tomcatBootsrap = new Tomcat4Bootstrap(); | |
| 344 | -// } | |
| 345 | -// if (getTomcatVersion().equals(TOMCAT_VERSION41)) { | |
| 346 | -// tomcatBootsrap = new Tomcat41Bootstrap(); | |
| 347 | -// } | |
| 348 | -// if (getTomcatVersion().equals(TOMCAT_VERSION5)) { | |
| 349 | -// tomcatBootsrap = new Tomcat5Bootstrap(); | |
| 350 | -// } | |
| 351 | -// if (getTomcatVersion().equals(TOMCAT_VERSION6)) { | |
| 352 | -// tomcatBootsrap = new Tomcat6Bootstrap(); | |
| 353 | -// } | |
| 339 | + // if (getTomcatVersion().equals(TOMCAT_VERSION3)) { | |
| 340 | + // tomcatBootsrap = new Tomcat3Bootstrap(); | |
| 341 | + // } | |
| 342 | + // if (getTomcatVersion().equals(TOMCAT_VERSION4)) { | |
| 343 | + // tomcatBootsrap = new Tomcat4Bootstrap(); | |
| 344 | + // } | |
| 345 | + // if (getTomcatVersion().equals(TOMCAT_VERSION41)) { | |
| 346 | + // tomcatBootsrap = new Tomcat41Bootstrap(); | |
| 347 | + // } | |
| 348 | + // if (getTomcatVersion().equals(TOMCAT_VERSION5)) { | |
| 349 | + // tomcatBootsrap = new Tomcat5Bootstrap(); | |
| 350 | + // } | |
| 351 | + // if (getTomcatVersion().equals(TOMCAT_VERSION6)) { | |
| 352 | + // tomcatBootsrap = new Tomcat6Bootstrap(); | |
| 353 | + // } | |
| 354 | 354 | |
| 355 | 355 | |
| 356 | 356 | if (getTomcatVersion().equals(TOMCAT_VERSION7)) { |