Mercurial > dive4elements > framework
changeset 430:bedc87d11596
dummy merge for repo head
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 28 Sep 2012 12:15:13 +0200 |
| parents | 48ae19f19f79 (diff) a8b6b4924f4e (current diff) |
| children | 29bd60a3ee67 |
| files | ChangeLog |
| diffstat | 4 files changed, 27 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Sep 07 13:09:11 2012 +0000 +++ b/ChangeLog Fri Sep 28 12:15:13 2012 +0200 @@ -1,3 +1,17 @@ +2012-09-26 Björn Ricks <bjoern.ricks@intevation.de> + + * artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java: + New method addOutput to allow subclasses to add Output object manually. + +2012-09-17 Ingo Weinzierl <ingo@intevation.de> + + Tagged RELEASE 2.9.1 + +2012-09-10 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * artifacts/pom.xml, pom.xml: source 1.5 -> 1.6 + (@Override annotations for interface implementations is 1.6). + 2012-09-07 Björn Ricks <bjoern.ricks@intevation.de> * artifact-database/src/main/resources/sql/org-h2-driver.properties,
--- a/artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java Fri Sep 07 13:09:11 2012 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/state/AbstractState.java Fri Sep 28 12:15:13 2012 +0200 @@ -274,10 +274,18 @@ int size = outs.getLength(); for (int i = 0; i < size; i++) { - outputs.add(buildOutput(outs.item(i))); + addOutput(buildOutput(outs.item(i))); } } + /** + * This methods allows subclasses to manually add outputs + * + * @param out The output to add + */ + protected void addOutput(Output out) { + outputs.add(out); + } /** * A helper method that creates an Output object based on the <i>out</i>
--- a/artifacts/pom.xml Fri Sep 07 13:09:11 2012 +0000 +++ b/artifacts/pom.xml Fri Sep 28 12:15:13 2012 +0200 @@ -22,8 +22,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> <plugin>
--- a/pom.xml Fri Sep 07 13:09:11 2012 +0000 +++ b/pom.xml Fri Sep 28 12:15:13 2012 +0200 @@ -27,8 +27,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.0.2</version> <configuration> - <source>1.5</source> - <target>1.5</target> + <source>1.6</source> + <target>1.6</target> </configuration> </plugin> <plugin>