Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/shared/model/DefaultTheme.java @ 575:5277f46a63c2
The description of a facet is now displayed in the ChartThemePanel.
flys-client/trunk@2141 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 17 Jun 2011 09:57:23 +0000 |
parents | a1048d310829 |
children | 374712890b94 |
comparison
equal
deleted
inserted
replaced
574:3629d36f0e5d | 575:5277f46a63c2 |
---|---|
6 */ | 6 */ |
7 public class DefaultTheme implements Theme { | 7 public class DefaultTheme implements Theme { |
8 | 8 |
9 protected int position; | 9 protected int position; |
10 | 10 |
11 protected int index; | |
12 | |
11 protected boolean active; | 13 protected boolean active; |
12 | 14 |
13 protected String artifact; | 15 protected String artifact; |
14 | 16 |
15 protected String facet; | 17 protected String facet; |
16 | 18 |
19 protected String description; | |
20 | |
17 | 21 |
18 public DefaultTheme() { | 22 public DefaultTheme() { |
19 } | 23 } |
20 | 24 |
21 | 25 |
22 public DefaultTheme(int pos, boolean active, String art, String facet) { | 26 public DefaultTheme( |
23 this.position = pos; | 27 int pos, |
24 this.active = active; | 28 int index, |
25 this.artifact = art; | 29 boolean active, |
26 this.facet = facet; | 30 String art, |
31 String facet, | |
32 String description) | |
33 { | |
34 this.position = pos; | |
35 this.index = index; | |
36 this.active = active; | |
37 this.artifact = art; | |
38 this.facet = facet; | |
39 this.description = description; | |
27 } | 40 } |
28 | 41 |
29 | 42 |
30 public int getPosition() { | 43 public int getPosition() { |
31 return position; | 44 return position; |
32 } | 45 } |
33 | 46 |
34 | 47 |
35 public void setPosition(int pos) { | 48 public void setPosition(int pos) { |
36 this.position = pos; | 49 this.position = pos; |
50 } | |
51 | |
52 | |
53 public int getIndex() { | |
54 return index; | |
37 } | 55 } |
38 | 56 |
39 | 57 |
40 public boolean isActive() { | 58 public boolean isActive() { |
41 return active; | 59 return active; |
52 } | 70 } |
53 | 71 |
54 | 72 |
55 public String getFacet() { | 73 public String getFacet() { |
56 return facet; | 74 return facet; |
75 } | |
76 | |
77 | |
78 public String getDescription() { | |
79 return description; | |
57 } | 80 } |
58 | 81 |
59 | 82 |
60 public boolean equals(Object o) { | 83 public boolean equals(Object o) { |
61 if (!(o instanceof DefaultTheme)) { | 84 if (!(o instanceof DefaultTheme)) { |
78 | 101 |
79 if (!other.facet.equals(facet)) { | 102 if (!other.facet.equals(facet)) { |
80 return false; | 103 return false; |
81 } | 104 } |
82 | 105 |
106 if (!other.description.equals(description)) { | |
107 return false; | |
108 } | |
109 | |
110 if (other.index != index) { | |
111 return false; | |
112 } | |
113 | |
83 return true; | 114 return true; |
84 } | 115 } |
85 } | 116 } |
86 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 117 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |