Changeset 17514 for release-kits
- Timestamp:
- 2008-10-10T09:05:07+13:00 (15 years ago)
- Location:
- release-kits/shared/ant-installer
- Files:
-
- 46 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/shared/ant-installer/src/org/tp23/antinstaller/Installer.java
r14982 r17514 29 29 import org.tp23.antinstaller.runtime.exe.ExecuteRunnerFilter.AbortException; 30 30 31 32 33 31 /** 34 32 * <p>Object representation of the Installer element in the config. </p> … … 43 41 44 42 // i18n support 45 p rivatestatic ResourceBundle langPack = null;46 static {43 public static ResourceBundle langPack = null; 44 static { 47 45 try { 48 46 langPack = ResourceBundle.getBundle("resources.LanguagePack"); 49 47 } catch (MissingResourceException e) { 50 // ignore, signifies no lang packs installed 48 // ignore, signifies no lang packs installed 51 49 } 52 50 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/antmod/FeedbackListener.java
r15210 r17514 21 21 import org.apache.tools.ant.BuildListener; 22 22 import org.tp23.antinstaller.renderer.swing.SwingInstallerContext; 23 import org.tp23.antinstaller.Installer; 24 23 25 /** 24 26 * … … 35 37 36 38 private final SwingInstallerContext swingCtx; 37 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");38 39 39 40 public FeedbackListener(SwingInstallerContext swingCtx) { … … 57 58 */ 58 59 public void buildFinished(BuildEvent buildEvent) { 59 swingCtx.provideAntFeedBack( res.getString("installFinished"));60 swingCtx.provideAntFeedBack(org.tp23.antinstaller.Installer.langPack.getString("installFinished")); 60 61 swingCtx.buildFinished(buildEvent); 61 62 } … … 67 68 */ 68 69 public void targetStarted(BuildEvent buildEvent) { 69 swingCtx.provideAntFeedBack( res.getString("running")+buildEvent.getTarget());70 swingCtx.provideAntFeedBack(org.tp23.antinstaller.Installer.langPack.getString("running")+buildEvent.getTarget()); 70 71 swingCtx.targetStarted(buildEvent); 71 72 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/AppRootInput.java
r15210 r17514 36 36 extends DirectoryInput { 37 37 38 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");39 40 41 38 private String checkFile1; 42 39 private String checkFile2; … … 63 60 // } 64 61 if(!file.isDirectory()){ 65 mr.printMessage( res.getString("dirNotExist")+":"+file.getAbsolutePath());62 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist")+":"+file.getAbsolutePath()); 66 63 return false; 67 64 } … … 92 89 private void reportMissing(MessageRenderer mr,File missing){ 93 90 StringBuffer message = new StringBuffer(); 94 message.append( res.getString("appRootInvalid"));91 message.append(org.tp23.antinstaller.Installer.langPack.getString("appRootInvalid")); 95 92 message.append(System.getProperty("line.separator")); 96 93 if(missing.isDirectory()){ 97 message.append( res.getString("dirNotExist"));94 message.append(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist")); 98 95 } 99 96 else{ 100 message.append( res.getString("fileNotExist"));97 message.append(org.tp23.antinstaller.Installer.langPack.getString("fileNotExist")); 101 98 } 102 99 message.append(":"); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/DirectoryInput.java
r15210 r17514 34 34 extends OSSpecific { 35 35 36 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");37 38 39 36 private boolean abort = false; 40 37 private String create; … … 54 51 if( "".equals(selectedName) ){ 55 52 if( InputField.isTrue(create) || InputField.isTrue(checkExists) ){ 56 mr.printMessage( res.getString("dirNotExist"));53 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist")); 57 54 return false; 58 55 } … … 65 62 if(!file.exists()){ 66 63 try { 67 if(mr.prompt( res.getString("dirNotExistCreate") + "\n" + file.getAbsolutePath())){64 if(mr.prompt(org.tp23.antinstaller.Installer.langPack.getString("dirNotExistCreate") + "\n" + file.getAbsolutePath())){ 68 65 boolean ok = file.mkdirs(); 69 66 if(!ok){ 70 mr.printMessage( res.getString("dirNotCreated"));67 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotCreated")); 71 68 } 72 69 } 73 70 } 74 71 catch (Exception ex) { 75 mr.printMessage( res.getString("canNotCreateFile") + "\n" + file.getAbsolutePath());72 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("canNotCreateFile") + "\n" + file.getAbsolutePath()); 76 73 //FIXME should not throw here, should do something better so users on linux can chmod where necessary 77 74 // then try again 78 throw new ValidationException( res.getString("canNotCreateFile"),ex);75 throw new ValidationException(org.tp23.antinstaller.Installer.langPack.getString("canNotCreateFile"),ex); 79 76 80 77 } … … 86 83 // } 87 84 if(!file.exists() || !file.isDirectory()){ 88 mr.printMessage( res.getString("dirNotExist") + "\n" + file.getAbsolutePath());85 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("dirNotExist") + "\n" + file.getAbsolutePath()); 89 86 return false; 90 87 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/InputField.java
r14982 r17514 18 18 import java.util.MissingResourceException; 19 19 import java.util.ResourceBundle; 20 import org.tp23.antinstaller.Installer; 20 21 21 22 /** … … 29 30 extends OutputField { 30 31 31 // i18n support32 private static ResourceBundle langPack = null;33 static{34 try {35 langPack = ResourceBundle.getBundle("resources.LanguagePack");36 } catch (MissingResourceException e) {37 // ignore, signifies no lang packs installed38 }39 }40 41 32 private String property; 42 33 protected String defaultValue; … … 46 37 */ 47 38 private boolean editted = false; 39 private Installer i = new Installer(); 48 40 49 41 public InputField() { … … 51 43 52 44 public String getDisplayText() { 53 if( langPack != null){54 return langPack.getString(getProperty() + ".displayText");45 if( org.tp23.antinstaller.Installer.langPack != null){ 46 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".displayText"); 55 47 } 56 48 return displayText; 57 49 } 58 50 public String getExplanatoryText() { 59 if( langPack != null){51 if( org.tp23.antinstaller.Installer.langPack != null ) { 60 52 try { 61 return langPack.getString(getProperty() + ".explanatoryText");53 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + ".explanatoryText"); 62 54 } catch (MissingResourceException e) { 63 55 // ignore and return null explanatoryText is optional -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/LargeSelectInput.java
r14982 r17514 37 37 extends InputField{ 38 38 39 // i18n support40 private static ResourceBundle langPack = null;41 39 private int optionIdx = 0; 42 static{43 try {44 langPack = ResourceBundle.getBundle("resources.LanguagePack");45 } catch (MissingResourceException e) {46 // ignore, signifies no lang packs installed47 }48 }49 40 50 41 private LargeSelectInput.Option[] options; … … 74 65 } 75 66 public String getText() { 76 if( langPack != null){77 return langPack.getString(getProperty() + "." + idx +".displayText");67 if( org.tp23.antinstaller.Installer.langPack != null ) { 68 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText"); 78 69 } 79 70 return text; -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/OutputField.java
r14982 r17514 29 29 public abstract class OutputField { 30 30 31 // i18n support32 private static ResourceBundle langPack = null;33 31 private static int commentIdx = 0; 34 static{35 try {36 langPack = ResourceBundle.getBundle("resources.LanguagePack");37 } catch (MissingResourceException e) {38 // ignore, signifies no lang packs installed39 }40 }41 32 42 33 /* This is redundant unless language packs are used … … 65 56 66 57 public String getDisplayText() { 67 if( langPack != null){68 return langPack.getString(getName() + ".displayText");58 if( org.tp23.antinstaller.Installer.langPack != null ) { 59 return org.tp23.antinstaller.Installer.langPack.getString(getName() + ".displayText"); 69 60 } 70 61 return displayText; … … 76 67 77 68 public String getExplanatoryText() { 78 if( langPack != null){69 if( org.tp23.antinstaller.Installer.langPack != null ) { 79 70 try { 80 return langPack.getString(getName() + ".explanatoryText");71 return org.tp23.antinstaller.Installer.langPack.getString(getName() + ".explanatoryText"); 81 72 } catch (MissingResourceException e) { 82 73 // ignore and return null explanatoryText is optional -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java
r14982 r17514 19 19 import java.util.MissingResourceException; 20 20 import java.util.ResourceBundle; 21 21 import java.util.Locale; 22 22 import org.tp23.antinstaller.InstallerContext; 23 23 import org.tp23.antinstaller.ValidationException; 24 24 import org.tp23.antinstaller.Installer; 25 25 26 26 … … 35 35 */ 36 36 public class SelectInput 37 extends InputField {37 extends InputField { 38 38 39 // i18n support40 private static ResourceBundle langPack = null;41 39 private int optionIdx = 0; 42 static{ 43 try { 44 langPack = ResourceBundle.getBundle("resources.LanguagePack"); 45 } catch (MissingResourceException e) { 46 // ignore, signifies no lang packs installed 47 } 40 private SelectInput.Option[] options; 41 private boolean useAsLocale = false; 42 43 public SelectInput() { 48 44 } 49 45 50 private SelectInput.Option[] options; 51 52 public SelectInput() { 46 public void setUseAsLocale(boolean ual) { 47 this.useAsLocale = ual; 53 48 } 54 49 … … 75 70 } 76 71 public String getText() { 77 if( langPack != null){78 return langPack.getString(getProperty() + "." + idx +".displayText");72 if( org.tp23.antinstaller.Installer.langPack != null ){ 73 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText"); 79 74 } 80 75 return text; … … 84 79 public void setValue(String value){ 85 80 setInputResult(value); 81 if ( useAsLocale ) { 82 //expect something like 'en' or or something like 'en_US' 83 if ( value.length() == 2 ) { 84 Locale.setDefault( new Locale(value) ); 85 } else if ( value.length() == 5 ) { 86 Locale.setDefault( new Locale(value.substring(0,2), value.substring(3,5)) ); 87 } //else { you're out of luck } 88 org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack"); 89 } 86 90 } 87 91 -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/page/Page.java
r15211 r17514 44 44 public abstract class Page { 45 45 46 // i18n support47 private static ResourceBundle langPack = null;48 //private static ResourceBundle otherLangPack = null;49 static{50 try {51 langPack = ResourceBundle.getBundle("resources.LanguagePack");52 } catch (MissingResourceException e) {53 // ignore, signifies no lang packs installed54 }55 }56 57 46 //private static final int MAX_TARGETS = 10; 58 47 private String name; … … 79 68 80 69 public String getDisplayText() { 81 if( langPack != null){82 return langPack.getString("page." + getName() + ".displayText");70 if( org.tp23.antinstaller.Installer.langPack != null ) { 71 return org.tp23.antinstaller.Installer.langPack.getString("page." + getName() + ".displayText"); 83 72 } 84 73 return displayText; -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ConfirmPasswordTextInputRenderer.java
r15210 r17514 20 20 public class ConfirmPasswordTextInputRenderer extends PasswordTextInputRenderer{ 21 21 22 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");23 24 22 protected String getErrorMessage(){ 25 return res.getString("passwordsDoNotMatch");23 return org.tp23.antinstaller.Installer.langPack.getString("passwordsDoNotMatch"); 26 24 } 27 25 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/DateInputRenderer.java
r15210 r17514 33 33 extends SwingOutputFieldRenderer { 34 34 35 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");36 37 35 protected DateInput inputField; 38 36 … … 96 94 public void renderError() { 97 95 MessageRenderer mr = ctx.getMessageRenderer(); 98 mr.printMessage( res.getString("notCorrectFormat") + "\n\n " + inputField.getDateFormat());96 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") + "\n\n " + inputField.getDateFormat()); 99 97 //fixed BUG1295944 mr.printMessage("The field is not of the correct format\n\n "+inputField.getDateFormat()); 100 98 this.jTextField.requestFocus(); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/DirectoryInputRenderer.java
r15211 r17514 37 37 public class DirectoryInputRenderer 38 38 extends SwingOutputFieldRenderer { 39 40 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");41 39 42 40 private static final String EMPTY_STRING = ""; … … 119 117 } 120 118 }); 121 browseButton.setText( res.getString("selectFolder"));119 browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("selectFolder")); 122 120 browseButton.setPreferredSize(new Dimension(150, SizeConstants.FIELD_HEIGHT)); 123 121 -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/FileInputRenderer.java
r15210 r17514 36 36 public class FileInputRenderer 37 37 extends SwingOutputFieldRenderer { 38 39 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");40 38 41 39 protected FileInput inputField; … … 103 101 } 104 102 }); 105 browseButton.setText( res.getString("selectFile"));103 browseButton.setText(org.tp23.antinstaller.Installer.langPack.getString("selectFile")); 106 104 browseButton.setPreferredSize(new Dimension(150, SizeConstants.FIELD_HEIGHT)); 107 105 … … 133 131 public void renderError() { 134 132 MessageRenderer mr = ctx.getMessageRenderer(); 135 mr.printMessage( res.getString("fileNotExist"));133 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("fileNotExist")); 136 134 this.jTextField.requestFocus(); 137 135 this.jTextField.setForeground(Color.red); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/LargeSelectInputRenderer.java
r15210 r17514 30 30 public class LargeSelectInputRenderer 31 31 extends SwingOutputFieldRenderer { 32 33 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");34 32 35 33 protected LargeSelectInput inputField; … … 111 109 */ 112 110 public void renderError() { 113 ctx.getMessageRenderer().printMessage( res.getString("notValidSelection"));111 ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("notValidSelection")); 114 112 optionCombo.requestFocus(); 115 113 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/LicensePageRenderer.java
r15210 r17514 42 42 public class LicensePageRenderer 43 43 extends SwingPageRenderer { 44 45 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");46 44 47 45 private JTextArea licenseTextArea = new JTextArea(); … … 90 88 this.add(scrollPane, BorderLayout.CENTER); 91 89 92 getNextButton().setText( res.getString( "license.next.text" ) );90 getNextButton().setText( org.tp23.antinstaller.Installer.langPack.getString( "license.next.text" ) ); 93 91 getNextButton().setIcon(getImage("/resources/icons/ok.png")); 94 getCancelButton().setText( res.getString( "license.cancel.text" ) );92 getCancelButton().setText( org.tp23.antinstaller.Installer.langPack.getString( "license.cancel.text" ) ); 95 93 96 94 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/PasswordTextInputRenderer.java
r15210 r17514 27 27 28 28 public class PasswordTextInputRenderer extends ValidatedTextInputRenderer{ 29 30 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");31 29 32 30 public PasswordTextInputRenderer() { … … 59 57 } 60 58 protected String getErrorMessage(){ 61 return res.getString("notCorrectPasswordFormat") +59 return org.tp23.antinstaller.Installer.langPack.getString("notCorrectPasswordFormat") + 62 60 "\n\n e.g. " + 63 61 inputField.getDefaultValue(); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ProgressPageRenderer.java
r15210 r17514 47 47 implements AntOutputRenderer { 48 48 49 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");50 49 private static final int MESSAGE_PANEL_HEIGHT = 30; 51 50 … … 103 102 104 103 //FIXME not i18n properly since the sentence is not correct ordering in German 105 feedBackLabel.setText( res.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+res.getString("toContinue"));104 feedBackLabel.setText(org.tp23.antinstaller.Installer.langPack.getString("click")+" "+ctx.getInstaller().getFinishButtonText()+" "+org.tp23.antinstaller.Installer.langPack.getString("toContinue")); 106 105 feedBackLabel.setBounds(new Rectangle(115, 7, 272, 22)); 107 jToggleButton.setText( res.getString("showDetails"));106 jToggleButton.setText(org.tp23.antinstaller.Installer.langPack.getString("showDetails")); 108 107 jToggleButton.setBounds(new Rectangle(5, 7, 104, 22)); 109 108 jToggleButton.setMargin(new Insets(0,0,0,0)); … … 138 137 contentPanel.add(progressScrollPane, BorderLayout.CENTER); 139 138 } 140 jTabbedPane.add( res.getString("output"), outPanel);141 jTabbedPane.add( res.getString("errors"), errPanel);139 jTabbedPane.add(org.tp23.antinstaller.Installer.langPack.getString("output"), outPanel); 140 jTabbedPane.add(org.tp23.antinstaller.Installer.langPack.getString("errors"), errPanel); 142 141 // if(OutputField.isTrue( ctx.getInstaller().getAntialiased())){ 143 142 // outPanel.setAntialiased(true); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/SelectInputRenderer.java
r15210 r17514 33 33 extends SwingOutputFieldRenderer { 34 34 35 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");36 37 35 protected SelectInput inputField; 38 36 … … 132 130 */ 133 131 public void renderError() { 134 ctx.getMessageRenderer().printMessage( res.getString("notValidSelection"));132 ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("notValidSelection")); 135 133 // fixed BUG:1295944 ctx.getMessageRenderer().printMessage("Not a valid selection"); 136 134 //optionGroup.requestFocus(); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/SwingPageRenderer.java
r15210 r17514 49 49 extends JPanel { 50 50 51 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");52 53 51 // gui components 54 52 private BorderLayout borderLayout1 = new BorderLayout(); … … 151 149 controlPanel.add(nextButton, null); 152 150 controlPanel.add(finishButton, null); 153 backButton.setText( res.getString("backButton"));// "<< Back");154 cancelButton.setText( res.getString("cancelButton"));// "Cancel");155 nextButton.setText( res.getString("nextButton"));// "Next >>");151 backButton.setText(org.tp23.antinstaller.Installer.langPack.getString("backButton"));// "<< Back"); 152 cancelButton.setText(org.tp23.antinstaller.Installer.langPack.getString("cancelButton"));// "Cancel"); 153 nextButton.setText(org.tp23.antinstaller.Installer.langPack.getString("nextButton"));// "Next >>"); 156 154 finishButton.setText(ctx.getInstaller().getFinishButtonText()); 157 155 finishButton.setEnabled(false); … … 223 221 finishButton.addActionListener(new ActionListener(){ 224 222 public void actionPerformed(ActionEvent e){ 225 if(finishButton.getText().equals( res.getString("exit"))) {223 if(finishButton.getText().equals(org.tp23.antinstaller.Installer.langPack.getString("exit"))) { 226 224 //TODO FindBugs this will prevent cleanup in FinalizerFilter 227 225 System.exit(0); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/swing/ValidatedTextInputRenderer.java
r15210 r17514 32 32 33 33 public class ValidatedTextInputRenderer extends SwingOutputFieldRenderer { 34 35 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");36 34 37 35 protected ValidatedTextInput inputField; … … 103 101 public void renderError() { 104 102 MessageRenderer mr = ctx.getMessageRenderer(); 105 mr.printMessage( res.getString("notCorrectFormat") + "\n\n e.g. "103 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("notCorrectFormat") + "\n\n e.g. " 106 104 + inputField.getDefaultValue()); 107 105 this.jTextField.requestFocus(); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/AbstractTextPageRenderer.java
r15353 r17514 84 84 } 85 85 86 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack"); 87 private static final char[] affimativeChars = parseChars(res.getString("affirmativeChars")); 86 private static final char[] affimativeChars = parseChars(org.tp23.antinstaller.Installer.langPack.getString("affirmativeChars")); 88 87 89 88 private static char[] parseChars(String commaSeparated){ -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/CheckboxInputRenderer.java
r15353 r17514 30 30 implements TextOutputFieldRenderer { 31 31 32 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");33 34 32 protected InstallerContext ctx; 35 33 … … 45 43 out.print(iField.getDisplayText()); 46 44 out.print(" ["); 47 out.print( res.getString("_default_"));45 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 48 46 out.print(":"); 49 47 out.print(iField.getDefaultValue()); 50 48 out.print("]"); 51 49 if (InputField.isTrue(iField.getForce())) { 52 out.println( res.getString("_required_"));50 out.println(org.tp23.antinstaller.Installer.langPack.getString("_required_")); 53 51 iField.setValue(iField.getDefaultValue()); 54 52 return; -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ConditionalFieldRenderer.java
r15353 r17514 36 36 public class ConditionalFieldRenderer implements TextOutputFieldRenderer 37 37 { 38 private static final ResourceBundleHelper res = new ResourceBundleHelper("resources.LanguagePack");39 38 39 private ResourceBundleHelper resHelper = new ResourceBundleHelper( "resources.LanguagePack" ); 40 40 private InstallerContext context; 41 41 … … 64 64 catch( ConfigurationException configExc ) 65 65 { 66 throw new InstallException( res .getMessage( "invalid.conditional.expression", conditional.getIfProperty()),66 throw new InstallException( resHelper.getMessage( "invalid.conditional.expression", conditional.getIfProperty()), 67 67 configExc ); 68 68 } 69 69 catch( ClassNotFoundException clsNotFoundExc ) 70 70 { 71 throw new InstallException( res .getMessage( "text.render.not.found" ),71 throw new InstallException( resHelper.getMessage( "text.render.not.found" ), 72 72 clsNotFoundExc ); 73 73 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ConfirmPasswordTextInputRenderer.java
r15210 r17514 5 5 public class ConfirmPasswordTextInputRenderer extends PasswordTextInputRenderer { 6 6 7 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");8 9 7 protected String getErrorMessage(){ 10 return res.getString("passwordsDoNotMatch");8 return org.tp23.antinstaller.Installer.langPack.getString("passwordsDoNotMatch"); 11 9 } 12 10 -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/DateInputRenderer.java
r15353 r17514 29 29 implements TextOutputFieldRenderer { 30 30 31 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");32 33 31 protected InstallerContext ctx; 34 32 public DateInputRenderer() { … … 44 42 45 43 out.print(" ["); 46 out.print( res.getString("_default_"));44 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 47 45 out.print(":"); 48 46 out.print(iField.getDefaultValue()); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/DirectoryInputRenderer.java
r15353 r17514 28 28 public class DirectoryInputRenderer implements TextOutputFieldRenderer { 29 29 30 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");31 32 30 protected InstallerContext ctx; 33 31 … … 44 42 45 43 out.print(" ["); 46 out.print( res.getString("_default_"));44 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 47 45 out.print(":"); 48 46 out.print(iField.getDefaultValue(true)); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/FileInputRenderer.java
r15353 r17514 31 31 implements TextOutputFieldRenderer { 32 32 33 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");34 35 33 protected InstallerContext ctx; 36 34 public FileInputRenderer() { … … 46 44 47 45 out.print(" ["); 48 out.print( res.getString("_default_"));46 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 49 47 out.print(":"); 50 48 out.print(iField.getDefaultValue(true)); … … 61 59 public void renderError(OutputField field, BufferedReader reader, PrintStream out) throws IOException{ 62 60 MessageRenderer mr = ctx.getMessageRenderer(); 63 mr.printMessage( res.getString("fileDoesNotExist"));61 mr.printMessage(org.tp23.antinstaller.Installer.langPack.getString("fileDoesNotExist")); 64 62 renderOutput(field, reader, out); 65 63 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/LargeSelectInputRenderer.java
r15353 r17514 29 29 implements TextOutputFieldRenderer { 30 30 31 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack"); 32 private static final String nextChar = res.getString("nextChar"); 31 private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar"); 33 32 34 33 protected InstallerContext ctx; … … 67 66 LargeSelectInput.Option[] options = iField.getOptions(); 68 67 out.print(" "); 69 out.println( res.getString("availableOptions"));68 out.println(org.tp23.antinstaller.Installer.langPack.getString("availableOptions")); 70 69 StringBuffer optionsData = new StringBuffer(); 71 70 for (int i = 0; i < options.length; i++) { … … 76 75 if(iField.getDefaultValue().equals(options[i].value)){ 77 76 optionsData.append(" ["); 78 optionsData.append( res.getString("_default_"));77 optionsData.append(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 79 78 optionsData.append("]"); 80 79 } … … 82 81 } 83 82 optionsData.append(" "); 84 optionsData.append( res.getString("enterNumber")).append("\n");83 optionsData.append(org.tp23.antinstaller.Installer.langPack.getString("enterNumber")).append("\n"); 85 84 Pager pager = new Pager(optionsData.toString()); 86 85 String command = null; … … 111 110 } 112 111 private String getNextInstructions() { 113 return res.getString("large_select_next");112 return org.tp23.antinstaller.Installer.langPack.getString("large_select_next"); 114 113 } 115 114 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/LicensePageRenderer.java
r15353 r17514 31 31 extends AbstractTextPageRenderer { 32 32 33 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack"); 34 private static final String nextChar = res.getString("nextChar"); 33 private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar"); 35 34 36 35 private boolean usePaging = false; … … 55 54 BufferedReader commandReader = reader; 56 55 out.println(); 57 out.println( res.getString("clickViewLicense"));56 out.println(org.tp23.antinstaller.Installer.langPack.getString("clickViewLicense")); 58 57 commandReader.readLine(); 59 58 … … 97 96 } 98 97 out.println(); 99 out.println( res.getString("licenseAccept"));98 out.println(org.tp23.antinstaller.Installer.langPack.getString("licenseAccept")); 100 99 command = commandReader.readLine(); 101 100 command = command.trim(); … … 114 113 115 114 private String getNextInstructions() { 116 return res.getString("license_next");115 return org.tp23.antinstaller.Installer.langPack.getString("license_next"); 117 116 } 118 117 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/PasswordTextInputRenderer.java
r15353 r17514 30 30 implements TextOutputFieldRenderer { 31 31 32 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");33 34 32 public PasswordTextInputRenderer() { 35 33 } … … 44 42 displayText.append(field.getDisplayText()); 45 43 displayText.append(" ["); 46 displayText.append( res.getString("_default_"));44 displayText.append(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 47 45 displayText.append(":"); 48 46 displayText.append(iField.getDefaultValue()); … … 75 73 76 74 protected String getErrorMessage(){ 77 return res.getString("notCorrectPasswordFormat");75 return org.tp23.antinstaller.Installer.langPack.getString("notCorrectPasswordFormat"); 78 76 } 79 77 -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/SelectInputRenderer.java
r15353 r17514 28 28 public class SelectInputRenderer 29 29 implements TextOutputFieldRenderer { 30 31 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");32 30 33 31 protected InstallerContext ctx; … … 65 63 SelectInput.Option[] options = iField.getOptions(); 66 64 out.print(" "); 67 out.println( res.getString("enterNumber"));65 out.println(org.tp23.antinstaller.Installer.langPack.getString("enterNumber")); 68 66 for (int i = 0; i < options.length; i++) { 69 67 out.print(" "); … … 73 71 if(iField.getDefaultValue().equals(options[i].value)){ 74 72 out.print(" ["); 75 out.print( res.getString("_default_"));73 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 76 74 out.print("]"); 77 75 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TargetInputRenderer.java
r15353 r17514 30 30 implements TextOutputFieldRenderer { 31 31 32 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");33 34 32 protected InstallerContext ctx; 35 33 public TargetInputRenderer() { … … 46 44 47 45 out.print(" ["); 48 out.print( res.getString("_default_"));46 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 49 47 out.print(":"); 50 48 out.print(iField.getDefaultValue()); … … 53 51 if (InputField.isTrue(iField.getForce())) { 54 52 out.print(" ["); 55 out.print( res.getString("_required_"));53 out.print(org.tp23.antinstaller.Installer.langPack.getString("_required_")); 56 54 out.println("]"); 57 55 ctx.getCurrentPage().addTarget(iField.getIdx(), iField.getTarget()); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TargetSelectInputRenderer.java
r15353 r17514 32 32 extends SelectInputRenderer { 33 33 34 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");35 36 34 public TargetSelectInputRenderer() { 37 35 } … … 62 60 TargetSelectInput.Option[] options = iField.getOptions(); 63 61 out.print(" "); 64 out.println( res.getString("enterNumber"));62 out.println(org.tp23.antinstaller.Installer.langPack.getString("enterNumber")); 65 63 for (int i = 0; i < options.length; i++) { 66 64 out.print(" "); … … 70 68 if(iField.getDefaultValue().equals(options[i].value)){ 71 69 out.print(" ["); 72 out.print( res.getString("_default_"));70 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 73 71 out.print("]"); 74 72 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/TextPageRenderer.java
r15353 r17514 30 30 extends AbstractTextPageRenderer { 31 31 32 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack"); 33 private static final String nextChar = res.getString("nextChar"); 32 private static final String nextChar = org.tp23.antinstaller.Installer.langPack.getString("nextChar"); 34 33 35 34 public TextPageRenderer() { … … 85 84 86 85 out.println(); 87 out.println( res.getString("clickViewText"));86 out.println(org.tp23.antinstaller.Installer.langPack.getString("clickViewText")); 88 87 commandReader.readLine(); 89 88 … … 96 95 97 96 private String getNextInstructions() { 98 return res.getString("license_next");97 return org.tp23.antinstaller.Installer.langPack.getString("license_next"); 99 98 } 100 99 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/UnvalidatedTextInputRenderer.java
r15353 r17514 29 29 implements TextOutputFieldRenderer { 30 30 31 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");32 33 31 protected InstallerContext ctx; 34 32 public UnvalidatedTextInputRenderer() { … … 44 42 45 43 out.print(" ["); 46 out.print( res.getString("_default_"));44 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 47 45 out.print(":"); 48 46 out.print(iField.getDefaultValue()); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/renderer/text/ValidatedTextInputRenderer.java
r15353 r17514 29 29 implements TextOutputFieldRenderer { 30 30 31 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");32 33 31 protected InstallerContext ctx; 34 32 public ValidatedTextInputRenderer() { … … 44 42 45 43 out.print(" ["); 46 out.print( res.getString("_default_"));44 out.print(org.tp23.antinstaller.Installer.langPack.getString("_default_")); 47 45 out.print(":"); 48 46 out.print(iField.getDefaultValue()); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/ExecInstall.java
r17314 r17514 49 49 public class ExecInstall { 50 50 51 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");52 51 public static final String CONFIG_RESOURCE = "/org/tp23/antinstaller/runtime/exe/script.fconfig"; 53 52 … … 118 117 MessageRenderer vLogger = ctx.getMessageRenderer(); 119 118 if(vLogger != null){ 120 vLogger.printMessage( res.getString("installationFailed") + "\n" + ex.getMessage());119 vLogger.printMessage(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + "\n" + ex.getMessage()); 121 120 //Fixed BUG:1295944 vLogger.printMessage("Install failed\n" + ex.getMessage()); 122 121 } else { 123 System.err.println( res.getString("installationFailed") + ex.getClass().getName());122 System.err.println(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + ex.getClass().getName()); 124 123 System.err.println(ex.getMessage()); 125 124 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/SwingRunner.java
r15615 r17514 56 56 public class SwingRunner extends AntRunner implements Runner, PageCompletionListener { 57 57 58 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");59 60 61 58 protected SwingInstallerContext swingCtx = null; 62 59 private JFrame frame = new JFrame(); … … 339 336 renderer.getNextButton().setEnabled(false); 340 337 renderer.getCancelButton().setEnabled(false); 341 renderer.getFinishButton().setText( res.getString("exit"));338 renderer.getFinishButton().setText(org.tp23.antinstaller.Installer.langPack.getString("exit")); 342 339 renderer.getFinishButton().setEnabled(true); 343 340 renderer.getFinishButton().requestFocus(); 344 renderer.getTitleLabel().setText( res.getString("complete"));341 renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("complete")); 345 342 ctx.getAntOutputRenderer().getErr().flush(); 346 343 ctx.getAntOutputRenderer().getOut().flush(); 347 ctx.getMessageRenderer().printMessage( res.getString("finished"));344 ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("finished")); 348 345 } 349 346 … … 355 352 renderer.getNextButton().setEnabled(false); 356 353 renderer.getCancelButton().setEnabled(false); 357 renderer.getFinishButton().setText( res.getString("exit"));354 renderer.getFinishButton().setText(org.tp23.antinstaller.Installer.langPack.getString("exit")); 358 355 renderer.getFinishButton().setEnabled(true); 359 356 renderer.getFinishButton().requestFocus(); 360 renderer.getTitleLabel().setText( res.getString("failed"));357 renderer.getTitleLabel().setText(org.tp23.antinstaller.Installer.langPack.getString("failed")); 361 358 } 362 359 // else - we're done here, or should we call abort()? -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/TextRunner.java
r15210 r17514 47 47 implements Runner { 48 48 49 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");50 51 49 protected final InstallerContext ctx; 52 50 protected final Installer installer; … … 86 84 logger.log(installer, ex); 87 85 88 ctx.getMessageRenderer().printMessage( res.getString("installationFailed") + ":" + ex.getMessage());86 ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("installationFailed") + ":" + ex.getMessage()); 89 87 //Fixed BUG: ctx.getMessageRenderer().printMessage("Installation failed:"+ex.getMessage()); 90 88 throw new InstallException("Installation failed", ex); … … 127 125 */ 128 126 public void antFinished() { 129 System.out.println( res.getString("finished"));127 System.out.println(org.tp23.antinstaller.Installer.langPack.getString("finished")); 130 128 //System.exit(0); 131 129 } … … 134 132 */ 135 133 public void fatalError(){ 136 System.out.println( res.getString("failed"));134 System.out.println(org.tp23.antinstaller.Installer.langPack.getString("failed")); 137 135 //System.exit(1); 138 136 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/AntLauncherFilter.java
r15210 r17514 23 23 import org.tp23.antinstaller.ResourceBundleHelper; 24 24 import org.tp23.antinstaller.antmod.Launcher; 25 import org.tp23.antinstaller.Installer; 25 26 26 27 /** … … 38 39 public class AntLauncherFilter implements ExecuteFilter { 39 40 40 private static final ResourceBundleHelper resHelper = new ResourceBundleHelper("resources.LanguagePack"); 41 41 private ResourceBundleHelper resHelper = new ResourceBundleHelper( "resources.LanguagePack" ); 42 42 43 43 public AntLauncherFilter() { -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/ExecuteRunnerFilter.java
r17314 r17514 19 19 import org.tp23.antinstaller.InstallException; 20 20 import org.tp23.antinstaller.InstallerContext; 21 21 import org.tp23.antinstaller.Installer; 22 22 23 23 /** … … 27 27 */ 28 28 public class ExecuteRunnerFilter implements ExecuteFilter { 29 30 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");31 29 32 30 /** … … 39 37 boolean ok = ctx.getRunner().runInstaller(); 40 38 if(!ok){ 41 throw new AbortException( res.getString("install-cancelled"));39 throw new AbortException(Installer.langPack.getString("install-cancelled")); 42 40 } 43 41 ctx.log("Install screens rendered"); -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/LoadConfigFilter.java
r15210 r17514 343 343 options.toArray(optionArr); 344 344 sInput.setOptions(optionArr); 345 346 String s = field.getAttribute("useAsLocale"); 347 if ( s != null || !s.equals("") ) { 348 sInput.setUseAsLocale(true); 349 } 345 350 346 351 return sInput; -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/runtime/exe/PropertyLoaderFilter.java
r15210 r17514 40 40 import org.tp23.antinstaller.runtime.VersionHelper; 41 41 import org.tp23.antinstaller.runtime.exe.ExecuteRunnerFilter.AbortException; 42 43 42 44 43 /** … … 60 59 public class PropertyLoaderFilter implements ExecuteFilter { 61 60 62 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");63 64 61 public static final String LOAD = "true"; 65 62 public static final String PROMPT = "prompt"; … … 128 125 129 126 if( foundProps && PROMPT.equals(loadDefaults) ) { 130 load = ctx.getMessageRenderer().prompt( res.getString("promptLoadDefaults"));127 load = ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("promptLoadDefaults")); 131 128 } 132 129 else if( foundProps && PROMPT_AUTO.equals(loadDefaults)) { 133 load = ctx.getMessageRenderer().prompt( res.getString("promptLoadDefaults"));130 load = ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("promptLoadDefaults")); 134 131 } 135 132 else if( foundProps && LOAD.equals(loadDefaults) ) { … … 159 156 // let major versions pass but prompt for differences 160 157 if( (! ctx.isAutoBuild()) && helper.majorVersionCompatible(configVersion , propertiesVersion) ){ 161 if( ! ctx.getMessageRenderer().prompt( res.getString("propertiesVersionMismatch")) ){158 if( ! ctx.getMessageRenderer().prompt(org.tp23.antinstaller.Installer.langPack.getString("propertiesVersionMismatch")) ){ 162 159 throw new AbortException("Install Aborted: existing configuration is not compatible, config version: " + configVersion); 163 160 } … … 224 221 if(field instanceof PasswordTextInput) { 225 222 if(value == null ){ 226 ctx.getMessageRenderer().printMessage( res.getString("promptMissingDefaultPassword"));223 ctx.getMessageRenderer().printMessage(org.tp23.antinstaller.Installer.langPack.getString("promptMissingDefaultPassword")); 227 224 228 225 } -
release-kits/shared/ant-installer/src/org/tp23/antinstaller/selfextract/ProgressIndicator.java
r15210 r17514 52 52 53 53 public static final String IMAGE_RESOURCE = "/resources/extract-image.png"; 54 private static final ResourceBundle res = ResourceBundle.getBundle("resources.LanguagePack");55 54 56 55 private JPanel jPanel1 = new JPanel(); … … 61 60 private static int PAGE_WIDTH = 160; 62 61 private static int PAGE_HEIGHT = 110; // 35 is text + bar 63 private String title = res.getString("extracting");62 private String title = org.tp23.antinstaller.Installer.langPack.getString("extracting"); 64 63 private JLabel imagePanel = new JLabel(); 65 64 GridBagLayout gridBagLayout1 = new GridBagLayout();
Note:
See TracChangeset
for help on using the changeset viewer.