mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Small logging change.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5276 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-09-07 21:38:46 +00:00
committed by derek
parent f0caeff432
commit d483ca28af
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/installer/spark.install4j
View File

@ -117,7 +117,7 @@
<customScreens /> <customScreens />
</installerGui> </installerGui>
<mediaSets> <mediaSets>
<win32 name="Windows" id="2" mediaFileName="" installDir="Spark" allLaunchers="true" includedJRE="windows-x86-1.5.0_05_us_only" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="3" desktopLauncherId="4" programGroup="Spark" allowUserDisableStartMenuCreation="false" reboot="false" rebootUninstaller="false" modeQuickLaunchIon="2"> <win32 name="Windows" id="2" mediaFileName="" installDir="Spark" allLaunchers="true" includedJRE="windows-x86-1.5.0_08" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" customInstallBaseDir="" allowUserStartAfterFinish="true" launchExecutableId="4" createUninstallIcon="true" overrideLicenseFile="false" licenseFile="" overridePreInformationFile="false" preInformationFile="" overridePostInformationFile="false" postInformationFile="" adminRequired="false" languageID="en" modeDesktopIcon="3" desktopLauncherId="4" programGroup="Spark" allowUserDisableStartMenuCreation="false" reboot="false" rebootUninstaller="false" modeQuickLaunchIon="2">
<selectedLaunchers /> <selectedLaunchers />
<messageSet language="English" /> <messageSet language="English" />
<exclude> <exclude>
@ -147,12 +147,13 @@
<excludedScreenIds /> <excludedScreenIds />
<additionalStartMenuEntries /> <additionalStartMenuEntries />
</win32> </win32>
<unixArchive name="Unix Archive" id="13" mediaFileName="" installDir="%APP_SHORT_NAME%" allLaunchers="true" includedJRE="linux-x86-1.5.0_06" manualJREEntry="false" customScriptMode="1" customScriptFile=""> <unixArchive name="Unix Archive" id="13" mediaFileName="" installDir="%APP_SHORT_NAME%" allLaunchers="true" includedJRE="linux-x86-1.5.0_08_client_only" manualJREEntry="false" customScriptMode="1" customScriptFile="">
<selectedLaunchers /> <selectedLaunchers />
<messageSet language="English" /> <messageSet language="English" />
<exclude> <exclude>
<entry location="bin/startup.bat" launcher="false" /> <entry location="bin/startup.bat" launcher="false" />
<entry location="lib/windows" launcher="false" /> <entry location="lib/windows" launcher="false" />
<entry location="plugins/jniwrapper.jar" launcher="false" />
</exclude> </exclude>
<variables /> <variables />
<customScriptLines /> <customScriptLines />

2
src/java/org/jivesoftware/resource/Res.java
View File

@ -46,7 +46,7 @@ public class Res {
public static final String getString(String propertyName, Object... obj) { public static final String getString(String propertyName, Object... obj) {
String str = prb.getString(propertyName); String str = prb.getString(propertyName);
if (str == null) { if (str == null) {
return null; return propertyName;
} }

2
src/java/org/jivesoftware/spark/PluginManager.java
View File

@ -564,7 +564,7 @@ public class PluginManager implements MainWindowListener {
zipFile = null; zipFile = null;
} }
catch (Exception e) { catch (Exception e) {
Log.warning("Error unzipping plugin", e); Log.error("Error unzipping plugin", e);
} }
} }

4
src/java/org/jivesoftware/sparkimpl/updater/CheckUpdates.java
View File

@ -202,7 +202,7 @@ public class CheckUpdates {
frame.setIconImage(SparkRes.getImageIcon(SparkRes.SMALL_MESSAGE_IMAGE).getImage()); frame.setIconImage(SparkRes.getImageIcon(SparkRes.SMALL_MESSAGE_IMAGE).getImage());
titlePanel = new TitlePanel(Res.getString("title.upgrading.client"), Res.getString("message.version ", version.getVersion()), SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24), true); titlePanel = new TitlePanel(Res.getString("title.upgrading.client"), Res.getString("message.version", version.getVersion()), SparkRes.getImageIcon(SparkRes.SEND_FILE_24x24), true);
final Thread thread = new Thread(new Runnable() { final Thread thread = new Thread(new Runnable() {
public void run() { public void run() {
@ -222,7 +222,7 @@ public class CheckUpdates {
if (!cancel) { if (!cancel) {
downloadComplete = true; downloadComplete = true;
promptForInstallation(downloadedFile, "Download Complete", Res.getString("message.restart.spark")); promptForInstallation(downloadedFile, Res.getString("title.download.complete"), Res.getString("message.restart.spark"));
} }
else { else {
out.close(); out.close();

1
src/resources/i18n/spark_i18n_en.properties
View File

@ -429,6 +429,7 @@ title.cancelled = Cancelled
title.new.version.available = New Version Available title.new.version.available = New Version Available
title.new.client.available = New Client Available title.new.client.available = New Client Available
title.password = Password title.password = Password
title.download.complete = Download Complete
menuitem.contacts = Contacts menuitem.contacts = Contacts
menuitem.actions = Actions menuitem.actions = Actions