svnno****@sourc*****
svnno****@sourc*****
2008年 6月 11日 (水) 22:42:33 JST
Revision: 976
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=976
Author: shinsuke
Date: 2008-06-11 22:42:33 +0900 (Wed, 11 Jun 2008)
Log Message:
-----------
applied patches. palportal has already used them.
Modified Paths:
--------------
pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/input/OutputField.java
pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/renderer/Res.properties
pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java
pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java
-------------- next part --------------
Modified: pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/input/OutputField.java
===================================================================
--- pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/input/OutputField.java 2008-06-11 13:36:41 UTC (rev 975)
+++ pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/input/OutputField.java 2008-06-11 13:42:33 UTC (rev 976)
@@ -65,7 +65,9 @@
public String getDisplayText() {
if(langPack != null){
+try{
return langPack.getString(getName() + ".displayText");
+}catch(Exception e){}
}
return displayText;
}
Modified: pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/renderer/Res.properties
===================================================================
--- pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/renderer/Res.properties 2008-06-11 13:36:41 UTC (rev 975)
+++ pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/renderer/Res.properties 2008-06-11 13:42:33 UTC (rev 976)
@@ -46,3 +46,4 @@
license.next.text=Accept
license.cancel.text=Reject
+installAborted=Install Aborted.
Modified: pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java
===================================================================
--- pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java 2008-06-11 13:36:41 UTC (rev 975)
+++ pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java 2008-06-11 13:42:33 UTC (rev 976)
@@ -15,6 +15,8 @@
*/
package org.tp23.antinstaller.runtime.exe;
+import java.util.ResourceBundle;
+
import org.tp23.antinstaller.InstallException;
import org.tp23.antinstaller.InstallerContext;
@@ -26,6 +28,8 @@
*/
public class ExecuteRunnerFilter implements ExecuteFilter {
+ private static final ResourceBundle res = ResourceBundle.getBundle("org.tp23.antinstaller.renderer.Res");
+
/**
* @see org.tp23.antinstaller.runtime.exe.ExecuteFilter#exec(org.tp23.antinstaller.InstallerContext)
*/
@@ -35,7 +39,7 @@
}
boolean ok = ctx.getRunner().runInstaller();
if(!ok){
- throw new AbortException("Install Aborted");
+ throw new AbortException(res.getString("installAborted"));
}
ctx.log("Install screens rendered");
}
Modified: pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java
===================================================================
--- pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java 2008-06-11 13:36:41 UTC (rev 975)
+++ pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java 2008-06-11 13:42:33 UTC (rev 976)
@@ -140,7 +140,7 @@
ctx.isAutoBuild() &&
PROMPT.equals(loadDefaults) ) {
ctx.log( "Cant run -auto install without properties");
- throw new AbortException("Install Aborted: cant load ant.install.properties");
+ throw new AbortException(res.getString("installAborted") + ": cant load ant.install.properties");
}
if(load) {
@@ -159,17 +159,17 @@
// let major versions pass but prompt for differences
if( (! ctx.isAutoBuild()) && helper.majorVersionCompatible(configVersion , propertiesVersion) ){
if( ! ctx.getMessageRenderer().prompt(res.getString("propertiesVersionMismatch")) ){
- throw new AbortException("Install Aborted: existing configuration is not compatible, config version: " + configVersion);
+ throw new AbortException(res.getString("installAborted") + ": existing configuration is not compatible, config version: " + configVersion);
}
}
else {
- throw new AbortException("Install Aborted: existing configuration is not compatible, config version: " + configVersion);
+ throw new AbortException(res.getString("installAborted") + ": existing configuration is not compatible, config version: " + configVersion);
}
}
}
else {
- throw new AbortException("Install Aborted: local ant.install.properties missing config version, must be equal or lower than: " + configVersion);
+ throw new AbortException(res.getString("installAborted") + ": local ant.install.properties missing config version, must be equal or lower than: " + configVersion);
}
// end version control