changeset 2536:256b458cc7ea

Changed data field 'name' to 'description' in fix overview. flys-client/trunk@4448 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Mon, 21 May 2012 09:17:24 +0000
parents d0a9acddbea2
children cc5969df0490
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/server/FixingsOverviewServiceImpl.java flys-client/src/main/java/de/intevation/flys/client/shared/model/FixingsOverviewInfo.java
diffstat 3 files changed, 13 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Mon May 21 08:48:16 2012 +0000
+++ b/flys-client/ChangeLog	Mon May 21 09:17:24 2012 +0000
@@ -1,3 +1,9 @@
+2012-05-21  Raimund Renkert <raimund.renkert@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/server/FixingsOverviewServiceImpl.java,
+	  src/main/java/de/intevation/flys/client/shared/model/FixingsOverviewInfo.java:
+	  Changed data field 'name' to 'description'.
+
 2012-05-21  Raimund Renkert <raimund.renkert@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/shared/model/Data.java,
--- a/flys-client/src/main/java/de/intevation/flys/client/server/FixingsOverviewServiceImpl.java	Mon May 21 08:48:16 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/FixingsOverviewServiceImpl.java	Mon May 21 09:17:24 2012 +0000
@@ -55,7 +55,7 @@
 
     protected static final String XPATH_CID = "@cid";
     protected static final String XPATH_DATE = "@date";
-    protected static final String XPATH_NAME = "@name";
+    protected static final String XPATH_DESCRIPTION = "@description";
     protected static final String XPATH_CLS = "@class";
     protected static final String XPATH_FROM = "@from";
     protected static final String XPATH_TO = "@to";
@@ -172,7 +172,7 @@
             String cid = XMLUtils.xpathString(n, XPATH_CID, null);
             log.debug("'" + cid + "'");
             String date = XMLUtils.xpathString(n, XPATH_DATE, null);
-            String name = XMLUtils.xpathString(n, XPATH_NAME, null);
+            String name = XMLUtils.xpathString(n, XPATH_DESCRIPTION, null);
             list.add(new FixEvent(
                 cid,
                 date,
--- a/flys-client/src/main/java/de/intevation/flys/client/shared/model/FixingsOverviewInfo.java	Mon May 21 08:48:16 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/shared/model/FixingsOverviewInfo.java	Mon May 21 09:17:24 2012 +0000
@@ -69,7 +69,7 @@
     public static class FixEvent implements Serializable {
         protected String cid;
         protected String date;
-        protected String name;
+        protected String description;
         protected List<Sector> sectors;
 
         protected FixEvent () {}
@@ -77,12 +77,12 @@
         public FixEvent(
             String cid,
             String date,
-            String name,
+            String description,
             List<Sector> sectors
         ) {
             this.cid = cid;
             this.date = date;
-            this.name = name;
+            this.description = description;
             this.sectors = new ArrayList<Sector>(sectors);
         }
 
@@ -94,8 +94,8 @@
             return this.date;
         }
 
-        public String getName() {
-            return this.name;
+        public String getDescription() {
+            return this.description;
         }
 
         public List<Sector> getSectors() {

http://dive4elements.wald.intevation.org