dflorey 2004/12/29 09:25:38
Modified: projector/src/java/org/apache/slide/projector/i18n
LocalizationManager.java
projector/src/java/org/apache/slide/projector/processor/tree
TreeLocalizer.java
Log:
Moved to commonsi-18n-0.4
Revision Changes Path
1.2 +7 -7
jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/LocalizationManager.java
Index: LocalizationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/i18n/LocalizationManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalizationManager.java 28 Nov 2004 13:54:08 -0000 1.1
+++ LocalizationManager.java 29 Dec 2004 17:25:38 -0000 1.2
@@ -5,7 +5,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.i18n.MessageManager;
+import org.apache.commons.i18n.XMLMessageProvider;
import org.apache.slide.projector.Projector;
import org.apache.slide.projector.application.Application;
import org.apache.slide.projector.application.ApplicationListener;
@@ -15,7 +15,7 @@
import org.apache.slide.projector.value.URIValue;
import org.apache.webdav.lib.Subscriber;
-public class LocalizationManager extends MessageManager implements
ApplicationListener, Subscriber {
+public class LocalizationManager implements ApplicationListener, Subscriber {
private static Logger logger =
Logger.getLogger(LocalizationManager.class.getName());
private final static LocalizationManager localizationManager = new
LocalizationManager();
@@ -28,7 +28,7 @@
if ( type == Application.MESSAGES ) {
try {
InputStream messages =
((Streamable)Projector.getRepository().getResource(configurationUri,
Projector.getCredentials())).getInputStream();
- install(configurationUri.toString(), messages);
+ XMLMessageProvider.install(configurationUri.toString(),
messages);
} catch (RepositoryException e) {
logger.log(Level.SEVERE, "Failed to intall messages with
URI="+configurationUri+", skipping...");
}
@@ -37,7 +37,7 @@
public void uninstall(String type, URI applicationUri, URI
configurationUri) {
if ( type == Application.MESSAGES ) {
- uninstall(configurationUri.toString());
+ XMLMessageProvider.uninstall(configurationUri.toString());
}
}
@@ -45,7 +45,7 @@
if ( type == Application.MESSAGES ) {
try {
InputStream messages =
((Streamable)Projector.getRepository().getResource(configurationUri,
Projector.getCredentials())).getInputStream();
- update(configurationUri.toString(), messages);
+ XMLMessageProvider.update(configurationUri.toString(),
messages);
} catch (RepositoryException e) {
logger.log(Level.SEVERE, "Failed to update messages with
URI="+configurationUri+", skipping...");
}
@@ -56,8 +56,8 @@
URI messageUri = new URIValue(uri);
try {
InputStream messages =
((Streamable)Projector.getRepository().getResource(new URIValue(uri),
Projector.getCredentials())).getInputStream();
- uninstall(uri);
- install(uri.toString(), messages);
+ XMLMessageProvider.uninstall(uri);
+ XMLMessageProvider.install(uri.toString(), messages);
} catch (RepositoryException e) {
logger.log(Level.SEVERE, "Failed to upate messages with
URI="+uri+", skipping...");
}
1.8 +4 -4
jakarta-slide/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java
Index: TreeLocalizer.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/projector/src/java/org/apache/slide/projector/processor/tree/TreeLocalizer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TreeLocalizer.java 28 Nov 2004 13:54:09 -0000 1.7
+++ TreeLocalizer.java 29 Dec 2004 17:25:38 -0000 1.8
@@ -101,7 +101,7 @@
key =
key.substring(IMAGE_IDENTIFIER.length()+1);
localizedMap.put(key,
ProcessorManager.getInstance().process(ProcessorManager.BINARY, value, "url",
context));
} else {
- localizedMap.put(key, new String(value));
+ localizedMap.put(key, value);
}
}
} catch ( MessageNotFoundException exception ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
