Commit 303e06b595563eab2db3a7dac63f9c6554404609
1 parent
c0f494d4
Exists in
master
and in
1 other branch
marcação
git-svn-id: https://svn.bento.ifrs.edu.br/default/ASES/ASES%20-%20Web/ASES%20-%20Web/Fontes/avaliador-api@10437 c2178572-b5ca-4887-91d2-9e3a90c7d55b
Showing
1 changed file
with
12 additions
and
12 deletions
Show diff stats
src/main/java/br/com/checker/emag/core/MarkEvaluation.java
@@ -245,10 +245,10 @@ public class MarkEvaluation extends Evaluation { | @@ -245,10 +245,10 @@ public class MarkEvaluation extends Evaluation { | ||
245 | Element img = element.getFirstElement("img"); | 245 | Element img = element.getFirstElement("img"); |
246 | if(img != null){ | 246 | if(img != null){ |
247 | if(img.getAttributes().get("alt") != null && img.getAttributes().get("alt").getValue().isEmpty()) | 247 | if(img.getAttributes().get("alt") != null && img.getAttributes().get("alt").getValue().isEmpty()) |
248 | - occurrences.add(this.buildOccurrence("1.2", true, element.getStartTag().toString(), element, "1")); | 248 | + occurrences.add(this.buildOccurrence("1.2", true, element.getStartTag().toString()+"<"+element.getName()+">", element, "1")); |
249 | }else{ | 249 | }else{ |
250 | if(element.getContent().toString().isEmpty() || element.getContent().toString().trim().equals("")) | 250 | if(element.getContent().toString().isEmpty() || element.getContent().toString().trim().equals("")) |
251 | - occurrences.add(this.buildOccurrence("1.2", true, element.getStartTag().toString(), element, "1")); | 251 | + occurrences.add(this.buildOccurrence("1.2", true, element.getStartTag().toString()+"<"+element.getName()+">", element, "1")); |
252 | } | 252 | } |
253 | } | 253 | } |
254 | } | 254 | } |
@@ -257,18 +257,18 @@ public class MarkEvaluation extends Evaluation { | @@ -257,18 +257,18 @@ public class MarkEvaluation extends Evaluation { | ||
257 | 257 | ||
258 | 258 | ||
259 | for (Element element : getDocument().getAllElements()) { | 259 | for (Element element : getDocument().getAllElements()) { |
260 | - | ||
261 | - if(element != null){ | ||
262 | - Element img = element.getFirstElement("img"); | ||
263 | - if(img != null){ | ||
264 | - if(img.getAttributes().get("alt") != null && img.getAttributes().get("alt").getValue().isEmpty()) | ||
265 | - occurrences.add(this.buildOccurrence("1.2", false, element.getStartTag().toString(), element, "1")); | ||
266 | - }else{ | ||
267 | - if(element.getSource().toString().trim().equals("")) | ||
268 | - occurrences.add(this.buildOccurrence("1.2", false, element.getStartTag().toString(), element, "1")); | 260 | + if(!tags.contains(element.getName())){ |
261 | + if(element != null){ | ||
262 | + Element img = element.getFirstElement("img"); | ||
263 | + if(img != null){ | ||
264 | + if(img.getAttributes().get("alt") != null && img.getAttributes().get("alt").getValue().isEmpty()) | ||
265 | + occurrences.add(this.buildOccurrence("1.2", false, element.getStartTag().toString()+"<"+element.getName()+">", element, "1")); | ||
266 | + }else{ | ||
267 | + if(element.getContent().toString().isEmpty() || element.getContent().toString().trim().equals("")) | ||
268 | + occurrences.add(this.buildOccurrence("1.2", false, element.getStartTag().toString()+"<"+element.getName()+">", element, "1")); | ||
269 | + } | ||
269 | } | 270 | } |
270 | } | 271 | } |
271 | - | ||
272 | } | 272 | } |
273 | 273 | ||
274 | this.oder(occurrences); | 274 | this.oder(occurrences); |