equal
deleted
inserted
replaced
57 |
57 |
58 public void setDefaults(Properties defaults) { |
58 public void setDefaults(Properties defaults) { |
59 this.defaults = defaults; |
59 this.defaults = defaults; |
60 } |
60 } |
61 |
61 |
|
62 /** |
|
63 * @param defaults the last/deepest defaults |
|
64 */ |
|
65 public void setLastDefaults(Properties defaults) { |
|
66 if (this.defaults == null) { |
|
67 this.defaults = defaults; |
|
68 } else { |
|
69 this.defaults.setLastDefaults(defaults); |
|
70 } |
|
71 } |
|
72 |
62 private Property findProperty(String name) { |
73 private Property findProperty(String name) { |
63 Property p = findByName(this, name); |
74 Property p = findByName(this, name); |
64 if (p == null) { |
75 if (p == null && defaults != null) { |
65 p = findByName(defaults, name); |
76 p = defaults.findProperty(name); |
66 } |
77 } |
67 return p; |
78 return p; |
68 } |
79 } |
69 |
80 |
70 public String getString(String name, String defaultValue) { |
81 public String getString(String name, String defaultValue) { |