Provide a default configuration for property file serialization
diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/configuration/ConfigurationManager.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/configuration/ConfigurationManager.java
index 69d8fb4..32dafb8 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/configuration/ConfigurationManager.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/configuration/ConfigurationManager.java
@@ -90,7 +90,7 @@
* @param serializerConfig
* The config for serialization
*/
- public void setSerializerConfig(IPropertiesSerializerConfig serializerConfig) {
+ public void setSerializerConfig(IPropertiesSerializerConfig serializerConfig) {
this.serializerConfig = serializerConfig;
}
diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/factory/MessagesBundleGroupFactory.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/factory/MessagesBundleGroupFactory.java
index 1c59b1b..9593431 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/factory/MessagesBundleGroupFactory.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/factory/MessagesBundleGroupFactory.java
@@ -30,7 +30,7 @@
public class MessagesBundleGroupFactory {
public static IMessagesBundleGroup createBundleGroup(IResource resource) {
-
+
File ioFile = new File(resource.getRawLocation().toFile().getPath());
return new MessagesBundleGroup(new PropertiesFileGroupStrategy(ioFile,
diff --git a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/ser/PropertiesSerializer.java b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/ser/PropertiesSerializer.java
index 8cdddd1..9c12591 100644
--- a/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/ser/PropertiesSerializer.java
+++ b/org.eclipse.babel.core/src/org/eclipse/babel/core/message/resource/ser/PropertiesSerializer.java
@@ -57,7 +57,12 @@
*/
public PropertiesSerializer(IPropertiesSerializerConfig config) {
super();
- this.config = config;
+
+ if (config == null) {
+ this.config = new DefaultPropertiesSerializerConfig();
+ } else {
+ this.config = config;
+ }
}
/**
diff --git a/org.eclipse.babel.editor/META-INF/MANIFEST.MF b/org.eclipse.babel.editor/META-INF/MANIFEST.MF
index 2cbf13a..50521ea 100644
--- a/org.eclipse.babel.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.babel.editor/META-INF/MANIFEST.MF
@@ -29,7 +29,6 @@
org.eclipse.pde.core;resolution:=optional,
org.eclipselabs.tapiji.translator.rap.model;bundle-version="0.0.2";resolution:=optional,
org.eclipselabs.tapiji.translator.rap.helpers;bundle-version="1.0.0";resolution:=optional
-Bundle-ActivationPolicy: lazy
Bundle-Vendor: %plugin.provider
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
@@ -39,3 +38,4 @@
org.eclipse.babel.editor.widgets,
org.eclipse.babel.editor.wizards
Import-Package: org.eclipse.ui.forms.widgets
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/MsgEditorPreferences.java b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/MsgEditorPreferences.java
index 6c40a50..8166792 100644
--- a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/MsgEditorPreferences.java
+++ b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/MsgEditorPreferences.java
@@ -43,11 +43,7 @@
*
* @author Pascal Essiembre (pascal@essiembre.com)
*/
-public final class MsgEditorPreferences implements /*
- * IPropertiesSerializerConfig,
- * IPropertiesDeserializerConfig
- * ,
- */IPropertyChangeListener {
+public final class MsgEditorPreferences implements IPropertyChangeListener {
/**
* the corresponding validation message with such a preference should not be
@@ -205,7 +201,7 @@
/**
* Constructor.
*/
- private MsgEditorPreferences() {
+ private MsgEditorPreferences() {
super();
}
diff --git a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/PropertiesSerializerConfig.java b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/PropertiesSerializerConfig.java
index c13e695..8b161de 100644
--- a/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/PropertiesSerializerConfig.java
+++ b/org.eclipse.babel.editor/src/org/eclipse/babel/editor/preferences/PropertiesSerializerConfig.java
@@ -57,7 +57,7 @@
* @return how many blank lines between groups
*/
public int getGroupSepBlankLineCount() {
- return PREFS.getInt(MsgEditorPreferences.GROUP_SEP_BLANK_LINE_COUNT);
+ return PREFS.getInt(MsgEditorPreferences.GROUP_SEP_BLANK_LINE_COUNT);
}
/**
