Skip to content

Commit b9db1f3

Browse files
committed
fixing comma and semi column bug
1 parent 45a3987 commit b9db1f3

File tree

2 files changed

+27
-7
lines changed

2 files changed

+27
-7
lines changed

src-impl/br/com/facilit/eclipse/ext/rclass/content/outputlclass.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<#list languageEntryList as languageEntry>
77
<#list languageEntry.valueMap?keys as prop>
88

9-
${languageEntry.encodedKey}="${languageEntry.valueMap[prop]}";
9+
${languageEntry.encodedKey}=${languageEntry.valueMap[prop]}
1010

1111
</#list>
1212
</#list>

src-impl/br/com/facilit/eclipse/ext/rclass/ui/RClassPreferencePage.java

+26-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.eclipse.core.runtime.preferences.InstanceScope;
55
import org.eclipse.jface.preference.BooleanFieldEditor;
66
import org.eclipse.jface.preference.FieldEditorPreferencePage;
7+
import org.eclipse.jface.preference.IPreferenceStore;
78
import org.eclipse.jface.preference.StringFieldEditor;
89
import org.eclipse.ui.IWorkbench;
910
import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -25,8 +26,11 @@ public RClassPreferencePage() {
2526

2627
@Override
2728
public void init(IWorkbench arg0) {
28-
29-
setPreferenceStore(Activator.getDefault().getPreferenceStore());
29+
30+
IPreferenceStore iPreferenceStore = Activator.getDefault().getPreferenceStore();
31+
32+
setDefaultValues(iPreferenceStore);
33+
setPreferenceStore(iPreferenceStore);
3034

3135
}
3236

@@ -43,8 +47,13 @@ private void initLanguagePatternField(IEclipsePreferences prefs) {
4347
languagePatternFieldEditor = new StringFieldEditor(StringPool.PREF_LANGUAGE_PATTERN_KEY,
4448
"&Language pattern file name:", getFieldEditorParent());
4549

46-
languagePatternFieldEditor.setStringValue(prefs.get(StringPool.PREF_LANGUAGE_PATTERN_KEY,
47-
StringPool.PREF_LANGUAGE_PATTERN_VALUE));
50+
String value = prefs.get(StringPool.PREF_LANGUAGE_PATTERN_KEY,
51+
StringPool.PREF_LANGUAGE_PATTERN_VALUE);
52+
53+
if(value == null || value.equals(""))
54+
value = StringPool.PREF_LANGUAGE_PATTERN_VALUE;
55+
56+
languagePatternFieldEditor.setStringValue(value);
4857

4958
addField(languagePatternFieldEditor);
5059
}
@@ -54,8 +63,13 @@ private void initSkipDirectoryPatternField(IEclipsePreferences prefs) {
5463
skipDirectoryFieldEditor = new StringFieldEditor(StringPool.PREF_SKIP_DIRECTORY_KEY, "Skip directory pattern:",
5564
getFieldEditorParent());
5665

57-
skipDirectoryFieldEditor.setStringValue(prefs.get(StringPool.PREF_SKIP_DIRECTORY_KEY,
58-
StringPool.PREF_SKIP_DIRECTORY_VALUE));
66+
String value = prefs.get(StringPool.PREF_SKIP_DIRECTORY_KEY,
67+
StringPool.PREF_SKIP_DIRECTORY_VALUE);
68+
69+
if(value == null || value.equals(""))
70+
value = StringPool.PREF_SKIP_DIRECTORY_VALUE;
71+
72+
skipDirectoryFieldEditor.setStringValue(value);
5973

6074
addField(skipDirectoryFieldEditor);
6175
}
@@ -72,6 +86,12 @@ protected void createFieldEditors() {
7286
initSkipDirectoryPatternField(prefs);
7387
}
7488

89+
private void setDefaultValues(IPreferenceStore prefStore) {
90+
91+
prefStore.setDefault(StringPool.PREF_SKIP_DIRECTORY_KEY, StringPool.PREF_SKIP_DIRECTORY_VALUE);
92+
prefStore.setDefault(StringPool.PREF_LANGUAGE_PATTERN_KEY, StringPool.PREF_LANGUAGE_PATTERN_VALUE);
93+
}
94+
7595
@Override
7696
public void performApply() {
7797
save();

0 commit comments

Comments
 (0)