Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html
Sun Jan 11 12:33:25 2015
@@ -26,79 +26,70 @@
<a class="jxr_linenumber" name="L18" href="#L18">18</a> <strong
class="jxr_keyword">package</strong>
org.apache.commons.imaging.formats.jpeg.exif;
<a class="jxr_linenumber" name="L19" href="#L19">19</a>
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a>
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.ImagingConstants;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html">GpsTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong> ImagingConstants {
-<a class="jxr_linenumber" name="L33" href="#L33">33</a>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> @Test
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
test() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L36" href="#L36">36</a>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData(300);
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
+<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a>
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.ImagingConstants;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong> org.junit.runners.Parameterized;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a>
+<a class="jxr_linenumber" name="L35" href="#L35">35</a>
@RunWith(Parameterized.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html">GpsTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong> ImagingConstants {
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">private</strong> File imageFile;
<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em
class="jxr_comment">// Debug.debug();</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em
class="jxr_comment">// Debug.debug("imageFile", imageFile);</em>
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
@Parameterized.Parameters
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
Collection<File> data() <strong class="jxr_keyword">throws</strong>
Exception {
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">return</strong> getImagesWithExifData();
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> }
<a class="jxr_linenumber" name="L44" href="#L44">44</a>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">if</strong>
(imageFile.getParentFile().getName().toLowerCase()
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
.equals(<span class="jxr_string">"@broken"</span>)) {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> }
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
<strong class="jxr_keyword">final</strong> Map<String, Object> params =
<strong class="jxr_keyword">new</strong> HashMap<String, Object>();
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> ignoreImageData =
isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L53" href="#L53">53</a>
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData));
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>
<strong class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
.getMetadata(imageFile, params);
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == metadata) {
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> }
-<a class="jxr_linenumber" name="L60" href="#L60">60</a>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata exifMetadata =
metadata.getExif();
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == exifMetadata) {
-<a class="jxr_linenumber" name="L63" href="#L63">63</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/GpsTest.html">GpsTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">this</strong>.imageFile = imageFile;
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> @Test
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
test() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">if</strong>
(imageFile.getParentFile().getName().toLowerCase()
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
.equals(<span class="jxr_string">"@broken"</span>)) {
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> }
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">final</strong> Map<String, Object> params = <strong
class="jxr_keyword">new</strong> HashMap<String, Object>();
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData));
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong
class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
.getMetadata(imageFile, params);
+<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> ==
metadata) {
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
<a class="jxr_linenumber" name="L65" href="#L65">65</a>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
<strong class="jxr_keyword">final</strong> TiffImageMetadata.GPSInfo gpsInfo =
exifMetadata.getGPS();
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
<strong class="jxr_keyword">if</strong> (<strong
class="jxr_keyword">null</strong> == gpsInfo) {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata exifMetadata =
metadata.getExif();
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> ==
exifMetadata) {
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
<a class="jxr_linenumber" name="L70" href="#L70">70</a>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
Debug.debug(<span class="jxr_string">"imageFile "</span> + imageFile);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
Debug.debug(<span class="jxr_string">"gpsInfo "</span> + gpsInfo);
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
Debug.debug(<span class="jxr_string">"gpsInfo longitude as degrees east
"</span> + gpsInfo.getLongitudeAsDegreesEast());
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
Debug.debug(<span class="jxr_string">"gpsInfo latitude as degrees north
"</span> + gpsInfo.getLatitudeAsDegreesNorth());
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
Debug.debug();
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
Exception e) {
-<a class="jxr_linenumber" name="L77" href="#L77">77</a>
Debug.debug(<span class="jxr_string">"imageFile "</span> +
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
Debug.debug(<span class="jxr_string">"imageFile "</span> + imageFile.length());
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>
Debug.debug(e, 13);
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> <em
class="jxr_comment">// File brokenFolder = new
File(imageFile.getParentFile(),</em>
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> <em
class="jxr_comment">// "@Broken");</em>
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> <em
class="jxr_comment">// if(!brokenFolder.exists())</em>
-<a class="jxr_linenumber" name="L84" href="#L84">84</a> <em
class="jxr_comment">// brokenFolder.mkdirs();</em>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> <em
class="jxr_comment">// File movedFile = new File(brokenFolder,
imageFile.getName());</em>
-<a class="jxr_linenumber" name="L86" href="#L86">86</a> <em
class="jxr_comment">// imageFile.renameTo(movedFile);</em>
-<a class="jxr_linenumber" name="L87" href="#L87">87</a>
-<a class="jxr_linenumber" name="L88" href="#L88">88</a>
<strong class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> }
-<a class="jxr_linenumber" name="L90" href="#L90">90</a> }
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
+<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">final</strong> TiffImageMetadata.GPSInfo gpsInfo =
exifMetadata.getGPS();
+<a class="jxr_linenumber" name="L72" href="#L72">72</a> <strong
class="jxr_keyword">if</strong> (<strong class="jxr_keyword">null</strong> ==
gpsInfo) {
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
+<a class="jxr_linenumber" name="L75" href="#L75">75</a>
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> <em
class="jxr_comment">// TODO we should assert something here.</em>
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>
Debug.debug(<span class="jxr_string">"imageFile "</span> + imageFile);
+<a class="jxr_linenumber" name="L78" href="#L78">78</a>
Debug.debug(<span class="jxr_string">"gpsInfo "</span> + gpsInfo);
+<a class="jxr_linenumber" name="L79" href="#L79">79</a>
Debug.debug(<span class="jxr_string">"gpsInfo longitude as degrees east
"</span> + gpsInfo.getLongitudeAsDegreesEast());
+<a class="jxr_linenumber" name="L80" href="#L80">80</a>
Debug.debug(<span class="jxr_string">"gpsInfo latitude as degrees north
"</span> + gpsInfo.getLatitudeAsDegreesNorth());
+<a class="jxr_linenumber" name="L81" href="#L81">81</a> Debug.debug();
+<a class="jxr_linenumber" name="L82" href="#L82">82</a>
+<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
+<a class="jxr_linenumber" name="L84" href="#L84">84</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.html
Sun Jan 11 12:33:25 2015
@@ -35,48 +35,34 @@
<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
<a class="jxr_linenumber" name="L28" href="#L28">28</a>
<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.html">MakerNoteFieldTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html">SpecificExifTagTest</a>
{
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em
class="jxr_comment">// public MakerNoteFieldTest(String name)</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em
class="jxr_comment">// super(name);</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em
class="jxr_comment">// }</em>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.html">MakerNoteFieldTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">super</strong>(imageFile);
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> }
<a class="jxr_linenumber" name="L34" href="#L34">34</a>
<a class="jxr_linenumber" name="L35" href="#L35">35</a> @Override
<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">void</strong> checkField(<strong
class="jxr_keyword">final</strong> File imageFile, <strong
class="jxr_keyword">final</strong> TiffField field)
<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">throws</strong> IOException, ImageReadException,
ImageWriteException {
<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">if</strong> (field.getTag() !=
ExifTagConstants.EXIF_TAG_MAKER_NOTE.tag) {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em
class="jxr_comment">// if (field.tag == EXIF_TAG_EXIF_OFFSET.tag)</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em
class="jxr_comment">// ;</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em
class="jxr_comment">// else</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> }
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a>
Debug.debug(<span class="jxr_string">"imageFile: "</span> + imageFile);
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field);
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>
Debug.debug(<span class="jxr_string">"type: "</span> +
field.getClass().getSimpleName());
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field.getTag());
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field.getTagInfo());
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
Debug.debug(<span class="jxr_string">"length: "</span> + field.getCount());
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
Debug.debug(<span class="jxr_string">"fieldType: "</span> +
field.getFieldType());
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em
class="jxr_comment">// Debug.debug("field", Debug.getType(field));</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> Debug.debug();
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em
class="jxr_comment">// try</em>
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> <em
class="jxr_comment">// Object userCommentValue = field.getValue();</em>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// Debug.debug("Text field value(" + field.tagInfo.name +
")",</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_comment">// userCommentValue);</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em
class="jxr_comment">// // Debug.debug("userCommentValue",
Debug.getType(userCommentValue));</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em
class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em
class="jxr_comment">// catch (ImageReadException e)</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <em
class="jxr_comment">// Debug.debug("imageFile", imageFile);</em>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <em
class="jxr_comment">// Debug.debug(e);</em>
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <em
class="jxr_comment">// }</em>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> }
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> }
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> }
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>
Debug.debug(<span class="jxr_string">"imageFile: "</span> + imageFile);
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field);
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>
Debug.debug(<span class="jxr_string">"type: "</span> +
field.getClass().getSimpleName());
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field.getTag());
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>
Debug.debug(<span class="jxr_string">"field: "</span> + field.getTagInfo());
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
Debug.debug(<span class="jxr_string">"length: "</span> + field.getCount());
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>
Debug.debug(<span class="jxr_string">"fieldType: "</span> +
field.getFieldType());
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <em
class="jxr_comment">// Debug.debug("field", Debug.getType(field));</em>
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> Debug.debug();
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em
class="jxr_comment">// TODO assert something</em>
+<a class="jxr_linenumber" name="L54" href="#L54">54</a>
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> }
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.html
Sun Jan 11 12:33:25 2015
@@ -96,9 +96,8 @@
<a class="jxr_linenumber" name="L88" href="#L88">88</a>
assertEquals(COMMENT,
metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPCOMMENT));
<a class="jxr_linenumber" name="L89" href="#L89">89</a>
assertEquals(SUBJECT,
metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT));
<a class="jxr_linenumber" name="L90" href="#L90">90</a>
assertEquals(TITLE,
metadata.getFieldValue(MicrosoftTagConstants.EXIF_TAG_XPTITLE));
-<a class="jxr_linenumber" name="L91" href="#L91">91</a>
-<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
+<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html
Sun Jan 11 12:33:25 2015
@@ -27,45 +27,45 @@
<a class="jxr_linenumber" name="L19" href="#L19">19</a>
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> java.io.File;
<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.io.IOException;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a>
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageReadException;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageWriteException;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.ImageMetadata;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffField;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L35" href="#L35">35</a>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">abstract</strong> <strong
class="jxr_keyword">class</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html">SpecificExifTagTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong>
-<a class="jxr_linenumber" name="L37" href="#L37">37</a>
AllTagConstants {
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <em
class="jxr_comment">// public SpecificExifTagTest(String name)</em>
-<a class="jxr_linenumber" name="L39" href="#L39">39</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <em
class="jxr_comment">// super(name);</em>
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <em
class="jxr_comment">// }</em>
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a>
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageReadException;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.ImageWriteException;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.common.ImageMetadata;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffField;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">import</strong> org.junit.runners.Parameterized;
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>
+<a class="jxr_linenumber" name="L39" href="#L39">39</a>
@RunWith(Parameterized.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">public</strong> <strong
class="jxr_keyword">abstract</strong> <strong
class="jxr_keyword">class</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html">SpecificExifTagTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
AllTagConstants {
<a class="jxr_linenumber" name="L42" href="#L42">42</a>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> @Test
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testSingleImage() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">final</strong> File imageFile = getImageWithExifData();
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
checkImage(imageFile);
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> }
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> @Test
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testAllImages() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithExifData();
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">private</strong> File imageFile;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>
+<a class="jxr_linenumber" name="L45" href="#L45">45</a>
@Parameterized.Parameters
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
Collection<File> data() <strong class="jxr_keyword">throws</strong>
Exception {
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">return</strong> getImagesWithExifData();
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> }
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html">SpecificExifTagTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> <strong
class="jxr_keyword">this</strong>.imageFile = imageFile;
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> }
<a class="jxr_linenumber" name="L53" href="#L53">53</a>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">if</strong>
(imageFile.getParentFile().getName().toLowerCase()
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
.equals(<span class="jxr_string">"@broken"</span>)) {
-<a class="jxr_linenumber" name="L57" href="#L57">57</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> }
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
checkImage(imageFile);
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> }
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> @Test
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testAllImages() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">if</strong>
(imageFile.getParentFile().getName().toLowerCase()
+<a class="jxr_linenumber" name="L57" href="#L57">57</a>
.equals(<span class="jxr_string">"@broken"</span>)) {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> }
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>
checkImage(imageFile);
<a class="jxr_linenumber" name="L61" href="#L61">61</a> }
<a class="jxr_linenumber" name="L62" href="#L62">62</a>
<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">abstract</strong> <strong class="jxr_keyword">void</strong>
checkField(File imageFile, TiffField field)
@@ -77,7 +77,7 @@
<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<a class="jxr_linenumber" name="L70" href="#L70">70</a> <strong
class="jxr_keyword">final</strong> Map<String, Object> params = <strong
class="jxr_keyword">new</strong> HashMap<String, Object>();
<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
params.put(PARAM_KEY_READ_THUMBNAILS, <strong class="jxr_keyword">new</strong>
Boolean(!ignoreImageData));
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData));
<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<a class="jxr_linenumber" name="L74" href="#L74">74</a> <em
class="jxr_comment">// note that metadata might be null if no metadata is
found.</em>
<a class="jxr_linenumber" name="L75" href="#L75">75</a> <strong
class="jxr_keyword">final</strong> ImageMetadata metadata =
Imaging.getMetadata(imageFile, params);
@@ -93,14 +93,13 @@
<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
<a class="jxr_linenumber" name="L86" href="#L86">86</a>
<a class="jxr_linenumber" name="L87" href="#L87">87</a> <strong
class="jxr_keyword">final</strong> List<TiffField> fields =
exif.getAllFields();
-<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < fields.size(); i++) {
-<a class="jxr_linenumber" name="L89" href="#L89">89</a> <strong
class="jxr_keyword">final</strong> TiffField field = fields.get(i);
-<a class="jxr_linenumber" name="L90" href="#L90">90</a>
checkField(imageFile, field);
-<a class="jxr_linenumber" name="L91" href="#L91">91</a> }
-<a class="jxr_linenumber" name="L92" href="#L92">92</a>
-<a class="jxr_linenumber" name="L93" href="#L93">93</a> }
-<a class="jxr_linenumber" name="L94" href="#L94">94</a>
-<a class="jxr_linenumber" name="L95" href="#L95">95</a> }
+<a class="jxr_linenumber" name="L88" href="#L88">88</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong>
TiffField field : fields) {
+<a class="jxr_linenumber" name="L89" href="#L89">89</a>
checkField(imageFile, field);
+<a class="jxr_linenumber" name="L90" href="#L90">90</a> }
+<a class="jxr_linenumber" name="L91" href="#L91">91</a>
+<a class="jxr_linenumber" name="L92" href="#L92">92</a> }
+<a class="jxr_linenumber" name="L93" href="#L93">93</a>
+<a class="jxr_linenumber" name="L94" href="#L94">94</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.html
Sun Jan 11 12:33:25 2015
@@ -38,55 +38,39 @@
<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> org.junit.Assert;
<a class="jxr_linenumber" name="L31" href="#L31">31</a>
<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.html">TextFieldTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.html">SpecificExifTagTest</a>
{
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em
class="jxr_comment">// public TextFieldTest(String name)</em>
-<a class="jxr_linenumber" name="L34" href="#L34">34</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> <em
class="jxr_comment">// super(name);</em>
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <em
class="jxr_comment">// }</em>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.html">TextFieldTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">super</strong>(imageFile);
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> }
<a class="jxr_linenumber" name="L37" href="#L37">37</a>
<a class="jxr_linenumber" name="L38" href="#L38">38</a> @Override
<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">void</strong> checkField(<strong
class="jxr_keyword">final</strong> File imageFile, <strong
class="jxr_keyword">final</strong> TiffField field)
<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">throws</strong> IOException, ImageReadException,
ImageWriteException {
-<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">if</strong> (field.getTag() ==
ExifTagConstants.EXIF_TAG_USER_COMMENT.tag) { <em class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em
class="jxr_comment">
* do</em>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <em
class="jxr_comment">
* nothing</em>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em
class="jxr_comment">
*/</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> } <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong>
(field.getTag() == GpsTagConstants.GPS_TAG_GPS_PROCESSING_METHOD.tag
-<a class="jxr_linenumber" name="L46" href="#L46">46</a>
&& field.getDirectoryType() ==
TiffDirectoryType.EXIF_DIRECTORY_GPS.directoryType) { <em
class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L47" href="#L47">47</a> <em
class="jxr_comment">
* do</em>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em
class="jxr_comment">
* nothing</em>
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <em
class="jxr_comment">
*/</em>
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> } <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong>
(field.getTag() == GpsTagConstants.GPS_TAG_GPS_AREA_INFORMATION.tag
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
&& field.getDirectoryType() ==
TiffDirectoryType.EXIF_DIRECTORY_GPS.directoryType) { <em
class="jxr_comment">/*</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a> <em
class="jxr_comment">
* do</em>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <em
class="jxr_comment">
* nothing</em>
-<a class="jxr_linenumber" name="L54" href="#L54">54</a> <em
class="jxr_comment">
*/</em>
-<a class="jxr_linenumber" name="L55" href="#L55">55</a> } <strong
class="jxr_keyword">else</strong> {
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> <strong
class="jxr_keyword">return</strong>;
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> }
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// Debug.debug("field", field);</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_comment">// Debug.debug("field", Debug.getType(field));</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em
class="jxr_comment">//</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <em
class="jxr_comment">// Debug.debug("field", field.tag);</em>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <em
class="jxr_comment">// Debug.debug("field", field.tagInfo);</em>
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <em
class="jxr_comment">// Debug.debug("field", Debug.getType(field));</em>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">final</strong> Object textFieldValue = field.getValue();
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
Assert.assertNotNull(textFieldValue);
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <em
class="jxr_comment">// Debug.debug("imageFile",
imageFile.getAbsoluteFile());</em>
-<a class="jxr_linenumber" name="L70" href="#L70">70</a> <em
class="jxr_comment">// Debug.debug("Text field value(" + field.tagInfo.name +
")",</em>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <em
class="jxr_comment">// textFieldValue);</em>
-<a class="jxr_linenumber" name="L72" href="#L72">72</a> <em
class="jxr_comment">// Debug.debug("userCommentValue",
Debug.getType(userCommentValue));</em>
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
ImageReadException e) {
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
Debug.debug(e);
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> <strong
class="jxr_keyword">throw</strong> e;
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
-<a class="jxr_linenumber" name="L80" href="#L80">80</a>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> }
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">if</strong> (field.getTag() ==
ExifTagConstants.EXIF_TAG_USER_COMMENT.tag) {
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <em
class="jxr_comment">// do nothing</em>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> } <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong>
(field.getTag() == GpsTagConstants.GPS_TAG_GPS_PROCESSING_METHOD.tag
+<a class="jxr_linenumber" name="L44" href="#L44">44</a>
&& field.getDirectoryType() ==
TiffDirectoryType.EXIF_DIRECTORY_GPS.directoryType) {
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em
class="jxr_comment">// do nothing</em>
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> } <strong
class="jxr_keyword">else</strong> <strong class="jxr_keyword">if</strong>
(field.getTag() == GpsTagConstants.GPS_TAG_GPS_AREA_INFORMATION.tag
+<a class="jxr_linenumber" name="L47" href="#L47">47</a>
&& field.getDirectoryType() ==
TiffDirectoryType.EXIF_DIRECTORY_GPS.directoryType) {
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <em
class="jxr_comment">// do nothing</em>
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> } <strong
class="jxr_keyword">else</strong> {
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L51" href="#L51">51</a> }
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">final</strong> Object textFieldValue = field.getValue();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a>
Assert.assertNotNull(textFieldValue);
+<a class="jxr_linenumber" name="L56" href="#L56">56</a> <em
class="jxr_comment">// TODO what else to assert?</em>
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
ImageReadException e) {
+<a class="jxr_linenumber" name="L58" href="#L58">58</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
Debug.debug(e);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> <strong
class="jxr_keyword">throw</strong> e;
+<a class="jxr_linenumber" name="L61" href="#L61">61</a> }
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> }
+<a class="jxr_linenumber" name="L64" href="#L64">64</a>
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html
Sun Jan 11 12:33:25 2015
@@ -26,71 +26,52 @@
<a class="jxr_linenumber" name="L18" href="#L18">18</a> <strong
class="jxr_keyword">package</strong>
org.apache.commons.imaging.formats.jpeg.exif;
<a class="jxr_linenumber" name="L19" href="#L19">19</a>
<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L22" href="#L22">22</a>
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.examples.WriteExifMetadataExample;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L27" href="#L27">27</a>
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html">WriteExifMetadataExampleTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong>
-<a class="jxr_linenumber" name="L29" href="#L29">29</a>
AllTagConstants {
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <em
class="jxr_comment">// public WriteExifMetadataExampleTest(String name)</em>
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <em
class="jxr_comment">// {</em>
-<a class="jxr_linenumber" name="L32" href="#L32">32</a> <em
class="jxr_comment">// super(name);</em>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <em
class="jxr_comment">// }</em>
+<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>
+<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.examples.WriteExifMetadataExample;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong> org.junit.runners.Parameterized;
+<a class="jxr_linenumber" name="L30" href="#L30">30</a>
+<a class="jxr_linenumber" name="L31" href="#L31">31</a>
@RunWith(Parameterized.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html">WriteExifMetadataExampleTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.html">ExifBaseTest</a>
<strong class="jxr_keyword">implements</strong>
+<a class="jxr_linenumber" name="L33" href="#L33">33</a>
AllTagConstants {
<a class="jxr_linenumber" name="L34" href="#L34">34</a>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> @Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
test() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">final</strong> List<File> images = getJpegImages();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>
-<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"test"</span>, <span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L44" href="#L44">44</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>,
tempFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">private</strong> File imageFile;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a>
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
@Parameterized.Parameters
+<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
Collection<File> data() <strong class="jxr_keyword">throws</strong>
Exception {
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">return</strong> getJpegImages();
+<a class="jxr_linenumber" name="L40" href="#L40">40</a> }
+<a class="jxr_linenumber" name="L41" href="#L41">41</a>
+<a class="jxr_linenumber" name="L42" href="#L42">42</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.html">WriteExifMetadataExampleTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L43" href="#L43">43</a> <strong
class="jxr_keyword">this</strong>.imageFile = imageFile;
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> }
<a class="jxr_linenumber" name="L45" href="#L45">45</a>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L47" href="#L47">47</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> ignoreImageData =
isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L48" href="#L48">48</a>
<strong class="jxr_keyword">if</strong> (ignoreImageData) {
-<a class="jxr_linenumber" name="L49" href="#L49">49</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
-<a class="jxr_linenumber" name="L51" href="#L51">51</a>
<strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/examples/WriteExifMetadataExample.html">WriteExifMetadataExample</a>().changeExifMetadata(imageFile,
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
tempFile);
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
ExifRewriter.ExifOverflowException e) {
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
Debug.debug(<span class="jxr_string">"Error image"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>
Debug.debug(e, 4);
-<a class="jxr_linenumber" name="L56" href="#L56">56</a> }
-<a class="jxr_linenumber" name="L57" href="#L57">57</a> }
-<a class="jxr_linenumber" name="L58" href="#L58">58</a> }
-<a class="jxr_linenumber" name="L59" href="#L59">59</a>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> @Test
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testInsert() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L62" href="#L62">62</a> <strong
class="jxr_keyword">final</strong> List<File> images = getJpegImages();
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L64" href="#L64">64</a>
-<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L67" href="#L67">67</a>
-<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"test"</span>, <span class="jxr_string">".jpg"</span>);
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>,
tempFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">try</strong> {
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
<strong class="jxr_keyword">final</strong> <strong
class="jxr_keyword">boolean</strong> ignoreImageData =
isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L73" href="#L73">73</a>
<strong class="jxr_keyword">if</strong> (ignoreImageData) {
-<a class="jxr_linenumber" name="L74" href="#L74">74</a>
<strong class="jxr_keyword">continue</strong>;
-<a class="jxr_linenumber" name="L75" href="#L75">75</a> }
-<a class="jxr_linenumber" name="L76" href="#L76">76</a>
<strong class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/examples/WriteExifMetadataExample.html">WriteExifMetadataExample</a>().changeExifMetadata(imageFile,
tempFile);
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
ExifRewriter.ExifOverflowException e) {
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
Debug.debug(<span class="jxr_string">"Ignoring unavoidable
ExifOverflowException: "</span> + e.getMessage());
-<a class="jxr_linenumber" name="L79" href="#L79">79</a>
Debug.debug(<span class="jxr_string">"Error image: "</span> +
imageFile.getAbsoluteFile());
-<a class="jxr_linenumber" name="L80" href="#L80">80</a> <em
class="jxr_comment">// Debug.debug(e, 4);</em>
-<a class="jxr_linenumber" name="L81" href="#L81">81</a> }
-<a class="jxr_linenumber" name="L82" href="#L82">82</a> }
-<a class="jxr_linenumber" name="L83" href="#L83">83</a> }
-<a class="jxr_linenumber" name="L84" href="#L84">84</a>
-<a class="jxr_linenumber" name="L85" href="#L85">85</a> }
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> @Test
+<a class="jxr_linenumber" name="L47" href="#L47">47</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
testInsert() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L48" href="#L48">48</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>,
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L49" href="#L49">49</a>
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> <strong
class="jxr_keyword">final</strong> File tempFile = createTempFile(<span
class="jxr_string">"test"</span>, <span class="jxr_string">".jpg"</span>);
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>
Debug.debug(<span class="jxr_string">"tempFile"</span>,
tempFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L52" href="#L52">52</a>
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">try</strong> {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">if</strong> (ignoreImageData) {
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
<strong class="jxr_keyword">return</strong>;
+<a class="jxr_linenumber" name="L57" href="#L57">57</a> }
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong
class="jxr_keyword">new</strong> <a
href="../../../../../../../org/apache/commons/imaging/examples/WriteExifMetadataExample.html">WriteExifMetadataExample</a>().changeExifMetadata(imageFile,
tempFile);
+<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// TODO assert that ExifMetadata has been changed</em>
+<a class="jxr_linenumber" name="L60" href="#L60">60</a> } <strong
class="jxr_keyword">catch</strong> (<strong class="jxr_keyword">final</strong>
ExifRewriter.ExifOverflowException e) {
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
Debug.debug(<span class="jxr_string">"Ignoring unavoidable
ExifOverflowException: "</span> + e.getMessage());
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>
Debug.debug(<span class="jxr_string">"Error image: "</span> +
imageFile.getAbsoluteFile());
+<a class="jxr_linenumber" name="L63" href="#L63">63</a> }
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> }
+<a class="jxr_linenumber" name="L65" href="#L65">65</a>
+<a class="jxr_linenumber" name="L66" href="#L66">66</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.html
Sun Jan 11 12:33:25 2015
@@ -74,7 +74,7 @@
<a class="jxr_linenumber" name="L66" href="#L66">66</a> <strong
class="jxr_keyword">return</strong> getTestImage(HAS_IPTC_IMAGE_FILTER);
<a class="jxr_linenumber" name="L67" href="#L67">67</a> }
<a class="jxr_linenumber" name="L68" href="#L68">68</a>
-<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">protected</strong> List<File> getImagesWithIptcData()
<strong class="jxr_keyword">throws</strong> IOException,
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">protected</strong> <strong
class="jxr_keyword">static</strong> List<File> getImagesWithIptcData()
<strong class="jxr_keyword">throws</strong> IOException,
<a class="jxr_linenumber" name="L70" href="#L70">70</a>
ImageReadException {
<a class="jxr_linenumber" name="L71" href="#L71">71</a> <strong
class="jxr_keyword">return</strong> getTestImages(HAS_IPTC_IMAGE_FILTER);
<a class="jxr_linenumber" name="L72" href="#L72">72</a> }
Modified:
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html
==============================================================================
---
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html
(original)
+++
websites/production/commons/content/proper/commons-imaging/xref-test/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html
Sun Jan 11 12:33:25 2015
@@ -25,66 +25,65 @@
<a class="jxr_linenumber" name="L17" href="#L17">17</a>
<a class="jxr_linenumber" name="L18" href="#L18">18</a> <strong
class="jxr_keyword">package</strong>
org.apache.commons.imaging.formats.jpeg.iptc;
<a class="jxr_linenumber" name="L19" href="#L19">19</a>
-<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong>
org.junit.Assert.assertNotNull;
-<a class="jxr_linenumber" name="L21" href="#L21">21</a>
-<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> java.io.File;
-<a class="jxr_linenumber" name="L23" href="#L23">23</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
-<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.util.List;
-<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
-<a class="jxr_linenumber" name="L26" href="#L26">26</a>
-<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
-<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-<a class="jxr_linenumber" name="L29" href="#L29">29</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata;
-<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
-<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
-<a class="jxr_linenumber" name="L32" href="#L32">32</a>
-<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html">IptcDumpTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.html">IptcBaseTest</a>
{
-<a class="jxr_linenumber" name="L34" href="#L34">34</a>
-<a class="jxr_linenumber" name="L35" href="#L35">35</a> @Test
-<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
test() <strong class="jxr_keyword">throws</strong> Exception {
-<a class="jxr_linenumber" name="L37" href="#L37">37</a> <strong
class="jxr_keyword">final</strong> List<File> images =
getImagesWithIptcData();
-<a class="jxr_linenumber" name="L38" href="#L38">38</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> i =
0; i < images.size(); i++) {
-<a class="jxr_linenumber" name="L39" href="#L39">39</a>
-<a class="jxr_linenumber" name="L40" href="#L40">40</a> <strong
class="jxr_keyword">final</strong> File imageFile = images.get(i);
-<a class="jxr_linenumber" name="L41" href="#L41">41</a>
Debug.debug(<span class="jxr_string">"imageFile"</span>, imageFile);
-<a class="jxr_linenumber" name="L42" href="#L42">42</a>
Debug.debug();
-<a class="jxr_linenumber" name="L43" href="#L43">43</a>
-<a class="jxr_linenumber" name="L44" href="#L44">44</a> <em
class="jxr_comment">// ByteSource byteSource = new
ByteSourceFile(imageFile);</em>
-<a class="jxr_linenumber" name="L45" href="#L45">45</a> <em
class="jxr_comment">// Debug.debug("Segments:");</em>
-<a class="jxr_linenumber" name="L46" href="#L46">46</a> <em
class="jxr_comment">// new JpegUtils().dumpJFIF(byteSource);</em>
+<a class="jxr_linenumber" name="L20" href="#L20">20</a> <strong
class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong>
org.junit.Assert.assertEquals;
+<a class="jxr_linenumber" name="L21" href="#L21">21</a> <strong
class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong>
org.junit.Assert.assertNotEquals;
+<a class="jxr_linenumber" name="L22" href="#L22">22</a> <strong
class="jxr_keyword">import</strong> <strong class="jxr_keyword">static</strong>
org.junit.Assert.assertNotNull;
+<a class="jxr_linenumber" name="L23" href="#L23">23</a>
+<a class="jxr_linenumber" name="L24" href="#L24">24</a> <strong
class="jxr_keyword">import</strong> java.io.File;
+<a class="jxr_linenumber" name="L25" href="#L25">25</a> <strong
class="jxr_keyword">import</strong> java.util.Collection;
+<a class="jxr_linenumber" name="L26" href="#L26">26</a> <strong
class="jxr_keyword">import</strong> java.util.HashMap;
+<a class="jxr_linenumber" name="L27" href="#L27">27</a> <strong
class="jxr_keyword">import</strong> java.util.List;
+<a class="jxr_linenumber" name="L28" href="#L28">28</a> <strong
class="jxr_keyword">import</strong> java.util.Map;
+<a class="jxr_linenumber" name="L29" href="#L29">29</a>
+<a class="jxr_linenumber" name="L30" href="#L30">30</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.Imaging;
+<a class="jxr_linenumber" name="L31" href="#L31">31</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
+<a class="jxr_linenumber" name="L32" href="#L32">32</a> <strong
class="jxr_keyword">import</strong>
org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata;
+<a class="jxr_linenumber" name="L33" href="#L33">33</a> <strong
class="jxr_keyword">import</strong> org.apache.commons.imaging.util.Debug;
+<a class="jxr_linenumber" name="L34" href="#L34">34</a> <strong
class="jxr_keyword">import</strong> org.junit.Test;
+<a class="jxr_linenumber" name="L35" href="#L35">35</a> <strong
class="jxr_keyword">import</strong> org.junit.runner.RunWith;
+<a class="jxr_linenumber" name="L36" href="#L36">36</a> <strong
class="jxr_keyword">import</strong> org.junit.runners.Parameterized;
+<a class="jxr_linenumber" name="L37" href="#L37">37</a>
+<a class="jxr_linenumber" name="L38" href="#L38">38</a>
@RunWith(Parameterized.<strong class="jxr_keyword">class</strong>)
+<a class="jxr_linenumber" name="L39" href="#L39">39</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">class</strong>
<a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html">IptcDumpTest</a>
<strong class="jxr_keyword">extends</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.html">IptcBaseTest</a>
{
+<a class="jxr_linenumber" name="L40" href="#L40">40</a>
+<a class="jxr_linenumber" name="L41" href="#L41">41</a> <strong
class="jxr_keyword">private</strong> File imageFile;
+<a class="jxr_linenumber" name="L42" href="#L42">42</a>
+<a class="jxr_linenumber" name="L43" href="#L43">43</a>
@Parameterized.Parameters
+<a class="jxr_linenumber" name="L44" href="#L44">44</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">static</strong>
Collection<File> data() <strong class="jxr_keyword">throws</strong>
Exception {
+<a class="jxr_linenumber" name="L45" href="#L45">45</a> <strong
class="jxr_keyword">return</strong> getImagesWithIptcData();
+<a class="jxr_linenumber" name="L46" href="#L46">46</a> }
<a class="jxr_linenumber" name="L47" href="#L47">47</a>
-<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">final</strong> Map<String, Object> params = <strong
class="jxr_keyword">new</strong> HashMap<String, Object>();
-<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
-<a class="jxr_linenumber" name="L50" href="#L50">50</a>
params.put(PARAM_KEY_READ_THUMBNAILS, <strong class="jxr_keyword">new</strong>
Boolean(!ignoreImageData));
-<a class="jxr_linenumber" name="L51" href="#L51">51</a> <em
class="jxr_comment">// params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);</em>
-<a class="jxr_linenumber" name="L52" href="#L52">52</a>
-<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging
-<a class="jxr_linenumber" name="L54" href="#L54">54</a>
.getMetadata(imageFile, params);
-<a class="jxr_linenumber" name="L55" href="#L55">55</a>
assertNotNull(metadata);
-<a class="jxr_linenumber" name="L56" href="#L56">56</a>
assertNotNull(metadata.getPhotoshop());
+<a class="jxr_linenumber" name="L48" href="#L48">48</a> <strong
class="jxr_keyword">public</strong> <a
href="../../../../../../../org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.html">IptcDumpTest</a>(File
imageFile) {
+<a class="jxr_linenumber" name="L49" href="#L49">49</a> <strong
class="jxr_keyword">this</strong>.imageFile = imageFile;
+<a class="jxr_linenumber" name="L50" href="#L50">50</a> }
+<a class="jxr_linenumber" name="L51" href="#L51">51</a>
+<a class="jxr_linenumber" name="L52" href="#L52">52</a> @Test
+<a class="jxr_linenumber" name="L53" href="#L53">53</a> <strong
class="jxr_keyword">public</strong> <strong class="jxr_keyword">void</strong>
test() <strong class="jxr_keyword">throws</strong> Exception {
+<a class="jxr_linenumber" name="L54" href="#L54">54</a> <strong
class="jxr_keyword">final</strong> Map<String, Object> params = <strong
class="jxr_keyword">new</strong> HashMap<String, Object>();
+<a class="jxr_linenumber" name="L55" href="#L55">55</a> <strong
class="jxr_keyword">final</strong> <strong class="jxr_keyword">boolean</strong>
ignoreImageData = isPhilHarveyTestImage(imageFile);
+<a class="jxr_linenumber" name="L56" href="#L56">56</a>
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData));
<a class="jxr_linenumber" name="L57" href="#L57">57</a>
-<a class="jxr_linenumber" name="L58" href="#L58">58</a>
metadata.getPhotoshop().dump();
-<a class="jxr_linenumber" name="L59" href="#L59">59</a> <em
class="jxr_comment">// if(metadata.getPhotoshop().getItems().size()>0)</em>
-<a class="jxr_linenumber" name="L60" href="#L60">60</a> <em
class="jxr_comment">// Debug.debug("iptc size",</em>
-<a class="jxr_linenumber" name="L61" href="#L61">61</a> <em
class="jxr_comment">// metadata.getPhotoshop().getItems().size());</em>
-<a class="jxr_linenumber" name="L62" href="#L62">62</a>
-<a class="jxr_linenumber" name="L63" href="#L63">63</a> <strong
class="jxr_keyword">final</strong> JpegPhotoshopMetadata psMetadata =
metadata.getPhotoshop();
-<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">final</strong> List<IptcRecord> oldRecords =
psMetadata.photoshopApp13Data.getRecords();
-<a class="jxr_linenumber" name="L65" href="#L65">65</a>
-<a class="jxr_linenumber" name="L66" href="#L66">66</a>
Debug.debug();
-<a class="jxr_linenumber" name="L67" href="#L67">67</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">int</strong> j =
0; j < oldRecords.size(); j++) {
-<a class="jxr_linenumber" name="L68" href="#L68">68</a>
<strong class="jxr_keyword">final</strong> IptcRecord record =
oldRecords.get(j);
-<a class="jxr_linenumber" name="L69" href="#L69">69</a>
<strong class="jxr_keyword">if</strong> (record.iptcType != IptcTypes.CITY) {
-<a class="jxr_linenumber" name="L70" href="#L70">70</a>
Debug.debug(<span class="jxr_string">"Key: "</span> + record.iptcType.getName()
+ <span class="jxr_string">" (0x"</span>
-<a class="jxr_linenumber" name="L71" href="#L71">71</a>
+ Integer.toHexString(record.iptcType.getType())
-<a class="jxr_linenumber" name="L72" href="#L72">72</a>
+ <span class="jxr_string">"), value: "</span> + record.value);
-<a class="jxr_linenumber" name="L73" href="#L73">73</a> }
-<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
-<a class="jxr_linenumber" name="L75" href="#L75">75</a>
Debug.debug();
-<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
-<a class="jxr_linenumber" name="L77" href="#L77">77</a> }
-<a class="jxr_linenumber" name="L78" href="#L78">78</a>
-<a class="jxr_linenumber" name="L79" href="#L79">79</a> }
+<a class="jxr_linenumber" name="L58" href="#L58">58</a> <strong
class="jxr_keyword">final</strong> JpegImageMetadata metadata =
(JpegImageMetadata) Imaging.getMetadata(imageFile, params);
+<a class="jxr_linenumber" name="L59" href="#L59">59</a>
assertNotNull(metadata);
+<a class="jxr_linenumber" name="L60" href="#L60">60</a>
assertNotNull(metadata.getPhotoshop());
+<a class="jxr_linenumber" name="L61" href="#L61">61</a>
+<a class="jxr_linenumber" name="L62" href="#L62">62</a>
metadata.getPhotoshop().dump();
+<a class="jxr_linenumber" name="L63" href="#L63">63</a>
+<a class="jxr_linenumber" name="L64" href="#L64">64</a> <strong
class="jxr_keyword">final</strong> JpegPhotoshopMetadata psMetadata =
metadata.getPhotoshop();
+<a class="jxr_linenumber" name="L65" href="#L65">65</a> <strong
class="jxr_keyword">final</strong> List<IptcRecord> oldRecords =
psMetadata.photoshopApp13Data.getRecords();
+<a class="jxr_linenumber" name="L66" href="#L66">66</a>
+<a class="jxr_linenumber" name="L67" href="#L67">67</a> Debug.debug();
+<a class="jxr_linenumber" name="L68" href="#L68">68</a> <strong
class="jxr_keyword">for</strong> (<strong class="jxr_keyword">final</strong>
IptcRecord record : oldRecords) {
+<a class="jxr_linenumber" name="L69" href="#L69">69</a> <strong
class="jxr_keyword">if</strong> (record.iptcType != IptcTypes.CITY) {
+<a class="jxr_linenumber" name="L70" href="#L70">70</a>
Debug.debug(<span class="jxr_string">"Key: "</span> + record.iptcType.getName()
+ <span class="jxr_string">" (0x"</span>
+<a class="jxr_linenumber" name="L71" href="#L71">71</a>
+ Integer.toHexString(record.iptcType.getType())
+<a class="jxr_linenumber" name="L72" href="#L72">72</a>
+ <span class="jxr_string">"), value: "</span> + record.value);
+<a class="jxr_linenumber" name="L73" href="#L73">73</a> }
+<a class="jxr_linenumber" name="L74" href="#L74">74</a> }
+<a class="jxr_linenumber" name="L75" href="#L75">75</a> Debug.debug();
+<a class="jxr_linenumber" name="L76" href="#L76">76</a> }
+<a class="jxr_linenumber" name="L77" href="#L77">77</a>
+<a class="jxr_linenumber" name="L78" href="#L78">78</a> }
</pre>
<hr/>
<div id="footer">Copyright © 2007–2015 <a
href="http://www.apache.org/">The Apache Software Foundation</a>. All rights
reserved.</div>