equal
deleted
inserted
replaced
92 /** |
92 /** |
93 * @return merged this and backing defaults as Java Properties |
93 * @return merged this and backing defaults as Java Properties |
94 */ |
94 */ |
95 public java.util.Properties getJavaProperties() { |
95 public java.util.Properties getJavaProperties() { |
96 java.util.Properties javaProperties = new java.util.Properties(); |
96 java.util.Properties javaProperties = new java.util.Properties(); |
97 if (defaults != null) { |
|
98 duplicateTo(javaProperties); |
|
99 } |
|
100 duplicateTo(javaProperties); |
97 duplicateTo(javaProperties); |
101 return javaProperties; |
98 return javaProperties; |
102 } |
99 } |
103 |
100 |
104 private void duplicateTo(java.util.Properties javaProperties) { |
101 private void duplicateTo(java.util.Properties javaProperties) { |
|
102 if (defaults != null) { |
|
103 defaults.duplicateTo(javaProperties); |
|
104 } |
105 for (Property p : this) { |
105 for (Property p : this) { |
106 javaProperties.setProperty(p.getName(), p.getValue()); |
106 javaProperties.setProperty(p.getName(), p.getValue()); |
107 } |
107 } |
108 } |
108 } |
109 } |
109 } |